summaryrefslogtreecommitdiff
path: root/ports/sysdeps/arm/dl-trampoline.S
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2013-02-14 21:45:50 -0800
committerRichard Henderson <rth@twiddle.net>2013-03-06 07:46:46 -0800
commit46dede0c00285bb43890ed68c0b8572e855b54e2 (patch)
treed7afc72e1db93ab766b9a4f98ea362e2a143913e /ports/sysdeps/arm/dl-trampoline.S
parent92cc8e332bb3b9b24d2ba581e40d4433594841be (diff)
downloadglibc-46dede0c00285bb43890ed68c0b8572e855b54e2.tar.gz
arm: Commonize BX conditionals
Add BLX macro in addition and use it where appropriate.
Diffstat (limited to 'ports/sysdeps/arm/dl-trampoline.S')
-rw-r--r--ports/sysdeps/arm/dl-trampoline.S9
1 files changed, 1 insertions, 8 deletions
diff --git a/ports/sysdeps/arm/dl-trampoline.S b/ports/sysdeps/arm/dl-trampoline.S
index f2d1679a64..9366976762 100644
--- a/ports/sysdeps/arm/dl-trampoline.S
+++ b/ports/sysdeps/arm/dl-trampoline.S
@@ -21,12 +21,6 @@
#include <sysdep.h>
#include <libc-symbols.h>
-#if defined(__USE_BX__)
-#define BX(x) bx x
-#else
-#define BX(x) mov pc, x
-#endif
-
.text
.globl _dl_runtime_resolve
.type _dl_runtime_resolve, #function
@@ -192,8 +186,7 @@ _dl_runtime_profile:
add ip, r7, #72
ldmia ip, {r0-r3}
ldr ip, [r7, #264]
- mov lr, pc
- BX(ip)
+ BLX(ip)
stmia r7, {r0-r3}
@ Call pltexit.