diff mbox series

[1/2] Revert "elf: Fix compile error with -DNDEBUG [BZ #18755]"

Message ID ce208f1b0b07d57c82c410d4f9dbeb487349e957.1696583991.git.fweimer@redhat.com
State Committed
Commit 2ad9b674cf6cd6ba59c064427cb7aeb43a66d8a9
Headers
Series Revert "elf: Always call destructors in reverse constructor order (bug 30785)" |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed

Commit Message

Florian Weimer Oct. 6, 2023, 9:21 a.m. UTC 
  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(-)

Comments

Andreas Schwab Oct. 18, 2023, 8:14 a.m. UTC | #1 
On Okt 06 2023, Florian Weimer wrote:

> This reverts commit 964d15a007d7fb1258f2ad7c8cf4afcfb9a65719.

Ok.
diff mbox series

Patch

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;