From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 29C633858D33; Wed, 18 Oct 2023 09:30:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29C633858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1697621453; bh=lpod+xie+qKSRoCQsrA8dP+hCC9xPNiaPLLQh2C0yAc=; h=From:To:Subject:Date:From; b=j+XSXM8+Q5uNkXdySDPTanwTj8e0+9h4l9N/6zi+unTVdpw1t0opRxKBUaDi2BM/C 0k9MxQpUzkxvS1zGOwqDdAw65VqCiC6OQHrupSyPDmml2HOWjvb5BpFi8qPsJ/g12O EZ7kehRgxZ5XKWH+qLKpN84g4dSGaTo5LQEtL7As= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] Revert "elf: Fix compile error with -DNDEBUG [BZ #18755]" X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: b316c9a76903fec1596642b3020b3f939c05b8db X-Git-Newrev: 2ad9b674cf6cd6ba59c064427cb7aeb43a66d8a9 Message-Id: <20231018093053.29C633858D33@sourceware.org> Date: Wed, 18 Oct 2023 09:30:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2ad9b674cf6cd6ba59c064427cb7aeb43a66d8a9 commit 2ad9b674cf6cd6ba59c064427cb7aeb43a66d8a9 Author: Florian Weimer 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;