mirror of
https://abf.rosa.ru/djam/glibc.git
synced 2025-02-23 23:12:48 +00:00
Fix building
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;
This commit is contained in:
parent
db1db13749
commit
6c2e44b158
2 changed files with 40 additions and 0 deletions
38
964d15a007d7fb1258f2ad7c8cf4afcfb9a65719.patch
Normal file
38
964d15a007d7fb1258f2ad7c8cf4afcfb9a65719.patch
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
From 964d15a007d7fb1258f2ad7c8cf4afcfb9a65719 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Qingqing Li <liqingqing3@huawei.com>
|
||||||
|
Date: Thu, 21 Sep 2023 20:11:36 +0800
|
||||||
|
Subject: [PATCH 1/1] elf: Fix compile error with -DNDEBUG [BZ #18755]
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=utf8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
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;
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
|
@ -208,6 +208,8 @@ Patch1050: https://803950.bugs.gentoo.org/attachment.cgi?id=757176#/nss-dont-cra
|
||||||
Patch1051: https://raw.githubusercontent.com/archlinux/svntogit-packages/e1d69d80d07494e3c086ee2c5458594d5261d2e4/trunk/reenable_DT_HASH.patch
|
Patch1051: https://raw.githubusercontent.com/archlinux/svntogit-packages/e1d69d80d07494e3c086ee2c5458594d5261d2e4/trunk/reenable_DT_HASH.patch
|
||||||
# Rosa patch rosa2023.1: /usr merge
|
# Rosa patch rosa2023.1: /usr merge
|
||||||
Patch1052: glibc.fix.sbin.patch
|
Patch1052: glibc.fix.sbin.patch
|
||||||
|
# from upstream: https://sourceware.org/git/?p=glibc.git;a=commit;h=964d15a007d7fb1258f2ad7c8cf4afcfb9a65719
|
||||||
|
Patch1053: 964d15a007d7fb1258f2ad7c8cf4afcfb9a65719.patch
|
||||||
|
|
||||||
BuildRequires: autoconf2.5
|
BuildRequires: autoconf2.5
|
||||||
BuildRequires: %{cross_prefix}binutils >= 2.30-7
|
BuildRequires: %{cross_prefix}binutils >= 2.30-7
|
||||||
|
|
Loading…
Add table
Reference in a new issue