ARM: Fix clone build for ARMv4

ARMv4 does not have the blx instruction, so use the BLX macro which
handles abstracting this for us.

Build tested for armv7, armv4t and armv4.

ports/ChangeLog.arm:

2014-01-24  Will Newton  <will.newton@linaro.org>

	[BZ #16499]
	* sysdeps/unix/sysv/linux/arm/clone.S: Use BLX macro instead
	of blx instruction directly.

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 4371b3ccfb57c60f9110f4867226fb2c1a658b91..51bb76b992ea348d760d0d6621a521f2a02b02fe 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2014-01-24  Will Newton  <will.newton@linaro.org>
+
+       [BZ #16499]
+       * sysdeps/unix/sysv/linux/arm/clone.S: Use BLX macro instead
+       of blx instruction directly.
+
 2014-01-14  Will Newton  <will.newton@linaro.org>
 
        * sysdeps/arm/__longjmp.S: Don't apply pointer encryption

diff --git a/ports/sysdeps/unix/sysv/linux/arm/clone.S b/ports/sysdeps/unix/sysv/linux/arm/clone.S
index 44286a5cd0b7196259038d2881bf164170841022..03fe9ab7284007b7eb45ec06177ba7cf53f6df15 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/arm/clone.S
+++ b/ports/sysdeps/unix/sysv/linux/arm/clone.S
@@ -88,14 +88,8 @@ PSEUDO_END (__clone)
 #endif
        @ pick the function arg and call address off the stack and execute
        ldr     r0, [sp, #4]
-#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
        ldr     ip, [sp], #8
-       mov     lr, pc
-       bx      ip
-#else
-       ldr     lr, [sp], #8
-       blx     lr
-#endif
+       BLX (ip)
 
        @ and we are done, passing the return value through r0
        b       PLTJMP(HIDDEN_JUMPTARGET(_exit))