diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-21 14:51:01 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-21 14:51:01 +0000 |
| commit | 5b2e19988f6d1893543c21003859ee66d30faa58 (patch) | |
| tree | 4789975cdf62e6b082e4feef3e562c8e5a6ebfe8 /cpukit | |
| parent | 2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-5b2e19988f6d1893543c21003859ee66d30faa58.tar.bz2 | |
2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-multiprocessing.m4: Add m4-quotes.
Remove RTEMS_CHECK_CPU.
* aclocal/check-itron.m4: Add m4-quotes.
Require RTEMS_CANONICAL_TARGET_CPU instead of RTEMS_CHECK_CPU.
* aclocal/check-networking.m4: Add m4-quotes.
Require RTEMS_CANONICAL_TARGET_CPU instead of RTEMS_CHECK_CPU.
* aclocal/check-cpu.m4: Remove.
* aclocal/canonical-target-name.m4: Add m4-quotes.
* configure.ac: Merge-in former aclocal/check-cpu.m4.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 12 | ||||
| -rw-r--r-- | cpukit/aclocal/canonical-target-name.m4 | 2 | ||||
| -rw-r--r-- | cpukit/aclocal/check-cpu.m4 | 17 | ||||
| -rw-r--r-- | cpukit/aclocal/check-itron.m4 | 4 | ||||
| -rw-r--r-- | cpukit/aclocal/check-multiprocessing.m4 | 3 | ||||
| -rw-r--r-- | cpukit/aclocal/check-networking.m4 | 4 | ||||
| -rw-r--r-- | cpukit/configure.ac | 9 |
7 files changed, 26 insertions, 25 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 80ee425f81..fa463b53fa 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,15 @@ +2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/check-multiprocessing.m4: Add m4-quotes. + Remove RTEMS_CHECK_CPU. + * aclocal/check-itron.m4: Add m4-quotes. + Require RTEMS_CANONICAL_TARGET_CPU instead of RTEMS_CHECK_CPU. + * aclocal/check-networking.m4: Add m4-quotes. + Require RTEMS_CANONICAL_TARGET_CPU instead of RTEMS_CHECK_CPU. + * aclocal/check-cpu.m4: Remove. + * aclocal/canonical-target-name.m4: Add m4-quotes. + * configure.ac: Merge-in former aclocal/check-cpu.m4. + 2003-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Check for sys/cdefs.h. diff --git a/cpukit/aclocal/canonical-target-name.m4 b/cpukit/aclocal/canonical-target-name.m4 index ab710dc722..990c84e2d1 100644 --- a/cpukit/aclocal/canonical-target-name.m4 +++ b/cpukit/aclocal/canonical-target-name.m4 @@ -8,7 +8,7 @@ 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_DEFUN([RTEMS_CANONICAL_TARGET_CPU], [ AC_CANONICAL_TARGET AC_MSG_CHECKING(rtems target cpu) diff --git a/cpukit/aclocal/check-cpu.m4 b/cpukit/aclocal/check-cpu.m4 deleted file mode 100644 index 146987ec49..0000000000 --- a/cpukit/aclocal/check-cpu.m4 +++ /dev/null @@ -1,17 +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]) -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/cpukit/aclocal/check-itron.m4 b/cpukit/aclocal/check-itron.m4 index 4c4dbf0042..d9afe3357d 100644 --- a/cpukit/aclocal/check-itron.m4 +++ b/cpukit/aclocal/check-itron.m4 @@ -1,8 +1,8 @@ dnl $Id$ dnl -AC_DEFUN(RTEMS_CHECK_ITRON_API, +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/cpukit/aclocal/check-multiprocessing.m4 b/cpukit/aclocal/check-multiprocessing.m4 index 88fec19614..5e3ebedde7 100644 --- a/cpukit/aclocal/check-multiprocessing.m4 +++ b/cpukit/aclocal/check-multiprocessing.m4 @@ -2,10 +2,9 @@ dnl dnl $Id$ dnl -AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING, +AC_DEFUN([RTEMS_CHECK_MULTIPROCESSING], [dnl AC_REQUIRE([RTEMS_ENV_RTEMSCPU])dnl -AC_REQUIRE([RTEMS_CHECK_CPU])dnl AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl AS_IF([test "$enable_multiprocessing" = "yes"], diff --git a/cpukit/aclocal/check-networking.m4 b/cpukit/aclocal/check-networking.m4 index 8c4fd3c633..514f61b6fa 100644 --- a/cpukit/aclocal/check-networking.m4 +++ b/cpukit/aclocal/check-networking.m4 @@ -1,8 +1,8 @@ dnl $Id$ dnl -AC_DEFUN(RTEMS_CHECK_NETWORKING, +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 CPU supports networking], diff --git a/cpukit/configure.ac b/cpukit/configure.ac index aa34e14038..da56d50f67 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -23,7 +23,14 @@ RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSCPU RTEMS_CHECK_RTEMS_DEBUG -RTEMS_CHECK_CPU +# Is this a supported CPU? +AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported]) +if test -d "$srcdir/score/cpu/$RTEMS_CPU"; then + AC_MSG_RESULT(yes) +else + AC_MSG_ERROR(no) +fi + RTEMS_CANONICAL_HOST RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) |