RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-06-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* configure.ac: Remove references to RTEMS_BSP.
	* aclocal/check-multiprocessing.m4: Remove references to RTEMS_BSP.
	Allow building w/ --enable-multiprocessing --enable-multilib.
	* aclocal/enable-multiprocessing.m4:
	Eliminate RTEMS_HAS_MULTIPROCESSING.
This commit is contained in:
Ralf Corsepius
2002-06-26 10:56:24 +00:00
parent 163abc10e8
commit 27f9f12d8e
8 changed files with 40 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/exec/ChangeLog
View File

@@ -1,3 +1,11 @@
2002-06-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove references to RTEMS_BSP.
* aclocal/check-multiprocessing.m4: Remove references to RTEMS_BSP.
Allow building w/ --enable-multiprocessing --enable-multilib.
* aclocal/enable-multiprocessing.m4:
Eliminate RTEMS_HAS_MULTIPROCESSING.
2002-06-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-06-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Fix stupid typo in previous patch. * wrapup/Makefile.am: Fix stupid typo in previous patch.

34
c/src/exec/aclocal/check-multiprocessing.m4
View File

@@ -4,43 +4,19 @@ dnl
AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING, AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
[dnl [dnl
AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl AC_REQUIRE([RTEMS_ENV_RTEMSCPU])dnl
AC_REQUIRE([RTEMS_ENV_RTEMSBSP])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], AS_IF([test "$enable_multiprocessing" = "yes"],
rtems_cv_HAS_MP, [HAS_MP="yes"],
[dnl [HAS_MP="no"])
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="no";
fi
fi])
if test "$rtems_cv_HAS_MP" = "yes"; then
HAS_MP="yes"
else
HAS_MP="no"
fi
AC_SUBST(HAS_MP)
]) ])
AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING, AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING,
[AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl [AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl
if test x"${HAS_MP}" = x"yes"; if test x"${HAS_MP}" = x"yes";
then then
AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported]) AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is enabled])
fi fi
]) ])

9
c/src/exec/aclocal/enable-multiprocessing.m4
View File

@@ -4,10 +4,9 @@ AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
[ [
AC_ARG_ENABLE(multiprocessing, AC_ARG_ENABLE(multiprocessing,
AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]), AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]),
[case "${enableval}" in [case "${enable_multiprocessing}" in
yes) RTEMS_HAS_MULTIPROCESSING=yes ;; yes) ;;
no) RTEMS_HAS_MULTIPROCESSING=no ;; no) ;;
*) AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;; *) AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
esac],[RTEMS_HAS_MULTIPROCESSING=no]) esac],[$enable_multiprocessing=no])
AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
]) ])

6
c/src/exec/configure.ac
View File

@@ -35,9 +35,9 @@ AC_PROG_RANLIB
RTEMS_CHECK_NEWLIB RTEMS_CHECK_NEWLIB
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING
RTEMS_CHECK_POSIX_API(RTEMS_BSP) RTEMS_CHECK_POSIX_API
RTEMS_CHECK_ITRON_API(RTEMS_BSP) RTEMS_CHECK_ITRON_API
RTEMS_CHECK_NETWORKING RTEMS_CHECK_NETWORKING
# If RTEMS macros are enabled, then use them. Otherwise, use inlines. # If RTEMS macros are enabled, then use them. Otherwise, use inlines.

8
cpukit/ChangeLog
View File

@@ -1,3 +1,11 @@
2002-06-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove references to RTEMS_BSP.
* aclocal/check-multiprocessing.m4: Remove references to RTEMS_BSP.
Allow building w/ --enable-multiprocessing --enable-multilib.
* aclocal/enable-multiprocessing.m4:
Eliminate RTEMS_HAS_MULTIPROCESSING.
2002-06-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-06-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Fix stupid typo in previous patch. * wrapup/Makefile.am: Fix stupid typo in previous patch.

34
cpukit/aclocal/check-multiprocessing.m4
View File

@@ -4,43 +4,19 @@ dnl
AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING, AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
[dnl [dnl
AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl AC_REQUIRE([RTEMS_ENV_RTEMSCPU])dnl
AC_REQUIRE([RTEMS_ENV_RTEMSBSP])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], AS_IF([test "$enable_multiprocessing" = "yes"],
rtems_cv_HAS_MP, [HAS_MP="yes"],
[dnl [HAS_MP="no"])
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="no";
fi
fi])
if test "$rtems_cv_HAS_MP" = "yes"; then
HAS_MP="yes"
else
HAS_MP="no"
fi
AC_SUBST(HAS_MP)
]) ])
AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING, AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING,
[AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl [AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl
if test x"${HAS_MP}" = x"yes"; if test x"${HAS_MP}" = x"yes";
then then
AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported]) AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is enabled])
fi fi
]) ])

9
cpukit/aclocal/enable-multiprocessing.m4
View File

@@ -4,10 +4,9 @@ AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
[ [
AC_ARG_ENABLE(multiprocessing, AC_ARG_ENABLE(multiprocessing,
AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]), AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]),
[case "${enableval}" in [case "${enable_multiprocessing}" in
yes) RTEMS_HAS_MULTIPROCESSING=yes ;; yes) ;;
no) RTEMS_HAS_MULTIPROCESSING=no ;; no) ;;
*) AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;; *) AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
esac],[RTEMS_HAS_MULTIPROCESSING=no]) esac],[$enable_multiprocessing=no])
AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
]) ])

6
cpukit/configure.ac
View File

@@ -35,9 +35,9 @@ AC_PROG_RANLIB
RTEMS_CHECK_NEWLIB RTEMS_CHECK_NEWLIB
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING
RTEMS_CHECK_POSIX_API(RTEMS_BSP) RTEMS_CHECK_POSIX_API
RTEMS_CHECK_ITRON_API(RTEMS_BSP) RTEMS_CHECK_ITRON_API
RTEMS_CHECK_NETWORKING RTEMS_CHECK_NETWORKING
# If RTEMS macros are enabled, then use them. Otherwise, use inlines. # If RTEMS macros are enabled, then use them. Otherwise, use inlines.