From patchwork Fri Apr 16 09:21:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42995 Return-Path: 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 E9B55389202D; Fri, 16 Apr 2021 09:21:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E9B55389202D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618564872; bh=xcSK4b4KaErC0/RXWv8hQZKfL+jz+DhgKmXpwxa5NME=; 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=NxsB+jQ1DzE4DUfIuCNPOZPnTYVrMIoKg7K1ddfv5AmM/a/p/GbaDmI5tEoPBXoAa QN01Rks5igSAgUO4KPCafA+8bmrwK64Eue16tLJ+mrSapt8Y571BcCKVKQ/0GfVGWh 1dh8a5CD9eFvkdluUC4sKM4FW6t/whk7vNncJANo= 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 C1FCB3892027 for ; Fri, 16 Apr 2021 09:21:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C1FCB3892027 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-491-Yw_7XwNuPq-AqxZpmS5jRA-1; Fri, 16 Apr 2021 05:21:07 -0400 X-MC-Unique: Yw_7XwNuPq-AqxZpmS5jRA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E131A18397AA for ; Fri, 16 Apr 2021 09:21:06 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 522B1610A8 for ; Fri, 16 Apr 2021 09:21:06 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v4 12/37] nptl_db: Introduce DB_MAIN_ARRAY_VARIABLE In-Reply-To: References: Message-Id: Date: Fri, 16 Apr 2021 11:21:24 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" And document the reason for DB_ARRAY_VARIABLE. Reviewed-by: Adhemerval Zanella --- 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)