src/patches/glibc-test-installation.pl-libgcc_s.patch

   1 diff -Naur glibc-2.12-2-gc4ccff1.org/nptl/sysdeps/pthread/unwind-forcedunwind.c glibc-2.12-2-gc4ccff1/nptl/sysdeps/pthread/unwind-forcedunwind.c
   2 index db56428..495f4b7 100644
   3 --- glibc-2.12-2-gc4ccff1.org/nptl/sysdeps/pthread/unwind-forcedunwind.c
   4 +++ glibc-2.12-2-gc4ccff1/nptl/sysdeps/pthread/unwind-forcedunwind.c
   5 @@ -22,7 +22,7 @@
   6  #include <unwind.h>
   7  #include <pthreadP.h>
   8  #include <sysdep.h>
   9 -#include <libgcc_s.h>
  10 +#include <gnu/lib-names.h>
  11
  12  static void *libgcc_s_handle;
  13  static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
  14 diff -Naur glibc-2.12-2-gc4ccff1.org/scripts/test-installation.pl glibc-2.12-2-gc4ccff1/scripts/test-installation.pl
  15 index 25a919b..3f409ab 100755
  16 --- glibc-2.12-2-gc4ccff1.org/scripts/test-installation.pl
  17 +++ glibc-2.12-2-gc4ccff1/scripts/test-installation.pl
  18 @@ -106,9 +106,10 @@ while (<SOVERSIONS>) {
  19      # - libnss1_* from glibc-compat add-on
  20      # - libthread_db since it contains unresolved references
  21      # - it's just a test NSS module
  22 +    # - We don't provide the libgcc so we don't test it
  23      if ($name ne "nss_ldap" && $name ne "db1"
  24         && !($name =~/^nss1_/) && $name ne "thread_db"
  25 -       && $name ne "nss_test1") {
  26 +       && $name ne "nss_test1" && $name ne "libgcc_s") {
  27        $link_libs .= " -l$name";
  28        $versions{$name} = $version;
  29      }
  30 diff -Naur glibc-2.12-2-gc4ccff1.org/shlib-versions glibc-2.12-2-gc4ccff1/shlib-versions
  31 index d3e8407..ac98e49 100644
  32 --- glibc-2.12-2-gc4ccff1.org/shlib-versions
  33 +++ glibc-2.12-2-gc4ccff1/shlib-versions
  34 @@ -138,3 +138,7 @@ sparc64.*-.*-.*             libBrokenLocale=1       GLIBC_2.2
  35
  36  # The asynchronous name lookup library.
  37  .*-.*-.*               libanl=1
  38 +
  39 +# This defines the libgcc soname version this glibc is to load for
  40 +# asynchronous cancellation to work correctly.
  41 +.*-.*-.*               libgcc_s=1
  42 diff -Naur glibc-2.12-2-gc4ccff1.org/sysdeps/generic/framestate.c glibc-2.12-2-gc4ccff1/sysdeps/generic/framestate.c
  43 index 80375bb..edc3539 100644
  44 --- glibc-2.12-2-gc4ccff1.org/sysdeps/generic/framestate.c
  45 +++ glibc-2.12-2-gc4ccff1/sysdeps/generic/framestate.c
  46 @@ -1,5 +1,5 @@
  47  /* __frame_state_for unwinder helper function wrapper.
  48 -   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
  49 +   Copyright (C) 2001-2012 Free Software Foundation, Inc.
  50     This file is part of the GNU C Library.
  51     Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
  52
  53 @@ -24,7 +24,7 @@
  54  #define __frame_state_for fallback_frame_state_for
  55  #include <unwind-dw2.c>
  56  #undef __frame_state_for
  57 -#include <libgcc_s.h>
  58 +#include <gnu/lib-names.h>
  59
  60  typedef struct frame_state * (*framesf)(void *pc, struct frame_state *);
  61  struct frame_state *__frame_state_for (void *pc,
  62 diff -Naur glibc-2.12-2-gc4ccff1.org/sysdeps/generic/libgcc_s.h glibc-2.12-2-gc4ccff1.org/sysdeps/generic/libgcc_s.h
  63 deleted file mode 100644
  64 index e74a103..0000000
  65 --- glibc-2.12-2-gc4ccff1.org/sysdeps/generic/libgcc_s.h
  66 +++ /dev/null
  67 @@ -1,2 +0,0 @@
  68 -/* Name of libgcc_s library provided by gcc.  */
  69 -#define LIBGCC_S_SO "libgcc_s.so.1"
  70 diff -Naur glibc-2.12-2-gc4ccff1.org/sysdeps/gnu/unwind-resume.c glibc-2.12-2-gc4ccff1/sysdeps/gnu/unwind-resume.c
  71 index f8ff0c4..dab4370 100644
  72 --- glibc-2.12-2-gc4ccff1.org/sysdeps/gnu/unwind-resume.c
  73 +++ glibc-2.12-2-gc4ccff1/sysdeps/gnu/unwind-resume.c
  74 @@ -1,4 +1,4 @@
  75 -/* Copyright (C) 2003 Free Software Foundation, Inc.
  76 +/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
  77     This file is part of the GNU C Library.
  78     Contributed by Jakub Jelinek <jakub@redhat.com>.
  79
  80 @@ -22,7 +22,7 @@
  81  #include <unwind.h>
  82  #include <pthreadP.h>
  83  #include <sysdep.h>
  84 -#include <libgcc_s.h>
  85 +#include <gnu/lib-names.h>
  86
  87  static void *libgcc_s_handle;
  88  static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);