BZ #15583: r7 uninitialized in strcpy.S when ARM_HAS_T2 undefined

diff --git a/NEWS b/NEWS
index 3068b788a87fe0074dbd987660efe8d41a9f4e57..99c0c9491d822e5a0e7f6297ee8f8daca8733bc9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 2.18
   15336, 15337, 15339, 15342, 15346, 15359, 15361, 15366, 15380, 15381,
   15394, 15395, 15405, 15406, 15409, 15416, 15418, 15419, 15423, 15424,
   15426, 15429, 15441, 15442, 15448, 15465, 15480, 15485, 15488, 15490,
-  15493, 15497, 15506, 15529, 15536, 15553.
+  15493, 15497, 15506, 15529, 15536, 15553, 15583.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 4c73bb31a476122dc2a7f683ce636f23cca31b56..37eac212865cfa2f82b0cc2e6ee4f28b42bd3d2c 100644 (file)
--- 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 cd13ff7ecf9da28529974f1661bc3dabd71239b0..69e82d831418db24aea3990da884adb079903dd7 100644 (file)
--- 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