diff --git a/ChangeLog b/ChangeLog
index 2bf841cfd1..52ee8ee2f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-31  Joseph Myers  <joseph@codesourcery.com>
+
+	* math/math.h
+	[__FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == 32]
+	(__MATH_EVAL_FMT2): Define to add 0.0f.
+
 2017-10-31  Alan Modra  <amodra@gmail.com>
 
 	* sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S: Don't
diff --git a/math/math.h b/math/math.h
index 125d845c86..326fd8ebe1 100644
--- a/math/math.h
+++ b/math/math.h
@@ -1144,6 +1144,8 @@ iszero (__T __val)
 #  define __MATH_EVAL_FMT2(x, y) ((x) + (y) + 0.0L)
 # elif __FLT_EVAL_METHOD__ == 1 || __FLT_EVAL_METHOD__ > 32
 #  define __MATH_EVAL_FMT2(x, y) ((x) + (y) + 0.0)
+# elif __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == 32
+#  define __MATH_EVAL_FMT2(x, y) ((x) + (y) + 0.0f)
 # else
 #  define __MATH_EVAL_FMT2(x, y) ((x) + (y))
 # endif