Message ID | ee5d613dc6fac605a426502174180204b87cd539.1615914631.git.fweimer@redhat.com |
---|---|
State | Superseded |
Delegated to: | Adhemerval Zanella Netto |
Headers |
Return-Path: <libc-alpha-bounces@sourceware.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D00A338618A5; Tue, 16 Mar 2021 17:29:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D00A338618A5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615915756; bh=2kyyMI1sp1NZNtGJgBeAw379jvDBd+9bION/hb6Vnp4=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=SK/DtXMmYgJoZyDTyjs6hCE8sVUXvjZaxohduy6cST9xzXFdBH0x0eiDA6+pTltWQ xGQ37Tq4pX1JqrG9J/UREliA8eSAKXS/JoXhgKaPBmwmqsEaxOGjDF2rla6sp4Qjys AjA4okPJ2j/Z1HZZyajwc7qbSBKSLNitj+QpCzMA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id BCB3938618AA for <libc-alpha@sourceware.org>; Tue, 16 Mar 2021 17:29:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BCB3938618AA Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-575-8ztKjWAENFuepd7IPH_HlQ-1; Tue, 16 Mar 2021 13:29:12 -0400 X-MC-Unique: 8ztKjWAENFuepd7IPH_HlQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8667A3E741 for <libc-alpha@sourceware.org>; Tue, 16 Mar 2021 17:29:11 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-254.ams2.redhat.com [10.36.112.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E15F719D61 for <libc-alpha@sourceware.org>; Tue, 16 Mar 2021 17:29:10 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v3 12/37] nptl_db: Introduce DB_MAIN_ARRAY_VARIABLE In-Reply-To: <cover.1615914631.git.fweimer@redhat.com> References: <cover.1615914631.git.fweimer@redhat.com> Message-Id: <ee5d613dc6fac605a426502174180204b87cd539.1615914631.git.fweimer@redhat.com> Date: Tue, 16 Mar 2021 18:29:19 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: Florian Weimer via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Florian Weimer <fweimer@redhat.com> Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org> |
Series |
libpthread removal: NPTL forwarders are gone
|
|
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
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 --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)