From b89f57fe5db364f78154671e1b2fe1ecd1b5c407 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 20 Aug 2014 13:25:17 +0200
Subject: [PATCH] mpi: Suppress set-but-unused-variables warnings.

* include/types.h (GNUPG_GCC_ATTR_UNUSED): Define for gcc >= 3.5.
* mpi/mpih-div.c (mpihelp_divmod_1, mpihelp_mod_1): Mark dummy as
 unused.
* mpi/mpi-internal.h (UDIV_QRNND_PREINV): Mark _ql as unused.
--

Due to the use of macros and longlong.h, we use variables which are
only used by some architectures.  At least gcc 4.7.2 prints new
warnings about set but not used variables.  This patch silences them.
---
 include/types.h    | 9 +++++++++
 mpi/mpi-internal.h | 3 ++-
 mpi/mpih-div.c     | 4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/types.h b/include/types.h
index 6baccdbbb..3c5248502 100644
--- a/include/types.h
+++ b/include/types.h
@@ -143,4 +143,13 @@ struct string_list {
 typedef struct string_list *STRLIST;
 typedef struct string_list *strlist_t;
 
+
+
+#if __GNUC__ > 2 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5 )
+# define GNUPG_GCC_ATTR_UNUSED  __attribute__ ((unused))
+#else
+# define GNUPG_GCC_ATTR_UNUSED
+#endif
+
+
 #endif /*G10_TYPES_H*/
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index 46da08d0d..9f79781f4 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -157,7 +157,8 @@ typedef int mpi_size_t;        /* (must be a signed type) */
  */
 #define UDIV_QRNND_PREINV(q, r, nh, nl, d, di) \
     do {							    \
-	mpi_limb_t _q, _ql, _r; 				    \
+	mpi_limb_t _ql GNUPG_GCC_ATTR_UNUSED;                       \
+	mpi_limb_t _q, _r; 				            \
 	mpi_limb_t _xh, _xl;					    \
 	umul_ppmm (_q, _ql, (nh), (di));			    \
 	_q += (nh);	/* DI is 2**BITS_PER_MPI_LIMB too small */  \
diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c
index 235a8107b..eedfabf55 100644
--- a/mpi/mpih-div.c
+++ b/mpi/mpih-div.c
@@ -49,7 +49,7 @@ mpihelp_mod_1(mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
 {
     mpi_size_t i;
     mpi_limb_t n1, n0, r;
-    int dummy;
+    int dummy GNUPG_GCC_ATTR_UNUSED;
 
     /* Botch: Should this be handled at all?  Rely on callers?	*/
     if( !dividend_size )
@@ -398,7 +398,7 @@ mpihelp_divmod_1( mpi_ptr_t quot_ptr,
 {
     mpi_size_t i;
     mpi_limb_t n1, n0, r;
-    int dummy;
+    int dummy GNUPG_GCC_ATTR_UNUSED;
 
     if( !dividend_size )
 	return 0;