forked from Imagelibrary/rtems
Patch ("FIX: no_cpu/no_bsp") from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
This patch should fix the nastiest configuration bugs for no_cpu/no_bsp.
With this patch applied, configure --target=no_cpu-rtems now correctly
acknowledges its configuration, but later fails building when trying to
build libcsupport (I leave this problem for you :-).
Fixes/Changes:
* aclocal/canonicalize-target-name.m4: use RTEMS_CPU instead of
target_cpu, switch to a native compiler setup if target = no_cpu*rtems,
ie. implicitly use host=target (native) and RTEMS_CPU=no_cpu for
--target=no_cpu*rtems.
* add no_bsp/bsp_specs (Support -qrtems, -qrtems_debug; please check
before adding :-)
* Use RTEMS_CANONICALIZE_TARGET_CPU instead of AC_CANONICAL_SYSTEM in
toplevel/configure.in
* All references to $target_cpu in aclocal/*.m4, Makefile.ins and *.cfg
files changed to RTEMS_CPU
* bug fixes to exec/score/cpu/no_cpu/wrap (This part of the patch may
result into patch rejections, because your recently posted patch may
also have addressed this problem).
After applying this patch, please do:
cvs add c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs
./autogen
This commit is contained in:
26
c/src/lib/libbsp/unix/posix/tools/aclocal.m4
vendored
26
c/src/lib/libbsp/unix/posix/tools/aclocal.m4
vendored
@@ -63,35 +63,37 @@ dnl and we have to fix it for rtems ourselves
|
||||
|
||||
AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
|
||||
[
|
||||
AC_REQUIRE([AC_CANONICAL_SYSTEM])
|
||||
rtems_target=$target;
|
||||
case "$target" in
|
||||
no_cpu*) target=$host;;
|
||||
*) ;;
|
||||
esac
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_MSG_CHECKING(rtems target cpu)
|
||||
changequote(,)dnl
|
||||
case "${target}" in
|
||||
case "${rtems_target}" in
|
||||
# hpux unix port should go here
|
||||
i[3456]86-go32-rtems*)
|
||||
target_cpu=i386
|
||||
RTEMS_CPU=i386
|
||||
;;
|
||||
i[3456]86-pc-linux*) # unix "simulator" port
|
||||
target_cpu=unix
|
||||
RTEMS_CPU=unix
|
||||
;;
|
||||
i[3456]86-*freebsd2*) # unix "simulator" port
|
||||
target_cpu=unix
|
||||
RTEMS_CPU=unix
|
||||
;;
|
||||
no_cpu-*rtems*)
|
||||
target_cpu=no_cpu
|
||||
;;
|
||||
ppc*-*rtems*)
|
||||
target_cpu=powerpc
|
||||
RTEMS_CPU=no_cpu
|
||||
;;
|
||||
sparc-sun-solaris*) # unix "simulator" port
|
||||
target_cpu=unix
|
||||
RTEMS_CPU=unix
|
||||
;;
|
||||
*)
|
||||
target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
|
||||
RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
|
||||
;;
|
||||
esac
|
||||
changequote([,])dnl
|
||||
AC_MSG_RESULT($target_cpu)
|
||||
AC_MSG_RESULT($RTEMS_CPU)
|
||||
])
|
||||
|
||||
# Do all the work for Automake. This macro actually does too much --
|
||||
|
||||
55
c/src/lib/libbsp/unix/posix/tools/configure
vendored
55
c/src/lib/libbsp/unix/posix/tools/configure
vendored
@@ -576,6 +576,12 @@ RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir;
|
||||
|
||||
|
||||
|
||||
rtems_target=$target;
|
||||
case "$target" in
|
||||
no_cpu*) target=$host;;
|
||||
*) ;;
|
||||
esac
|
||||
|
||||
# Do some error checking and defaulting for the host and target type.
|
||||
# The inputs are:
|
||||
# configure --host=HOST --target=TARGET --build=BUILD NONOPT
|
||||
@@ -603,7 +609,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||
echo "configure:607: checking host system type" >&5
|
||||
echo "configure:613: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
@@ -624,7 +630,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||
echo "$ac_t""$host" 1>&6
|
||||
|
||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||
echo "configure:628: checking target system type" >&5
|
||||
echo "configure:634: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
@@ -642,7 +648,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||
echo "$ac_t""$target" 1>&6
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:646: checking build system type" >&5
|
||||
echo "configure:652: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
@@ -664,35 +670,30 @@ test "$host_alias" != "$target_alias" &&
|
||||
NONENONEs,x,x, &&
|
||||
program_prefix=${target_alias}-
|
||||
|
||||
|
||||
|
||||
echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6
|
||||
echo "configure:671: checking rtems target cpu" >&5
|
||||
case "${target}" in
|
||||
echo "configure:675: checking rtems target cpu" >&5
|
||||
case "${rtems_target}" in
|
||||
# hpux unix port should go here
|
||||
i[3456]86-go32-rtems*)
|
||||
target_cpu=i386
|
||||
RTEMS_CPU=i386
|
||||
;;
|
||||
i[3456]86-pc-linux*) # unix "simulator" port
|
||||
target_cpu=unix
|
||||
RTEMS_CPU=unix
|
||||
;;
|
||||
i[3456]86-*freebsd2*) # unix "simulator" port
|
||||
target_cpu=unix
|
||||
RTEMS_CPU=unix
|
||||
;;
|
||||
no_cpu-*rtems*)
|
||||
target_cpu=no_cpu
|
||||
;;
|
||||
ppc*-*rtems*)
|
||||
target_cpu=powerpc
|
||||
RTEMS_CPU=no_cpu
|
||||
;;
|
||||
sparc-sun-solaris*) # unix "simulator" port
|
||||
target_cpu=unix
|
||||
RTEMS_CPU=unix
|
||||
;;
|
||||
*)
|
||||
target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
|
||||
RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
|
||||
;;
|
||||
esac
|
||||
echo "$ac_t""$target_cpu" 1>&6
|
||||
echo "$ac_t""$RTEMS_CPU" 1>&6
|
||||
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
@@ -707,7 +708,7 @@ echo "$ac_t""$target_cpu" 1>&6
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:711: checking for a BSD compatible install" >&5
|
||||
echo "configure:712: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -760,7 +761,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
|
||||
echo "configure:764: checking whether build environment is sane" >&5
|
||||
echo "configure:765: checking whether build environment is sane" >&5
|
||||
# Just in case
|
||||
sleep 1
|
||||
echo timestamp > conftestfile
|
||||
@@ -817,7 +818,7 @@ test "$program_suffix" != NONE &&
|
||||
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:821: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:822: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -856,7 +857,7 @@ fi
|
||||
|
||||
missing_dir=`cd $ac_aux_dir && pwd`
|
||||
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
|
||||
echo "configure:860: checking for working aclocal" >&5
|
||||
echo "configure:861: checking for working aclocal" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@@ -869,7 +870,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
|
||||
echo "configure:873: checking for working autoconf" >&5
|
||||
echo "configure:874: checking for working autoconf" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@@ -882,7 +883,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working automake""... $ac_c" 1>&6
|
||||
echo "configure:886: checking for working automake" >&5
|
||||
echo "configure:887: checking for working automake" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@@ -895,7 +896,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
|
||||
echo "configure:899: checking for working autoheader" >&5
|
||||
echo "configure:900: checking for working autoheader" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@@ -908,7 +909,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
|
||||
echo "configure:912: checking for working makeinfo" >&5
|
||||
echo "configure:913: checking for working makeinfo" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@@ -928,7 +929,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:932: checking for $ac_word" >&5
|
||||
echo "configure:933: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -973,7 +974,7 @@ fi
|
||||
# Extract the first word of "perl", so it can be a program name with args.
|
||||
set dummy perl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:977: checking for $ac_word" >&5
|
||||
echo "configure:978: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user