summary refs log tree commit diff
path: root/ports
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2013-06-05 15:44:52 -0700
committerRichard Henderson <rth@twiddle.net>2013-06-05 15:52:01 -0700
commitecdaa7c9207615a1dc5882560095389a18b1e2ca (patch)
tree099db2da7f7f9c2f2e19d8d61952b0020de24f4d /ports
parent44a988afd8f7aef70b88ecdc2e47d14fdf89e7e5 (diff)
downloadglibc-ecdaa7c9207615a1dc5882560095389a18b1e2ca.tar.gz
glibc-ecdaa7c9207615a1dc5882560095389a18b1e2ca.tar.xz
glibc-ecdaa7c9207615a1dc5882560095389a18b1e2ca.zip
BZ #15583: r7 uninitialized in strcpy.S when ARM_HAS_T2 undefined
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.arm6
-rw-r--r--ports/sysdeps/arm/armv6/strcpy.S2
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 4c73bb31a4..37eac21286 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2013-06-05  Richard Henderson  <rth@redhat.com>
+
+	[BZ #15583]
+	* sysdeps/arm/armv6/strcpy.S (strcpy): Fix register usage in
+	non ARCH_HAS_T2 case.
+
 2013-06-05  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/arm/machine-gmon.h: Remove trailing whitespace.
diff --git a/ports/sysdeps/arm/armv6/strcpy.S b/ports/sysdeps/arm/armv6/strcpy.S
index cd13ff7ecf..69e82d8314 100644
--- a/ports/sysdeps/arm/armv6/strcpy.S
+++ b/ports/sysdeps/arm/armv6/strcpy.S
@@ -89,7 +89,7 @@ ENTRY (strcpy)
 	tst	r0, #3			@ Test alignment of DEST
 	movt	r7, #0x0101
 #else
-	ldr	ip, =0x01010101
+	ldr	r7, =0x01010101
 	tst	r0, #3
 #endif
 	bne	.Lunaligned