about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-15 17:05:10 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-15 17:05:10 -0700
commit4b4f2771c217d7b038bcfc17c985ba057da554db (patch)
tree0ff9e7a20c64542169872437529f35a2afd120c5
parent601c888b2f3afc111911dd45717cd2718eac7f99 (diff)
downloadglibc-4b4f2771c217d7b038bcfc17c985ba057da554db.tar.gz
glibc-4b4f2771c217d7b038bcfc17c985ba057da554db.tar.xz
glibc-4b4f2771c217d7b038bcfc17c985ba057da554db.zip
Fix dl-load.c for [!_LIBC_REENTRANT] case.
-rw-r--r--ChangeLog3
-rw-r--r--elf/dl-load.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a658d6403..22c9c6c6b0 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 43e1269c43..7bf0c12a7c 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.