]>
Commit | Line | Data |
---|---|---|
847a7298 MT |
1 | From 6e236b92765cdafb46d19e4907471699accc8269 Mon Sep 17 00:00:00 2001 |
2 | From: Siddhesh Poyarekar <siddhesh@redhat.com> | |
3 | Date: Thu, 26 Apr 2012 09:18:48 +0530 | |
4 | Subject: [PATCH] move libgcc_s soname definition to shlib-versions | |
5 | ||
6 | diff --git a/nptl/sysdeps/pthread/unwind-forcedunwind.c b/nptl/sysdeps/pthread/unwind-forcedunwind.c | |
7 | index adce6e7..60dfbe6 100644 | |
8 | --- a/nptl/sysdeps/pthread/unwind-forcedunwind.c | |
9 | +++ b/nptl/sysdeps/pthread/unwind-forcedunwind.c | |
10 | @@ -21,7 +21,7 @@ | |
11 | #include <unwind.h> | |
12 | #include <pthreadP.h> | |
13 | #include <sysdep.h> | |
14 | -#include <libgcc_s.h> | |
15 | +#include <gnu/lib-names.h> | |
16 | ||
17 | static void *libgcc_s_handle; | |
18 | static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); | |
19 | diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl | |
20 | index c4f3d6d..1b22086 100755 | |
21 | --- a/scripts/test-installation.pl | |
22 | +++ b/scripts/test-installation.pl | |
23 | ||
24 | @@ -105,9 +105,10 @@ while (<SOVERSIONS>) { | |
25 | # - libnss1_* from glibc-compat add-on | |
26 | # - libthread_db since it contains unresolved references | |
27 | # - it's just a test NSS module | |
28 | + # - We don't provide the libgcc so we don't test it | |
29 | if ($name ne "nss_ldap" && $name ne "db1" | |
30 | && !($name =~/^nss1_/) && $name ne "thread_db" | |
31 | - && $name ne "nss_test1") { | |
32 | + && $name ne "nss_test1" && $name ne "libgcc_s") { | |
33 | $link_libs .= " -l$name"; | |
34 | $versions{$name} = $version; | |
35 | } | |
36 | diff --git a/shlib-versions b/shlib-versions | |
37 | index c530a44..840e08f 100644 | |
38 | --- a/shlib-versions | |
39 | +++ b/shlib-versions | |
40 | @@ -124,3 +124,7 @@ sparc64.*-.*-.* libBrokenLocale=1 GLIBC_2.2 | |
41 | ||
42 | # The asynchronous name lookup library. | |
43 | .*-.*-.* libanl=1 | |
44 | + | |
45 | +# This defines the libgcc soname version this glibc is to load for | |
46 | +# asynchronous cancellation to work correctly. | |
47 | +.*-.*-.* libgcc_s=1 | |
48 | diff --git a/sysdeps/generic/framestate.c b/sysdeps/generic/framestate.c | |
49 | index 3638bbe..3bad5b5 100644 | |
50 | --- a/sysdeps/generic/framestate.c | |
51 | +++ b/sysdeps/generic/framestate.c | |
52 | @@ -1,5 +1,5 @@ | |
53 | /* __frame_state_for unwinder helper function wrapper. | |
54 | - Copyright (C) 2001, 2003 Free Software Foundation, Inc. | |
55 | + Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
56 | This file is part of the GNU C Library. | |
57 | Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. | |
58 | ||
59 | @@ -23,7 +23,7 @@ | |
60 | #define __frame_state_for fallback_frame_state_for | |
61 | #include <unwind-dw2.c> | |
62 | #undef __frame_state_for | |
63 | -#include <libgcc_s.h> | |
64 | +#include <gnu/lib-names.h> | |
65 | ||
66 | typedef struct frame_state * (*framesf)(void *pc, struct frame_state *); | |
67 | struct frame_state *__frame_state_for (void *pc, | |
68 | diff --git a/sysdeps/generic/libgcc_s.h b/sysdeps/generic/libgcc_s.h | |
69 | deleted file mode 100644 | |
70 | index e74a103..0000000 | |
71 | --- a/sysdeps/generic/libgcc_s.h | |
72 | +++ /dev/null | |
73 | @@ -1,2 +0,0 @@ | |
74 | -/* Name of libgcc_s library provided by gcc. */ | |
75 | -#define LIBGCC_S_SO "libgcc_s.so.1" | |
76 | diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c | |
77 | index 1d3e33f..6afaebd 100644 | |
78 | --- a/sysdeps/gnu/unwind-resume.c | |
79 | +++ b/sysdeps/gnu/unwind-resume.c | |
80 | @@ -1,4 +1,4 @@ | |
81 | -/* Copyright (C) 2003 Free Software Foundation, Inc. | |
82 | +/* Copyright (C) 2003-2012 Free Software Foundation, Inc. | |
83 | This file is part of the GNU C Library. | |
84 | Contributed by Jakub Jelinek <jakub@redhat.com>. | |
85 | ||
86 | @@ -19,7 +19,7 @@ | |
87 | #include <dlfcn.h> | |
88 | #include <stdio.h> | |
89 | #include <unwind.h> | |
90 | -#include <libgcc_s.h> | |
91 | +#include <gnu/lib-names.h> | |
92 | ||
93 | static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); | |
94 | static _Unwind_Reason_Code (*libgcc_s_personality) | |
95 | -- | |
96 | 1.7.3.4 | |
97 |