SHA256
3
0
forked from pool/glibc

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
This commit is contained in:
Andreas Schwab 2015-03-02 16:43:59 +00:00 committed by Git OBS Bridge
parent 797ff301f4
commit bdc7240bd7
7 changed files with 48 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

21
memcpy-chk-non-SSE2.patch Normal file
View File

@ -0,0 +1,21 @@
2015-02-10 Evangelos Foutras <evangelos@foutrelis.com>
[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)