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.

(cherry picked from commit 132a1328eccd20621b77f7810eebbeec0a1af187)

diff --git a/ChangeLog b/ChangeLog
index af405a0481c629be74ff683ebddf4a39aef016c4..45579dea4082523b2c8bf8210e8d5679309fdd01 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-06  Carlos O'Donell  <carlos@systemhalted.org>
 
        * version.h (RELEASE): Set to "stable".

diff --git a/NEWS b/NEWS
index 4b07474326f3930747b7172f14e3df3d959cc944..ff79f0d1b5b32e2eb2a1c27019b3fab00efe0010 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ See the end for copying conditions.
 Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
 using `glibc' in the "product" field.
 \f
+Version 2.21.1
+
+* The following bugs are resolved with this release:
+
+  17949.
+\f
 Version 2.21
 
 * The following bugs are resolved with this release:

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)