diff options
| author | Will Newton <will.newton@linaro.org> | 2013-08-29 20:10:26 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-06 08:37:59 -0500 |
| commit | 6987b2d519f836926540d6fee1ad8840b29865bf (patch) | |
| tree | 0aaa864a6cd64e8443c55803b77e65f2a6e19f75 | |
| parent | 50219dba1e5108fd32de15b0533a6a53db0085ed (diff) | |
| download | glibc-6987b2d519f836926540d6fee1ad8840b29865bf.zip glibc-6987b2d519f836926540d6fee1ad8840b29865bf.tar.gz glibc-6987b2d519f836926540d6fee1ad8840b29865bf.tar.bz2 | |
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)
(cherry picked from commit 4f2bcda964d4fff56855e0c66198c9bcb682ea1e)
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | ports/ChangeLog.arm | 6 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/arm/clone.S | 4 |
3 files changed, 14 insertions, 2 deletions
@@ -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 1e7a35c..54debd7 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 ce9c2a5..6e74fa7 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 |