diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/unwind-forcedunwind.c | 4 | ||||
| -rwxr-xr-x | scripts/test-installation.pl | 5 | ||||
| -rw-r--r-- | shlib-versions | 4 | ||||
| -rw-r--r-- | sysdeps/generic/framestate.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/libgcc_s.h | 2 | ||||
| -rw-r--r-- | sysdeps/gnu/unwind-resume.c | 4 |
8 files changed, 27 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 56ad6da0dd..65cb6ba554 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-04-26 Siddhesh Poyarekar <siddhesh@redhat.com> + + * shlib-versions: Add libgcc_s version information. + * sysdeps/generic/libgcc_s.h: Remove. + * sysdeps/generic/framestate.c: Include gnu/lib-names.h instead of + libgcc_s.h. + * sysdeps/gnu/unwind-resume.c: Likewise. + * scripts/test-installation.pl: Remove libgcc_s from link_libs. + 2012-04-25 David S. Miller <davem@davemloft.net> * sysdeps/unix/sparc/brk.S: Delete. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 40b01cfac7..194dcc39a3 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2012-04-26 Siddhesh Poyarekar <siddhesh@redhat.com> + + * sysdeps/pthread/unwind-forcedunwind.c: Include gnu/lib-names.h + instead of libgcc_s.h. + 2012-04-20 Paul Pluzhnikov <ppluzhnikov@google.com> * sysdeps/x86_64/tls.h (TLS_GET_FS, TLS_SET_FS): Delete. diff --git a/nptl/sysdeps/pthread/unwind-forcedunwind.c b/nptl/sysdeps/pthread/unwind-forcedunwind.c index adce6e721e..60dfbe6c92 100644 --- a/nptl/sysdeps/pthread/unwind-forcedunwind.c +++ b/nptl/sysdeps/pthread/unwind-forcedunwind.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2005, 2006, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>. @@ -21,7 +21,7 @@ #include <unwind.h> #include <pthreadP.h> #include <sysdep.h> -#include <libgcc_s.h> +#include <gnu/lib-names.h> static void *libgcc_s_handle; static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl index c4f3d6df01..1b22086bf9 100755 --- a/scripts/test-installation.pl +++ b/scripts/test-installation.pl @@ -1,5 +1,5 @@ #! /usr/bin/perl -w -# Copyright (C) 1997, 1998, 1999, 2004, 2011 Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997. @@ -105,9 +105,10 @@ while (<SOVERSIONS>) { # - libnss1_* from glibc-compat add-on # - libthread_db since it contains unresolved references # - it's just a test NSS module + # - We don't provide the libgcc so we don't test it if ($name ne "nss_ldap" && $name ne "db1" && !($name =~/^nss1_/) && $name ne "thread_db" - && $name ne "nss_test1") { + && $name ne "nss_test1" && $name ne "libgcc_s") { $link_libs .= " -l$name"; $versions{$name} = $version; } diff --git a/shlib-versions b/shlib-versions index c530a44dff..840e08fbd1 100644 --- a/shlib-versions +++ b/shlib-versions @@ -124,3 +124,7 @@ sparc64.*-.*-.* libBrokenLocale=1 GLIBC_2.2 # The asynchronous name lookup library. .*-.*-.* libanl=1 + +# This defines the libgcc soname version this glibc is to load for +# asynchronous cancellation to work correctly. +.*-.*-.* libgcc_s=1 diff --git a/sysdeps/generic/framestate.c b/sysdeps/generic/framestate.c index 3638bbee7f..3bad5b579b 100644 --- a/sysdeps/generic/framestate.c +++ b/sysdeps/generic/framestate.c @@ -1,5 +1,5 @@ /* __frame_state_for unwinder helper function wrapper. - Copyright (C) 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2001-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. @@ -23,7 +23,7 @@ #define __frame_state_for fallback_frame_state_for #include <unwind-dw2.c> #undef __frame_state_for -#include <libgcc_s.h> +#include <gnu/lib-names.h> typedef struct frame_state * (*framesf)(void *pc, struct frame_state *); struct frame_state *__frame_state_for (void *pc, diff --git a/sysdeps/generic/libgcc_s.h b/sysdeps/generic/libgcc_s.h deleted file mode 100644 index e74a1034ca..0000000000 --- a/sysdeps/generic/libgcc_s.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Name of libgcc_s library provided by gcc. */ -#define LIBGCC_S_SO "libgcc_s.so.1" diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c index 1d3e33f7d5..6afaebdaa0 100644 --- a/sysdeps/gnu/unwind-resume.c +++ b/sysdeps/gnu/unwind-resume.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>. @@ -19,7 +19,7 @@ #include <dlfcn.h> #include <stdio.h> #include <unwind.h> -#include <libgcc_s.h> +#include <gnu/lib-names.h> static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); static _Unwind_Reason_Code (*libgcc_s_personality) |