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: ----------------------------------------------------------------------
2000-07-06 20:13:35 +00:00
parent 6c5aba209a
commit 04e6f7bffb
23 changed files with 68 additions and 20 deletions
--- 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
 ])
--- 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
+
 ])
--- 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
 ])
--- 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
+
+
 ])
--- 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
 ])
--- a/c/src/configure.in
+++ b/c/src/configure.in
@@ -17,6 +17,7 @@ RTEMS_CANONICAL_HOST
 AM_INIT_AUTOMAKE(rtems-c-src,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

+RTEMS_ENABLE_MULTILIB
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CPU
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
@@ -25,7 +26,10 @@ RTEMS_CHECK_NETWORKING(RTEMS_BSP)

 ## Note: the order of the directories below is essential
 cfg_subdirs="make"
+## Exclude exec from building if multilibs are enabled
+if test x"$multilib" = x"no"; then
 cfg_subdirs="$cfg_subdirs exec"
+fi
 cfg_subdirs="$cfg_subdirs lib"
 cfg_subdirs="$cfg_subdirs libmisc"

--- a/c/src/exec/configure.in
+++ b/c/src/exec/configure.in
@@ -11,13 +11,15 @@ RTEMS_CANONICAL_TARGET_CPU

 AM_INIT_AUTOMAKE(rtems-c-src-exec,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTILIB
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_ITRON
 RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/itron/configure.in
+++ b/c/src/exec/itron/configure.in
@@ -16,7 +16,7 @@ RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_ITRON
 RTEMS_ENABLE_INLINES

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/posix/configure.in
+++ b/c/src/exec/posix/configure.in
@@ -16,7 +16,7 @@ RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_INLINES

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/a29k/configure.in
+++ b/c/src/exec/score/cpu/a29k/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-a29k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/h8300/configure.in
+++ b/c/src/exec/score/cpu/h8300/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-h8300,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/hppa1.1/configure.in
+++ b/c/src/exec/score/cpu/hppa1.1/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-hppa1.1,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/i386/configure.in
+++ b/c/src/exec/score/cpu/i386/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-i386,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/i960/configure.in
+++ b/c/src/exec/score/cpu/i960/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-i960,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/m68k/configure.in
+++ b/c/src/exec/score/cpu/m68k/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-m68k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/mips/configure.in
+++ b/c/src/exec/score/cpu/mips/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/mips64orion/configure.in
+++ b/c/src/exec/score/cpu/mips64orion/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/no_cpu/configure.in
+++ b/c/src/exec/score/cpu/no_cpu/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-no_cpu,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/powerpc/configure.in
+++ b/c/src/exec/score/cpu/powerpc/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-powerpc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
@@ -26,8 +26,11 @@ RTEMS_CHECK_NEWLIB

 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+
+# FIXME: This is in contradiction to multilibs
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

+# FIXME: This is in contradiction to multilibs
 AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604")

 # Explicitly list all Makefiles here
--- a/c/src/exec/score/cpu/sh/configure.in
+++ b/c/src/exec/score/cpu/sh/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sh,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
@@ -26,7 +26,6 @@ RTEMS_CHECK_NEWLIB

 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

 # Explicitly list all Makefiles here
 AC_OUTPUT( 
--- a/c/src/exec/score/cpu/sparc/configure.in
+++ b/c/src/exec/score/cpu/sparc/configure.in
@@ -12,7 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-sparc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/cpu/unix/configure.in
+++ b/c/src/exec/score/cpu/unix/configure.in
@@ -14,7 +14,7 @@ AM_MAINTAINER_MODE

 RTEMS_ENABLE_MULTIPROCESSING

-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU

 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
--- a/c/src/exec/score/include/rtems/score/Makefile.am
+++ b/c/src/exec/score/include/rtems/score/Makefile.am
@@ -5,7 +5,6 @@
 AUTOMAKE_OPTIONS = foreign 1.4

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg

 # We only build multiprocessing related files if HAS_MP was defined
 MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h