From: Will Newton Date: Thu, 29 Aug 2013 19:10:26 +0000 (+0100) Subject: ARM: Fix clone code when built for Thumb. X-Git-Tag: upstream/2.30~8761 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b06ac56cdfc9293908724e51e827534e97819aa;p=external%2Fglibc.git 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 [BZ #15909] * sysdeps/unix/sysv/linux/arm/clone.S (__clone): Use blx instead of mov lr, pc. --- diff --git a/NEWS b/NEWS index d3524ff..4fe4b63 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ Version 2.19 * The following bugs are resolved with this release: 14699, 15522, 15531, 15532, 15736, 15749, 15797, 15867, 15890, 15897, - 15905. + 15905, 15909. * CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes to the d_name member of struct dirent, or omit the terminating NUL diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 8236f0f..2a95834 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,5 +1,11 @@ 2013-08-30 Will Newton + [BZ #15909] + * sysdeps/unix/sysv/linux/arm/clone.S (__clone): Use blx + instead of mov lr, pc. + +2013-08-30 Will Newton + * sysdeps/arm/armv6t2/strlen.S: New file. 2013-08-29 Thomas Schwinge 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