diff --git a/ChangeLog b/ChangeLog
index a577d3d853..0acc46be89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-12-05  Joseph Myers  <joseph@codesourcery.com>
 
+	* soft-fp/op-common.h (_FP_DECL): Declare X##_s with __attribute__
+	((unused)).
+
 	* sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c: Include <stdlib.h>.
 
 	* stdio-common/tst-put-error.c (do_test): Use 10000000 instead of
diff --git a/soft-fp/op-common.h b/soft-fp/op-common.h
index 12fb16e5ef..8855ad3acf 100644
--- a/soft-fp/op-common.h
+++ b/soft-fp/op-common.h
@@ -29,8 +29,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#define _FP_DECL(wc, X)						\
-  _FP_I_TYPE X##_c __attribute__((unused)), X##_s, X##_e;	\
+#define _FP_DECL(wc, X)				\
+  _FP_I_TYPE X##_c __attribute__((unused));	\
+  _FP_I_TYPE X##_s __attribute__((unused));	\
+  _FP_I_TYPE X##_e;				\
   _FP_FRAC_DECL_##wc(X)
 
 /*