This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-204-g4b4f277
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Aug 2012 00:05:57 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-204-g4b4f277
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 4b4f2771c217d7b038bcfc17c985ba057da554db (commit)
from 601c888b2f3afc111911dd45717cd2718eac7f99 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4b4f2771c217d7b038bcfc17c985ba057da554db
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
elf/dl-load.c | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3a658d6..22c9c6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-08-15 Roland McGrath <roland@hack.frob.com>
+ * elf/dl-load.c (_dl_map_object_from_fd) [SHARED]: Conditionalize
+ check of GL(dl_error_catch_tsd) on [_LIBC_REENTRANT].
+
* bits/libc-lock.h (__rtld_lock_initialize): New macro.
* elf/dl-sym.c: Include <stdlib.h>.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 43e1269..7bf0c12 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1194,9 +1194,11 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
was executed directly. The setup will happen later. */
break;
+# ifdef _LIBC_REENTRANT
/* In a static binary there is no way to tell if we dynamically
loaded libpthread. */
if (GL(dl_error_catch_tsd) == &_dl_initial_error_catch_tsd)
+# endif
#endif
{
/* We have not yet loaded libpthread.
hooks/post-receive
--
GNU C Library master sources