aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2013-08-29 20:10:26 +0100
committerWill Newton <will.newton@linaro.org>2013-08-30 11:15:20 +0100
commit4f2bcda964d4fff56855e0c66198c9bcb682ea1e (patch)
treeb534f4076d769698bd6dd49704c0f4de9f96caad
parentc7afb54706dadc3c3d7069b946730a23dab66912 (diff)
downloadtermbaud-4f2bcda964d4fff56855e0c66198c9bcb682ea1e.tar.gz
termbaud-4f2bcda964d4fff56855e0c66198c9bcb682ea1e.tar.xz
termbaud-4f2bcda964d4fff56855e0c66198c9bcb682ea1e.zip
ARM: Fix clone code when built for Thumb.
The mov lr, pc instruction will lose the Thumb bit from the return address so use blx lr instead. ports/ChangeLog.arm: 2013-08-30 Will Newton <will.newton@linaro.org> [BZ #15909] * sysdeps/unix/sysv/linux/arm/clone.S (__clone): Use blx instead of mov lr, pc. (cherry picked from commit 6b06ac56cdfc9293908724e51e827534e97819aa)
-rw-r--r--NEWS6
-rw-r--r--ports/ChangeLog.arm6
-rw-r--r--ports/sysdeps/unix/sysv/linux/arm/clone.S4
3 files changed, 14 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index b023c30242d..f64fb8225f7 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ See the end for copying conditions.
Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
using `glibc' in the "product" field.
+Version 2.18.1
+
+* The following bugs are resolved with this release:
+
+ 15909.
+
Version 2.18
* The following bugs are resolved with this release:
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 1e7a35c6a91..54debd77203 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2013-08-30 Will Newton <will.newton@linaro.org>
+
+ [BZ #15909]
+ * sysdeps/unix/sysv/linux/arm/clone.S (__clone): Use blx
+ instead of mov lr, pc.
+
2013-07-03 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
diff --git a/ports/sysdeps/unix/sysv/linux/arm/clone.S b/ports/sysdeps/unix/sysv/linux/arm/clone.S
index ce9c2a5ba1c..6e74fa702b5 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/clone.S
+++ b/ports/sysdeps/unix/sysv/linux/arm/clone.S
@@ -93,8 +93,8 @@ PSEUDO_END (__clone)
mov lr, pc
bx ip
#else
- mov lr, pc
- ldr pc, [sp], #8
+ ldr lr, [sp], #8
+ blx lr
#endif
@ and we are done, passing the return value through r0