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_db | |
| parent | a78e5979a92c7985eadad7246740f3874271303f (diff) | |
| download | glibc-23ce1cf35a59a4fdb3dabe073e3d1fe2b76fb0ca.tar.gz glibc-23ce1cf35a59a4fdb3dabe073e3d1fe2b76fb0ca.tar.xz glibc-23ce1cf35a59a4fdb3dabe073e3d1fe2b76fb0ca.zip | |
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_db')
| -rw-r--r-- | nptl_db/db-symbols.awk | 1 | ||||
| -rw-r--r-- | nptl_db/structs.def | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nptl_db/db-symbols.awk b/nptl_db/db-symbols.awk index 9e981537c8..6f326cf379 100644 --- a/nptl_db/db-symbols.awk +++ b/nptl_db/db-symbols.awk @@ -4,6 +4,7 @@ BEGIN { %define DB_RTLD_VARIABLE(name) /* Nothing. */ %define DB_MAIN_VARIABLE(name) /* Nothing. */ +%define DB_MAIN_SYMBOL(name) /* Nothing. */ %define DB_MAIN_ARRAY_VARIABLE(name) /* Nothing. */ %define DB_LOOKUP_NAME(idx, name) required[STRINGIFY (name)] = 1; %define DB_LOOKUP_NAME_TH_UNIQUE(idx, name) th_unique[STRINGIFY (name)] = 1; diff --git a/nptl_db/structs.def b/nptl_db/structs.def index 275c12bc7a..71c9f7bfc2 100644 --- a/nptl_db/structs.def +++ b/nptl_db/structs.def @@ -26,11 +26,14 @@ # define DB_RTLD_VARIABLE(name) DB_VARIABLE (name) #endif -/* DB_MAIN_VARIABLE and DB_MAIN_ARRAY_VARIABLE are not covered by the - libpthread symbol check in db-symbols.awk. */ +/* DB_MAIN_VARIABLE, DB_MAIN_SYMBOL, DB_MAIN_ARRAY_VARIABLE are not + covered by the libpthread symbol check in db-symbols.awk. */ #ifndef DB_MAIN_VARIABLE # define DB_MAIN_VARIABLE(name) DB_VARIABLE (name) #endif +#ifndef DB_MAIN_SYMBOL +# define DB_MAIN_SYMBOL(name) DB_SYMBOL (name) +#endif #ifndef DB_MAIN_ARRAY_VARIABLE # define DB_MAIN_ARRAY_VARIABLE(name) DB_ARRAY_VARIABLE (name) #endif @@ -75,8 +78,8 @@ DB_STRUCT_FIELD (td_eventbuf_t, eventnum) DB_STRUCT_FIELD (td_eventbuf_t, eventdata) DB_SYMBOL (nptl_version) -DB_FUNCTION (__nptl_create_event) -DB_FUNCTION (__nptl_death_event) +DB_MAIN_SYMBOL (__nptl_create_event) +DB_MAIN_SYMBOL (__nptl_death_event) DB_SYMBOL (__nptl_threads_events) DB_MAIN_VARIABLE (__nptl_nthreads) DB_VARIABLE (__nptl_last_event) |