vapier 15/02/15 05:26:49 Modified: README.history Added: 00_all_0016-Fix-__memcpy_chk-on-non-SSE2-CPUs.patch Log: add fix from upstream for memcpy #539820 by Matt Turner
Revision Changes Path 1.3 src/patchsets/glibc/2.21/README.history file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/README.history?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/README.history?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/README.history?r1=1.2&r2=1.3 Index: README.history =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.21/README.history,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.history 15 Feb 2015 04:56:15 -0000 1.2 +++ README.history 15 Feb 2015 05:26:49 -0000 1.3 @@ -1,3 +1,6 @@ +2 14 Feb 2015 + + 00_all_0016-Fix-__memcpy_chk-on-non-SSE2-CPUs.patch + 1 09 Feb 2015 + 00_all_0001-disable-ldconfig-during-install.patch + 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch 1.1 src/patchsets/glibc/2.21/00_all_0016-Fix-__memcpy_chk-on-non-SSE2-CPUs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/00_all_0016-Fix-__memcpy_chk-on-non-SSE2-CPUs.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/00_all_0016-Fix-__memcpy_chk-on-non-SSE2-CPUs.patch?rev=1.1&content-type=text/plain Index: 00_all_0016-Fix-__memcpy_chk-on-non-SSE2-CPUs.patch =================================================================== >From 0ff9adeaba3ec9e2f08ab0f99dead08eafe15ca7 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras <evange...@foutrelis.com> Date: Tue, 10 Feb 2015 03:22:58 +0000 Subject: [PATCH] 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) --- sysdeps/i386/i686/multiarch/mempcpy_chk.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S index 207b648..b6fa202 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) -- 2.2.1
