diff options
| author | Evangelos Foutras <evangelos@foutrelis.com> | 2015-02-10 03:22:58 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-14 23:55:02 -0500 |
| commit | 0ff9adeaba3ec9e2f08ab0f99dead08eafe15ca7 (patch) | |
| tree | 18b4f05408a91dde3036454bc53b136c111da72b | |
| parent | f14f39cfd7b959c806d822a2f6863873151f0a83 (diff) | |
| download | glibc-0ff9adeaba3ec9e2f08ab0f99dead08eafe15ca7.tar.gz | |
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)
(cherry picked from commit 75adf430d2d7ee16eaf3166680de83b498444720)
| -rw-r--r-- | sysdeps/i386/i686/multiarch/mempcpy_chk.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S index 207b648c82..b6fa202833 100644 --- 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) |