Skip to content

Commit ae8c659

Browse files
cvinayakAnas Nashif
authored andcommitted
arch: arm: Fix compile error on ARMv6-M SoCs with TICKLESS_KERNEL
pop {lr} instruction is not supported in ARMv6-M, fixed by using pop {r0}; mov lr, r0; instructions. Jira: ZEP-2222 Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent 2b358a3 commit ae8c659

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

arch/arm/core/exc_exit.S

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, _IntExit)
6161
#ifdef CONFIG_TICKLESS_KERNEL
6262
push {lr}
6363
bl _update_time_slice_before_swap
64+
#if defined(CONFIG_ARMV6_M)
65+
pop {r0}
66+
mov lr, r0
67+
#else
6468
pop {lr}
69+
#endif /* CONFIG_ARMV6_M */
6570
#endif
6671

6772
/**

0 commit comments

Comments
 (0)