public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Revert "elf: Fix compile error with -DNDEBUG [BZ #18755]"
Date: Wed, 18 Oct 2023 09:30:53 +0000 (GMT)	[thread overview]
Message-ID: <20231018093053.29C633858D33@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2ad9b674cf6cd6ba59c064427cb7aeb43a66d8a9

commit 2ad9b674cf6cd6ba59c064427cb7aeb43a66d8a9
Author: Florian Weimer <fweimer@redhat.com>
Date:   Wed Oct 18 11:30:38 2023 +0200

    Revert "elf: Fix compile error with -DNDEBUG [BZ #18755]"
    
    This reverts commit 964d15a007d7fb1258f2ad7c8cf4afcfb9a65719.
    
    Reason for revert: Conflicts with revert of commit 6985865bc3ad5b23147.

Diff:
---
 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;

                 reply	other threads:[~2023-10-18  9:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231018093053.29C633858D33@sourceware.org \
    --to=fw@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).