From: Aurelien Jarno <aurelien@aurel32.net>
To: libc-stable@sourceware.org
Cc: Florian Weimer <fweimer@redhat.com>
Subject: [2.24 COMMITTED 5/5] csu: Update __libgcc_s_init comment
Date: Mon, 01 Jan 2018 00:00:00 -0000 [thread overview]
Message-ID: <20181228222540.18325-5-aurelien@aurel32.net> (raw)
In-Reply-To: <20181228222540.18325-1-aurelien@aurel32.net>
From: Florian Weimer <fweimer@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(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 4d6686a9f5..82767ac063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-11 Florian Weimer <fweimer@redhat.com>
+
+ * sysdeps/gnu/unwind-resume.c (__libgcc_s_init): Update comment
+ and error message.
+
2018-01-16 Florian Weimer <fweimer@redhat.com>
* 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 5d25e73dd1..e81b65692a 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.19.2
next prev parent reply other threads:[~2018-12-28 22:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-01 0:00 [2.24 COMMITTED 1/5] [BZ #22637] Fix stack guard size accounting Aurelien Jarno
2018-01-01 0:00 ` Aurelien Jarno [this message]
2018-01-01 0:00 ` [2.24 COMMITTED 3/5] nptl: Add tst-minstack-cancel, tst-minstack-exit [BZ #22636] Aurelien Jarno
2018-01-01 0:00 ` [2.24 COMMITTED 2/5] nptl: Open libgcc.so with RTLD_NOW during pthread_cancel " Aurelien Jarno
2018-01-01 0:00 ` [2.24 COMMITTED 4/5] nptl/tst-minstack-throw: Compile in C++11 mode with GNU extensions Aurelien Jarno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181228222540.18325-5-aurelien@aurel32.net \
--to=aurelien@aurel32.net \
--cc=fweimer@redhat.com \
--cc=libc-stable@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).