diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.h index a9b110b092..de47bda964 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.h @@ -164,7 +164,7 @@ static __INLINE void nrf_delay_us(uint32_t volatile number_of_us) { register uint32_t delay __ASM ("r0") = number_of_us; __ASM volatile ( -#ifdef NRF51 +#if defined(NRF51) && !defined(__ARMCC_VERSION) ".syntax unified\n" #endif "1:\n" @@ -230,7 +230,7 @@ __ASM volatile ( " NOP\n" #endif " BNE 1b\n" -#ifdef NRF51 +#if defined(NRF51) && !defined(__ARMCC_VERSION) ".syntax divided\n" #endif : "+r" (delay)); diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_clock.c b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_clock.c index 19d80f3870..2cb8919f9a 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_clock.c +++ b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_clock.c @@ -91,7 +91,7 @@ void SystemInit (void) #if defined(__ICCARM__) #pragma section=".intvec" #define FLASH_VTOR_BASE ((uint32_t)__section_begin(".intvec")) -#elif defined(__CC_ARM) +#elif defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)) extern uint32_t Load$$LR$$LR_IROM1$$Base[]; #define FLASH_VTOR_BASE ((uint32_t)Load$$LR$$LR_IROM1$$Base) #elif defined(__GNUC__)