diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-22 10:54:05 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-10-22 10:54:05 +0000 |
| commit | 5f7d7640c0a0c8287bfb5db9b996a0f3cf33ee37 (patch) | |
| tree | 8c168be8d1510a16415d400388de6bab8d7cccc1 | |
| parent | 2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-5f7d7640c0a0c8287bfb5db9b996a0f3cf33ee37.tar.bz2 | |
2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/canonical-host.m4: Remove.
* aclocal/canonical-target-name.m4: Merge-in aclocal/canonical-host.m4.
| -rw-r--r-- | c/src/tests/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/tests/aclocal/canonical-host.m4 | 25 | ||||
| -rw-r--r-- | c/src/tests/aclocal/canonical-target-name.m4 | 14 | ||||
| -rw-r--r-- | testsuites/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/aclocal/canonical-target-name.m4 | 14 |
5 files changed, 32 insertions, 31 deletions
diff --git a/c/src/tests/ChangeLog b/c/src/tests/ChangeLog index 236ece9c1b..cdb5b425f1 100644 --- a/c/src/tests/ChangeLog +++ b/c/src/tests/ChangeLog @@ -1,5 +1,10 @@ 2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/canonical-host.m4: Remove. + * aclocal/canonical-target-name.m4: Merge-in aclocal/canonical-host.m4. + +2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Remove RTEMS_CANONICAL_HOST. 2003-10-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/tests/aclocal/canonical-host.m4 b/c/src/tests/aclocal/canonical-host.m4 deleted file mode 100644 index 7077ab31c5..0000000000 --- a/c/src/tests/aclocal/canonical-host.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl $Id$ - -AC_DEFUN(RTEMS_CANONICAL_HOST, -[dnl -AC_REQUIRE([AC_CANONICAL_HOST]) -RTEMS_HOST=$host_os -case "${target}" in - # hpux unix port should go here - i[[34567]]86-*linux*) # unix "simulator" port - RTEMS_HOST=Linux - ;; - i[[34567]]86-*freebsd*) # unix "simulator" port - RTEMS_HOST=FreeBSD - ;; - i[[34567]]86-pc-cygwin*) # Cygwin is just enough unix like :) - RTEMS_HOST=Cygwin - ;; - sparc-sun-solaris*) # unix "simulator" port - RTEMS_HOST=Solaris - ;; - *) - ;; -esac -AC_SUBST(RTEMS_HOST) -])dnl diff --git a/c/src/tests/aclocal/canonical-target-name.m4 b/c/src/tests/aclocal/canonical-target-name.m4 index ab710dc722..34126b0483 100644 --- a/c/src/tests/aclocal/canonical-target-name.m4 +++ b/c/src/tests/aclocal/canonical-target-name.m4 @@ -10,32 +10,40 @@ dnl and we have to fix it for rtems ourselves AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU, [ -AC_CANONICAL_TARGET +AC_CANONICAL_HOST AC_MSG_CHECKING(rtems target cpu) -case "${target}" in +case "${host}" in # hpux unix port should go here i[[34567]]86-*linux*) # unix "simulator" port RTEMS_CPU=unix + RTEMS_HOST=Linux ;; i[[34567]]86-*freebsd*) # unix "simulator" port RTEMS_CPU=unix + RTEMS_HOST=FreeBSD ;; i[[34567]]86-pc-cygwin*) # Cygwin is just enough unix like :) RTEMS_CPU=unix + RTEMS_HOST=Cygwin ;; no_cpu-*rtems*) RTEMS_CPU=no_cpu + RTEMS_HOST=$host_os ;; sparc-sun-solaris*) # unix "simulator" port RTEMS_CPU=unix + RTEMS_HOST=Solaris ;; tic4x-*rtems*) # gcc changed the name RTEMS_CPU=c4x + RTEMS_HOST=$host_os ;; *) - RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` + RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` + RTEMS_HOST=$host_os ;; esac AC_SUBST(RTEMS_CPU) +AC_SUBST(RTEMS_HOST) AC_MSG_RESULT($RTEMS_CPU) ]) diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index 236ece9c1b..cdb5b425f1 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -1,5 +1,10 @@ 2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/canonical-host.m4: Remove. + * aclocal/canonical-target-name.m4: Merge-in aclocal/canonical-host.m4. + +2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Remove RTEMS_CANONICAL_HOST. 2003-10-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/testsuites/aclocal/canonical-target-name.m4 b/testsuites/aclocal/canonical-target-name.m4 index ab710dc722..34126b0483 100644 --- a/testsuites/aclocal/canonical-target-name.m4 +++ b/testsuites/aclocal/canonical-target-name.m4 @@ -10,32 +10,40 @@ dnl and we have to fix it for rtems ourselves AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU, [ -AC_CANONICAL_TARGET +AC_CANONICAL_HOST AC_MSG_CHECKING(rtems target cpu) -case "${target}" in +case "${host}" in # hpux unix port should go here i[[34567]]86-*linux*) # unix "simulator" port RTEMS_CPU=unix + RTEMS_HOST=Linux ;; i[[34567]]86-*freebsd*) # unix "simulator" port RTEMS_CPU=unix + RTEMS_HOST=FreeBSD ;; i[[34567]]86-pc-cygwin*) # Cygwin is just enough unix like :) RTEMS_CPU=unix + RTEMS_HOST=Cygwin ;; no_cpu-*rtems*) RTEMS_CPU=no_cpu + RTEMS_HOST=$host_os ;; sparc-sun-solaris*) # unix "simulator" port RTEMS_CPU=unix + RTEMS_HOST=Solaris ;; tic4x-*rtems*) # gcc changed the name RTEMS_CPU=c4x + RTEMS_HOST=$host_os ;; *) - RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` + RTEMS_CPU=`echo $host | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` + RTEMS_HOST=$host_os ;; esac AC_SUBST(RTEMS_CPU) +AC_SUBST(RTEMS_HOST) AC_MSG_RESULT($RTEMS_CPU) ]) |