Fix __memcpy_chk on non-SSE2 CPUs

In commit 8b4416d, the 1: jump label in __mempcpy_chk was accidentally
moved.  This resulted in failures of mempcpy on CPU without SSE2.

diff --git a/ChangeLog b/ChangeLog
index e6cb46aef71761c1e4ba3028cc56190ee03c76ad..4851863b8577cf2849393c5349cf4611a4ce34e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-10  Evangelos Foutras  <evangelos@foutrelis.com>
+
+       [BZ #17949]
+       * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Fix position of
+       jump label.
+
 2015-02-09  Adhemerval Zanellla  <azanella@linux.vnet.ibm.com>
 
        * sysdeps/powerpc/powerpc32/configure.ac: Remove R_PPC_REL16 check.

diff --git a/NEWS b/NEWS
index 41bc5512d776835fcfa61308dbd57e5aee8a5b84..d85e26fdd2dd620a3b9d238e80e5049856b28df8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.22
 
 * The following bugs are resolved with this release:
 
-  4719, 17912, 17932, 17944.
+  4719, 17912, 17932, 17944, 17949.
 \f
 Version 2.21
 

diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
index 207b648c8232680a8369ce9804a2272156925fe3..b6fa202833cfbb85941b508e3a46f0ef231b5277 100644 (file)
--- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S
+++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
@@ -36,8 +36,8 @@ ENTRY(__mempcpy_chk)
        cmpl    $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx)
        jne     1f
        call    __init_cpu_features
-       leal    __mempcpy_chk_ia32@GOTOFF(%ebx), %eax
-1:     testl   $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx)
+1:     leal    __mempcpy_chk_ia32@GOTOFF(%ebx), %eax
+       testl   $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx)
        jz      2f
        leal    __mempcpy_chk_sse2_unaligned@GOTOFF(%ebx), %eax
        testl   $bit_Fast_Unaligned_Load, FEATURE_OFFSET+index_Fast_Unaligned_Load+__cpu_features@GOTOFF(%ebx)