* [2.25 COMMITTED] csu: Update __libgcc_s_init comment
@ 2018-01-01 0:00 Florian Weimer
0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2018-01-01 0:00 UTC (permalink / raw)
To: libc-stable
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit 08c6e95234c60a5c2f37532d1111acf084f39345)
2018-01-11 Florian Weimer <fweimer@redhat.com>
* sysdeps/gnu/unwind-resume.c (__libgcc_s_init): Update comment
and error message.
diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c
index 1ea833ba9b..ecb4ce2067 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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-01-16 8:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-01 0:00 [2.25 COMMITTED] csu: Update __libgcc_s_init comment Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).