From 79d8599db014b513c966935d6bfa5e5dec93ec343c252e1b14af630b1e1ce162 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 26 May 2011 08:05:01 +0000 Subject: [PATCH] Accepting request 71357 from home:a_jaeger:branches:openSUSE:Factory 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 --- glibc-static-memcpy.diff | 61 ++++++++++++++++++++++++++++++++++++++++ glibc.changes | 5 ++++ glibc.spec | 2 ++ 3 files changed, 68 insertions(+) create mode 100644 glibc-static-memcpy.diff diff --git a/glibc-static-memcpy.diff b/glibc-static-memcpy.diff new file mode 100644 index 0000000..8ed7718 --- /dev/null +++ b/glibc-static-memcpy.diff @@ -0,0 +1,61 @@ +2011-02-06 Mike Frysinger + + [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) diff --git a/glibc.changes b/glibc.changes index 67b28cc..d29595d 100644 --- a/glibc.changes +++ b/glibc.changes @@ -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 diff --git a/glibc.spec b/glibc.spec index 6f723e9..8648e73 100644 --- a/glibc.spec +++ b/glibc.spec @@ -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