Permalink
Browse files

Fix building glibc master with NDEBUG and --with-cpu.

When building on i686, x86_64, and arm, and with NDEBUG, or --with-cpu
there are various variables and functions which are unused based on
these settings.

This patch marks all such variables with __attribute__((unused)) to
avoid the compiler warnings when building with the aformentioned
options.
  • Loading branch information...
Carlos O'Donell
Carlos O'Donell committed Mar 16, 2016
1 parent 089b772 commit b4f518ecfad09fc4279ea26a565332835e403dab
Showing with 15 additions and 5 deletions.
  1. +9 −0 ChangeLog
  2. +1 −1 catgets/tst-catgets.c
  3. +1 −1 dlfcn/bug-dl-leaf-lib.c
  4. +1 −1 math/atest-exp.c
  5. +1 −1 math/atest-exp2.c
  6. +1 −1 sysdeps/arm/dl-machine.h
  7. +1 −0 sysdeps/i386/i686/dl-hash.h
@@ -1,3 +1,12 @@
2016-03-15 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.

2016-03-15 Joseph Myers <joseph@codesourcery.com>

* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_PPOLL):
@@ -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;

@@ -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. */
@@ -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));
@@ -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));
@@ -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);
@@ -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;

0 comments on commit b4f518e

Please sign in to comment.