Description: fix up ARM assembly to use 'bx lr' in place of 'mov pc, lr'.
Author: Steve Langasek <steve.langasek@linaro.org>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/527720

Index: klibc/usr/klibc/arch/arm/vfork.S
===================================================================
--- klibc.orig/usr/klibc/arch/arm/vfork.S
+++ klibc/usr/klibc/arch/arm/vfork.S
@@ -25,7 +25,11 @@
         ldrcs	r3, 1f
         mvncs	r0, #0
         strcs	r2, [r3]
+#if defined (__ARM_ARCH_4__)
 	mov	pc, lr
+#else
+	bx	lr
+#endif
 
 	.balign 4
 1:
@@ -49,7 +53,11 @@
 	str	r2, [r1]
 	neg	r0, r0
 1:
+#if defined (__ARM_ARCH_4__)
 	mov	pc, lr
+#else
+	bx	lr
+#endif
 
 	.balign	4
 2:
Index: klibc/usr/klibc/arch/arm/setjmp.S
===================================================================
--- klibc.orig/usr/klibc/arch/arm/setjmp.S
+++ klibc/usr/klibc/arch/arm/setjmp.S
@@ -29,7 +29,11 @@
 setjmp:
 	stmia	r0, {r4, r5, r6, r7, r8, r9, r10, fp, sp, lr}
 	mov	r0, #0
+#if defined (__ARM_ARCH_4__)
 	mov	pc, lr
+#else
+	bx	lr
+#endif
 	.size setjmp,.-setjmp
 
 	.text
@@ -39,7 +43,11 @@
 longjmp:
 	ldmia	r0, {r4, r5, r6, r7, r8, r9, r10, fp, sp, lr}
 	mov	r0, r1
+#if defined (__ARM_ARCH_4__)
 	mov	pc, lr
+#else
+	bx	lr
+#endif
 	.size longjmp,.-longjmp
 
 #else /* __thumb__ */
@@ -75,7 +83,11 @@
 	mov	r7, sp
 	stmia	r0!, {r3, r4, r5, r6, r7}
 	mov	r0, #0
+#if defined (__ARM_ARCH_4__)
 	mov	pc, lr
+#else
+	bx	lr
+#endif
 	.size setjmp,.-setjmp
 
 	.text
@@ -96,7 +108,11 @@
 	mov	r0, r1
 	bne	1f
 	mov	r0, #1
+#if defined (__ARM_ARCH_4__)
 1:	mov	pc, r3
+#else
+1:	bx	r3
+#endif
 	.size longjmp,.-longjmp
 
 #endif /* __thumb__ */