Skip to content

Commit aff2bee

Browse files
authored
Merge pull request #9352 from mprse/armc6_fix
mbed_boot_arm_std.c: remove redundant compiler check
2 parents a180d69 + 8cc4234 commit aff2bee

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

rtos/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ __value_in_regs struct __argc_argv __rt_lib_init(unsigned heapbase, unsigned hea
2828
void _platform_post_stackheap_init(void);
2929

3030
#if !defined(ISR_STACK_SIZE)
31-
#if (defined(__CC_ARM))
3231
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[];
3332
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Length[];
3433
#define ISR_STACK_START ((unsigned char*)Image$$ARM_LIB_STACK$$ZI$$Base)
3534
#define ISR_STACK_SIZE ((uint32_t)Image$$ARM_LIB_STACK$$ZI$$Length)
3635
#endif
37-
#endif
3836

3937
#if !defined(HEAP_START)
4038
/* Defined by linker script */

rtos/TARGET_CORTEX/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@ static mbed_rtos_storage_mutex_t env_mutex_obj;
3030
static osMutexAttr_t env_mutex_attr;
3131

3232
#if !defined(ISR_STACK_SIZE)
33-
#if (defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC_VERSION))
3433
extern uint32_t __StackLimit;
3534
extern uint32_t __StackTop;
3635
#define ISR_STACK_START ((unsigned char*)&__StackLimit)
3736
#define ISR_STACK_SIZE ((uint32_t)((uint32_t)&__StackTop - (uint32_t)&__StackLimit))
3837
#endif
39-
#endif
4038

4139
#if !defined(HEAP_START)
4240
/* Defined by linker script */

0 commit comments

Comments
 (0)