Skip to content

Commit

Permalink
arch: arm: Fix compile error on ARMv6-M SoCs with TICKLESS_KERNEL
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
cvinayak authored and Anas Nashif committed Jun 1, 2017
1 parent 7ac7578 commit 1084165
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/arm/core/exc_exit.S
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, _IntExit)
#ifdef CONFIG_TICKLESS_KERNEL
push {lr}
bl _update_time_slice_before_swap
#if defined(CONFIG_ARMV6_M)
pop {r0}
mov lr, r0
#else
pop {lr}
#endif /* CONFIG_ARMV6_M */
#endif

/**
Expand Down

0 comments on commit 1084165

Please sign in to comment.