mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 10:43:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make name of libgcc_s library configurable

Browse Source
This commit is contained in:
Andreas Schwab 2009-11-03 23:52:01 +01:00
parent cc49a5a883
commit 13f6812ffb
6 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-03 Andreas Schwab <schwab@linux-m68k.org>
[BZ #4457]
* sysdeps/generic/libgcc_s.h: New file.
* sysdeps/generic/framestate.c: Include it and use LIBGCC_S_SO.
2009-11-01 Ulrich Drepper <drepper@redhat.com>
* malloc/hooks.c (free_check): Restore locking and call _int_free

7
nptl/ChangeLog
View File

@ -1,3 +1,10 @@
2009-11-03 Andreas Schwab <schwab@linux-m68k.org>
[BZ #4457]
* sysdeps/pthread/unwind-resume.c: Include <libgcc_s.h> and use
LIBGCC_S_SO.
* sysdeps/pthread/unwind-forcedunwind.c: Likewise.
2009-10-30 Ulrich Drepper <drepper@redhat.com>
* tst-sem11.c (main): Rewrite to avoid aliasing problems.

5
nptl/sysdeps/pthread/unwind-forcedunwind.c
View File

@ -22,6 +22,7 @@
#include <unwind.h>
#include <pthreadP.h>
#include <sysdep.h>
#include <libgcc_s.h>
static void *libgcc_s_handle;
static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
@ -49,7 +50,7 @@ pthread_cancel_init (void)
return;
}
handle = __libc_dlopen ("libgcc_s.so.1");
handle = __libc_dlopen (LIBGCC_S_SO);
if (handle == NULL
|| (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL
@ -61,7 +62,7 @@ pthread_cancel_init (void)
|| ARCH_CANCEL_INIT (handle)
#endif
)
__libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n");
__libc_fatal (LIBGCC_S_SO " must be installed for pthread_cancel to work\n");
PTR_MANGLE (resume);
libgcc_s_resume = resume;

5
nptl/sysdeps/pthread/unwind-resume.c
View File

@ -20,6 +20,7 @@
#include <dlfcn.h>
#include <stdio.h>
#include <unwind.h>
#include <libgcc_s.h>
static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
static _Unwind_Reason_Code (*libgcc_s_personality)
@ -32,12 +33,12 @@ init (void)
void *resume, *personality;
void *handle;
handle = __libc_dlopen ("libgcc_s.so.1");
handle = __libc_dlopen (LIBGCC_S_SO);
if (handle == NULL
|| (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL
|| (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL)
__libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n");
__libc_fatal (LIBGCC_S_SO " must be installed for pthread_cancel to work\n");
libgcc_s_resume = resume;
libgcc_s_personality = personality;

3
sysdeps/generic/framestate.c
View File

@ -24,6 +24,7 @@
#define __frame_state_for fallback_frame_state_for
#include <unwind-dw2.c>
#undef __frame_state_for
#include <libgcc_s.h>
typedef struct frame_state * (*framesf)(void *pc, struct frame_state *);
struct frame_state *__frame_state_for (void *pc,
@ -36,7 +37,7 @@ __frame_state_for (void *pc, struct frame_state *frame_state)
if (frame_state_for == NULL)
{
void *handle = __libc_dlopen ("libgcc_s.so.1");
void *handle = __libc_dlopen (LIBGCC_S_SO);
if (handle == NULL
|| (frame_state_for

2
sysdeps/generic/libgcc_s.h Normal file
View File

@ -0,0 +1,2 @@
/* Name of libgcc_s library provided by gcc. */
#define LIBGCC_S_SO "libgcc_s.so.1"