diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
commit | 928ab832caa67c0c1a44e3a8e1483b0ed33cda50 (patch) | |
tree | 6e3df2d0437f834971fe28bdf519a2c8da694fc1 /libc/sysdeps/linux/arm/bits/arm_asm.h | |
parent | 74c69da52ad5029cd2fc2d3d41d581022ed0a7aa (diff) | |
parent | f1f98784e65ce9621a570af50998b1940e7fb81d (diff) |
merge uClibc changes
Diffstat (limited to 'libc/sysdeps/linux/arm/bits/arm_asm.h')
-rw-r--r-- | libc/sysdeps/linux/arm/bits/arm_asm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h index 04664b376..898a78bcc 100644 --- a/libc/sysdeps/linux/arm/bits/arm_asm.h +++ b/libc/sysdeps/linux/arm/bits/arm_asm.h @@ -13,12 +13,12 @@ unified assembly syntax. */ #define IT(t, cond) /* Code to return from a thumb function stub. */ -#ifdef __ARM_ARCH_4T__ -#define POP_RET pop {r2, pc} -#else -#define POP_RET pop {r2, r3}; bx r3 -#endif -#endif +# if defined __ARM_ARCH_4T__ && defined __THUMB_INTERWORK__ +# define POP_RET pop {r2, r3}; bx r3 +# else +# define POP_RET pop {r2, pc} +# endif +#endif /* __thumb2__ */ #if defined(__ARM_ARCH_6M__) /* Force arm mode to flush out errors on M profile cores. */ |