[COMMITTED PATCH] fix dl-load.c for [!_LIBC_REENTRANT] case

Roland McGrath roland@hack.frob.com
Thu Aug 16 00:06:00 GMT 2012


	* elf/dl-load.c (_dl_map_object_from_fd) [SHARED]: Conditionalize
	check of GL(dl_error_catch_tsd) on [_LIBC_REENTRANT].

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.



More information about the Libc-alpha mailing list