This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Fix building glibc master with NDEBUG.
- From: Carlos O'Donell <carlos at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 10 Mar 2016 21:29:34 -0500
- Subject: [PATCH] Fix building glibc master with NDEBUG.
- Authentication-results: sourceware.org; auth=none
When building on i686, x86_64, and arm, and with NDEBUG, the following
variables are unused because their only use is in an assert. Following
what appears to be existing practice in sysdeps/generic/dl-hash.h we
mark such variables and functions with __attribute__ ((unused)).
If nobody objects I'll check this in on Friday.
2016-03-10 Carlos O'Donell <carlos@redhat.com>
* catgets/tst-catgets.c (do_bz17905): Mark result unused.
* dlfcn/bug-dl-leaf-lib.c (check_val_fini): Mark ret unused.
* math/atest-exp.c (exp_mpn): Mark chk unused.
* math/atest-exp2.c (exp_mpn): Likwise.
* sysdeps/arm/dl-machine.h (elf_machine_rela): Mark td unused.
* sysdeps/i386/i686/dl-hash.h: Mark _dl_elf_hash unused.
diff --git a/catgets/tst-catgets.c b/catgets/tst-catgets.c
index 0886938..7169ceb 100644
--- a/catgets/tst-catgets.c
+++ b/catgets/tst-catgets.c
@@ -22,7 +22,7 @@ do_bz17905 (void)
{
char *buf;
struct rlimit rl;
- nl_catd result;
+ nl_catd result __attribute__ ((unused));
const int sz = 1024 * 1024;
diff --git a/dlfcn/bug-dl-leaf-lib.c b/dlfcn/bug-dl-leaf-lib.c
index d5a3460..105ab24 100644
--- a/dlfcn/bug-dl-leaf-lib.c
+++ b/dlfcn/bug-dl-leaf-lib.c
@@ -50,7 +50,7 @@ void check_val_fini (void)
int lib_main (void)
{
- int ret;
+ int ret __attribute__ ((unused));
void *hdl;
/* Make sure the constructor sees the updated val. */
diff --git a/math/atest-exp.c b/math/atest-exp.c
index ebacff5..cde4019 100644
--- a/math/atest-exp.c
+++ b/math/atest-exp.c
@@ -61,7 +61,7 @@ exp_mpn (mp1 ex, mp1 x)
unsigned n;
mp1 xp;
mp2 tmp;
- mp_limb_t chk;
+ mp_limb_t chk __attribute__ ((unused));
mp1 tol;
memset (xp, 0, sizeof (mp1));
diff --git a/math/atest-exp2.c b/math/atest-exp2.c
index 395b8f9..8a9cc70 100644
--- a/math/atest-exp2.c
+++ b/math/atest-exp2.c
@@ -87,7 +87,7 @@ exp_mpn (mp1 ex, mp1 x)
unsigned int n;
mp1 xp;
mp2 tmp;
- mp_limb_t chk;
+ mp_limb_t chk __attribute__ ((unused));
mp1 tol;
memset (xp, 0, sizeof (mp1));
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 0905add..60eee00 100644
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -581,7 +581,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
# ifdef RESOLVE_CONFLICT_FIND_MAP
case R_ARM_TLS_DESC:
{
- struct tlsdesc volatile *td =
+ struct tlsdesc volatile *td __attribute__ ((unused)) =
(struct tlsdesc volatile *) reloc_addr;
RESOLVE_CONFLICT_FIND_MAP (map, reloc_addr);
diff --git a/sysdeps/i386/i686/dl-hash.h b/sysdeps/i386/i686/dl-hash.h
index 8ba85d2..dd4458f 100644
--- a/sysdeps/i386/i686/dl-hash.h
+++ b/sysdeps/i386/i686/dl-hash.h
@@ -26,6 +26,7 @@
would be much slower than the generic C implementation. So don't
use it. */
static unsigned int
+__attribute__ ((unused))
_dl_elf_hash (const char *name)
{
unsigned int result;
--
Cheers,
Carlos.