forked from Imagelibrary/rtems
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.
This commit is contained in:
@@ -2,11 +2,10 @@ dnl
|
|||||||
dnl $Id$
|
dnl $Id$
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
dnl RTEMS_BSP_ALIAS(BSP_ALIAS,BSP_RETURNED)
|
dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
|
||||||
dnl convert a bsp alias $1 into its bsp directory $2
|
dnl Internal subroutine to RTEMS_BSP_ALIAS
|
||||||
AC_DEFUN(RTEMS_BSP_ALIAS,
|
AC_DEFUN(_RTEMS_BSP_ALIAS,
|
||||||
[
|
[# account for "aliased" bsps which share source code
|
||||||
# account for "aliased" bsps which share source code
|
|
||||||
case $1 in
|
case $1 in
|
||||||
mcp750) $2=motorola_powerpc ;; # Motorola PPC board variant
|
mcp750) $2=motorola_powerpc ;; # Motorola PPC board variant
|
||||||
mvme2307) $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
|
pc486) $2=pc386 ;; # i386 - PC with i486DX
|
||||||
pc586) $2=pc386 ;; # i386 - PC with Pentium
|
pc586) $2=pc386 ;; # i386 - PC with Pentium
|
||||||
pc686) $2=pc386 ;; # i386 - PC with PentiumPro
|
pc686) $2=pc386 ;; # i386 - PC with PentiumPro
|
||||||
|
bare*) $2=bare ;; # EXP: bare-aliases
|
||||||
*) $2=$1;;
|
*) $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]))]
|
||||||
|
)
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
|
|||||||
AC_REQUIRE([RTEMS_TOP])dnl
|
AC_REQUIRE([RTEMS_TOP])dnl
|
||||||
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
|
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
|
||||||
AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
|
AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
|
||||||
|
AC_REQUIRE([RTEMS_BSP_ALIAS])dnl
|
||||||
|
|
||||||
AC_CACHE_CHECK([whether BSP supports multiprocessing],
|
AC_CACHE_CHECK([whether BSP supports multiprocessing],
|
||||||
rtems_cv_HAS_MP,
|
rtems_cv_HAS_MP,
|
||||||
[dnl
|
[dnl
|
||||||
RTEMS_BSP_ALIAS(${$1},bspdir)
|
if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/shmsupp"; then
|
||||||
if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${bspdir}/shmsupp"; then
|
|
||||||
if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
|
if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
|
||||||
rtems_cv_HAS_MP="yes" ;
|
rtems_cv_HAS_MP="yes" ;
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ dnl $Id$
|
|||||||
dnl
|
dnl
|
||||||
AC_DEFUN(RTEMS_CHECK_POSIX_API,
|
AC_DEFUN(RTEMS_CHECK_POSIX_API,
|
||||||
[dnl
|
[dnl
|
||||||
AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
|
|
||||||
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
|
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
|
||||||
AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
|
AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user