From 270e3cce9610120bfc3b818bde99ffaf8f880940 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 11 Jul 2000 14:56:04 +0000
Subject: Patch rtems-rc-20000711-1-cvs.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that decouples exec/ for the sh, m68k and i960 from
 targopts.h.

NOTE: The change to system.h is a hack to enable cpuopts.h
for some targets, but keep using targopts.h for others - I know it
does *not* work for sparc, mips, i386 and ppc.  This will have
to be addressed as work continues on multilibing.
---
 c/src/exec/score/cpu/i960/asm.h                   |  2 +-
 c/src/exec/score/cpu/m68k/asm.h                   |  2 +-
 c/src/exec/score/cpu/no_cpu/asm.h                 |  2 +-
 c/src/exec/score/cpu/sh/asm.h                     |  2 +-
 c/src/exec/score/include/rtems/system.h           | 11 +++++++++--
 c/src/lib/libbsp/m68k/dmv152/console/Makefile.am  |  2 ++
 c/src/lib/libbsp/m68k/mvme167/console/Makefile.am |  1 +
 7 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'c/src')

diff --git a/c/src/exec/score/cpu/i960/asm.h b/c/src/exec/score/cpu/i960/asm.h
index a9a0788925..e98f900f59 100644
--- a/c/src/exec/score/cpu/i960/asm.h
+++ b/c/src/exec/score/cpu/i960/asm.h
@@ -33,7 +33,7 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/i960.h>
 
 /*
diff --git a/c/src/exec/score/cpu/m68k/asm.h b/c/src/exec/score/cpu/m68k/asm.h
index 456b213cb2..6c388fb396 100644
--- a/c/src/exec/score/cpu/m68k/asm.h
+++ b/c/src/exec/score/cpu/m68k/asm.h
@@ -33,7 +33,7 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/cpu.h>
 
 /*
diff --git a/c/src/exec/score/cpu/no_cpu/asm.h b/c/src/exec/score/cpu/no_cpu/asm.h
index 1ca7fd435b..3e9164a28c 100644
--- a/c/src/exec/score/cpu/no_cpu/asm.h
+++ b/c/src/exec/score/cpu/no_cpu/asm.h
@@ -33,7 +33,7 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*
diff --git a/c/src/exec/score/cpu/sh/asm.h b/c/src/exec/score/cpu/sh/asm.h
index f6fff9f40e..446d77b276 100644
--- a/c/src/exec/score/cpu/sh/asm.h
+++ b/c/src/exec/score/cpu/sh/asm.h
@@ -49,7 +49,7 @@
 #define ASM
 #endif
 
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/sh.h>
 
 /*
diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h
index 5e9cabb448..f0c3c6f3e5 100644
--- a/c/src/exec/score/include/rtems/system.h
+++ b/c/src/exec/score/include/rtems/system.h
@@ -28,10 +28,17 @@ extern "C" {
  */
 
 /*
- * FIXME: Instead of targopts.h, cpuopts.h should be included here.
- * #include <rtems/score/cpuopts.h>
+ * FIXME: cpuopts.h should be included here.
  */
+#if defined(__sh__) \
+  || defined(__mc68000__) \
+  || defined(__i960__)
+  /* these cpus are ready to apply cpuopts.h */
+#include <rtems/score/cpuopts.h>
+#else
+  /* fallback to targopts.h */
 #include <rtems/score/targopts.h>
+#endif
 
 /*
  *  The following insures that all data is declared in the space
diff --git a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am
index d4e5619fac..9a6f5f7147 100644
--- a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am
@@ -14,6 +14,8 @@ OBJS = $(C_O_FILES)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../../automake/lib.am
 
+AM_CPPFLAGS += $(BSP_CPPFLAGS)
+
 #
 # (OPTIONAL) Add local stuff here using +=
 #
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am
index d4e5619fac..7c0b1d1b2a 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am
@@ -14,6 +14,7 @@ OBJS = $(C_O_FILES)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../../automake/lib.am
 
+AM_CPPFLAGS += $(BSP_CPPFLAGS)
 #
 # (OPTIONAL) Add local stuff here using +=
 #
-- 
cgit v1.2.3