[v2] elf: Fix compile error with -DNDEBUG [BZ #18755]

Message ID 0073b7dd-94dd-7561-88f8-f12cbca5a1a6@huawei.com
State Committed
Series [v2] elf: Fix compile error with -DNDEBUG [BZ #18755] |


Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
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
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Qingqing Li Sept. 21, 2023, 12:11 p.m. UTC
  Compilation fails when building with -DNDEBUG after commit a3189f66a5f2fe86568286fa025fa153be04c6c0.
Here is the error:

dl-close.c: In function ‘_dl_close_worker’:
dl-close.c:140:22: error: unused variable ‘nloaded’ [-Werror=unused-variable]
  140 |   const unsigned int nloaded = ns->_ns_nloaded;

Add __attribute_maybe_unused__ for‘nloaded’to fix it.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 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 c9a7d06577..24cc4750a5 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 = ns->_ns_nloaded;
+  const unsigned int nloaded __attribute_maybe_unused__ = ns->_ns_nloaded;

   /* Run over the list and assign indexes to the link maps.  */
   int idx = 0;