summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-11 14:56:04 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-11 14:56:04 +0000
commit270e3cce9610120bfc3b818bde99ffaf8f880940 (patch)
treeb6a941caa1d5e125540fb939a7a22e51b8419230 /cpukit
parentebb0bb924242ad54ba714c778d21a5746a8f3c31 (diff)
downloadrtems-270e3cce9610120bfc3b818bde99ffaf8f880940.tar.bz2
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.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/cpu/i960/asm.h2
-rw-r--r--cpukit/score/cpu/m68k/asm.h2
-rw-r--r--cpukit/score/cpu/m68k/rtems/asm.h2
-rw-r--r--cpukit/score/cpu/no_cpu/asm.h2
-rw-r--r--cpukit/score/cpu/no_cpu/rtems/asm.h2
-rw-r--r--cpukit/score/cpu/sh/asm.h2
-rw-r--r--cpukit/score/cpu/sh/rtems/asm.h2
-rw-r--r--cpukit/score/include/rtems/system.h11
8 files changed, 16 insertions, 9 deletions
diff --git a/cpukit/score/cpu/i960/asm.h b/cpukit/score/cpu/i960/asm.h
index a9a0788925..e98f900f59 100644
--- a/cpukit/score/cpu/i960/asm.h
+++ b/cpukit/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/cpukit/score/cpu/m68k/asm.h b/cpukit/score/cpu/m68k/asm.h
index 456b213cb2..6c388fb396 100644
--- a/cpukit/score/cpu/m68k/asm.h
+++ b/cpukit/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/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/rtems/asm.h
index 456b213cb2..6c388fb396 100644
--- a/cpukit/score/cpu/m68k/rtems/asm.h
+++ b/cpukit/score/cpu/m68k/rtems/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/cpukit/score/cpu/no_cpu/asm.h b/cpukit/score/cpu/no_cpu/asm.h
index 1ca7fd435b..3e9164a28c 100644
--- a/cpukit/score/cpu/no_cpu/asm.h
+++ b/cpukit/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/cpukit/score/cpu/no_cpu/rtems/asm.h b/cpukit/score/cpu/no_cpu/rtems/asm.h
index 1ca7fd435b..3e9164a28c 100644
--- a/cpukit/score/cpu/no_cpu/rtems/asm.h
+++ b/cpukit/score/cpu/no_cpu/rtems/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/cpukit/score/cpu/sh/asm.h b/cpukit/score/cpu/sh/asm.h
index f6fff9f40e..446d77b276 100644
--- a/cpukit/score/cpu/sh/asm.h
+++ b/cpukit/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/cpukit/score/cpu/sh/rtems/asm.h b/cpukit/score/cpu/sh/rtems/asm.h
index f6fff9f40e..446d77b276 100644
--- a/cpukit/score/cpu/sh/rtems/asm.h
+++ b/cpukit/score/cpu/sh/rtems/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/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 5e9cabb448..f0c3c6f3e5 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/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