From bdc7240bd7ba57540f268a7fd41fa53e077bd51eced641a1a6ff903a71db5a8a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 2 Mar 2015 16:43:59 +0000 Subject: [PATCH] Accepting request 288520 from home:Andreas_Schwab:Factory - memcpy-chk-non-SSE2.patch: Fix __memcpy_chk on non-SSE2 CPUs (bsc#920084) OBS-URL: https://build.opensuse.org/request/show/288520 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=395 --- glibc-testsuite.changes | 6 ++++++ glibc-testsuite.spec | 3 +++ glibc-utils.changes | 6 ++++++ glibc-utils.spec | 3 +++ glibc.changes | 6 ++++++ glibc.spec | 3 +++ memcpy-chk-non-SSE2.patch | 21 +++++++++++++++++++++ 7 files changed, 48 insertions(+) create mode 100644 memcpy-chk-non-SSE2.patch diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index 467e870..21af9d2 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 14:27:02 UTC 2015 - schwab@suse.de + +- memcpy-chk-non-SSE2.patch: Fix __memcpy_chk on non-SSE2 CPUs + (bsc#920084) + ------------------------------------------------------------------- Tue Feb 24 10:11:46 UTC 2015 - schwab@suse.de diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index b8a20a6..93f2fa1 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -235,6 +235,8 @@ Patch306: glibc-fix-double-loopback.diff Patch1000: htm-tabort.patch # PATCH-FIX-UPSTREAM Fix value of O_TMPFILE for architectures with non-default O_DIRECTORY (BZ #17912) Patch1001: o-tmpfile.patch +# PATH-FIX-UPSTREAM Fix __memcpy_chk on non-SSE2 CPUs (BZ #17949) +Patch1002: memcpy-chk-non-SSE2.patch ### # Patches awaiting upstream approval @@ -455,6 +457,7 @@ rm nscd/s-stamp %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %patch2000 -p1 %patch2002 -p1 diff --git a/glibc-utils.changes b/glibc-utils.changes index 467e870..21af9d2 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 14:27:02 UTC 2015 - schwab@suse.de + +- memcpy-chk-non-SSE2.patch: Fix __memcpy_chk on non-SSE2 CPUs + (bsc#920084) + ------------------------------------------------------------------- Tue Feb 24 10:11:46 UTC 2015 - schwab@suse.de diff --git a/glibc-utils.spec b/glibc-utils.spec index 3de4dfd..a02a571 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -234,6 +234,8 @@ Patch306: glibc-fix-double-loopback.diff Patch1000: htm-tabort.patch # PATCH-FIX-UPSTREAM Fix value of O_TMPFILE for architectures with non-default O_DIRECTORY (BZ #17912) Patch1001: o-tmpfile.patch +# PATH-FIX-UPSTREAM Fix __memcpy_chk on non-SSE2 CPUs (BZ #17949) +Patch1002: memcpy-chk-non-SSE2.patch ### # Patches awaiting upstream approval @@ -455,6 +457,7 @@ rm nscd/s-stamp %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %patch2000 -p1 %patch2002 -p1 diff --git a/glibc.changes b/glibc.changes index 467e870..21af9d2 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 14:27:02 UTC 2015 - schwab@suse.de + +- memcpy-chk-non-SSE2.patch: Fix __memcpy_chk on non-SSE2 CPUs + (bsc#920084) + ------------------------------------------------------------------- Tue Feb 24 10:11:46 UTC 2015 - schwab@suse.de diff --git a/glibc.spec b/glibc.spec index 33ee52c..171f596 100644 --- a/glibc.spec +++ b/glibc.spec @@ -235,6 +235,8 @@ Patch306: glibc-fix-double-loopback.diff Patch1000: htm-tabort.patch # PATCH-FIX-UPSTREAM Fix value of O_TMPFILE for architectures with non-default O_DIRECTORY (BZ #17912) Patch1001: o-tmpfile.patch +# PATH-FIX-UPSTREAM Fix __memcpy_chk on non-SSE2 CPUs (BZ #17949) +Patch1002: memcpy-chk-non-SSE2.patch ### # Patches awaiting upstream approval @@ -455,6 +457,7 @@ rm nscd/s-stamp %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %patch2000 -p1 %patch2002 -p1 diff --git a/memcpy-chk-non-SSE2.patch b/memcpy-chk-non-SSE2.patch new file mode 100644 index 0000000..810481e --- /dev/null +++ b/memcpy-chk-non-SSE2.patch @@ -0,0 +1,21 @@ +2015-02-10 Evangelos Foutras + + [BZ #17949] + * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Fix position of + jump label. + +Index: glibc-2.21/sysdeps/i386/i686/multiarch/mempcpy_chk.S +=================================================================== +--- glibc-2.21.orig/sysdeps/i386/i686/multiarch/mempcpy_chk.S ++++ glibc-2.21/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)