mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-31 14:01:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

For b/5836136, do dlsym(0, "_Unwind..."), i.e. ignore libgcc_s.so.1 dlopen failure.

Browse Source
This commit is contained in:
Paul Pluzhnikov 2014-03-03 17:03:35 -08:00
parent 60548afc9f
commit 8205f0d10e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysdeps/nptl/unwind-forcedunwind.c
View File

@ -23,6 +23,7 @@
#include <sysdep.h>
#include <gnu/lib-names.h>
#include <unwind-resume.h>
#include <ldsodefs.h>
static void *libgcc_s_handle;
void (*__libgcc_s_resume) (struct _Unwind_Exception *exc)
@ -51,6 +52,14 @@ pthread_cancel_init (void)
handle = __libc_dlopen_mode (LIBGCC_S_SO, RTLD_NOW | __RTLD_DLOPEN);
/* Google-local: b/5836136 */
/* This is kind of weird to do, but has proven useful in cases where
the unwind support may be statically linked into us; we don't
want to pull in a redundant shared libgcc, we just want to use
the symbols we already have. */
if (handle == NULL)
handle = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
if (handle == NULL
|| (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL
|| (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL