diff --git a/ChangeLog b/ChangeLog
index 5375211973..36b2bb0dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-06  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* sysdeps/generic/fpu_control.h (_FPU_GETCW): Define to set cw to
+	0, not just to plain "0" as a statement.
+	(_FPU_SETCW): Define to (void) (cw), rather than doing nothing
+	with cw.
+
 2012-12-06  Joseph Myers  <joseph@codesourcery.com>
 
 	* NEWS: Use sourceware.org in Bugzilla URL.
diff --git a/sysdeps/generic/fpu_control.h b/sysdeps/generic/fpu_control.h
index b9134eb2af..503905298e 100644
--- a/sysdeps/generic/fpu_control.h
+++ b/sysdeps/generic/fpu_control.h
@@ -1,5 +1,5 @@
 /* FPU control word definitions.  Stub version.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,8 +29,8 @@
 typedef unsigned int fpu_control_t;
 
 /* Macros for accessing the hardware control word.  */
-#define _FPU_GETCW(cw) 0
-#define _FPU_SETCW(cw) do { } while (0)
+#define _FPU_GETCW(cw) (cw) = 0
+#define _FPU_SETCW(cw) (void) (cw)
 
 /* Default control word set at startup.  */
 extern fpu_control_t __fpu_control;