diff options
Diffstat (limited to '')
38 files changed, 1021 insertions, 957 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index f221ea2826..229b03058f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -51,6 +51,51 @@ RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; AC_SUBST(RTEMS_ROOT) ])dnl +dnl +dnl $Id$ +dnl + +dnl canonicalize target cpu +dnl NOTE: Most rtems targets do not fullfil autoconf's +dnl target naming conventions "processor-vendor-os" +dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them +dnl and we have to fix it for rtems ourselves + +AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU, +[ +rtems_target=$target; +case "$target" in +no_cpu*) target=$host;; +*) ;; +esac +AC_CANONICAL_SYSTEM +AC_MSG_CHECKING(rtems target cpu) +changequote(,)dnl +case "${rtems_target}" in + # hpux unix port should go here + i[3456]86-go32-rtems*) + RTEMS_CPU=i386 + ;; + i[3456]86-pc-linux*) # unix "simulator" port + RTEMS_CPU=unix + ;; + i[3456]86-*freebsd2*) # unix "simulator" port + RTEMS_CPU=unix + ;; + no_cpu-*rtems*) + RTEMS_CPU=no_cpu + ;; + sparc-sun-solaris*) # unix "simulator" port + RTEMS_CPU=unix + ;; + *) + RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` + ;; +esac +changequote([,])dnl +AC_MSG_RESULT($RTEMS_CPU) +]) + dnl $Id$ AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING, @@ -233,49 +278,6 @@ AC_MSG_ERROR( fi ]) -dnl -dnl $Id$ -dnl - -dnl canonicalize target cpu -dnl NOTE: Most rtems targets do not fullfil autoconf's -dnl target naming conventions "processor-vendor-os" -dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them -dnl and we have to fix it for rtems ourselves - -AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU, -[ -AC_REQUIRE([AC_CANONICAL_SYSTEM]) -AC_MSG_CHECKING(rtems target cpu) -changequote(,)dnl -case "${target}" in - # hpux unix port should go here - i[3456]86-go32-rtems*) - target_cpu=i386 - ;; - i[3456]86-pc-linux*) # unix "simulator" port - target_cpu=unix - ;; - i[3456]86-*freebsd2*) # unix "simulator" port - target_cpu=unix - ;; - no_cpu-*rtems*) - target_cpu=no_cpu - ;; - ppc*-*rtems*) - target_cpu=powerpc - ;; - sparc-sun-solaris*) # unix "simulator" port - target_cpu=unix - ;; - *) - target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` - ;; -esac -changequote([,])dnl -AC_MSG_RESULT($target_cpu) -]) - dnl $Id$ dnl check if RTEMS support a cpu @@ -284,8 +286,8 @@ AC_DEFUN(RTEMS_CHECK_CPU, AC_REQUIRE([RTEMS_TOP]) AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU]) # Is this a supported CPU? -AC_MSG_CHECKING([if cpu $target_cpu is supported]) -if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$target_cpu"; then +AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported]) +if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then AC_MSG_RESULT(yes) else AC_MSG_ERROR(no) diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4 index 8a12973436..65c55b8dc5 100644 --- a/aclocal/canonical-target-name.m4 +++ b/aclocal/canonical-target-name.m4 @@ -10,33 +10,35 @@ 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) ]) diff --git a/aclocal/check-cpu.m4 b/aclocal/check-cpu.m4 index 89ef96e661..60551ba4d8 100644 --- a/aclocal/check-cpu.m4 +++ b/aclocal/check-cpu.m4 @@ -6,8 +6,8 @@ AC_DEFUN(RTEMS_CHECK_CPU, AC_REQUIRE([RTEMS_TOP]) AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU]) # Is this a supported CPU? -AC_MSG_CHECKING([if cpu $target_cpu is supported]) -if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$target_cpu"; then +AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported]) +if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then AC_MSG_RESULT(yes) else AC_MSG_ERROR(no) diff --git a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in index be33fee786..e5c27120bf 100644 --- a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in @@ -29,7 +29,7 @@ C_PIECES = cpu cpu_asm C_FILES=$(C_PIECES:%=%.c) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) -H_PIECES = asm.h cpu_asm.h +H_PIECES = asm.h H_FILES=$(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S @@ -65,8 +65,9 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(ARCH)/rtems.o $(RELS) + +$(ARCH)/rtems.o: rtems.c ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) diff --git a/c/src/exec/score/tools/generic/aclocal.m4 b/c/src/exec/score/tools/generic/aclocal.m4 index cc365b2c50..b2cf4a3008 100644 --- a/c/src/exec/score/tools/generic/aclocal.m4 +++ b/c/src/exec/score/tools/generic/aclocal.m4 @@ -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 -- diff --git a/c/src/exec/score/tools/generic/configure b/c/src/exec/score/tools/generic/configure index 7aa0c3e7bc..14f7f2e63a 100644 --- a/c/src/exec/score/tools/generic/configure +++ b/c/src/exec/score/tools/generic/configure @@ -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 diff --git a/c/src/exec/score/tools/hppa1.1/aclocal.m4 b/c/src/exec/score/tools/hppa1.1/aclocal.m4 index 5b6113bc96..818ad53205 100644 --- a/c/src/exec/score/tools/hppa1.1/aclocal.m4 +++ b/c/src/exec/score/tools/hppa1.1/aclocal.m4 @@ -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 -- diff --git a/c/src/exec/score/tools/hppa1.1/configure b/c/src/exec/score/tools/hppa1.1/configure index 2caf4635d9..4ee4a3bcd9 100644 --- a/c/src/exec/score/tools/hppa1.1/configure +++ b/c/src/exec/score/tools/hppa1.1/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/c/src/exec/score/tools/sh/aclocal.m4 b/c/src/exec/score/tools/sh/aclocal.m4 index 5b6113bc96..818ad53205 100644 --- a/c/src/exec/score/tools/sh/aclocal.m4 +++ b/c/src/exec/score/tools/sh/aclocal.m4 @@ -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 -- diff --git a/c/src/exec/score/tools/sh/configure b/c/src/exec/score/tools/sh/configure index 906bb31063..565698c137 100644 --- a/c/src/exec/score/tools/sh/configure +++ b/c/src/exec/score/tools/sh/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,7 +1146,7 @@ else fi echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 -echo "configure:1149: checking for fabs in -lm" >&5 +echo "configure:1150: checking for fabs in -lm" >&5 ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1153,7 +1154,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1157 "configure" +#line 1158 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1164,7 +1165,7 @@ int main() { fabs() ; return 0; } EOF -if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/c/src/exec/score/tools/unix/aclocal.m4 b/c/src/exec/score/tools/unix/aclocal.m4 index 5b6113bc96..818ad53205 100644 --- a/c/src/exec/score/tools/unix/aclocal.m4 +++ b/c/src/exec/score/tools/unix/aclocal.m4 @@ -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 -- diff --git a/c/src/exec/score/tools/unix/configure b/c/src/exec/score/tools/unix/configure index 57139ca44d..64a0b360c8 100644 --- a/c/src/exec/score/tools/unix/configure +++ b/c/src/exec/score/tools/unix/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 b/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 index a4ec066f23..f3316f3ca7 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/aclocal.m4 @@ -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 -- diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure index aa980bd5ce..2223d291e3 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1148,12 +1149,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1152: checking for $ac_func" >&5 +echo "configure:1153: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1157 "configure" +#line 1158 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1176,7 +1177,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 b/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 index ceacc3877f..219ab0c8f6 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 +++ b/c/src/lib/libbsp/i386/pc386/tools/aclocal.m4 @@ -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 -- diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure b/c/src/lib/libbsp/i386/pc386/tools/configure index e4c375ce33..babc39d899 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/configure +++ b/c/src/lib/libbsp/i386/pc386/tools/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1148,12 +1149,12 @@ fi for ac_func in strtol strtoul do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1152: checking for $ac_func" >&5 +echo "configure:1153: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1157 "configure" +#line 1158 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1176,7 +1177,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/aclocal.m4 b/c/src/lib/libbsp/m68k/mvme162/tools/aclocal.m4 index ceacc3877f..219ab0c8f6 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/aclocal.m4 +++ b/c/src/lib/libbsp/m68k/mvme162/tools/aclocal.m4 @@ -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 -- diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/configure b/c/src/lib/libbsp/m68k/mvme162/tools/configure index 3e3c743aac..0fa3e43d49 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/configure +++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1146,7 +1147,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1150: checking how to run the C preprocessor" >&5 +echo "configure:1151: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1161,13 +1162,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1165 "configure" +#line 1166 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1178,13 +1179,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1182 "configure" +#line 1183 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1195,13 +1196,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1199 "configure" +#line 1200 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1226,12 +1227,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1230: checking for ANSI C header files" >&5 +echo "configure:1231: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1235 "configure" +#line 1236 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1239,7 +1240,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1256,7 +1257,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1260 "configure" +#line 1261 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1274,7 +1275,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1278 "configure" +#line 1279 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1295,7 +1296,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1299 "configure" +#line 1300 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1306,7 +1307,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1333,17 +1334,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1337: checking for $ac_hdr" >&5 +echo "configure:1338: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1342 "configure" +#line 1343 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1373,17 +1374,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1377: checking for $ac_hdr" >&5 +echo "configure:1378: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1382 "configure" +#line 1383 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1412,12 +1413,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1416: checking for $ac_func" >&5 +echo "configure:1417: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1421 "configure" +#line 1422 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1440,7 +1441,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1465,7 +1466,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1469: checking for working mmap" >&5 +echo "configure:1470: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1473,7 +1474,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 1477 "configure" +#line 1478 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -1613,7 +1614,7 @@ main() } EOF -if { (eval echo configure:1617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs b/c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs new file mode 100644 index 0000000000..1a49230640 --- /dev/null +++ b/c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs @@ -0,0 +1,12 @@ +%rename cpp old_cpp +%rename lib old_lib + +*cpp: +%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded) + +*lib: +%{!qrtems: %(old_lib)} \ +%{qrtems: --start-group %{!qrtems_debug: -lrtemsall } %{qrtems_debug: -lrtemsall_g} \ + -lc -lgcc --end-group \ + %{!qnolinkcmds: -T linkcmds%s}} + diff --git a/c/src/lib/libbsp/powerpc/psim/tools/aclocal.m4 b/c/src/lib/libbsp/powerpc/psim/tools/aclocal.m4 index ceacc3877f..219ab0c8f6 100644 --- a/c/src/lib/libbsp/powerpc/psim/tools/aclocal.m4 +++ b/c/src/lib/libbsp/powerpc/psim/tools/aclocal.m4 @@ -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 -- diff --git a/c/src/lib/libbsp/powerpc/psim/tools/configure b/c/src/lib/libbsp/powerpc/psim/tools/configure index c7bfa18367..14fb99ab6e 100644 --- a/c/src/lib/libbsp/powerpc/psim/tools/configure +++ b/c/src/lib/libbsp/powerpc/psim/tools/configure @@ -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. diff --git a/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 b/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 index 0a121ff006..318d046234 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 +++ b/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 @@ -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 -- diff --git a/c/src/lib/libbsp/sparc/erc32/tools/configure b/c/src/lib/libbsp/sparc/erc32/tools/configure index a3485c2118..b750703381 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/configure +++ b/c/src/lib/libbsp/sparc/erc32/tools/configure @@ -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 diff --git a/c/src/lib/libbsp/unix/posix/tools/aclocal.m4 b/c/src/lib/libbsp/unix/posix/tools/aclocal.m4 index 01e1e9f560..47c44259d9 100644 --- a/c/src/lib/libbsp/unix/posix/tools/aclocal.m4 +++ b/c/src/lib/libbsp/unix/posix/tools/aclocal.m4 @@ -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 -- diff --git a/c/src/lib/libbsp/unix/posix/tools/configure b/c/src/lib/libbsp/unix/posix/tools/configure index be764122a3..98afe7e972 100644 --- a/c/src/lib/libbsp/unix/posix/tools/configure +++ b/c/src/lib/libbsp/unix/posix/tools/configure @@ -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 diff --git a/c/src/tests/tools/generic/aclocal.m4 b/c/src/tests/tools/generic/aclocal.m4 index 0a121ff006..318d046234 100644 --- a/c/src/tests/tools/generic/aclocal.m4 +++ b/c/src/tests/tools/generic/aclocal.m4 @@ -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 -- diff --git a/c/src/tests/tools/generic/configure b/c/src/tests/tools/generic/configure index d38b7da449..e11bfead97 100644 --- a/c/src/tests/tools/generic/configure +++ b/c/src/tests/tools/generic/configure @@ -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 @@ -617,6 +617,15 @@ else SET_MAKE="MAKE=${MAKE-make}" fi + +# Check whether --with-cross-host or --without-cross-host was given. +if test "${with_cross_host+set}" = set; then + withval="$with_cross_host" + \ +host=$withval +fi + + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -637,6 +646,12 @@ ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +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 @@ -664,7 +679,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:668: checking host system type" >&5 +echo "configure:683: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -685,7 +700,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:689: checking target system type" >&5 +echo "configure:704: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -703,7 +718,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:707: checking build system type" >&5 +echo "configure:722: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -725,14 +740,30 @@ test "$host_alias" != "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- - -# Check whether --with-cross-host or --without-cross-host was given. -if test "${with_cross_host+set}" = set; then - withval="$with_cross_host" - \ -host=$withval -fi - +echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 +echo "configure:745: checking rtems target cpu" >&5 +case "${rtems_target}" in + # hpux unix port should go here + i[3456]86-go32-rtems*) + RTEMS_CPU=i386 + ;; + i[3456]86-pc-linux*) # unix "simulator" port + RTEMS_CPU=unix + ;; + i[3456]86-*freebsd2*) # unix "simulator" port + RTEMS_CPU=unix + ;; + no_cpu-*rtems*) + RTEMS_CPU=no_cpu + ;; + sparc-sun-solaris*) # unix "simulator" port + RTEMS_CPU=unix + ;; + *) + RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` + ;; +esac +echo "$ac_t""$RTEMS_CPU" 1>&6 # Check whether --enable-multiprocessing or --disable-multiprocessing was given. @@ -895,7 +926,7 @@ RTEMS_PREFIX=${target_cpu}-${target_vendor} # Extract the first word of "cat", so it can be a program name with args. set dummy cat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:899: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -930,7 +961,7 @@ fi # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:934: checking for $ac_word" >&5 +echo "configure:965: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -965,7 +996,7 @@ fi # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:969: checking for $ac_word" >&5 +echo "configure:1000: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1000,7 +1031,7 @@ fi # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1004: checking for $ac_word" >&5 +echo "configure:1035: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1066,7 @@ fi # Extract the first word of "ln", so it can be a program name with args. set dummy ln; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1039: checking for $ac_word" >&5 +echo "configure:1070: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1068,7 +1099,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1072: checking whether ln -s works" >&5 +echo "configure:1103: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1091,7 +1122,7 @@ fi # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1095: checking for $ac_word" >&5 +echo "configure:1126: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1126,7 +1157,7 @@ fi # Extract the first word of "sort", so it can be a program name with args. set dummy sort; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1130: checking for $ac_word" >&5 +echo "configure:1161: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SORT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1170,7 +1201,7 @@ fi # 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:1174: checking for a BSD compatible install" >&5 +echo "configure:1205: 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 @@ -1226,7 +1257,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:1230: checking for $ac_word" >&5 +echo "configure:1261: 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 @@ -1268,7 +1299,7 @@ fi # Extract the first word of "touch", so it can be a program name with args. set dummy touch; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1272: checking for $ac_word" >&5 +echo "configure:1303: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1303,7 +1334,7 @@ fi # Extract the first word of "cmp", so it can be a program name with args. set dummy cmp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1307: checking for $ac_word" >&5 +echo "configure:1338: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1339,7 +1370,7 @@ fi # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1343: checking for $ac_word" >&5 +echo "configure:1374: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1376,7 +1407,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:1380: checking for $ac_word" >&5 +echo "configure:1411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1418,7 +1449,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:1422: checking for $ac_word" >&5 +echo "configure:1453: 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 @@ -1463,42 +1494,13 @@ fi - - -echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 -echo "configure:1470: checking rtems target cpu" >&5 -case "${target}" in - # hpux unix port should go here - i[3456]86-go32-rtems*) - target_cpu=i386 - ;; - i[3456]86-pc-linux*) # unix "simulator" port - target_cpu=unix - ;; - i[3456]86-*freebsd2*) # unix "simulator" port - target_cpu=unix - ;; - no_cpu-*rtems*) - target_cpu=no_cpu - ;; - ppc*-*rtems*) - target_cpu=powerpc - ;; - sparc-sun-solaris*) # unix "simulator" port - target_cpu=unix - ;; - *) - target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` - ;; -esac -echo "$ac_t""$target_cpu" 1>&6 - +# RTEMS_CANONICAL_TARGET_CPU # Is this a supported CPU? -echo $ac_n "checking if cpu $target_cpu is supported""... $ac_c" 1>&6 -echo "configure:1501: checking if cpu $target_cpu is supported" >&5 -if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$target_cpu"; then +echo $ac_n "checking if cpu $RTEMS_CPU is supported""... $ac_c" 1>&6 +echo "configure:1503: checking if cpu $RTEMS_CPU is supported" >&5 +if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then echo "$ac_t""yes" 1>&6 else { echo "configure: error: no" 1>&2; exit 1; } @@ -1559,7 +1561,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:1563: checking for $ac_word" >&5 +echo "configure:1565: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1603,7 +1605,7 @@ rtems_save_CFLAGS=$CFLAGS CC=$CC_FOR_TARGET echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1607: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1609: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1614,12 +1616,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1618 "configure" +#line 1620 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1645,12 +1647,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1649: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1651: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1654: checking whether we are using GNU C" >&5 +echo "configure:1656: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1659,7 +1661,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1674,7 +1676,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1680: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1716,7 +1718,7 @@ unset ac_cv_prog_cc_cross echo $ac_n "checking whether $CC_FOR_TARGET accepts -specs""... $ac_c" 1>&6 -echo "configure:1720: checking whether $CC_FOR_TARGET accepts -specs" >&5 +echo "configure:1722: checking whether $CC_FOR_TARGET accepts -specs" >&5 if eval "test \"`echo '$''{'rtems_cv_gcc_specs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1737,7 +1739,7 @@ echo "$ac_t""$rtems_cv_gcc_specs" 1>&6 echo $ac_n "checking whether $CC_FOR_TARGET accepts --pipe""... $ac_c" 1>&6 -echo "configure:1741: checking whether $CC_FOR_TARGET accepts --pipe" >&5 +echo "configure:1743: checking whether $CC_FOR_TARGET accepts --pipe" >&5 if eval "test \"`echo '$''{'rtems_cv_gcc_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1778,7 +1780,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:1782: checking for $ac_word" >&5 +echo "configure:1784: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CXX_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1822,7 +1824,7 @@ rtems_save_CXXFLAGS=$CXXFLAGS CXX=$CXX_FOR_TARGET echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1826: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1828: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1833,12 +1835,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1837 "configure" +#line 1839 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1864,12 +1866,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1868: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1870: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1873: checking whether we are using GNU C++" >&5 +echo "configure:1875: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1878,7 +1880,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1893,7 +1895,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1897: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1899: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1947,7 +1949,7 @@ fi echo $ac_n "checking target's ar""... $ac_c" 1>&6 -echo "configure:1951: checking target's ar" >&5 +echo "configure:1953: checking target's ar" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1980,7 +1982,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable AR_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:1984: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5 +echo "configure:1986: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5 case "$AR_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -1997,7 +1999,7 @@ echo "configure:1984: checking whether environment variable AR_FOR_TARGET is an # Extract the first word of ""$program_prefix"ar", so it can be a program name with args. set dummy "$program_prefix"ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2001: checking for $ac_word" >&5 +echo "configure:2003: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2034,7 +2036,7 @@ fi echo $ac_n "checking target's as""... $ac_c" 1>&6 -echo "configure:2038: checking target's as" >&5 +echo "configure:2040: checking target's as" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2067,7 +2069,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable AS_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2071: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5 +echo "configure:2073: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5 case "$AS_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2084,7 +2086,7 @@ echo "configure:2071: checking whether environment variable AS_FOR_TARGET is an # Extract the first word of ""$program_prefix"as", so it can be a program name with args. set dummy "$program_prefix"as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2088: checking for $ac_word" >&5 +echo "configure:2090: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2121,7 +2123,7 @@ fi echo $ac_n "checking target's ld""... $ac_c" 1>&6 -echo "configure:2125: checking target's ld" >&5 +echo "configure:2127: checking target's ld" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2154,7 +2156,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable LD_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2158: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5 +echo "configure:2160: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5 case "$LD_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2171,7 +2173,7 @@ echo "configure:2158: checking whether environment variable LD_FOR_TARGET is an # Extract the first word of ""$program_prefix"ld", so it can be a program name with args. set dummy "$program_prefix"ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2175: checking for $ac_word" >&5 +echo "configure:2177: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2208,7 +2210,7 @@ fi echo $ac_n "checking target's nm""... $ac_c" 1>&6 -echo "configure:2212: checking target's nm" >&5 +echo "configure:2214: checking target's nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2241,7 +2243,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable NM_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2245: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5 +echo "configure:2247: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5 case "$NM_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2258,7 +2260,7 @@ echo "configure:2245: checking whether environment variable NM_FOR_TARGET is an # Extract the first word of ""$program_prefix"nm", so it can be a program name with args. set dummy "$program_prefix"nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2262: checking for $ac_word" >&5 +echo "configure:2264: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2296,7 +2298,7 @@ fi echo $ac_n "checking target's ranlib""... $ac_c" 1>&6 -echo "configure:2300: checking target's ranlib" >&5 +echo "configure:2302: checking target's ranlib" >&5 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2329,7 +2331,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable RANLIB_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2333: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5 +echo "configure:2335: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5 case "$RANLIB_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2346,7 +2348,7 @@ echo "configure:2333: checking whether environment variable RANLIB_FOR_TARGET is # Extract the first word of ""$program_prefix"ranlib", so it can be a program name with args. set dummy "$program_prefix"ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2350: checking for $ac_word" >&5 +echo "configure:2352: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2385,7 +2387,7 @@ fi # ranlib wasn't found; check if ar -s is available echo $ac_n "checking whether $AR_FOR_TARGET -s works""... $ac_c" 1>&6 -echo "configure:2389: checking whether $AR_FOR_TARGET -s works" >&5 +echo "configure:2391: checking whether $AR_FOR_TARGET -s works" >&5 if eval "test \"`echo '$''{'rtems_cv_AR_FOR_TARGET_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2394,8 +2396,8 @@ cat > conftest.$ac_ext <<EOF int foo( int b ) { return b; } EOF -if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ - && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:2399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ +if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:2400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ + && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ && test -s conftest.a ; \ then rtems_cv_AR_FOR_TARGET_S="yes" @@ -2420,7 +2422,7 @@ echo "$ac_t""$rtems_cv_AR_FOR_TARGET_S" 1>&6 echo $ac_n "checking target's objcopy""... $ac_c" 1>&6 -echo "configure:2424: checking target's objcopy" >&5 +echo "configure:2426: checking target's objcopy" >&5 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2453,7 +2455,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2457: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5 +echo "configure:2459: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5 case "$OBJCOPY_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2470,7 +2472,7 @@ echo "configure:2457: checking whether environment variable OBJCOPY_FOR_TARGET i # Extract the first word of ""$program_prefix"objcopy", so it can be a program name with args. set dummy "$program_prefix"objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2474: checking for $ac_word" >&5 +echo "configure:2476: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2507,7 +2509,7 @@ fi echo $ac_n "checking target's size""... $ac_c" 1>&6 -echo "configure:2511: checking target's size" >&5 +echo "configure:2513: checking target's size" >&5 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2540,7 +2542,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable SIZE_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2544: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5 +echo "configure:2546: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5 case "$SIZE_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2557,7 +2559,7 @@ echo "configure:2544: checking whether environment variable SIZE_FOR_TARGET is a # Extract the first word of ""$program_prefix"size", so it can be a program name with args. set dummy "$program_prefix"size; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2561: checking for $ac_word" >&5 +echo "configure:2563: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2594,7 +2596,7 @@ fi echo $ac_n "checking target's strip""... $ac_c" 1>&6 -echo "configure:2598: checking target's strip" >&5 +echo "configure:2600: checking target's strip" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2627,7 +2629,7 @@ else # will override the environment variable, which isn't what the user # intends echo $ac_n "checking whether environment variable STRIP_FOR_TARGET is an absolute path""... $ac_c" 1>&6 -echo "configure:2631: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5 +echo "configure:2633: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5 case "$STRIP_FOR_TARGET" in /*) # valid echo "$ac_t"""yes"" 1>&6 @@ -2644,7 +2646,7 @@ echo "configure:2631: checking whether environment variable STRIP_FOR_TARGET is # Extract the first word of ""$program_prefix"strip", so it can be a program name with args. set dummy "$program_prefix"strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2648: checking for $ac_word" >&5 +echo "configure:2650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2683,7 +2685,7 @@ fi if test "${target_cpu}" = "i386"; then echo $ac_n "checking for 16 bit mode assembler support""... $ac_c" 1>&6 -echo "configure:2687: checking for 16 bit mode assembler support" >&5 +echo "configure:2689: checking for 16 bit mode assembler support" >&5 if eval "test \"`echo '$''{'rtems_cv_prog_gas_code16'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2693,7 +2695,7 @@ else addr32 lgdt 0 EOF - if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then rtems_cv_prog_gas_code16=yes else rtems_cv_prog_gas_code16=no @@ -2709,7 +2711,7 @@ echo "$ac_t""$rtems_cv_prog_gas_code16" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2713: checking for $ac_word" >&5 +echo "configure:2715: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2739,7 +2741,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2743: checking for $ac_word" >&5 +echo "configure:2745: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2790,7 +2792,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2794: checking for $ac_word" >&5 +echo "configure:2796: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2822,7 +2824,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2826: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2828: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2833,12 +2835,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2837 "configure" +#line 2839 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2864,12 +2866,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2868: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2870: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2873: checking whether we are using GNU C" >&5 +echo "configure:2875: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2878,7 +2880,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2897,7 +2899,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2901: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2903: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2929,12 +2931,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2933: checking for Cygwin environment" >&5 +echo "configure:2935: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2938 "configure" +#line 2940 "configure" #include "confdefs.h" int main() { @@ -2945,7 +2947,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:2949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2962,19 +2964,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2966: checking for mingw32 environment" >&5 +echo "configure:2968: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2971 "configure" +#line 2973 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:2978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2993,7 +2995,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2997: checking for executable suffix" >&5 +echo "configure:2999: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3003,7 +3005,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:3007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -3038,11 +3040,11 @@ fi test "$ac_cv_prog_cc_g" = "yes" && CC_CFLAGS_DEBUG_V=${CC_CFLAGS_DEBUG_V-"-g"} -if test "$target_cpu" = "unix" ; then +if test "$RTEMS_CPU" = "unix" ; then echo $ac_n "checking whether $RTEMS_HOST supports System V semaphores""... $ac_c" 1>&6 -echo "configure:3046: checking whether $RTEMS_HOST supports System V semaphores" >&5 +echo "configure:3048: checking whether $RTEMS_HOST supports System V semaphores" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_sem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3051,7 +3053,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3055 "configure" +#line 3057 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3077,7 +3079,7 @@ int main () { } EOF -if { (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_sem="yes" else @@ -3100,7 +3102,7 @@ echo "$ac_t""$rtems_cv_sysv_sem" 1>&6 echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6 -echo "configure:3104: checking whether $RTEMS_HOST supports System V shared memory" >&5 +echo "configure:3106: checking whether $RTEMS_HOST supports System V shared memory" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3109,7 +3111,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3113 "configure" +#line 3115 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3125,7 +3127,7 @@ int main () { } EOF -if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_shm="yes" else @@ -3148,7 +3150,7 @@ echo "$ac_t""$rtems_cv_sysv_shm" 1>&6 echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6 -echo "configure:3152: checking whether $RTEMS_HOST supports System V messages" >&5 +echo "configure:3154: checking whether $RTEMS_HOST supports System V messages" >&5 if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3157,7 +3159,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3161 "configure" +#line 3163 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3173,7 +3175,7 @@ int main () { } EOF -if { (eval echo configure:3177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rtems_cv_sysv_msg="yes" else @@ -3198,14 +3200,14 @@ fi # Collect config subdirs for exec/score/tools t="c/src/exec/score/tools" scoretools_cfgdirs="$t/generic" -if test -d $srcdir/$t/$target_cpu; then - scoretools_cfgdirs="$scoretools_cfgdirs $t/$target_cpu" +if test -d $srcdir/$t/$RTEMS_CPU; then + scoretools_cfgdirs="$scoretools_cfgdirs $t/$RTEMS_CPU" fi # find all the Executive Makefiles echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6 -echo "configure:3209: checking for Makefile.in in c/src/exec/rtems" >&5 +echo "configure:3211: checking for Makefile.in in c/src/exec/rtems" >&5 if test -d $srcdir/c/src/exec/rtems; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3220,7 +3222,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6 -echo "configure:3224: checking for Makefile.in in c/src/exec/sapi" >&5 +echo "configure:3226: checking for Makefile.in in c/src/exec/sapi" >&5 if test -d $srcdir/c/src/exec/sapi; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3234,12 +3236,12 @@ fi -echo $ac_n "checking for Makefile.in in c/src/exec/score/cpu/$target_cpu""... $ac_c" 1>&6 -echo "configure:3239: checking for Makefile.in in c/src/exec/score/cpu/$target_cpu" >&5 -if test -d $srcdir/c/src/exec/score/cpu/$target_cpu; then +echo $ac_n "checking for Makefile.in in c/src/exec/score/cpu/$RTEMS_CPU""... $ac_c" 1>&6 +echo "configure:3241: checking for Makefile.in in c/src/exec/score/cpu/$RTEMS_CPU" >&5 +if test -d $srcdir/c/src/exec/score/cpu/$RTEMS_CPU; then rtems_av_save_dir=`pwd`; cd $srcdir; - rtems_av_tmp=`find c/src/exec/score/cpu/$target_cpu -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` + rtems_av_tmp=`find c/src/exec/score/cpu/$RTEMS_CPU -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` makefiles="$makefiles $rtems_av_tmp"; cd $rtems_av_save_dir; echo "$ac_t""done" 1>&6 @@ -3252,7 +3254,7 @@ fi if test "$RTEMS_HAS_POSIX_API" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6 -echo "configure:3256: checking for Makefile.in in c/src/exec/posix" >&5 +echo "configure:3258: checking for Makefile.in in c/src/exec/posix" >&5 if test -d $srcdir/c/src/exec/posix; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3269,13 +3271,13 @@ fi fi # find all the Makefiles for the BSPs -if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then - makefiles="$makefiles c/src/lib/libbsp/$target_cpu/Makefile" +if test -d "$srcdir/c/src/lib/libbsp/$RTEMS_CPU"; then + makefiles="$makefiles c/src/lib/libbsp/$RTEMS_CPU/Makefile" if test -z "$rtems_bsp"; then echo $ac_n "checking for bsps""... $ac_c" 1>&6 -echo "configure:3278: checking for bsps" >&5 - files=`ls $srcdir/c/src/lib/libbsp/$target_cpu` +echo "configure:3280: checking for bsps" >&5 + files=`ls $srcdir/c/src/lib/libbsp/$RTEMS_CPU` for file in $files; do case $file in shared*);; @@ -3315,7 +3317,7 @@ echo "configure:3278: checking for bsps" >&5 esac # Is there code where there should be for this BSP? - # The bare bsp is a special case as it is not under the target_cpu path + # The bare bsp is a special case as it is not under the RTEMS_CPU path case $i in bare) bspcpudir= @@ -3327,7 +3329,7 @@ echo "configure:3278: checking for bsps" >&5 fi ;; *) - bspcpudir=$target_cpu/ + bspcpudir=$RTEMS_CPU/ ;; esac @@ -3339,7 +3341,7 @@ echo "configure:3278: checking for bsps" >&5 bspdirs="$bspdirs $bspdir" echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir""... $ac_c" 1>&6 -echo "configure:3343: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5 +echo "configure:3345: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5 if test -d $srcdir/c/src/lib/libbsp/$bspcpudir$bspdir; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3354,7 +3356,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared""... $ac_c" 1>&6 -echo "configure:3358: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5 +echo "configure:3360: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5 if test -d $srcdir/c/src/lib/libbsp/${bspcpudir}shared; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3383,12 +3385,12 @@ fi # find all the CPU dependent library Makefiles -echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6 -echo "configure:3388: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5 -if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then +echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$RTEMS_CPU""... $ac_c" 1>&6 +echo "configure:3390: checking for Makefile.in in c/src/lib/libcpu/$RTEMS_CPU" >&5 +if test -d $srcdir/c/src/lib/libcpu/$RTEMS_CPU; then rtems_av_save_dir=`pwd`; cd $srcdir; - rtems_av_tmp=`find c/src/lib/libcpu/$target_cpu -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` + rtems_av_tmp=`find c/src/lib/libcpu/$RTEMS_CPU -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` makefiles="$makefiles $rtems_av_tmp"; cd $rtems_av_save_dir; echo "$ac_t""done" 1>&6 @@ -3400,12 +3402,12 @@ fi if test "$skip_startfiles" != "yes"; then -echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6 -echo "configure:3405: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5 -if test -d $srcdir/c/src/lib/start/$target_cpu; then +echo $ac_n "checking for Makefile.in in c/src/lib/start/$RTEMS_CPU""... $ac_c" 1>&6 +echo "configure:3407: checking for Makefile.in in c/src/lib/start/$RTEMS_CPU" >&5 +if test -d $srcdir/c/src/lib/start/$RTEMS_CPU; then rtems_av_save_dir=`pwd`; cd $srcdir; - rtems_av_tmp=`find c/src/lib/start/$target_cpu -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` + rtems_av_tmp=`find c/src/lib/start/$RTEMS_CPU -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` makefiles="$makefiles $rtems_av_tmp"; cd $rtems_av_save_dir; echo "$ac_t""done" 1>&6 @@ -3430,12 +3432,12 @@ fi # If the TCP/IP stack is enabled, then find all TCP/IP Makefiles echo $ac_n "checking if networking is enabled? ""... $ac_c" 1>&6 -echo "configure:3434: checking if networking is enabled? " >&5 +echo "configure:3436: checking if networking is enabled? " >&5 echo "$ac_t""$RTEMS_HAS_NETWORKING" 1>&6 if test "$RTEMS_HAS_NETWORKING" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/lib/libnetworking""... $ac_c" 1>&6 -echo "configure:3439: checking for Makefile.in in c/src/lib/libnetworking" >&5 +echo "configure:3441: checking for Makefile.in in c/src/lib/libnetworking" >&5 if test -d $srcdir/c/src/lib/libnetworking; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3450,7 +3452,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/librpc""... $ac_c" 1>&6 -echo "configure:3454: checking for Makefile.in in c/src/lib/librpc" >&5 +echo "configure:3456: checking for Makefile.in in c/src/lib/librpc" >&5 if test -d $srcdir/c/src/lib/librpc; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3465,14 +3467,14 @@ fi if test "$RTEMS_HAS_RDBG" = "yes"; then echo $ac_n "checking whether cpu supports rdbg? ""... $ac_c" 1>&6 -echo "configure:3469: checking whether cpu supports rdbg? " >&5 - test ! -d "$srcdir/c/src/lib/librdbg/$target_cpu" && RTEMS_HAS_RDBG="no" ; +echo "configure:3471: checking whether cpu supports rdbg? " >&5 + test ! -d "$srcdir/c/src/lib/librdbg/$RTEMS_CPU" && RTEMS_HAS_RDBG="no" ; echo "$ac_t""$RTEMS_HAS_RDBG" 1>&6 if test "$RTEMS_HAS_RDBG" = "yes"; then # Extract the first word of "rpcgen", so it can be a program name with args. set dummy rpcgen; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3476: checking for $ac_word" >&5 +echo "configure:3478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RPCGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3512,7 +3514,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:3516: checking for $ac_word" >&5 +echo "configure:3518: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3546,7 +3548,7 @@ done if test "$RTEMS_HAS_RDBG" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/lib/librdbg""... $ac_c" 1>&6 -echo "configure:3550: checking for Makefile.in in c/src/lib/librdbg" >&5 +echo "configure:3552: checking for Makefile.in in c/src/lib/librdbg" >&5 if test -d $srcdir/c/src/lib/librdbg; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3573,7 +3575,7 @@ fi # If the tests are enabled, then find all the test suite Makefiles echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6 -echo "configure:3577: checking if the test suites are enabled? " >&5 +echo "configure:3579: checking if the test suites are enabled? " >&5 # Check whether --enable-tests or --disable-tests was given. if test "${enable_tests+set}" = set; then enableval="$enable_tests" @@ -3594,7 +3596,7 @@ testtools_cfgdirs="c/src/tests/tools/generic" if test "$tests_enabled" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6 -echo "configure:3598: checking for Makefile.in in c/src/tests/libtests" >&5 +echo "configure:3600: checking for Makefile.in in c/src/tests/libtests" >&5 if test -d $srcdir/c/src/tests/libtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3609,7 +3611,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6 -echo "configure:3613: checking for Makefile.in in c/src/tests/sptests" >&5 +echo "configure:3615: checking for Makefile.in in c/src/tests/sptests" >&5 if test -d $srcdir/c/src/tests/sptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3624,7 +3626,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6 -echo "configure:3628: checking for Makefile.in in c/src/tests/tmtests" >&5 +echo "configure:3630: checking for Makefile.in in c/src/tests/tmtests" >&5 if test -d $srcdir/c/src/tests/tmtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3640,7 +3642,7 @@ fi if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6 -echo "configure:3644: checking for Makefile.in in c/src/tests/mptests" >&5 +echo "configure:3646: checking for Makefile.in in c/src/tests/mptests" >&5 if test -d $srcdir/c/src/tests/mptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3657,7 +3659,7 @@ fi if test "$RTEMS_HAS_POSIX_API" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6 -echo "configure:3661: checking for Makefile.in in c/src/tests/psxtests" >&5 +echo "configure:3663: checking for Makefile.in in c/src/tests/psxtests" >&5 if test -d $srcdir/c/src/tests/psxtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3671,8 +3673,8 @@ fi fi - if test -d "$srcdir/c/src/tests/tools/$target_cpu"; then - testtools_cfgdirs="$testtools_cfgdirs c/src/tests/tools/$target_cpu" + if test -d "$srcdir/c/src/tests/tools/$RTEMS_CPU"; then + testtools_cfgdirs="$testtools_cfgdirs c/src/tests/tools/$RTEMS_CPU" fi fi @@ -3692,13 +3694,13 @@ fi if test "$RTEMS_HAS_HWAPI" = "yes"; then echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6 -echo "configure:3696: checking whether libwapi is present" >&5 +echo "configure:3698: checking whether libwapi is present" >&5 if test -f ${srcdir}/c/src/lib/libhwapi/Makefile.in ; then echo "$ac_t""yes" 1>&6 makefiles="$makefiles c/src/lib/libhwapi/Makefile" echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6 -echo "configure:3702: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 +echo "configure:3704: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 if test -d $srcdir/c/src/lib/libhwapi/analog; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3713,7 +3715,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6 -echo "configure:3717: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 +echo "configure:3719: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 if test -d $srcdir/c/src/lib/libhwapi/discrete; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3728,7 +3730,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6 -echo "configure:3732: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 +echo "configure:3734: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 if test -d $srcdir/c/src/lib/libhwapi/drivers; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3743,7 +3745,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6 -echo "configure:3747: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5 +echo "configure:3749: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5 if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3758,7 +3760,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6 -echo "configure:3762: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 +echo "configure:3764: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 if test -d $srcdir/c/src/lib/libhwapi/serial; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3773,7 +3775,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6 -echo "configure:3777: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 +echo "configure:3779: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 if test -d $srcdir/c/src/lib/libhwapi/support; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3788,7 +3790,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6 -echo "configure:3792: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 +echo "configure:3794: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 if test -d $srcdir/c/src/lib/libhwapi/wrapup; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3821,7 +3823,7 @@ fi # pick up all the Makefiles in required parts of the tree echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6 -echo "configure:3825: checking for Makefile.in in make" >&5 +echo "configure:3827: checking for Makefile.in in make" >&5 if test -d $srcdir/make; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3836,7 +3838,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libchip""... $ac_c" 1>&6 -echo "configure:3840: checking for Makefile.in in c/src/lib/libchip" >&5 +echo "configure:3842: checking for Makefile.in in c/src/lib/libchip" >&5 if test -d $srcdir/c/src/lib/libchip; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3851,7 +3853,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6 -echo "configure:3855: checking for Makefile.in in c/src/lib/libmisc" >&5 +echo "configure:3857: checking for Makefile.in in c/src/lib/libmisc" >&5 if test -d $srcdir/c/src/lib/libmisc; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3866,7 +3868,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6 -echo "configure:3870: checking for Makefile.in in c/src/tests/samples" >&5 +echo "configure:3872: checking for Makefile.in in c/src/tests/samples" >&5 if test -d $srcdir/c/src/tests/samples; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -4393,7 +4395,7 @@ fi echo -echo target architecture: $target_cpu. +echo target architecture: $RTEMS_CPU. echo available BSPs: $rtems_bsp. echo \'make all\' will build the following BSPs: $RTEMS_BSP_LIST. echo other BSPs can be built with \'make RTEMS_BSP=\"bsp1 bsp2 ...\"\' diff --git a/configure.in b/configure.in index cec1d918ff..9581f2fd99 100644 --- a/configure.in +++ b/configure.in @@ -9,11 +9,11 @@ RTEMS_TOP(.) dnl Checks for programs. AC_PROG_MAKE_SET -AC_CANONICAL_SYSTEM AC_ARG_WITH(cross-host,[ --with-cross-host=HOST host (cygnus)], \ host=$withval) +RTEMS_CANONICAL_TARGET_CPU RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX RTEMS_ENABLE_NETWORKING @@ -65,7 +65,7 @@ dnl imply all BSPs. Eventually we would like to build a collection dnl of CPU model specific RTEMS libraries which in conjunction with dnl a BSP library would be used to link an application. -RTEMS_CANONICAL_TARGET_CPU +# RTEMS_CANONICAL_TARGET_CPU RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST @@ -150,7 +150,7 @@ dnl Add -g if the host compiler accepts -g, assume -g means debugging test "$ac_cv_prog_cc_g" = "yes" && CC_CFLAGS_DEBUG_V=${CC_CFLAGS_DEBUG_V-"-g"} dnl check for SysV IPC used by simulators -if test "$target_cpu" = "unix" ; then +if test "$RTEMS_CPU" = "unix" ; then RTEMS_SYSV_SEM if test "$rtems_cv_sysv_sem" != "yes" ; then AC_MSG_ERROR([System V semaphores don't work, required by simulator]) @@ -168,14 +168,14 @@ fi # Collect config subdirs for exec/score/tools t="c/src/exec/score/tools" scoretools_cfgdirs="$t/generic" -if test -d $srcdir/$t/$target_cpu; then - scoretools_cfgdirs="$scoretools_cfgdirs $t/$target_cpu" +if test -d $srcdir/$t/$RTEMS_CPU; then + scoretools_cfgdirs="$scoretools_cfgdirs $t/$RTEMS_CPU" fi # find all the Executive Makefiles RTEMS_CHECK_MAKEFILE(c/src/exec/rtems) RTEMS_CHECK_MAKEFILE(c/src/exec/sapi) -RTEMS_CHECK_MAKEFILE(c/src/exec/score/cpu/$target_cpu) +RTEMS_CHECK_MAKEFILE(c/src/exec/score/cpu/$RTEMS_CPU) if test "$RTEMS_HAS_POSIX_API" = "yes"; then RTEMS_CHECK_MAKEFILE(c/src/exec/posix) @@ -183,12 +183,12 @@ if test "$RTEMS_HAS_POSIX_API" = "yes"; then fi # find all the Makefiles for the BSPs -if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then - makefiles="$makefiles c/src/lib/libbsp/$target_cpu/Makefile" +if test -d "$srcdir/c/src/lib/libbsp/$RTEMS_CPU"; then + makefiles="$makefiles c/src/lib/libbsp/$RTEMS_CPU/Makefile" if test -z "$rtems_bsp"; then AC_MSG_CHECKING([for bsps]) - files=`ls $srcdir/c/src/lib/libbsp/$target_cpu` + files=`ls $srcdir/c/src/lib/libbsp/$RTEMS_CPU` for file in $files; do case $file in shared*);; @@ -228,7 +228,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then esac # Is there code where there should be for this BSP? - # The bare bsp is a special case as it is not under the target_cpu path + # The bare bsp is a special case as it is not under the RTEMS_CPU path case $i in bare) bspcpudir= @@ -240,7 +240,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then fi ;; *) - bspcpudir=$target_cpu/ + bspcpudir=$RTEMS_CPU/ ;; esac @@ -267,11 +267,11 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then fi # find all the CPU dependent library Makefiles -RTEMS_CHECK_MAKEFILE(c/src/lib/libcpu/$target_cpu) +RTEMS_CHECK_MAKEFILE(c/src/lib/libcpu/$RTEMS_CPU) dnl Workaround for go32 if test "$skip_startfiles" != "yes"; then - RTEMS_CHECK_MAKEFILE(c/src/lib/start/$target_cpu) + RTEMS_CHECK_MAKEFILE(c/src/lib/start/$RTEMS_CPU) fi dnl END configure.target.in @@ -295,7 +295,7 @@ if test "$RTEMS_HAS_NETWORKING" = "yes"; then RTEMS_CHECK_MAKEFILE(c/src/lib/librpc) if test "$RTEMS_HAS_RDBG" = "yes"; then AC_MSG_CHECKING([whether cpu supports rdbg? ]) - test ! -d "$srcdir/c/src/lib/librdbg/$target_cpu" && RTEMS_HAS_RDBG="no" ; + test ! -d "$srcdir/c/src/lib/librdbg/$RTEMS_CPU" && RTEMS_HAS_RDBG="no" ; AC_MSG_RESULT($RTEMS_HAS_RDBG) if test "$RTEMS_HAS_RDBG" = "yes"; then AC_PATH_PROG(RPCGEN,rpcgen) @@ -332,8 +332,8 @@ if test "$tests_enabled" = "yes"; then if test "$RTEMS_HAS_POSIX_API" = "yes"; then RTEMS_CHECK_MAKEFILE(c/src/tests/psxtests) fi - if test -d "$srcdir/c/src/tests/tools/$target_cpu"; then - testtools_cfgdirs="$testtools_cfgdirs c/src/tests/tools/$target_cpu" + if test -d "$srcdir/c/src/tests/tools/$RTEMS_CPU"; then + testtools_cfgdirs="$testtools_cfgdirs c/src/tests/tools/$RTEMS_CPU" fi fi @@ -423,7 +423,7 @@ c/src/tests/tools/Makefile $makefiles) echo -echo target architecture: $target_cpu. +echo target architecture: $RTEMS_CPU. echo available BSPs: $rtems_bsp. echo \'make all\' will build the following BSPs: $RTEMS_BSP_LIST. echo other BSPs can be built with \'make RTEMS_BSP=\"bsp1 bsp2 ...\"\' diff --git a/make/target.cfg.in b/make/target.cfg.in index 5a4a6c8100..55c19287b3 100644 --- a/make/target.cfg.in +++ b/make/target.cfg.in @@ -46,7 +46,7 @@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ RTEMS_USE_MACROS = @RTEMS_USE_MACROS@ RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@ RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@ -RTEMS_CPU = @target_cpu@ +RTEMS_CPU = @RTEMS_CPU@ # the following are only used for the bare bsp BARE_CPU_MODEL = @BARE_CPU_MODEL@ diff --git a/tools/cpu/generic/aclocal.m4 b/tools/cpu/generic/aclocal.m4 index cc365b2c50..b2cf4a3008 100644 --- a/tools/cpu/generic/aclocal.m4 +++ b/tools/cpu/generic/aclocal.m4 @@ -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 -- diff --git a/tools/cpu/generic/configure b/tools/cpu/generic/configure index 7aa0c3e7bc..14f7f2e63a 100644 --- a/tools/cpu/generic/configure +++ b/tools/cpu/generic/configure @@ -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 diff --git a/tools/cpu/hppa1.1/aclocal.m4 b/tools/cpu/hppa1.1/aclocal.m4 index 5b6113bc96..818ad53205 100644 --- a/tools/cpu/hppa1.1/aclocal.m4 +++ b/tools/cpu/hppa1.1/aclocal.m4 @@ -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 -- diff --git a/tools/cpu/hppa1.1/configure b/tools/cpu/hppa1.1/configure index 2caf4635d9..4ee4a3bcd9 100644 --- a/tools/cpu/hppa1.1/configure +++ b/tools/cpu/hppa1.1/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/tools/cpu/sh/aclocal.m4 b/tools/cpu/sh/aclocal.m4 index 5b6113bc96..818ad53205 100644 --- a/tools/cpu/sh/aclocal.m4 +++ b/tools/cpu/sh/aclocal.m4 @@ -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 -- diff --git a/tools/cpu/sh/configure b/tools/cpu/sh/configure index 906bb31063..565698c137 100644 --- a/tools/cpu/sh/configure +++ b/tools/cpu/sh/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,7 +1146,7 @@ else fi echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 -echo "configure:1149: checking for fabs in -lm" >&5 +echo "configure:1150: checking for fabs in -lm" >&5 ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1153,7 +1154,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1157 "configure" +#line 1158 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1164,7 +1165,7 @@ int main() { fabs() ; return 0; } EOF -if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/tools/cpu/unix/aclocal.m4 b/tools/cpu/unix/aclocal.m4 index 5b6113bc96..818ad53205 100644 --- a/tools/cpu/unix/aclocal.m4 +++ b/tools/cpu/unix/aclocal.m4 @@ -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 -- diff --git a/tools/cpu/unix/configure b/tools/cpu/unix/configure index 57139ca44d..64a0b360c8 100644 --- a/tools/cpu/unix/configure +++ b/tools/cpu/unix/configure @@ -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. @@ -925,7 +926,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +956,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:959: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1007,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1039,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1049,12 +1050,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1053 "configure" +#line 1054 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1080,12 +1081,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1090: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1095,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1113,7 +1114,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else |