diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 14:33:53 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 14:34:32 +0200 |
| commit | d22705e7de9ee153508681a1c8842dcd17c490da (patch) | |
| tree | f442582b4bae62232e2904267c5dd2e2fa75842d /nptl_db | |
| parent | 3101b967874fb7d54a23f75fe93c310143e64af6 (diff) | |
| download | glibc-d22705e7de9ee153508681a1c8842dcd17c490da.zip glibc-d22705e7de9ee153508681a1c8842dcd17c490da.tar.gz glibc-d22705e7de9ee153508681a1c8842dcd17c490da.tar.bz2 | |
nptl_db: Clean up main/rtld variable handling
Most symbols are now in libc.so.6. The "main" (exempted from
coverage checks) status is therefore not necessary. Use
DB_MAIN_VARIABLE for the remaining separate symbol,
__nptl_initial_report_events. DB_RTLD_VARIABLE is now unused, so
remove it.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl_db')
| -rw-r--r-- | nptl_db/db-symbols.awk | 1 | ||||
| -rw-r--r-- | nptl_db/structs.def | 14 |
2 files changed, 5 insertions, 10 deletions
diff --git a/nptl_db/db-symbols.awk b/nptl_db/db-symbols.awk index 6f326cf..ef1d91b 100644 --- a/nptl_db/db-symbols.awk +++ b/nptl_db/db-symbols.awk @@ -2,7 +2,6 @@ # we've just built. It checks for all the symbols used in td_symbol_list. 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. */ diff --git a/nptl_db/structs.def b/nptl_db/structs.def index 6a726f2..fb7bb93 100644 --- a/nptl_db/structs.def +++ b/nptl_db/structs.def @@ -22,10 +22,6 @@ # define STRUCTS_DEF_DEFAULTS 1 #endif -#ifndef DB_RTLD_VARIABLE -# define DB_RTLD_VARIABLE(name) DB_VARIABLE (name) -#endif - /* DB_MAIN_VARIABLE, DB_MAIN_SYMBOL, DB_MAIN_ARRAY_VARIABLE are not covered by the libc symbol check in db-symbols.awk. */ #ifndef DB_MAIN_VARIABLE @@ -78,14 +74,14 @@ DB_STRUCT_FIELD (td_eventbuf_t, eventnum) DB_STRUCT_FIELD (td_eventbuf_t, eventdata) DB_SYMBOL (nptl_version) -DB_MAIN_SYMBOL (__nptl_create_event) -DB_MAIN_SYMBOL (__nptl_death_event) +DB_SYMBOL (__nptl_create_event) +DB_SYMBOL (__nptl_death_event) DB_SYMBOL (__nptl_threads_events) -DB_MAIN_VARIABLE (__nptl_nthreads) +DB_VARIABLE (__nptl_nthreads) DB_VARIABLE (__nptl_last_event) -DB_RTLD_VARIABLE (__nptl_initial_report_events) +DB_MAIN_VARIABLE (__nptl_initial_report_events) -DB_MAIN_ARRAY_VARIABLE (__pthread_keys) +DB_ARRAY_VARIABLE (__pthread_keys) DB_STRUCT (pthread_key_struct) DB_STRUCT_FIELD (pthread_key_struct, seq) DB_STRUCT_FIELD (pthread_key_struct, destr) |