summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-11-21 10:11:18 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-11-21 10:11:18 +0100
commit9f225dea192e7b17ba465a6b78029532cdf97933 (patch)
tree4728882d2ee01691c2e57b969c0f09860a963062
parentbfin: ASM compatibility for <rtems/score/cpu.h> (diff)
downloadrtems-9f225dea192e7b17ba465a6b78029532cdf97933.tar.bz2
arm: Fix ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE
Close #2816.
-rw-r--r--cpukit/score/cpu/arm/rtems/score/cpu.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 6a57ac85e5..df3034134c 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -210,10 +210,12 @@
#endif
#ifdef ARM_MULTILIB_ARCH_V4
- #ifdef ARM_MULTILIB_VFP
+ #if defined(ARM_MULTILIB_VFP)
#define ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE 112
- #else
+ #elif defined(ARM_MULTILIB_HAS_THREAD_ID_REGISTER)
#define ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE 48
+ #else
+ #define ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE 44
#endif
#endif