diff options
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index c2ca4b7ce3..34879016ad 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -48,7 +48,6 @@ #include <array_length.h> #include <libc-early-init.h> #include <dl-main.h> -#include <list.h> #include <gnu/lib-names.h> #include <dl-tunables.h> @@ -807,9 +806,7 @@ cannot allocate TLS data structures for initial thread\n"); const char *lossage = TLS_INIT_TP (tcbp); if (__glibc_unlikely (lossage != NULL)) _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); -#if THREAD_GSCOPE_IN_TCB - list_add (&THREAD_SELF->list, &GL (dl_stack_user)); -#endif + __tls_init_tp (); tls_init_tp_called = true; return tcbp; @@ -1150,11 +1147,6 @@ dl_main (const ElfW(Phdr) *phdr, GL(dl_rtld_unlock_recursive) = rtld_lock_default_unlock_recursive; #endif -#if THREAD_GSCOPE_IN_TCB - INIT_LIST_HEAD (&GL (dl_stack_used)); - INIT_LIST_HEAD (&GL (dl_stack_user)); -#endif - /* The explicit initialization here is cheaper than processing the reloc in the _rtld_local definition's initializer. */ GL(dl_make_stack_executable_hook) = &_dl_make_stack_executable; @@ -2454,9 +2446,7 @@ dl_main (const ElfW(Phdr) *phdr, if (__glibc_unlikely (lossage != NULL)) _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); -#if THREAD_GSCOPE_IN_TCB - list_add (&THREAD_SELF->list, &GL (dl_stack_user)); -#endif + __tls_init_tp (); } /* Make sure no new search directories have been added. */ |