diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-17 09:59:14 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-17 10:04:06 +0200 |
| commit | a78e5979a92c7985eadad7246740f3874271303f (patch) | |
| tree | 7f81163f014fa77b5270950f1679e4a188cdf92a /nptl | |
| parent | c1760eaf3b575ad174fd88b252fd16bd525fa818 (diff) | |
| download | glibc-a78e5979a92c7985eadad7246740f3874271303f.tar.gz glibc-a78e5979a92c7985eadad7246740f3874271303f.tar.xz glibc-a78e5979a92c7985eadad7246740f3874271303f.zip | |
nptl: Move __nptl_initial_report_events into ld.so/startup code
The initialization of the report_events TCB field is now performed in __tls_init_tp instead of __pthread_initialize_minimal_internal (in libpthread). The events interface is difficult to test because GDB stopped using it in 2015. The td_thr_get_info change to ignore lookup issues is enough to support GDB with this change. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Versions | 1 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 12 | ||||
| -rw-r--r-- | nptl/pthreadP.h | 5 |
3 files changed, 6 insertions, 12 deletions
diff --git a/nptl/Versions b/nptl/Versions index 1dd3fbc18c..fb3379b788 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -497,6 +497,7 @@ libpthread { ld { GLIBC_PRIVATE { + __nptl_initial_report_events; __nptl_set_robust_list_avail; } } \ No newline at end of file diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 16fb66bdf5..f4b86fbfaf 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -96,21 +96,9 @@ sigcancel_handler (int sig, siginfo_t *si, void *ctx) extern void **__libc_dl_error_tsd (void) __attribute__ ((const)); -/* This can be set by the debugger before initialization is complete. */ -static bool __nptl_initial_report_events __attribute_used__; - void __pthread_initialize_minimal_internal (void) { - /* Partial initialization of the TCB already happened in TLS_INIT_TP - and __tls_init_tp. */ - struct pthread *pd = THREAD_SELF; - - /* Before initializing GL (dl_stack_user), the debugger could not - find us and had to set __nptl_initial_report_events. Propagate - its setting. */ - THREAD_SETMEM (pd, report_events, __nptl_initial_report_events); - struct sigaction sa; __sigemptyset (&sa.sa_mask); diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 5b844f331a..dc2aece37e 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -328,6 +328,11 @@ extern int __pthread_attr_init (pthread_attr_t *attr); libc_hidden_proto (__pthread_attr_init) extern int __pthread_attr_init_2_0 (pthread_attr_t *attr); +/* Part of the legacy thread events interface (which has been + superseded by PTRACE_O_TRACECLONE). This can be set by the + debugger before initialization is complete. */ +extern bool __nptl_initial_report_events; +rtld_hidden_proto (__nptl_initial_report_events) /* Event handlers for libthread_db interface. */ extern void __nptl_create_event (void); |