diff mbox series

[v3,12/37] nptl_db: Introduce DB_MAIN_ARRAY_VARIABLE

Message ID ee5d613dc6fac605a426502174180204b87cd539.1615914631.git.fweimer@redhat.com
State Superseded
Delegated to: Adhemerval Zanella Netto
Headers show
Series libpthread removal: NPTL forwarders are gone | expand

Commit Message

Florian Weimer March 16, 2021, 5:29 p.m. UTC
And document the reason for DB_ARRAY_VARIABLE.
---
 nptl_db/db-symbols.awk | 1 +
 nptl_db/structs.def    | 5 +++++
 2 files changed, 6 insertions(+)

Comments

Adhemerval Zanella March 18, 2021, 12:43 p.m. UTC | #1
LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

On 16/03/2021 14:29, Florian Weimer via Libc-alpha wrote:
> And document the reason for DB_ARRAY_VARIABLE.
> ---
>  nptl_db/db-symbols.awk | 1 +
>  nptl_db/structs.def    | 5 +++++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/nptl_db/db-symbols.awk b/nptl_db/db-symbols.awk
> index eb089e188a..9e981537c8 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_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;
>  %include "db-symbols.h"
> diff --git a/nptl_db/structs.def b/nptl_db/structs.def
> index d0e1cb659a..1522c96f8f 100644
> --- a/nptl_db/structs.def
> +++ b/nptl_db/structs.def
> @@ -26,9 +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.  */
>  #ifndef DB_MAIN_VARIABLE
>  # define DB_MAIN_VARIABLE(name) DB_VARIABLE (name)
>  #endif
> +#ifndef DB_MAIN_ARRAY_VARIABLE
> +# define DB_MAIN_ARRAY_VARIABLE(name) DB_ARRAY_VARIABLE (name)
> +#endif
>  
>  #ifndef DB_RTLD_GLOBAL_FIELD
>  # if !IS_IN (libpthread)
>
diff mbox series

Patch

diff --git a/nptl_db/db-symbols.awk b/nptl_db/db-symbols.awk
index eb089e188a..9e981537c8 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_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;
 %include "db-symbols.h"
diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index d0e1cb659a..1522c96f8f 100644
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -26,9 +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.  */
 #ifndef DB_MAIN_VARIABLE
 # define DB_MAIN_VARIABLE(name) DB_VARIABLE (name)
 #endif
+#ifndef DB_MAIN_ARRAY_VARIABLE
+# define DB_MAIN_ARRAY_VARIABLE(name) DB_ARRAY_VARIABLE (name)
+#endif
 
 #ifndef DB_RTLD_GLOBAL_FIELD
 # if !IS_IN (libpthread)