diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-01-09 13:25:09 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-01-09 14:06:41 +0100 |
commit | 5759510c9645bb0dd41e97da8ec3ac95595ebf66 (patch) | |
tree | 8cb81227c9a08b2f504c78f73958bc21df80c349 /cpukit/score/cpu/arm/rtems/score/cpu.h | |
parent | powerpc: Add AltiVec register ASM defines (diff) | |
download | rtems-5759510c9645bb0dd41e97da8ec3ac95595ebf66.tar.bz2 |
arm: Fix compile error for ARMv6-M multilib
ARMv6-M is not supported since we cannot directly use the ARMv7-M code
due to some inline assembler statements.
Close #2231.
Diffstat (limited to 'cpukit/score/cpu/arm/rtems/score/cpu.h')
-rw-r--r-- | cpukit/score/cpu/arm/rtems/score/cpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h index 900486bbe4..869ab1cb27 100644 --- a/cpukit/score/cpu/arm/rtems/score/cpu.h +++ b/cpukit/score/cpu/arm/rtems/score/cpu.h @@ -260,7 +260,7 @@ typedef struct { uint32_t register_fp; uint32_t register_sp; uint32_t register_lr; -#elif defined(ARM_MULTILIB_ARCH_V7M) +#elif defined(ARM_MULTILIB_ARCH_V6M) || defined(ARM_MULTILIB_ARCH_V7M) uint32_t register_r4; uint32_t register_r5; uint32_t register_r6; @@ -682,7 +682,7 @@ typedef struct { #if defined(ARM_MULTILIB_ARCH_V4) uint32_t register_cpsr; Arm_symbolic_exception_name vector; -#elif defined(ARM_MULTILIB_ARCH_V7M) +#elif defined(ARM_MULTILIB_ARCH_V6M) || defined(ARM_MULTILIB_ARCH_V7M) uint32_t register_xpsr; uint32_t vector; #endif |