From e853f05a5757dfee0c8b7f301e6a52047cc9864a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 11 Jan 2018 13:13:28 +0100 Subject: [PATCH] csu: Update __libgcc_s_init comment Reviewed-by: Carlos O'Donell (cherry picked from commit 08c6e95234c60a5c2f37532d1111acf084f39345) --- ChangeLog | 5 +++++ sysdeps/gnu/unwind-resume.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d6686a9f52..82767ac063c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-11 Florian Weimer + + * sysdeps/gnu/unwind-resume.c (__libgcc_s_init): Update comment + and error message. + 2018-01-16 Florian Weimer * nptl/Makefile (CFLAGS-tst-minstack-throw.o): Compile in C++11 diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c index 5d25e73dd13..e81b65692ad 100644 --- a/sysdeps/gnu/unwind-resume.c +++ b/sysdeps/gnu/unwind-resume.c @@ -35,13 +35,17 @@ __libgcc_s_init (void) void *resume, *personality; void *handle; - handle = __libc_dlopen (LIBGCC_S_SO); + /* Use RTLD_NOW here for consistency with pthread_cancel_init. + RTLD_NOW will rarely make a difference here because unwinding is + already in progress, so libgcc_s.so has already been loaded if + its unwinder is used. */ + handle = __libc_dlopen_mode (LIBGCC_S_SO, RTLD_NOW | __RTLD_DLOPEN); if (handle == NULL || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL) __libc_fatal (LIBGCC_S_SO - " must be installed for pthread_cancel to work\n"); + " must be installed for unwinding to work\n"); #ifdef PTR_MANGLE PTR_MANGLE (resume); -- 2.47.2