From 4b4f2771c217d7b038bcfc17c985ba057da554db Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 15 Aug 2012 17:05:10 -0700 Subject: [PATCH] Fix dl-load.c for [!_LIBC_REENTRANT] case. --- ChangeLog | 3 +++ elf/dl-load.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3a658d6..22c9c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-08-15 Roland McGrath + * 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 . 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. -- 2.7.4