mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
nptl: Move stack list variables into _rtld_global
Now __thread_gscope_wait (the function behind THREAD_GSCOPE_WAIT, formerly __wait_lookup_done) can be implemented directly in ld.so, eliminating the unprotected GL (dl_wait_lookup_done) function pointer. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
12
elf/rtld.c
12
elf/rtld.c
@ -48,6 +48,7 @@
|
||||
#include <array_length.h>
|
||||
#include <libc-early-init.h>
|
||||
#include <dl-main.h>
|
||||
#include <list.h>
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
@ -799,6 +800,9 @@ 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_called = true;
|
||||
|
||||
return tcbp;
|
||||
@ -1139,6 +1143,11 @@ 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;
|
||||
@ -2383,6 +2392,9 @@ 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
|
||||
}
|
||||
|
||||
/* Make sure no new search directories have been added. */
|
||||
|
Reference in New Issue
Block a user