about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--ports/ChangeLog.arm6
-rw-r--r--ports/sysdeps/unix/sysv/linux/arm/clone.S4
3 files changed, 9 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index d3524ffa27..4fe4b63e23 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 8236f0f7d7..2a95834ce7 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,5 +1,11 @@
 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-08-30  Will Newton  <will.newton@linaro.org>
+
 	* sysdeps/arm/armv6t2/strlen.S: New file.
 
 2013-08-29  Thomas Schwinge  <thomas@codesourcery.com>
diff --git a/ports/sysdeps/unix/sysv/linux/arm/clone.S b/ports/sysdeps/unix/sysv/linux/arm/clone.S
index ce9c2a5ba1..6e74fa702b 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