diff options
| author | Sergey Bugaev <bugaevc@gmail.com> | 2021-09-07 16:33:21 +0300 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-09-15 01:29:23 +0200 |
| commit | 520a5887057c328c99304d6947453eb06351f5fd (patch) | |
| tree | 46c68436cf80c498588a56184191a3e9afcb5e94 /sysdeps | |
| parent | 3561106278cddd2f007bd27fd4c3e90caaf14b43 (diff) | |
| download | glibc-520a5887057c328c99304d6947453eb06351f5fd.tar.gz glibc-520a5887057c328c99304d6947453eb06351f5fd.tar.xz glibc-520a5887057c328c99304d6947453eb06351f5fd.zip | |
elf: Replace most uses of THREAD_GSCOPE_IN_TCB
While originally this definition was indeed used to distinguish between the cases where the GSCOPE flag was stored in TCB or not, it has since become used as a general way to distinguish between HTL and NPTL. THREAD_GSCOPE_IN_TCB will be removed in the following commits, as HTL, which currently is the only port that does not put the flag into TCB, will get ported to put the GSCOPE flag into the TCB as well. To prepare for that change, migrate all code that wants to distinguish between HTL and NPTL to use PTHREAD_IN_LIBC instead, which is a better choice since the distinction mostly has to do with whether libc has access to the list of thread structures and therefore can initialize thread-local storage. The parts of code that actually depend on whether the GSCOPE flag is in TCB are left unchanged. Signed-off-by: Sergey Bugaev <bugaevc@gmail.com> Message-Id: <20210907133325.255690-2-bugaevc@gmail.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9c15259236..02bd579ef8 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -456,7 +456,7 @@ struct rtld_global /* Generation counter for the dtv. */ EXTERN size_t _dl_tls_generation; -#if !THREAD_GSCOPE_IN_TCB +#if !PTHREAD_IN_LIBC EXTERN void (*_dl_init_static_tls) (struct link_map *); #endif @@ -466,7 +466,7 @@ struct rtld_global size_t count; void *list[50]; } *_dl_scope_free_list; -#if THREAD_GSCOPE_IN_TCB +#if PTHREAD_IN_LIBC /* List of active thread stacks, with memory managed by glibc. */ EXTERN list_t _dl_stack_used; @@ -486,7 +486,8 @@ struct rtld_global /* Mutex protecting the stack lists. */ EXTERN int _dl_stack_cache_lock; -#else +#endif +#if !THREAD_GSCOPE_IN_TCB EXTERN int _dl_thread_gscope_count; #endif #ifdef SHARED @@ -1297,13 +1298,13 @@ extern void _dl_aux_init (ElfW(auxv_t) *av) /* Initialize the static TLS space for the link map in all existing threads. */ -#if THREAD_GSCOPE_IN_TCB +#if PTHREAD_IN_LIBC void _dl_init_static_tls (struct link_map *map) attribute_hidden; #endif static inline void dl_init_static_tls (struct link_map *map) { -#if THREAD_GSCOPE_IN_TCB +#if PTHREAD_IN_LIBC /* The stack list is available to ld.so, so the initialization can be handled within ld.so directly. */ _dl_init_static_tls (map); |