summaryrefslogtreecommitdiffstats
path: root/c/src/exec/score/cpu
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-06 20:13:35 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-06 20:13:35 +0000
commit04e6f7bffb71106516097299e37f57bb28cf9844 (patch)
tree8442c8591d6021418c7e2a8cb681b358fdd41b3d /c/src/exec/score/cpu
parentPatch rtems-rc-20000705-2.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-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 'c/src/exec/score/cpu')
-rw-r--r--c/src/exec/score/cpu/a29k/configure.in2
-rw-r--r--c/src/exec/score/cpu/h8300/configure.in2
-rw-r--r--c/src/exec/score/cpu/hppa1.1/configure.in2
-rw-r--r--c/src/exec/score/cpu/i386/configure.in2
-rw-r--r--c/src/exec/score/cpu/i960/configure.in2
-rw-r--r--c/src/exec/score/cpu/m68k/configure.in2
-rw-r--r--c/src/exec/score/cpu/mips/configure.in2
-rw-r--r--c/src/exec/score/cpu/mips64orion/configure.in2
-rw-r--r--c/src/exec/score/cpu/no_cpu/configure.in2
-rw-r--r--c/src/exec/score/cpu/powerpc/configure.in5
-rw-r--r--c/src/exec/score/cpu/sh/configure.in3
-rw-r--r--c/src/exec/score/cpu/sparc/configure.in2
-rw-r--r--c/src/exec/score/cpu/unix/configure.in2
13 files changed, 16 insertions, 14 deletions
diff --git a/c/src/exec/score/cpu/a29k/configure.in b/c/src/exec/score/cpu/a29k/configure.in
index da5ac59c80..01a6738ba9 100644
--- 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
diff --git a/c/src/exec/score/cpu/h8300/configure.in b/c/src/exec/score/cpu/h8300/configure.in
index 1d9b92d6ef..15dd05c27d 100644
--- 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
diff --git a/c/src/exec/score/cpu/hppa1.1/configure.in b/c/src/exec/score/cpu/hppa1.1/configure.in
index 04d7c085b5..6bc33ec27e 100644
--- 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
diff --git a/c/src/exec/score/cpu/i386/configure.in b/c/src/exec/score/cpu/i386/configure.in
index 5b50199cfc..4c61a67576 100644
--- 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
diff --git a/c/src/exec/score/cpu/i960/configure.in b/c/src/exec/score/cpu/i960/configure.in
index ee5027626b..e0cd5f3b6d 100644
--- 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
diff --git a/c/src/exec/score/cpu/m68k/configure.in b/c/src/exec/score/cpu/m68k/configure.in
index 3a80e45eda..29da74db0b 100644
--- 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
diff --git a/c/src/exec/score/cpu/mips/configure.in b/c/src/exec/score/cpu/mips/configure.in
index edf945294b..3617976e9f 100644
--- 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
diff --git a/c/src/exec/score/cpu/mips64orion/configure.in b/c/src/exec/score/cpu/mips64orion/configure.in
index edf945294b..3617976e9f 100644
--- 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
diff --git a/c/src/exec/score/cpu/no_cpu/configure.in b/c/src/exec/score/cpu/no_cpu/configure.in
index 7a8cc99b1b..1761efbc66 100644
--- 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
diff --git a/c/src/exec/score/cpu/powerpc/configure.in b/c/src/exec/score/cpu/powerpc/configure.in
index 333acdaf5b..1c35a770d9 100644
--- 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
diff --git a/c/src/exec/score/cpu/sh/configure.in b/c/src/exec/score/cpu/sh/configure.in
index 3bc43813d1..df246379c2 100644
--- 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(
diff --git a/c/src/exec/score/cpu/sparc/configure.in b/c/src/exec/score/cpu/sparc/configure.in
index be419fc020..231532264b 100644
--- 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
diff --git a/c/src/exec/score/cpu/unix/configure.in b/c/src/exec/score/cpu/unix/configure.in
index d7fbb84b05..5b527b629a 100644
--- 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