svn commit: trunk/uClibc/ldso/ldso/arm

[kraj at uclibc.org]

Author: kraj
Date: 2006-10-09 18:03:46 -0700 (Mon, 09 Oct 2006)
New Revision: 16354

Log:
Make _dl_linux_resolve interworking safe. Thanks Paul Brook


Modified:
   trunk/uClibc/ldso/ldso/arm/resolve.S


Changeset:
Modified: trunk/uClibc/ldso/ldso/arm/resolve.S
===================================================================
--- trunk/uClibc/ldso/ldso/arm/resolve.S	2006-10-09 21:11:07 UTC (rev 16353)
+++ trunk/uClibc/ldso/ldso/arm/resolve.S	2006-10-10 01:03:46 UTC (rev 16354)
@@ -18,6 +18,8 @@
  *  -Erik Andersen
  */
 
+#include <features.h>
+
 #define sl r10
 #define fp r11
 #define ip r12
@@ -39,5 +41,9 @@
 
 	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