From 6626da07e35651fbd94493a23ac4ecc342c2b0d9 Mon Sep 17 00:00:00 2001
From: Khem Raj <kraj@mvista.com>
Date: Tue, 10 Oct 2006 01:03:46 +0000
Subject: Make _dl_linux_resolve interworking safe. Thanks Paul Brook

---
 ldso/ldso/arm/resolve.S | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
cgit v1.2.3