rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 71357 from home:a_jaeger:branches:openSUSE:Factory

Browse Source 
Fix static builds

OBS-URL: https://build.opensuse.org/request/show/71357
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=54
This commit is contained in:
Andreas Jaeger 2011-05-26 08:05:01 +00:00 committed by Git OBS Bridge
parent 9aff35bbd4
commit 79d8599db0
3 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
glibc-static-memcpy.diff Normal file
View File

@ -0,0 +1,61 @@
2011-02-06 Mike Frysinger <vapier@gentoo.org>
[BZ #12653]
* sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Only protect
MEMCPY_CHK with USE_AS_BCOPY ifdef check.
* sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise.
* sysdeps/x86_64/multiarch/memcpy-ssse3.S: Likewise.
* sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: Likewise.
Index: glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
===================================================================
--- glibc-2.13.orig/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
@@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx:
#endif
.section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY
+#if !defined USE_AS_BCOPY
ENTRY (MEMCPY_CHK)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
Index: glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
===================================================================
--- glibc-2.13.orig/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
+++ glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
@@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx:
#endif
.section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY
+#if !defined USE_AS_BCOPY
ENTRY (MEMCPY_CHK)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
===================================================================
--- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
+++ glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
@@ -49,7 +49,7 @@
ud2
.section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc
+#if !defined USE_AS_BCOPY
ENTRY (MEMCPY_CHK)
cmpq %rdx, %rcx
jb HIDDEN_JUMPTARGET (__chk_fail)
Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3.S
===================================================================
--- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy-ssse3.S
+++ glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3.S
@@ -49,7 +49,7 @@
ud2
.section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc
+#if !defined USE_AS_BCOPY
ENTRY (MEMCPY_CHK)
cmpq %rdx, %rcx
jb HIDDEN_JUMPTARGET (__chk_fail)

5
glibc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 26 07:53:51 UTC 2011 - aj@suse.de
- Add glibc-static-memcpy.diff to fix static compiles.
-------------------------------------------------------------------
Wed May 25 15:28:37 UTC 2011 - aj@suse.de

2
glibc.spec
View File

@ -143,6 +143,7 @@ Patch52: glibc-elf-localscope.diff
Patch53: glibc-zarch-longlong.diff
Patch54: glibc-disable-backward-memcpy.diff
Patch55: glibc-bso-12454.diff
Patch56: glibc-static-memcpy.diff
Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff
Patch501: ARM_glibc-2.10.1-local-hwcap-updates.diff
Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff
@ -366,6 +367,7 @@ rm nscd/s-stamp
%patch53 -p1
%patch54 -p1
%patch55 -p1
%patch56 -p1
%ifarch %arm armv5tel armv7l
%patch500
%patch501