about summary refs log tree commit diff
path: root/elf/dl-open.c
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2014-02-05 21:14:59 +1000
committerAllan McRae <allan@archlinux.org>2014-02-06 08:46:20 +1000
commit73d61e4f6c65da714c0f8a3a233725322553ceba (patch)
tree1bd578a230d6b0d7a7d09c53de0c243008928df3 /elf/dl-open.c
parent27e839f6f068b6109c6bf2f634f4426b48723218 (diff)
downloadglibc-73d61e4f6c65da714c0f8a3a233725322553ceba.tar.gz
glibc-73d61e4f6c65da714c0f8a3a233725322553ceba.tar.xz
glibc-73d61e4f6c65da714c0f8a3a233725322553ceba.zip
Revert "Async-signal safe TLS."
This reverts commit 7f507ee17aee720fa423fa38502bc3caa0dd03d7.

Conflicts:
	ChangeLog
	nptl/tst-tls7.c
	nptl/tst-tls7mod.c
Diffstat (limited to 'elf/dl-open.c')
-rw-r--r--elf/dl-open.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c
index ea222d03e1..a9ca6b3b44 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -548,10 +548,7 @@ cannot load any more object with static TLS"));
 	     generation of the DSO we are allocating data for.  */
 	  _dl_update_slotinfo (imap->l_tls_modid);
 #endif
-	  /* We do this iteration under a signal mask in dl-reloc; why not
-	     here?  Because these symbols are new and dlopen hasn't
-	     returned yet.  So we can't possibly be racing with a TLS
-	     access to them from another thread.  */
+
 	  GL(dl_init_static_tls) (imap);
 	  assert (imap->l_need_tls_init == 0);
 	}