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-tls.c | |
| parent | 3561106278cddd2f007bd27fd4c3e90caaf14b43 (diff) | |
| download | glibc-520a5887057c328c99304d6947453eb06351f5fd.tar glibc-520a5887057c328c99304d6947453eb06351f5fd.tar.gz glibc-520a5887057c328c99304d6947453eb06351f5fd.tar.bz2 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-tls.c')
| -rw-r--r-- | elf/dl-tls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 423e380f7c..d554ae4497 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -29,7 +29,7 @@ #include <dl-tls.h> #include <ldsodefs.h> -#if THREAD_GSCOPE_IN_TCB +#if PTHREAD_IN_LIBC # include <list.h> #endif @@ -1058,7 +1058,7 @@ cannot create TLS data structures")); } } -#if THREAD_GSCOPE_IN_TCB +#if PTHREAD_IN_LIBC static inline void __attribute__((always_inline)) init_one_static_tls (struct pthread *curp, struct link_map *map) { @@ -1091,4 +1091,4 @@ _dl_init_static_tls (struct link_map *map) lll_unlock (GL (dl_stack_cache_lock), LLL_PRIVATE); } -#endif /* THREAD_GSCOPE_IN_TCB */ +#endif /* PTHREAD_IN_LIBC */ |