diff options
author | Alexey Neyman <stilor@att.net> | 2017-12-02 23:30:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-02 23:30:38 (GMT) |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/glibc/2.15/992-gcc_s-suffix.patch | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'packages/glibc/2.15/992-gcc_s-suffix.patch')
-rw-r--r-- | packages/glibc/2.15/992-gcc_s-suffix.patch | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/packages/glibc/2.15/992-gcc_s-suffix.patch b/packages/glibc/2.15/992-gcc_s-suffix.patch deleted file mode 100644 index 6dbc70f..0000000 --- a/packages/glibc/2.15/992-gcc_s-suffix.patch +++ /dev/null @@ -1,108 +0,0 @@ -[As applied to 2.15] -commit 3a533ca370725b68b516e6b74adf4727d17ed28a -Author: Joseph Myers <joseph@codesourcery.com> -Date: Tue Apr 24 10:22:45 2012 +0000 - - Don't handle libgcc_s suffixes. - -diff -urpN glibc-2.15.orig/config.make.in glibc-2.15/config.make.in ---- glibc-2.15.orig/config.make.in 2017-02-08 13:24:23.338055977 -0800 -+++ glibc-2.15/config.make.in 2017-02-08 13:25:21.810625337 -0800 -@@ -50,7 +50,6 @@ have-z-execstack = @libc_cv_z_execstack@ - have-initfini = @libc_cv_have_initfini@ - have-Bgroup = @libc_cv_Bgroup@ - have-as-needed = @libc_cv_as_needed@ --libgcc_s_suffix = @libc_cv_libgcc_s_suffix@ - need-nopic-initfini = @nopic_initfini@ - with-fp = @with_fp@ - old-glibc-headers = @old_glibc_headers@ -diff -urpN glibc-2.15.orig/configure glibc-2.15/configure ---- glibc-2.15.orig/configure 2017-02-08 13:24:23.346056054 -0800 -+++ glibc-2.15/configure 2017-02-08 13:27:07.327670602 -0800 -@@ -654,7 +654,6 @@ libc_cv_z_execstack - libc_cv_z_combreloc - ASFLAGS_config - libc_cv_as_needed --libc_cv_libgcc_s_suffix - libc_cv_Bgroup - libc_cv_cc_with_libunwind - VERSIONING -@@ -6465,24 +6464,6 @@ fi - $as_echo "$libc_cv_Bgroup" >&6; } - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcc_s suffix" >&5 --$as_echo_n "checking for libgcc_s suffix... " >&6; } --if ${libc_cv_libgcc_s_suffix+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat > conftest.c <<EOF --int main (void) { return 0; } --EOF -- libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \ -- -fPIC -shared -shared-libgcc -o conftest.so \ -- conftest.c -v 2>&1 >/dev/null \ -- | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` -- rm -f conftest* --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_libgcc_s_suffix" >&5 --$as_echo "$libc_cv_libgcc_s_suffix" >&6; } -- -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed option" >&5 - $as_echo_n "checking for --as-needed option... " >&6; } - if ${libc_cv_as_needed+:} false; then : -@@ -6493,7 +6474,7 @@ int main (void) { return 0; } - EOF - if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS - -fPIC -shared -o conftest.so conftest.c -- -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed -+ -lgcc_s -Wl,--as-needed - -nostdlib 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 -diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in ---- glibc-2.15.orig/configure.in 2017-02-08 13:24:23.346056054 -0800 -+++ glibc-2.15/configure.in 2017-02-08 13:26:44.383441535 -0800 -@@ -1639,20 +1639,6 @@ EOF - rm -f conftest*]) - AC_SUBST(libc_cv_Bgroup) - -- AC_CACHE_CHECK(for libgcc_s suffix, -- libc_cv_libgcc_s_suffix, [dnl -- cat > conftest.c <<EOF --int main (void) { return 0; } --EOF --changequote(,)dnl -- libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \ -- -fPIC -shared -shared-libgcc -o conftest.so \ -- conftest.c -v 2>&1 >/dev/null \ -- | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` --changequote([,])dnl -- rm -f conftest*]) -- AC_SUBST(libc_cv_libgcc_s_suffix) -- - AC_CACHE_CHECK(for --as-needed option, - libc_cv_as_needed, [dnl - cat > conftest.c <<EOF -@@ -1660,7 +1646,7 @@ int main (void) { return 0; } - EOF - if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS - -fPIC -shared -o conftest.so conftest.c -- -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed -+ -lgcc_s -Wl,--as-needed - -nostdlib 1>&AS_MESSAGE_LOG_FD]) - then - libc_cv_as_needed=yes -diff -urpN glibc-2.15.orig/Makeconfig glibc-2.15/Makeconfig ---- glibc-2.15.orig/Makeconfig 2017-02-08 13:24:23.338055977 -0800 -+++ glibc-2.15/Makeconfig 2017-02-08 13:24:31.262132679 -0800 -@@ -565,7 +565,7 @@ endif - ifneq ($(have-as-needed),yes) - libgcc_eh := -lgcc_eh $(libunwind) - else -- libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed -+ libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed - endif - gnulib := -lgcc $(libgcc_eh) - static-gnulib := -lgcc -lgcc_eh $(libunwind) |