michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: asm: Fix some asm issues when building with clang

Browse source 
The clang ARM assembler is a bit stricter than GNU as, make a few
changes so things build with both

Signed-off-by: Peter Smith <peter.smith@linaro.org>
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-03-13 11:26:28 -05:00 • committed by Kumar Gala
commit 4e90103fcb
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/core/swap_helper.S
View file

@ -110,7 +110,7 @@ SECTION_FUNC(TEXT, __pendsv)
/* _kernel is still in r1 */
/* fetch the thread to run from the ready queue cache */
ldr r2, [r1, _kernel_offset_to_ready_q_cache]
ldr r2, [r1, #_kernel_offset_to_ready_q_cache]
str r2, [r1, #_kernel_offset_to_current]
@ -226,7 +226,7 @@ _thread_irq_disabled:
/* r2 contains k_thread */
add r0, r2, #0
push {r2, lr}
blx configure_builtin_stack_guard
bl configure_builtin_stack_guard
pop {r2, lr}
#endif /* CONFIG_BUILTIN_STACK_GUARD */
@ -302,7 +302,7 @@ _stack_frame_endif:
#if CONFIG_IRQ_OFFLOAD
push {r0, lr}
blx _irq_do_offload /* call C routine which executes the offload */
bl _irq_do_offload /* call C routine which executes the offload */
pop {r0, r1}
mov lr, r1
#endif /* CONFIG_IRQ_OFFLOAD */
@ -312,7 +312,7 @@ _stack_frame_endif:
_oops:
push {r0, lr}
blx _do_kernel_oops
bl _do_kernel_oops
pop {r0, pc}
#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
@ -368,7 +368,7 @@ SECTION_FUNC(TEXT, __svc)
#if CONFIG_IRQ_OFFLOAD
push {r0, lr}
blx _irq_do_offload /* call C routine which executes the offload */
bl _irq_do_offload /* call C routine which executes the offload */
pop {r0, lr}
/* exception return is done in _IntExit() */
@ -377,7 +377,7 @@ SECTION_FUNC(TEXT, __svc)
_oops:
push {r0, lr}
blx _do_kernel_oops
bl _do_kernel_oops
pop {r0, pc}
#if CONFIG_USERSPACE