From patchwork Fri Oct 6 09:21:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 77204 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 660E4385DC35 for ; Fri, 6 Oct 2023 09:22:02 +0000 (GMT) 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 [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id C36C3385559E for ; Fri, 6 Oct 2023 09:21:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C36C3385559E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696584107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NvS3Y/NxK/4oTqlbyVc5VBiNLGSX7HRFOQWHv2eDfRY=; b=eWeq28EfLBr9swBzDYJ3hdEUyEoDyQmm4wInPTCyFoRCtSeh9S7h+iI4TaSoF//Eg6lb6A xnUawPBv8BHviZuCSItEl7eoStLn2Jb3a6FOtxQqYbX9YIDgX8N1D6C7/5TUjRjspGIjZN WiZnqxBbY67F9TOuFSNtR/kccQY4r2U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-81-7UNr4NCSOUWoLvV1oVuiBA-1; Fri, 06 Oct 2023 05:21:35 -0400 X-MC-Unique: 7UNr4NCSOUWoLvV1oVuiBA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDBE48001EA for ; Fri, 6 Oct 2023 09:21:34 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.57]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9AF58170E9 for ; Fri, 6 Oct 2023 09:21:34 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 1/2] Revert "elf: Fix compile error with -DNDEBUG [BZ #18755]" In-Reply-To: Message-ID: References: X-From-Line: ce208f1b0b07d57c82c410d4f9dbeb487349e957 Mon Sep 17 00:00:00 2001 Date: Fri, 06 Oct 2023 11:21:33 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.6 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_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org This reverts commit 964d15a007d7fb1258f2ad7c8cf4afcfb9a65719. Reason for revert: Conflicts with revert of commit 6985865bc3ad5b23147. --- elf/dl-close.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elf/dl-close.c b/elf/dl-close.c index 24cc4750a5..c9a7d06577 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -137,7 +137,7 @@ _dl_close_worker (struct link_map *map, bool force) dl_close_state = pending; bool any_tls = false; - const unsigned int nloaded __attribute_maybe_unused__ = ns->_ns_nloaded; + const unsigned int nloaded = ns->_ns_nloaded; /* Run over the list and assign indexes to the link maps. */ int idx = 0;