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: Remove THREAD_GSCOPE_IN_TCB

Browse Source 
All the ports now have THREAD_GSCOPE_IN_TCB set to 1. Remove all
support for !THREAD_GSCOPE_IN_TCB, along with the definition itself.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20210915171110.226187-4-bugaevc@gmail.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Sergey Bugaev
2021-09-15 20:11:10 +03:00
committed by Samuel Thibault
parent ed2f9aaf5e
commit c484da9087
22 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
elf/dl-support.c
View File

@@ -197,9 +197,6 @@ int _dl_stack_cache_lock;
int (*_dl_make_stack_executable_hook) (void **) = _dl_make_stack_executable; int (*_dl_make_stack_executable_hook) (void **) = _dl_make_stack_executable;
void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls; void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls;
#endif #endif
#if !THREAD_GSCOPE_IN_TCB
int _dl_thread_gscope_count;
#endif
struct dl_scope_free_list *_dl_scope_free_list; struct dl_scope_free_list *_dl_scope_free_list;
#ifdef NEED_DL_SYSINFO #ifdef NEED_DL_SYSINFO

1
sysdeps/aarch64/nptl/tls.h
View File

@@ -109,7 +109,6 @@ typedef struct
descr->member[idx] = (value) descr->member[idx] = (value)
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
# define THREAD_GSCOPE_IN_TCB 1
# define THREAD_GSCOPE_FLAG_UNUSED 0 # define THREAD_GSCOPE_FLAG_UNUSED 0
# define THREAD_GSCOPE_FLAG_USED 1 # define THREAD_GSCOPE_FLAG_USED 1
# define THREAD_GSCOPE_FLAG_WAIT 2 # define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/alpha/nptl/tls.h
View File

@@ -103,7 +103,6 @@ typedef struct
descr->member[idx] = (value) descr->member[idx] = (value)
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/arc/nptl/tls.h
View File

@@ -111,7 +111,6 @@ typedef struct
descr->member[idx] = (value) descr->member[idx] = (value)
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/arm/nptl/tls.h
View File

@@ -100,7 +100,6 @@ typedef struct
descr->member[idx] = (value) descr->member[idx] = (value)
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/csky/nptl/tls.h
View File

@@ -127,7 +127,6 @@ typedef struct
descr->member[idx] = (value) descr->member[idx] = (value)
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
# define THREAD_GSCOPE_IN_TCB 1
# define THREAD_GSCOPE_FLAG_UNUSED 0 # define THREAD_GSCOPE_FLAG_UNUSED 0
# define THREAD_GSCOPE_FLAG_USED 1 # define THREAD_GSCOPE_FLAG_USED 1
# define THREAD_GSCOPE_FLAG_WAIT 2 # define THREAD_GSCOPE_FLAG_WAIT 2

6
sysdeps/generic/ldsodefs.h
View File

@@ -495,10 +495,6 @@ struct rtld_global
EXTERN struct __pthread **_dl_pthread_threads; EXTERN struct __pthread **_dl_pthread_threads;
__libc_rwlock_define (EXTERN, _dl_pthread_threads_lock) __libc_rwlock_define (EXTERN, _dl_pthread_threads_lock)
#endif #endif
#if !THREAD_GSCOPE_IN_TCB
EXTERN int _dl_thread_gscope_count;
#endif
#ifdef SHARED #ifdef SHARED
}; };
# define __rtld_global_attribute__ # define __rtld_global_attribute__
@@ -1381,10 +1377,8 @@ __rtld_mutex_init (void)
} }
#endif /* !PTHREAD_IN_LIBC */ #endif /* !PTHREAD_IN_LIBC */
#if THREAD_GSCOPE_IN_TCB
void __thread_gscope_wait (void) attribute_hidden; void __thread_gscope_wait (void) attribute_hidden;
# define THREAD_GSCOPE_WAIT() __thread_gscope_wait () # define THREAD_GSCOPE_WAIT() __thread_gscope_wait ()
#endif
__END_DECLS __END_DECLS

6
sysdeps/generic/tls.h
View File

@@ -71,10 +71,4 @@
This macro returns the address of the DTV of the current thread. This macro returns the address of the DTV of the current thread.
This normally is done using the thread register which points This normally is done using the thread register which points
to the dtv or the TCB (from which the DTV can found). to the dtv or the TCB (from which the DTV can found).
THREAD_GSCOPE_IN_TCB
This should be set to 1 if the global scope flag is stored within the TCB.
When set to 0, GL(_dl_thread_gscope_count) will be defined to store it.
*/ */

1
sysdeps/hppa/nptl/tls.h
View File

@@ -134,7 +134,6 @@ static inline void __set_cr27(struct pthread *cr27)
} }
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/i386/nptl/tls.h
View File

