lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

elf: Introduce __tls_init_tp for second-phase TCB initialization

Browse Source 
TLS_INIT_TP is processor-specific, so it is not a good place to
put thread library initialization code (it would have to be repeated
for all CPUs).  Introduce __tls_init_tp as a separate function,
to be called immediately after TLS_INIT_TP.  Move the existing
stack list setup code for NPTL to this function.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer
2021-04-21 19:49:51 +02:00
parent 90e97b3720
commit 90d7e7e5bd
6 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
elf/rtld.c
View File

@@ -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. */