From d0de5f792e6bf511e74ca4bfebf09697918bedcd Mon Sep 17 00:00:00 2001 From: Tony Wu Date: Mon, 2 Oct 2017 14:16:34 +0800 Subject: [PATCH] rtl8195am - fix ARMC6 guards Fix ARMC6 guard typo introduced in commit 4f3f0cc9cc49 (Make Realtek link) While at it, remove redundant ISR_STACK_SIZE assignment for ARMCC. Signed-off-by: Tony Wu --- targets/TARGET_Realtek/mbed_rtx.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/targets/TARGET_Realtek/mbed_rtx.h b/targets/TARGET_Realtek/mbed_rtx.h index 9ac21a6be8..1da2503cd2 100644 --- a/targets/TARGET_Realtek/mbed_rtx.h +++ b/targets/TARGET_Realtek/mbed_rtx.h @@ -20,7 +20,7 @@ #include "rtl8195a.h" -#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) || (__ARMCC_VERSION >= 6010050)) +#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)) extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[]; extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Length[]; #define ISR_STACK_START (unsigned char *)(Image$$ARM_LIB_STACK$$ZI$$Base) @@ -33,8 +33,7 @@ #define INITIAL_SP (__StackTop) #endif - -#if defined(__CC_ARM) || defined(__GNUC__) +#if defined(__GNUC__) #ifndef ISR_STACK_SIZE #define ISR_STACK_SIZE (0x1000) #endif