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:06:44 +0200 |
| commit | 23ce1cf35a59a4fdb3dabe073e3d1fe2b76fb0ca (patch) | |
| tree | 694d5fb5e5dbe1af48f5eda2ec8668d38ffc9668 /nptl | |
| parent | a78e5979a92c7985eadad7246740f3874271303f (diff) | |
| download | glibc-23ce1cf35a59a4fdb3dabe073e3d1fe2b76fb0ca.zip glibc-23ce1cf35a59a4fdb3dabe073e3d1fe2b76fb0ca.tar.gz glibc-23ce1cf35a59a4fdb3dabe073e3d1fe2b76fb0ca.tar.bz2 | |
nptl: Move __nptl_create_event, __nptl_death_event into libc
In libthread_db, use the exported GLIBC_PRIVATE symbols directly
instead of relying on _thread_db_* variables in libpthread
(which used to be created by the DB_FUNCTION macros).
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 2 | ||||
| -rw-r--r-- | nptl/events.c | 4 | ||||
| -rw-r--r-- | nptl/pthreadP.h | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 37a762d..b57b010 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -41,6 +41,7 @@ routines = \ elision-timed \ elision-trylock \ elision-unlock \ + events \ futex-internal \ libc-cleanup \ libc_multiple_threads \ @@ -200,7 +201,6 @@ shared-only-routines = forward static-only-routines = pthread_atfork libpthread-routines = \ - events \ libpthread-compat \ nptl-init \ pt-interp \ diff --git a/nptl/Versions b/nptl/Versions index fb3379b..6e2def1 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -351,6 +351,8 @@ libc { tss_set; } GLIBC_PRIVATE { + __nptl_create_event; + __nptl_death_event; __default_pthread_attr; __default_pthread_attr_lock; __futex_abstimed_wait64; diff --git a/nptl/events.c b/nptl/events.c index 5a07e58..ab57fef 100644 --- a/nptl/events.c +++ b/nptl/events.c @@ -24,10 +24,10 @@ void __nptl_create_event (void) { } -hidden_def (__nptl_create_event) +libc_hidden_def (__nptl_create_event) void __nptl_death_event (void) { } -hidden_def (__nptl_death_event) +libc_hidden_def (__nptl_death_event) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index dc2aece..a4a87cb 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -337,8 +337,8 @@ rtld_hidden_proto (__nptl_initial_report_events) /* Event handlers for libthread_db interface. */ extern void __nptl_create_event (void); extern void __nptl_death_event (void); -hidden_proto (__nptl_create_event) -hidden_proto (__nptl_death_event) +libc_hidden_proto (__nptl_create_event) +libc_hidden_proto (__nptl_death_event) /* The fork generation counter, defined in libpthread. */ extern unsigned long int __fork_generation attribute_hidden; |