From 9f225dea192e7b17ba465a6b78029532cdf97933 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 21 Nov 2016 10:11:18 +0100 Subject: arm: Fix ARM_CONTEXT_CONTROL_ISR_DISPATCH_DISABLE Close #2816. --- cpukit/score/cpu/arm/rtems/score/cpu.h | 6 ++++-- 1 file 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 -- cgit v1.2.3