|
 |
25845f |
commit b4f518ecfad09fc4279ea26a565332835e403dab
|
|
|
25845f |
Author: Carlos O'Donell <carlos@redhat.com>
|
|
|
25845f |
Date: Tue Mar 15 23:16:47 2016 -0400
|
|
|
25845f |
|
|
|
25845f |
Fix building glibc master with NDEBUG and --with-cpu.
|
|
|
25845f |
|
|
|
25845f |
When building on i686, x86_64, and arm, and with NDEBUG, or --with-cpu
|
|
|
25845f |
there are various variables and functions which are unused based on
|
|
|
25845f |
these settings.
|
|
|
25845f |
|
|
|
25845f |
This patch marks all such variables with __attribute__((unused)) to
|
|
|
25845f |
avoid the compiler warnings when building with the aformentioned
|
|
|
25845f |
options.
|
|
|
25845f |
|
|
|
25845f |
Conflicts:
|
|
|
25845f |
dlfcn/bug-dl-leaf-lib.c
|
|
|
25845f |
(Missing backport of fix for swbz#15897; file removed.)
|
|
|
25845f |
sysdeps/arm/dl-machine.h
|
|
|
25845f |
(Missing backport of fix for swbz#17078.)
|
|
|
25845f |
|
|
|
25845f |
diff --git a/catgets/tst-catgets.c b/catgets/tst-catgets.c
|
|
|
25845f |
index 140de722c893297d..fdc9f2758ffd60a1 100644
|
|
|
25845f |
--- a/catgets/tst-catgets.c
|
|
|
25845f |
+++ b/catgets/tst-catgets.c
|
|
|
25845f |
@@ -22,7 +22,7 @@ do_bz17905 (void)
|
|
|
25845f |
{
|
|
|
25845f |
char *buf;
|
|
|
25845f |
struct rlimit rl;
|
|
|
25845f |
- nl_catd result;
|
|
|
25845f |
+ nl_catd result __attribute__ ((unused));
|
|
|
25845f |
|
|
|
25845f |
const int sz = 1024 * 1024;
|
|
|
25845f |
|
|
|
25845f |
diff --git a/math/atest-exp.c b/math/atest-exp.c
|
|
|
25845f |
index d384c4920acb044f..8f4711aaa90d09e5 100644
|
|
|
25845f |
--- a/math/atest-exp.c
|
|
|
25845f |
+++ b/math/atest-exp.c
|
|
|
25845f |
@@ -61,7 +61,7 @@ exp_mpn (mp1 ex, mp1 x)
|
|
|
25845f |
unsigned n;
|
|
|
25845f |
mp1 xp;
|
|
|
25845f |
mp2 tmp;
|
|
|
25845f |
- mp_limb_t chk;
|
|
|
25845f |
+ mp_limb_t chk __attribute__ ((unused));
|
|
|
25845f |
mp1 tol;
|
|
|
25845f |
|
|
|
25845f |
memset (xp, 0, sizeof (mp1));
|
|
|
25845f |
diff --git a/math/atest-exp2.c b/math/atest-exp2.c
|
|
|
25845f |
index 1a2be9ba021bb24a..6f5dd7760c78b7e2 100644
|
|
|
25845f |
--- a/math/atest-exp2.c
|
|
|
25845f |
+++ b/math/atest-exp2.c
|
|
|
25845f |
@@ -102,7 +102,7 @@ exp_mpn (mp1 ex, mp1 x)
|
|
|
25845f |
unsigned int n;
|
|
|
25845f |
mp1 xp;
|
|
|
25845f |
mp2 tmp;
|
|
|
25845f |
- mp_limb_t chk;
|
|
|
25845f |
+ mp_limb_t chk __attribute__ ((unused));
|
|
|
25845f |
mp1 tol;
|
|
|
25845f |
|
|
|
25845f |
memset (xp, 0, sizeof (mp1));
|
|
|
25845f |
diff --git a/sysdeps/i386/i686/dl-hash.h b/sysdeps/i386/i686/dl-hash.h
|
|
|
25845f |
index 14fbbc251148c176..65acc88a6e6f093c 100644
|
|
|
25845f |
--- a/sysdeps/i386/i686/dl-hash.h
|
|
|
25845f |
+++ b/sysdeps/i386/i686/dl-hash.h
|
|
|
25845f |
@@ -26,6 +26,7 @@
|
|
|
25845f |
would be much slower than the generic C implementation. So don't
|
|
|
25845f |
use it. */
|
|
|
25845f |
static unsigned int
|
|
|
25845f |
+__attribute__ ((unused))
|
|
|
25845f |
_dl_elf_hash (const char *name)
|
|
|
25845f |
{
|
|
|
25845f |
unsigned int result;
|