ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct NRF SDK11 assembly

pull/4949/head
Jimmy Brisson 2017-08-30 11:27:35 -05:00
parent 4f3f0cc9cc
commit d3b33d75a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.h
View File

@ -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));

2
targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_clock.c
View File

@ -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__)