Changeset c63a5cf in rtems

Timestamp:

06/14/00 17:12:23 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ec6968b

Parents:

ac815430

Message:

Patch rtems-rc-20000614-1-cvs.diff from Ralf Corsepius
<corsepiu@…> that addresses a couple of
minor configuration issues which popped up when
experimenting with multilibs.

Note: The multigen generated make/custom/bare-*.cfg will still be
non-functional, even after having applied this patch.

Location:

aclocal

Files:

• bsp-alias.m4 (modified) (2 diffs)
• check-multiprocessing.m4 (modified) (1 diff)
• check-posix.m4 (modified) (1 diff)

aclocal/bsp-alias.m4

@@ -3 +3 @@
 dnl 
 
-dnl RTEMS_BSP_ALIAS(BSP_ALIAS,BSP_RETURNED)
-dnl convert a bsp alias $1 into its bsp directory $2
-AC_DEFUN(RTEMS_BSP_ALIAS,
-[
-  # account for "aliased" bsps which share source code
+dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
+dnl Internal subroutine to RTEMS_BSP_ALIAS
+AC_DEFUN(_RTEMS_BSP_ALIAS,
+[# account for "aliased" bsps which share source code
   case $1 in
     mcp750)       $2=motorola_powerpc ;; # Motorola PPC board variant
@@ -19 +18 @@
     pc586)        $2=pc386            ;; # i386 - PC with Pentium
     pc686)        $2=pc386            ;; # i386 - PC with PentiumPro
+    bare*)        $2=bare             ;; # EXP: bare-aliases
     *)            $2=$1;;
-  esac
-])
+  esac]
+)
+
+dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
+dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY
+AC_DEFUN(RTEMS_BSP_ALIAS,
+[_RTEMS_BSP_ALIAS(ifelse([$1],,[$RTEMS_BSP],[$1]),
+  ifelse([$2],,[RTEMS_BSP_FAMILY],[$2]))]
+)

aclocal/check-multiprocessing.m4

@@ -9 +9 @@
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
+AC_REQUIRE([RTEMS_BSP_ALIAS])dnl
 
 AC_CACHE_CHECK([whether BSP supports multiprocessing],
   rtems_cv_HAS_MP,
   [dnl
-    RTEMS_BSP_ALIAS(${$1},bspdir) 
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${bspdir}/shmsupp"; then
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/shmsupp"; then
       if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
         rtems_cv_HAS_MP="yes" ;

aclocal/check-posix.m4

@@ -3 +3 @@
 AC_DEFUN(RTEMS_CHECK_POSIX_API,
 [dnl
-AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl