summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorKhem Raj <kraj@mvista.com>2006-10-10 01:03:46 +0000
committerKhem Raj <kraj@mvista.com>2006-10-10 01:03:46 +0000
commit6626da07e35651fbd94493a23ac4ecc342c2b0d9 (patch)
treeba1e8241ce34cebaedb4b277fb9d9367f2907c65 /ldso
parentfc5b21e5c3f0f1f9edbd63ad304ae13e74eb0259 (diff)
Make _dl_linux_resolve interworking safe. Thanks Paul Brook
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/arm/resolve.S6
1 files changed, 6 insertions, 0 deletions
diff --git a/ldso/ldso/arm/resolve.S b/ldso/ldso/arm/resolve.S
index 8b51ed1c7..9bd88419f 100644
--- a/ldso/ldso/arm/resolve.S
+++ b/ldso/ldso/arm/resolve.S
@@ -18,6 +18,8 @@
* -Erik Andersen
*/
+#include <features.h>
+
#define sl r10
#define fp r11
#define ip r12
@@ -39,5 +41,9 @@ _dl_linux_resolve:
mov ip, r0
ldmia sp!, {r0, r1, r2, r3, sl, fp, lr}
+#if defined(__USE_BX__)
+ bx ip
+#else
mov pc,ip
+#endif
.size _dl_linux_resolve, .-_dl_linux_resolve