From 6b4e9426834580810790ecfa924979d61c5c1987 Mon Sep 17 00:00:00 2001 From: Albert ARIBAUD Date: Mon, 27 Feb 2017 20:19:07 +0100 Subject: [PATCH] armv5te: make 'ret lr' produce iinterworking 'bx lr' Current ARM assembler helper for the 'return to caller' pseudo-instruction turns 'ret lr' into 'mov pc, lr' for ARMv5TE. This causes the core to remain in its current ARM state even when the routine doing the 'ret' was called from Thumb-1 state, triggering an undefined instruction exception. This causes early run-time failures in all boards compiled using the Thumb-1 instruction set (for instance the Open-RD family). ARMv5TE supports 'bx lr' which properly implements interworking and thus correctly returns to Thumb-1 state from ARM state. This change makes 'ret lr' turn into 'bx lr' for ARMv5TE. Signed-off-by: Albert ARIBAUD --- arch/arm/include/asm/assembler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index ae1e42f..c56daf2 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -59,7 +59,7 @@ .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo .macro ret\c, reg -#if defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) +#if defined(__ARM_ARCH_5E__) mov\c pc, \reg #else .ifeqs "\reg", "lr" -- 2.7.4