summaryrefslogtreecommitdiffstats
path: root/aclocal/check-multiprocessing.m4
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-29 15:29:31 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-29 15:29:31 +0000
commitfe5851ceaec2e233c48fc5707ece2f69fce77090 (patch)
treee926ecf6fa2cc4e6be0211709ba8c30c415d2200 /aclocal/check-multiprocessing.m4
parent50195920e3fa175af9ed786b53a36816c6ef4eb5 (diff)
downloadrtems-fe5851ceaec2e233c48fc5707ece2f69fce77090.tar.bz2
Patch rtems-rc-20000627-1 from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that is part of the multilib/gnu-canonicalization movement: Changes: * New m4-macro: aclocal/multilib.am * Suppress multiprocessing if --enable-multilib is given to configure Notes: For now this patch only suppresses multiprocessing if --enable-multilib is given to configure and should not have any other side-effects, ie. it works around a minor issue which prevents introduction of multilibs in general. The RTEMS_ENABLE_MULTILIB_MASTER macro is the core part to build real multilibs, but can not be applied before other multilib related issues with RTEMS have been solved. (e.g. sptables.h, bsp_specs, Cygnus/Gnu canonicalization, _RTEMS_version, targopts.h, changing the installation point/tooldir support, etc.).
Diffstat (limited to 'aclocal/check-multiprocessing.m4')
-rw-r--r--aclocal/check-multiprocessing.m419
1 files changed, 13 insertions, 6 deletions
diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4
index 7ee1b6d7d6..e2bbe80b48 100644
--- a/aclocal/check-multiprocessing.m4
+++ b/aclocal/check-multiprocessing.m4
@@ -4,6 +4,7 @@ dnl
AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
[dnl
+AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl
AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
AC_REQUIRE([RTEMS_TOP])dnl
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
@@ -13,14 +14,20 @@ AC_REQUIRE([RTEMS_BSP_ALIAS])dnl
AC_CACHE_CHECK([whether BSP supports multiprocessing],
rtems_cv_HAS_MP,
[dnl
- 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" ;
+ if test x"$multilib" = x"yes"; then
+ # FIXME: Currently, multilibs and multiprocessing can not be
+ # build simultaneously
+ rtems_cv_HAS_MP="disabled"
+ else
+ 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
+ rtems_cv_HAS_MP="disabled";
+ fi
else
- rtems_cv_HAS_MP="disabled";
+ rtems_cv_HAS_MP="no";
fi
- else
- rtems_cv_HAS_MP="no";
fi])
if test "$rtems_cv_HAS_MP" = "yes"; then
HAS_MP="yes"