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

@@ -33,7 +33,7 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/i960.h>
 
 /*

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>
 
 /*

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>
 
 /*

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>
 
 /*

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

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 +=
 #

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 +=
 #