qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix dl-load.c for [!_LIBC_REENTRANT] case.

This commit is contained in:
Roland McGrath 2012-08-15 17:05:10 -07:00
parent 601c888b2f
commit 4b4f2771c2
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2012-08-15 Roland McGrath <roland@hack.frob.com> 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. * bits/libc-lock.h (__rtld_lock_initialize): New macro.
* elf/dl-sym.c: Include <stdlib.h>. * elf/dl-sym.c: Include <stdlib.h>.

2
elf/dl-load.c
View File

@ -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. */ was executed directly. The setup will happen later. */
break; break;
# ifdef _LIBC_REENTRANT
/* In a static binary there is no way to tell if we dynamically /* In a static binary there is no way to tell if we dynamically
loaded libpthread. */ loaded libpthread. */
if (GL(dl_error_catch_tsd) == &_dl_initial_error_catch_tsd) if (GL(dl_error_catch_tsd) == &_dl_initial_error_catch_tsd)
# endif
#endif #endif
{ {
/* We have not yet loaded libpthread. /* We have not yet loaded libpthread.