@@ -375,7 +375,6 @@ tls_fill_user_desc (union user_desc_init *desc,
/* Get and set the global scope generation counter in the TCB head. */ /* Get and set the global scope generation counter in the TCB head. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/ia64/nptl/tls.h
View File

@@ -155,7 +155,6 @@ register struct pthread *__thread_self __asm__("r13");
= THREAD_GET_POINTER_GUARD ()) = THREAD_GET_POINTER_GUARD ())
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/m68k/nptl/tls.h
View File

@@ -132,7 +132,6 @@ extern void * __m68k_read_tp (void);
# define NO_TLS_OFFSET -1 # define NO_TLS_OFFSET -1
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

2
sysdeps/mach/hurd/i386/tls.h
View File

@@ -370,8 +370,6 @@ _hurd_tls_new (thread_t child, struct i386_thread_state *state, tcbhead_t *tcb)
} }
/* Global scope switch support. */ /* Global scope switch support. */
# define THREAD_GSCOPE_IN_TCB 1
# define THREAD_GSCOPE_FLAG_UNUSED 0 # define THREAD_GSCOPE_FLAG_UNUSED 0
# define THREAD_GSCOPE_FLAG_USED 1 # define THREAD_GSCOPE_FLAG_USED 1
# define THREAD_GSCOPE_FLAG_WAIT 2 # define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/microblaze/nptl/tls.h
View File

@@ -116,7 +116,6 @@ typedef struct
(descr->member[idx] = (value)) (descr->member[idx] = (value))
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
# define THREAD_GSCOPE_IN_TCB 1
# define THREAD_GSCOPE_FLAG_UNUSED 0 # define THREAD_GSCOPE_FLAG_UNUSED 0
# define THREAD_GSCOPE_FLAG_USED 1 # define THREAD_GSCOPE_FLAG_USED 1
# define THREAD_GSCOPE_FLAG_WAIT 2 # define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/mips/nptl/tls.h
View File

@@ -158,7 +158,6 @@ typedef struct
# define NO_TLS_OFFSET -1 # define NO_TLS_OFFSET -1
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/nios2/nptl/tls.h
View File

@@ -137,7 +137,6 @@ register struct pthread *__thread_self __asm__("r23");
# define NO_TLS_OFFSET -1 # define NO_TLS_OFFSET -1
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/powerpc/nptl/tls.h
View File

@@ -231,7 +231,6 @@ typedef struct
# define NO_TLS_OFFSET -1 # define NO_TLS_OFFSET -1
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/riscv/nptl/tls.h
View File

@@ -119,7 +119,6 @@ typedef struct
# define NO_TLS_OFFSET -1 # define NO_TLS_OFFSET -1
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
# define THREAD_GSCOPE_IN_TCB 1
# define THREAD_GSCOPE_FLAG_UNUSED 0 # define THREAD_GSCOPE_FLAG_UNUSED 0
# define THREAD_GSCOPE_FLAG_USED 1 # define THREAD_GSCOPE_FLAG_USED 1
# define THREAD_GSCOPE_FLAG_WAIT 2 # define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/s390/nptl/tls.h
View File

@@ -165,7 +165,6 @@ typedef struct
#define THREAD_COPY_POINTER_GUARD(descr) #define THREAD_COPY_POINTER_GUARD(descr)
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/sh/nptl/tls.h
View File

@@ -141,7 +141,6 @@ typedef struct
((tcbhead_t *) (descr + 1))->pointer_guard = __tcbp->pointer_guard;}) ((tcbhead_t *) (descr + 1))->pointer_guard = __tcbp->pointer_guard;})
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/sparc/nptl/tls.h
View File

@@ -138,7 +138,6 @@ register struct pthread *__thread_self __asm__("%g7");
((descr)->header.pointer_guard = THREAD_GET_POINTER_GUARD ()) ((descr)->header.pointer_guard = THREAD_GET_POINTER_GUARD ())
/* Get and set the global scope generation counter in struct pthread. */ /* Get and set the global scope generation counter in struct pthread. */
#define THREAD_GSCOPE_IN_TCB 1
#define THREAD_GSCOPE_FLAG_UNUSED 0 #define THREAD_GSCOPE_FLAG_UNUSED 0
#define THREAD_GSCOPE_FLAG_USED 1 #define THREAD_GSCOPE_FLAG_USED 1
#define THREAD_GSCOPE_FLAG_WAIT 2 #define THREAD_GSCOPE_FLAG_WAIT 2

1
sysdeps/x86_64/nptl/tls.h
View File

@@ -326,7 +326,6 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
/* Get and set the global scope generation counter in the TCB head. */ /* Get and set the global scope generation counter in the TCB head. */
# define THREAD_GSCOPE_IN_TCB 1
# define THREAD_GSCOPE_FLAG_UNUSED 0 # define THREAD_GSCOPE_FLAG_UNUSED 0
# define THREAD_GSCOPE_FLAG_USED 1 # define THREAD_GSCOPE_FLAG_USED 1
# define THREAD_GSCOPE_FLAG_WAIT 2 # define THREAD_GSCOPE_FLAG_WAIT 2