From 15aa5ffbfd859e7e16e8e3dbbb35f548646ee984 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 14 Jun 1999 18:54:24 +0000 Subject: Patch ("FIX: no_cpu/no_bsp") from Ralf Corsepius : 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 --- aclocal.m4 | 92 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 45 deletions(-) (limited to 'aclocal.m4') diff --git a/aclocal.m4 b/aclocal.m4 index f221ea2826..229b03058f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -51,6 +51,51 @@ RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; AC_SUBST(RTEMS_ROOT) ])dnl +dnl +dnl $Id$ +dnl + +dnl canonicalize target cpu +dnl NOTE: Most rtems targets do not fullfil autoconf's +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, +[ +rtems_target=$target; +case "$target" in +no_cpu*) target=$host;; +*) ;; +esac +AC_CANONICAL_SYSTEM +AC_MSG_CHECKING(rtems target cpu) +changequote(,)dnl +case "${rtems_target}" in + # hpux unix port should go here + i[3456]86-go32-rtems*) + RTEMS_CPU=i386 + ;; + i[3456]86-pc-linux*) # unix "simulator" port + RTEMS_CPU=unix + ;; + i[3456]86-*freebsd2*) # unix "simulator" port + RTEMS_CPU=unix + ;; + no_cpu-*rtems*) + RTEMS_CPU=no_cpu + ;; + sparc-sun-solaris*) # unix "simulator" port + RTEMS_CPU=unix + ;; + *) + RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` + ;; +esac +changequote([,])dnl +AC_MSG_RESULT($RTEMS_CPU) +]) + dnl $Id$ AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING, @@ -233,49 +278,6 @@ AC_MSG_ERROR( fi ]) -dnl -dnl $Id$ -dnl - -dnl canonicalize target cpu -dnl NOTE: Most rtems targets do not fullfil autoconf's -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_REQUIRE([AC_CANONICAL_SYSTEM]) -AC_MSG_CHECKING(rtems target cpu) -changequote(,)dnl -case "${target}" in - # hpux unix port should go here - i[3456]86-go32-rtems*) - target_cpu=i386 - ;; - i[3456]86-pc-linux*) # unix "simulator" port - target_cpu=unix - ;; - i[3456]86-*freebsd2*) # unix "simulator" port - target_cpu=unix - ;; - no_cpu-*rtems*) - target_cpu=no_cpu - ;; - ppc*-*rtems*) - target_cpu=powerpc - ;; - sparc-sun-solaris*) # unix "simulator" port - target_cpu=unix - ;; - *) - target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` - ;; -esac -changequote([,])dnl -AC_MSG_RESULT($target_cpu) -]) - dnl $Id$ dnl check if RTEMS support a cpu @@ -284,8 +286,8 @@ AC_DEFUN(RTEMS_CHECK_CPU, AC_REQUIRE([RTEMS_TOP]) AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU]) # Is this a supported CPU? -AC_MSG_CHECKING([if cpu $target_cpu is supported]) -if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$target_cpu"; then +AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported]) +if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then AC_MSG_RESULT(yes) else AC_MSG_ERROR(no) -- cgit v1.2.3