Skip to content

Commit f02a5f4

Browse files
stephanosioJarmouniA
authored andcommitted
arch: arm: cortex_m: Force literal pool placement in inline asm block
When LTO is enabled, linker may relocate literal pools out of Thumb LDR instruction's reach causing "offset out of range" errors while linking. This commit adds `.ltorg` directive in the inline asm blocks where absolute addresses are loaded using the `ldr` instructions, in order to ensure that the literal pool containing the absolute addresses are placed near the `ldr` instructions. Note that the `.ltorg` directive is recognised by all toolchains supported by Zephyr and no toolchain abstraction is provided for now. Signed-off-by: Stephanos Ioannidis <[email protected]> (cherry picked from commit d7d3ae5)
1 parent 4ebecae commit f02a5f4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm/core/cortex_m/thread.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,8 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr,
586586
"mov r3, #0\n"
587587
"ldr r4, =z_thread_entry\n"
588588
"bx r4\n" /* We don’t intend to return, so there is no need to link. */
589+
/* Force a literal pool placement for the addresses referenced above */
590+
".ltorg\n"
589591
:
590592
: "r" (_main), "r" (stack_ptr)
591593
: "r0", "r1", "r2", "r3", "r4", "ip", "lr", "memory");
@@ -653,6 +655,8 @@ FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
653655
"ldr r0, =arch_irq_lock_outlined\n"
654656
"blx r0\n"
655657
"loop: b loop\n\t" /* while (true); */
658+
/* Force a literal pool placement for the addresses referenced above */
659+
".ltorg\n"
656660
:
657661
: [_p1]"r" (p1), [_p2]"r" (p2), [_p3]"r" (p3),
658662
[_psp]"r" (psp), [_main_entry]"r" (main_entry)

0 commit comments

Comments
 (0)