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 /elf/dl-support.c | |
| 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 'elf/dl-support.c')
| -rw-r--r-- | elf/dl-support.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/dl-support.c b/elf/dl-support.c index 0155718175..a317459fae 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -183,7 +183,7 @@ uint64_t _dl_hwcap_mask; * executable but this isn't true for all platforms. */ ElfW(Word) _dl_stack_flags = DEFAULT_STACK_PERMS; -#if THREAD_GSCOPE_IN_TCB +#if PTHREAD_IN_LIBC list_t _dl_stack_used; list_t _dl_stack_user; list_t _dl_stack_cache; @@ -195,9 +195,11 @@ int _dl_stack_cache_lock; when it was not, we do it by calling this function. It returns an errno code or zero on success. */ int (*_dl_make_stack_executable_hook) (void **) = _dl_make_stack_executable; -int _dl_thread_gscope_count; void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls; #endif +#if !THREAD_GSCOPE_IN_TCB +int _dl_thread_gscope_count; +#endif struct dl_scope_free_list *_dl_scope_free_list; #ifdef NEED_DL_SYSINFO |