Patch rtems-rc-20000708-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that is another small step toward multilibs: Changes: * Eliminate RTEMS_CHECK_CUSTOM_BSP from all configure.ins below exec/ * Add RTEMS_CHECK_CUSTOM_BSP to the multilib-disabled branch in RTEMS_ENV_RTEMSCPU to preserve the old per-BSP building scheme functional. Notes: * --enable-multilibs is still non-functional * This patch should not have any influence on the old building scheme (--disable-multilib should silently fall back to the old building scheme). * running ./bootstrap is required after applying the patch
2000-07-10 19:12:07 +00:00
parent dc39377e53
commit 256cbecf68
17 changed files with 1 additions and 45 deletions
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -42,6 +42,7 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU,
 [AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
 if test x"$multilib" = x"no"; then
  RTEMS_ENV_RTEMSBSP
+  RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 else
  rtems_cv_RTEMS_BSP="multilib"
  RTEMS_BSP="$rtems_cv_RTEMS_BSP"
--- a/c/src/exec/configure.in
+++ b/c/src/exec/configure.in
@@ -31,8 +31,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 RTEMS_CHECK_ITRON_API(RTEMS_BSP)
--- a/c/src/exec/itron/configure.in
+++ b/c/src/exec/itron/configure.in
@@ -26,8 +26,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

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

--- a/c/src/exec/posix/configure.in
+++ b/c/src/exec/posix/configure.in
@@ -26,8 +26,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

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

--- a/c/src/exec/score/cpu/a29k/configure.in
+++ b/c/src/exec/score/cpu/a29k/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/h8300/configure.in
+++ b/c/src/exec/score/cpu/h8300/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/hppa1.1/configure.in
+++ b/c/src/exec/score/cpu/hppa1.1/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/i386/configure.in
+++ b/c/src/exec/score/cpu/i386/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/i960/configure.in
+++ b/c/src/exec/score/cpu/i960/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/m68k/configure.in
+++ b/c/src/exec/score/cpu/m68k/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/mips/configure.in
+++ b/c/src/exec/score/cpu/mips/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/mips64orion/configure.in
+++ b/c/src/exec/score/cpu/mips64orion/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/no_cpu/configure.in
+++ b/c/src/exec/score/cpu/no_cpu/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/powerpc/configure.in
+++ b/c/src/exec/score/cpu/powerpc/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/sh/configure.in
+++ b/c/src/exec/score/cpu/sh/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/sparc/configure.in
+++ b/c/src/exec/score/cpu/sparc/configure.in
@@ -24,9 +24,6 @@ RTEMS_CANONICALIZE_TOOLS

 RTEMS_CHECK_NEWLIB

-# Check if there is custom/*.cfg for this BSP
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/unix/configure.in
+++ b/c/src/exec/score/cpu/unix/configure.in
@@ -24,9 +24,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS

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