diff options
| -rw-r--r-- | c/src/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/aclocal/canonical-target-name.m4 | 18 | ||||
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/aclocal/canonical-target-name.m4 | 15 | ||||
| -rw-r--r-- | testsuites/ChangeLog | 7 | ||||
| -rw-r--r-- | testsuites/aclocal/canonical-target-name.m4 | 18 |
6 files changed, 50 insertions, 22 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 419d54fe34..3b09c7adca 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2011-02-25 Ralf Corsépius <ralf.corsepius@rtems.org> + + * aclocal/canonical-target-name.m4: + Stop pretending no_cpu* was buildable. + Derive RTEMS_CPU from "$host_cpu". + Error out if "$host" doesn't match "*-*-rtems*". + 2011-02-22 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: Remove AM_CONDITIONAL(HAS_POSIX) (Unused). diff --git a/c/src/aclocal/canonical-target-name.m4 b/c/src/aclocal/canonical-target-name.m4 index 5a096f2e20..230583bf8c 100644 --- a/c/src/aclocal/canonical-target-name.m4 +++ b/c/src/aclocal/canonical-target-name.m4 @@ -9,17 +9,19 @@ 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_CANONICAL_HOST +[AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(rtems target cpu) case "${host}" in - no_cpu-*rtems*) - RTEMS_CPU=no_cpu - ;; - *) - RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` +*-*-rtems*) + RTEMS_CPU="$host_cpu";; +*) ;; esac +AS_IF([test -n "$RTEMS_CPU"], +[dnl +AC_MSG_RESULT($RTEMS_CPU)], +[dnl +AC_MSG_RESULT([<none>]) +AC_MSG_ERROR([unsupported host $host])]) AC_SUBST(RTEMS_CPU) -AC_MSG_RESULT($RTEMS_CPU) ]) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ee7ac547f6..0e009c7b39 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,12 @@ 2011-02-25 Ralf Corsépius <ralf.corsepius@rtems.org> + * aclocal/canonical-target-name.m4: + Stop pretending no_cpu* was buildable. + Derive RTEMS_CPU from "$host_cpu". + Error out if "$host" doesn't match "*-*-rtems*". + +2011-02-25 Ralf Corsépius <ralf.corsepius@rtems.org> + * aclocal/check-networking.m4, aclocal/check-posix.m4: Rebase check on "$host". diff --git a/cpukit/aclocal/canonical-target-name.m4 b/cpukit/aclocal/canonical-target-name.m4 index f2a1d66a09..230583bf8c 100644 --- a/cpukit/aclocal/canonical-target-name.m4 +++ b/cpukit/aclocal/canonical-target-name.m4 @@ -12,13 +12,16 @@ AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU], [AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(rtems target cpu) case "${host}" in - no_cpu-*rtems*) - RTEMS_CPU=no_cpu - ;; - *) - RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` +*-*-rtems*) + RTEMS_CPU="$host_cpu";; +*) ;; esac +AS_IF([test -n "$RTEMS_CPU"], +[dnl +AC_MSG_RESULT($RTEMS_CPU)], +[dnl +AC_MSG_RESULT([<none>]) +AC_MSG_ERROR([unsupported host $host])]) AC_SUBST(RTEMS_CPU) -AC_MSG_RESULT($RTEMS_CPU) ]) diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index 2a5fc3c455..76c546cf4c 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -1,3 +1,10 @@ +2011-02-25 Ralf Corsépius <ralf.corsepius@rtems.org> + + * aclocal/canonical-target-name.m4: + Stop pretending no_cpu* was buildable. + Derive RTEMS_CPU from "$host_cpu". + Error out if "$host" doesn't match "*-*-rtems*". + 2011-02-22 Ralf Corsépius <ralf.corsepius@rtems.org> * support/src/tmtests_support.c: diff --git a/testsuites/aclocal/canonical-target-name.m4 b/testsuites/aclocal/canonical-target-name.m4 index 5a096f2e20..230583bf8c 100644 --- a/testsuites/aclocal/canonical-target-name.m4 +++ b/testsuites/aclocal/canonical-target-name.m4 @@ -9,17 +9,19 @@ 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_CANONICAL_HOST +[AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(rtems target cpu) case "${host}" in - no_cpu-*rtems*) - RTEMS_CPU=no_cpu - ;; - *) - RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` +*-*-rtems*) + RTEMS_CPU="$host_cpu";; +*) ;; esac +AS_IF([test -n "$RTEMS_CPU"], +[dnl +AC_MSG_RESULT($RTEMS_CPU)], +[dnl +AC_MSG_RESULT([<none>]) +AC_MSG_ERROR([unsupported host $host])]) AC_SUBST(RTEMS_CPU) -AC_MSG_RESULT($RTEMS_CPU) ]) |