diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-07-06 20:13:35 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-07-06 20:13:35 +0000 |
commit | 04e6f7bffb71106516097299e37f57bb28cf9844 (patch) | |
tree | 8442c8591d6021418c7e2a8cb681b358fdd41b3d /aclocal | |
parent | Patch rtems-rc-20000705-2.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-04e6f7bffb71106516097299e37f57bb28cf9844.tar.bz2 |
Patch rtems-rc-20000705-3.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that is a somewhat experimental, multilib-related patch:
Changes:
* Use RTEMS_ENV_RTEMSCPU instead of RTEMS_ENV_RTEMSBSP in
configure.ins below exec/.
At the moment, RTEMS_ENV_RTEMSCPU is more or less an optical change
to emphasize that these subdirectories shall not depend on RTEMS_BSP
than a real behavioral change.
* Add AC_DEFINE_* to several aclocal/*.m4 macros to prepare
autoheader/autoconf generated targopts.h and similiar configuration
headers.
* c/src/configure.in: remove exec from cfg_subdirs if multilibs are
enabled (c/src is build per bsp, exec shall be build per cpu in c/
or from the toplevel in future, when multilibs are enabled.)
Notes:
* This patch should not have any impact on the current building scheme.
* --enable-multilib still does not work.
* running bootstrap from the toplevel directory is required.
CVS: ----------------------------------------------------------------------
CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: c/src/tests/libtests/termios/init.c
CVS: ----------------------------------------------------------------------
Diffstat (limited to 'aclocal')
-rw-r--r-- | aclocal/check-itron.m4 | 7 | ||||
-rw-r--r-- | aclocal/check-multiprocessing.m4 | 6 | ||||
-rw-r--r-- | aclocal/check-posix.m4 | 7 | ||||
-rw-r--r-- | aclocal/enable-inlines.m4 | 9 | ||||
-rw-r--r-- | aclocal/enable-rtemsbsp.m4 | 16 |
5 files changed, 43 insertions, 2 deletions
diff --git a/aclocal/check-itron.m4 b/aclocal/check-itron.m4 index e30023b341..a5813878d7 100644 --- a/aclocal/check-itron.m4 +++ b/aclocal/check-itron.m4 @@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_CHECK_ITRON_API, AC_REQUIRE([RTEMS_CHECK_CPU])dnl AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl -AC_CACHE_CHECK([whether BSP supports libitron], +AC_CACHE_CHECK([whether CPU supports libitron], rtems_cv_HAS_ITRON_API, [dnl case "$RTEMS_CPU" in @@ -26,4 +26,9 @@ else HAS_ITRON_API="no"; fi AC_SUBST(HAS_ITRON_API)dnl + +if test x"${HAS_ITRON_API}" = x"yes"; +then + AC_DEFINE_UNQUOTED(RTEMS_ITRON_API,1,[if itron api is supported]) +fi ]) diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4 index e2bbe80b48..e5ddc8fbe0 100644 --- a/aclocal/check-multiprocessing.m4 +++ b/aclocal/check-multiprocessing.m4 @@ -35,4 +35,10 @@ else HAS_MP="no" fi AC_SUBST(HAS_MP) + +if test x"${HAS_MP}" = x"yes"; +then + AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported]) +fi + ]) diff --git a/aclocal/check-posix.m4 b/aclocal/check-posix.m4 index a49fd008d7..16e2bf350e 100644 --- a/aclocal/check-posix.m4 +++ b/aclocal/check-posix.m4 @@ -5,7 +5,7 @@ AC_DEFUN(RTEMS_CHECK_POSIX_API, AC_REQUIRE([RTEMS_CHECK_CPU])dnl AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl -AC_CACHE_CHECK([whether BSP supports libposix], +AC_CACHE_CHECK([whether CPU supports libposix], rtems_cv_HAS_POSIX_API, [dnl case "$RTEMS_CPU" in @@ -26,4 +26,9 @@ else HAS_POSIX_API="no"; fi AC_SUBST(HAS_POSIX_API)dnl + +if test x"${HAS_POSIX_API}" = x"yes"; +then + AC_DEFINE_UNQUOTED(RTEMS_POSIX_API,1,[if posix api is supported]) +fi ]) diff --git a/aclocal/enable-inlines.m4 b/aclocal/enable-inlines.m4 index f4d00c39d2..259697f825 100644 --- a/aclocal/enable-inlines.m4 +++ b/aclocal/enable-inlines.m4 @@ -10,4 +10,13 @@ AC_DEFUN(RTEMS_ENABLE_INLINES, *) AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;; esac],[RTEMS_USE_MACROS=no]) AC_SUBST(RTEMS_USE_MACROS)dnl + +if test x"${RTEMS_USE_MACROS}" = x"yes"; +then + AC_DEFINE_UNQUOTED(USE_MACROS,1,[if using macros]) +else + AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines]) +fi + + ]) diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4 index b686a185ed..39dc733a22 100644 --- a/aclocal/enable-rtemsbsp.m4 +++ b/aclocal/enable-rtemsbsp.m4 @@ -33,4 +33,20 @@ fi RTEMS_BSP="$rtems_cv_RTEMS_BSP" AC_MSG_RESULT(${RTEMS_BSP}) AC_SUBST(RTEMS_BSP) + +## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP +## AC_SUBST(RTEMS_ROOT) +]) + +AC_DEFUN(RTEMS_ENV_RTEMSCPU, +[AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) +if test x"$multilib" = x"no"; then + RTEMS_ENV_RTEMSBSP +else + rtems_cv_RTEMS_BSP="multilib" + RTEMS_BSP="$rtems_cv_RTEMS_BSP" + AC_SUBST(RTEMS_BSP) +## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c +## AC_SUBST(RTEMS_ROOT) +fi ]) |