aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-16 18:24:32 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-16 18:24:32 +0000
commit850dcfcafe6c1cc9e59763a882a25a2f0c2c4d68 (patch)
tree988a3b6a1130ece7cb796db6f01cb8d367dfbf80 /elf
parenta1f8ec97fdaf3e0636957bfc3861651869c60b40 (diff)
downloadglibc-850dcfcafe6c1cc9e59763a882a25a2f0c2c4d68.tar
glibc-850dcfcafe6c1cc9e59763a882a25a2f0c2c4d68.tar.gz
glibc-850dcfcafe6c1cc9e59763a882a25a2f0c2c4d68.tar.bz2
glibc-850dcfcafe6c1cc9e59763a882a25a2f0c2c4d68.zip
Update.
2003-01-16 Jakub Jelinek <jakub@redhat.com> * elf/dl-load.c (_dl_map_object_from_fd): Use GL(dl_tls_dtv_slotinfo_list) != NULL to check whether TLS has been already initialized.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 9d9ba94539..9856294c67 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -953,9 +953,9 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
/* If not loading the initial set of shared libraries,
check whether we should permit loading a TLS segment. */
if (__builtin_expect (l->l_type == lt_library, 1)
- /* If GL(dl_tls_max_dtv_idx) == 0, then rtld.c did not
- set up TLS data structures, so don't use them now. */
- || __builtin_expect (GL(dl_tls_max_dtv_idx), 1) != 0)
+ /* If GL(dl_tls_dtv_slotinfo_list) == NULL, then rtld.c did
+ not set up TLS data structures, so don't use them now. */
+ || __builtin_expect (GL(dl_tls_dtv_slotinfo_list) != NULL, 1))
{
/* Assign the next available module ID. */
l->l_tls_modid = _dl_next_tls_modid ();