From 15aa5ffbfd859e7e16e8e3dbbb35f548646ee984 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 14 Jun 1999 18:54:24 +0000
Subject: Patch ("FIX: no_cpu/no_bsp") from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de>:

    This patch should fix the nastiest configuration bugs for no_cpu/no_bsp.

    With this patch applied, configure --target=no_cpu-rtems now correctly
    acknowledges its configuration, but later fails building when trying to
    build libcsupport (I leave this problem for you :-).

    Fixes/Changes:
    * aclocal/canonicalize-target-name.m4: use RTEMS_CPU instead of
      target_cpu, switch to a native compiler setup if target = no_cpu*rtems,
      ie. implicitly use host=target (native) and RTEMS_CPU=no_cpu for
      --target=no_cpu*rtems.
    * add no_bsp/bsp_specs (Support -qrtems, -qrtems_debug; please check
      before adding :-)
    * Use RTEMS_CANONICALIZE_TARGET_CPU instead of AC_CANONICAL_SYSTEM in
      toplevel/configure.in
    * All references to $target_cpu in aclocal/*.m4, Makefile.ins and *.cfg
      files changed to RTEMS_CPU
    * bug fixes to exec/score/cpu/no_cpu/wrap (This part of the patch may
      result into patch rejections, because your recently posted patch may
      also have addressed this problem).

    After applying this patch, please do:

        cvs add c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs
        ./autogen
---
 tools/cpu/unix/aclocal.m4 | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'tools/cpu/unix/aclocal.m4')

diff --git a/tools/cpu/unix/aclocal.m4 b/tools/cpu/unix/aclocal.m4
index 5b6113bc96..818ad53205 100644
--- a/tools/cpu/unix/aclocal.m4
+++ b/tools/cpu/unix/aclocal.m4
@@ -63,35 +63,37 @@ dnl and we have to fix it for rtems ourselves
 
 AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
 [
-AC_REQUIRE([AC_CANONICAL_SYSTEM])
+rtems_target=$target;
+case "$target" in
+no_cpu*) target=$host;;
+*) ;;
+esac
+AC_CANONICAL_SYSTEM
 AC_MSG_CHECKING(rtems target cpu)
 changequote(,)dnl
-case "${target}" in
+case "${rtems_target}" in
   # hpux unix port should go here
   i[3456]86-go32-rtems*)
-	target_cpu=i386
+	RTEMS_CPU=i386
 	;;
   i[3456]86-pc-linux*)		# unix "simulator" port
-	target_cpu=unix
+	RTEMS_CPU=unix
 	;;
   i[3456]86-*freebsd2*) 	# unix "simulator" port
-	target_cpu=unix
+	RTEMS_CPU=unix
 	;;
   no_cpu-*rtems*)
-        target_cpu=no_cpu
-	;;
-  ppc*-*rtems*)
-	target_cpu=powerpc
+        RTEMS_CPU=no_cpu
 	;;
   sparc-sun-solaris*)           # unix "simulator" port
-	target_cpu=unix
+	RTEMS_CPU=unix
 	;;
   *) 
-	target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
+	RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
 	;;
 esac
 changequote([,])dnl
-AC_MSG_RESULT($target_cpu)
+AC_MSG_RESULT($RTEMS_CPU)
 ])
 
 # Do all the work for Automake.  This macro actually does too much --
-- 
cgit v1.2.3