summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-18 22:33:49 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-18 22:33:49 +0000
commit61129cc54f1447a1516f587464c5af7ec6be4168 (patch)
tree43573085a452913614f3632be48dc7135ff9ad42 /cpukit
parent8560ed944d75fa1b442fc4ff51885f1ff00da03e (diff)
downloadrtems-61129cc54f1447a1516f587464c5af7ec6be4168.tar.bz2
2001-01-18 Joel Sherrill <joel@OARcorp.com>
* include/rtems/system.h: Only include cpuopts.h when building a multilib configuration. Some ports still need targopts.h but this small modification lets those ports work non-multilib while fixing being fixed for multilib.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/ChangeLog7
-rw-r--r--cpukit/score/include/rtems/system.h24
2 files changed, 18 insertions, 13 deletions
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index 4ac3cbfac2..472ae06395 100644
--- a/cpukit/score/ChangeLog
+++ b/cpukit/score/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-18 Joel Sherrill <joel@OARcorp.com>
+
+ * include/rtems/system.h: Only include cpuopts.h when building a
+ multilib configuration. Some ports still need targopts.h but this
+ small modification lets those ports work non-multilib while
+ fixing being fixed for multilib.
+
2002-01-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/seterr.h: Add do {..} while (0) in defines.
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index d11e3ea8d7..3fdff9c92b 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -27,23 +27,21 @@ extern "C" {
* first so the basic macro definitions are in place.
*/
+#include <rtems/score/cpuopts.h>
+
/*
- * FIXME: cpuopts.h should be included here.
+ * FIXME: No port should have to include targopts.h
+ *
+ * Most cpus are ready to apply only cpuopts.h but these ports
+ * unfortunately still need targopts.h. This means these ports
+ * are not ready to be built multilib yet.
*/
-#if defined(_AM29K) \
- || defined(__hppa__) \
- || defined(__h8300__) \
- || defined(__i960__) \
- || defined(__mc68000__) \
- || defined(__sh__) \
- || defined(__sparc__) \
- || defined(__i386__)
- /* these cpus are ready to apply cpuopts.h */
-#include <rtems/score/cpuopts.h>
-#else
- /* fallback to targopts.h for mips and powerpc */
+
+#if !defined(RTEMS_MULTILIB)
+#if defined(__PPC__) || defined(__sparc__) || defined(__i386__)
#include <rtems/score/targopts.h>
#endif
+#endif
/*
* The following ensures that all data is declared in the space