diff options
-rw-r--r-- | c/src/exec/score/cpu/arm/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/exec/score/cpu/arm/asm.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/cpu/arm/rtems/score/arm.h | 2 | ||||
-rw-r--r-- | cpukit/score/cpu/arm/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/score/cpu/arm/asm.h | 2 | ||||
-rw-r--r-- | cpukit/score/cpu/arm/rtems/asm.h | 2 | ||||
-rw-r--r-- | cpukit/score/cpu/arm/rtems/score/arm.h | 2 |
7 files changed, 15 insertions, 5 deletions
diff --git a/c/src/exec/score/cpu/arm/ChangeLog b/c/src/exec/score/cpu/arm/ChangeLog index 882e0acab4..2d6bc09f1b 100644 --- a/c/src/exec/score/cpu/arm/ChangeLog +++ b/c/src/exec/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/c/src/exec/score/cpu/arm/asm.h b/c/src/exec/score/cpu/arm/asm.h index 59d7e18787..b974287b45 100644 --- a/c/src/exec/score/cpu/arm/asm.h +++ b/c/src/exec/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/c/src/exec/score/cpu/arm/rtems/score/arm.h b/c/src/exec/score/cpu/arm/rtems/score/arm.h index f5f6ca2a28..7994d7150b 100644 --- a/c/src/exec/score/cpu/arm/rtems/score/arm.h +++ b/c/src/exec/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 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 |