summaryrefslogtreecommitdiffstats
path: root/cpukit/score
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-18 14:09:49 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-18 14:09:49 +0000
commit7e950a442032c18824d9645e8701d7a97b210f3c (patch)
tree3a1a1245a64f15660ff4a570dbdf64a09365abf2 /cpukit/score
parentchanged version to ss-20011210 (diff)
downloadrtems-7e950a442032c18824d9645e8701d7a97b210f3c.tar.bz2
2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* asm.h: include cpuopts.h instead of targopts.h * rtems/score/arm.h: Use __arm__.
Diffstat (limited to 'cpukit/score')
-rw-r--r--cpukit/score/cpu/arm/ChangeLog5
-rw-r--r--cpukit/score/cpu/arm/asm.h2
-rw-r--r--cpukit/score/cpu/arm/rtems/asm.h2
-rw-r--r--cpukit/score/cpu/arm/rtems/score/arm.h2
4 files changed, 8 insertions, 3 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 882e0acab4..2d6bc09f1b 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * asm.h: include cpuopts.h instead of targopts.h
+ * rtems/score/arm.h: Use __arm__.
+
2001-11-28 Joel Sherrill <joel@OARcorp.com>,
This was tracked as PR91.
diff --git a/cpukit/score/cpu/arm/asm.h b/cpukit/score/cpu/arm/asm.h
index 59d7e18787..b974287b45 100644
--- a/cpukit/score/cpu/arm/asm.h
+++ b/cpukit/score/cpu/arm/asm.h
@@ -36,7 +36,7 @@
#ifndef ASM
#define ASM
#endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
#include <rtems/score/arm.h>
/*
diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/cpukit/score/cpu/arm/rtems/asm.h
index 59d7e18787..b974287b45 100644
--- a/cpukit/score/cpu/arm/rtems/asm.h
+++ b/cpukit/score/cpu/arm/rtems/asm.h
@@ -36,7 +36,7 @@
#ifndef ASM
#define ASM
#endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
#include <rtems/score/arm.h>
/*
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h
index f5f6ca2a28..7994d7150b 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/rtems/score/arm.h
@@ -29,7 +29,7 @@ extern "C" {
* of the family.
*/
-#if defined(arm)
+#if defined(__arm__)
#define CPU_MODEL_NAME "arm"
#define ARM_HAS_FPU 0