summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-14 17:12:23 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-14 17:12:23 +0000
commitc63a5cfe572cb016ef681d8b4404e007e1e122ab (patch)
tree6c12a7c42fcbb01ff6079258e1fca139d6f81315
parentPatch rtems-rc-20000614-sh.tar.gz from Ralf Corsepius (diff)
downloadrtems-c63a5cfe572cb016ef681d8b4404e007e1e122ab.tar.bz2
Patch rtems-rc-20000614-1-cvs.diff from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> 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.
-rw-r--r--aclocal/bsp-alias.m421
-rw-r--r--aclocal/check-multiprocessing.m44
-rw-r--r--aclocal/check-posix.m41
3 files changed, 16 insertions, 10 deletions
diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4
index e574ef44a2..37b55c753f 100644
--- a/aclocal/bsp-alias.m4
+++ b/aclocal/bsp-alias.m4
@@ -2,11 +2,10 @@ dnl
dnl $Id$
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
mvme2307) $2=motorola_powerpc ;; # Motorola PPC board variant
@@ -18,6 +17,14 @@ AC_DEFUN(RTEMS_BSP_ALIAS,
pc486) $2=pc386 ;; # i386 - PC with i486DX
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]))]
+)
diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4
index 2af6c5905a..7ee1b6d7d6 100644
--- a/aclocal/check-multiprocessing.m4
+++ b/aclocal/check-multiprocessing.m4
@@ -8,12 +8,12 @@ AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
AC_REQUIRE([RTEMS_TOP])dnl
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" ;
else
diff --git a/aclocal/check-posix.m4 b/aclocal/check-posix.m4
index 2a2091c1eb..a49fd008d7 100644
--- a/aclocal/check-posix.m4
+++ b/aclocal/check-posix.m4
@@ -2,7 +2,6 @@ dnl $Id$
dnl
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