summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/ChangeLog7
-rw-r--r--testsuites/aclocal/canonical-target-name.m418
2 files changed, 17 insertions, 8 deletions
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)
])