From db1ee0a836f4938dc14014c6341fcb11ef66e929 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 16 Aug 2012 14:08:47 -0700 Subject: [PATCH] Suppress -Wunused-but-set warnings in GMP code. --- ChangeLog | 10 ++++++++++ stdio-common/_itoa.c | 14 +++++++++----- stdio-common/_itowa.c | 10 ++++++---- stdlib/divmod_1.c | 4 ++-- stdlib/gmp-impl.h | 5 +++-- stdlib/mod_1.c | 4 ++-- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f6903c408..3842dd148d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-08-16 Roland McGrath + + * stdlib/gmp-impl.h (udiv_qrnnd_preinv): Use __attribute__ ((unused)) + on _QL, which is set by umul_ppmm but never used. + * stdio-common/_itoa.c (_itoa): Use __attribute__ ((unused)) on DUMMY + variables, which are set by GMP macros but never used. + * stdio-common/_itowa.c (_itowa): Likewise. + * stdlib/divmod_1.c (mpn_divmod_1): Likewise. + * stdlib/mod_1.c (mpn_mod_1): Likewise. + 2012-08-16 Carlos O'Donell * sysdeps/sh/ldsodefs.h (ARCH_PLTENTER_MEMBERS) : diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c index ebb3e857c6..4c588d989d 100644 --- a/stdio-common/_itoa.c +++ b/stdio-common/_itoa.c @@ -206,7 +206,7 @@ _itoa (value, buflim, base, upper_case) { # define RUN_2N(BITS) \ do \ - { \ + { \ /* `unsigned long long int' always has 64 bits. */ \ mp_limb_t work_hi = value >> (64 - BITS_PER_MP_LIMB); \ \ @@ -264,7 +264,8 @@ _itoa (value, buflim, base, upper_case) if (brec->flag) while (value != 0) { - mp_limb_t quo, rem, x, dummy; + mp_limb_t quo, rem, x; + mp_limb_t __attribute__ ((unused)); umul_ppmm (x, dummy, value, base_multiplier); quo = (x + ((value - x) >> 1)) >> (brec->post_shift - 1); @@ -275,7 +276,8 @@ _itoa (value, buflim, base, upper_case) else while (value != 0) { - mp_limb_t quo, rem, x, dummy; + mp_limb_t quo, rem, x; + mp_limb_t __attribute__ ((unused)); umul_ppmm (x, dummy, value, base_multiplier); quo = x >> brec->post_shift; @@ -401,7 +403,8 @@ _itoa (value, buflim, base, upper_case) if (brec->flag) while (ti != 0) { - mp_limb_t quo, rem, x, dummy; + mp_limb_t quo, rem, x; + mp_limb_t dummy __attribute__ ((unused)); umul_ppmm (x, dummy, ti, base_multiplier); quo = (x + ((ti - x) >> 1)) >> (brec->post_shift - 1); @@ -413,7 +416,8 @@ _itoa (value, buflim, base, upper_case) else while (ti != 0) { - mp_limb_t quo, rem, x, dummy; + mp_limb_t quo, rem, x; + mp_limb_t dummy __attribute__ ((unused)); umul_ppmm (x, dummy, ti, base_multiplier); quo = x >> brec->post_shift; diff --git a/stdio-common/_itowa.c b/stdio-common/_itowa.c index 9381d33b6c..6561ee1585 100644 --- a/stdio-common/_itowa.c +++ b/stdio-common/_itowa.c @@ -1,5 +1,5 @@ /* Internal function for converting integers to ASCII. - Copyright (C) 1994-1996,1999,2000,2002,2007 Free Software Foundation, Inc. + Copyright (C) 1994-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Torbjorn Granlund and Ulrich Drepper . @@ -102,7 +102,7 @@ _itowa (value, buflim, base, upper_case) { # define RUN_2N(BITS) \ do \ - { \ + { \ /* `unsigned long long int' always has 64 bits. */ \ mp_limb_t work_hi = value >> (64 - BITS_PER_MP_LIMB); \ \ @@ -296,7 +296,8 @@ _itowa (value, buflim, base, upper_case) if (brec->flag) while (ti != 0) { - mp_limb_t quo, rem, x, dummy; + mp_limb_t quo, rem, x; + mp_limb_t dummy __attribute__ ((unused)); umul_ppmm (x, dummy, ti, base_multiplier); quo = (x + ((ti - x) >> 1)) >> (brec->post_shift - 1); @@ -308,7 +309,8 @@ _itowa (value, buflim, base, upper_case) else while (ti != 0) { - mp_limb_t quo, rem, x, dummy; + mp_limb_t quo, rem, x; + mp_limb_t dummy __attribute__ ((unused)); umul_ppmm (x, dummy, ti, base_multiplier); quo = x >> brec->post_shift; diff --git a/stdlib/divmod_1.c b/stdlib/divmod_1.c index b11fd7bf8c..4e6966bc91 100644 --- a/stdlib/divmod_1.c +++ b/stdlib/divmod_1.c @@ -6,7 +6,7 @@ QUOT_PTR and DIVIDEND_PTR might point to the same limb. -Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation, Inc. +Copyright (C) 1991-2012 Free Software Foundation, Inc. This file is part of the GNU MP Library. @@ -54,7 +54,7 @@ mpn_divmod_1 (quot_ptr, dividend_ptr, dividend_size, divisor_limb) { mp_size_t i; mp_limb_t n1, n0, r; - mp_limb_t dummy; + mp_limb_t dummy __attribute__ ((unused)); /* ??? Should this be handled at all? Rely on callers? */ if (dividend_size == 0) diff --git a/stdlib/gmp-impl.h b/stdlib/gmp-impl.h index f6454ee2d0..7e94624859 100644 --- a/stdlib/gmp-impl.h +++ b/stdlib/gmp-impl.h @@ -1,6 +1,6 @@ /* Include file for internal GNU MP types and definitions. -Copyright (C) 1991, 1993, 1994, 1995, 1996, 2011 Free Software Foundation, Inc. +Copyright (C) 1991-2012 Free Software Foundation, Inc. This file is part of the GNU MP Library. @@ -216,7 +216,8 @@ extern mp_size_t __gmp_default_fp_limb_precision; has to be set. Put the quotient in Q and the remainder in R. */ #define udiv_qrnnd_preinv(q, r, nh, nl, d, di) \ do { \ - mp_limb_t _q, _ql, _r; \ + mp_limb_t _ql __attribute__ ((unused)); \ + mp_limb_t _q, _r; \ mp_limb_t _xh, _xl; \ umul_ppmm (_q, _ql, (nh), (di)); \ _q += (nh); /* DI is 2**BITS_PER_MP_LIMB too small */\ diff --git a/stdlib/mod_1.c b/stdlib/mod_1.c index 00f338baf1..d325a931ad 100644 --- a/stdlib/mod_1.c +++ b/stdlib/mod_1.c @@ -3,7 +3,7 @@ Return the single-limb remainder. There are no constraints on the value of the divisor. -Copyright (C) 1991, 1993, 1994, Free Software Foundation, Inc. +Copyright (C) 1991-2012 Free Software Foundation, Inc. This file is part of the GNU MP Library. @@ -49,7 +49,7 @@ mpn_mod_1 (dividend_ptr, dividend_size, divisor_limb) { mp_size_t i; mp_limb_t n1, n0, r; - mp_limb_t dummy; + mp_limb_t dummy __attribute__ ((unused)); /* Botch: Should this be handled at all? Rely on callers? */ if (dividend_size == 0)