6 files changed, 5 insertions, 23 deletions
diff --git a/c/src/tests/aclocal/check-cpu.m4 b/c/src/tests/aclocal/check-cpu.m4
deleted file mode 100644
index f3bc2141ae..0000000000
--- a/c/src/tests/aclocal/check-cpu.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-dnl $Id$
-
-dnl check if RTEMS support a cpu
-AC_DEFUN(RTEMS_CHECK_CPU,
-[dnl
-AC_REQUIRE([RTEMS_TOP])
-AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
-
-# Is this a supported CPU?
-AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
-# FIXME: Temporary hack
-if test -d "$srcdir/$RTEMS_TOPdir/cpukit/score/cpu/$RTEMS_CPU"; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_ERROR(no)
-fi
-])dnl
-
diff --git a/c/src/tests/aclocal/check-cxx.m4 b/c/src/tests/aclocal/check-cxx.m4
index a780c3a8de..1234672b0e 100644
--- a/c/src/tests/aclocal/check-cxx.m4
+++ b/c/src/tests/aclocal/check-cxx.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl
 AC_DEFUN(RTEMS_CHECK_CXX,
 [dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
 AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl
 AC_CACHE_CHECK([whether to build rtems++],
diff --git a/c/src/tests/aclocal/check-itron.m4 b/c/src/tests/aclocal/check-itron.m4
index 4c4dbf0042..514daf4cc2 100644
--- a/c/src/tests/aclocal/check-itron.m4
+++ b/c/src/tests/aclocal/check-itron.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl
 AC_DEFUN(RTEMS_CHECK_ITRON_API,
 [dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl
 
 AC_CACHE_CHECK([whether CPU supports libitron],
diff --git a/c/src/tests/aclocal/check-multiprocessing.m4 b/c/src/tests/aclocal/check-multiprocessing.m4
index 355635ce54..833b89d09a 100644
--- a/c/src/tests/aclocal/check-multiprocessing.m4
+++ b/c/src/tests/aclocal/check-multiprocessing.m4
@@ -7,7 +7,7 @@ AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
 AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl
 AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
 AC_REQUIRE([RTEMS_TOP])dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
 AC_REQUIRE([RTEMS_BSP_ALIAS])dnl
 
diff --git a/c/src/tests/aclocal/check-networking.m4 b/c/src/tests/aclocal/check-networking.m4
index db3a0c60d3..db5d8f2e07 100644
--- a/c/src/tests/aclocal/check-networking.m4
+++ b/c/src/tests/aclocal/check-networking.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl
 AC_DEFUN(RTEMS_CHECK_NETWORKING,
 [dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
 
 AC_CACHE_CHECK([whether BSP supports networking],
diff --git a/c/src/tests/aclocal/check-posix.m4 b/c/src/tests/aclocal/check-posix.m4
index 7512f663f5..bcb7f3c728 100644
--- a/c/src/tests/aclocal/check-posix.m4
+++ b/c/src/tests/aclocal/check-posix.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl
 AC_DEFUN(RTEMS_CHECK_POSIX_API,
 [dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
 
 AC_CACHE_CHECK([whether CPU supports libposix],