From 73d61e4f6c65da714c0f8a3a233725322553ceba Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 5 Feb 2014 21:14:59 +1000 Subject: Revert "Async-signal safe TLS." This reverts commit 7f507ee17aee720fa423fa38502bc3caa0dd03d7. Conflicts: ChangeLog nptl/tst-tls7.c nptl/tst-tls7mod.c --- elf/dl-open.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'elf/dl-open.c') 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); } -- cgit v1.2.3