diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a2ce92c6cf..f8126eff8c2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-13  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.h (TARGET_FLT_EVAL_METHOD): Return -1 for
+	TARGET_SSE_MATH without TARGET_SSE2.  Rewrite.
+
 2016-01-13  Yvan Roux  <yvan.roux@linaro.org>
 
 	* config/arm/arm-arches.def: Remove spurious whitespace in "armv8.1-a"
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 6c63871e7f2..9062d631165 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -693,8 +693,11 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
    only SSE, rounding is correct; when using both SSE and the FPU,
    the rounding precision is indeterminate, since either may be chosen
    apparently at random.  */
-#define TARGET_FLT_EVAL_METHOD \
-  (TARGET_MIX_SSE_I387 ? -1 : (TARGET_80387 && !TARGET_SSE_MATH) ? 2 : 0)
+#define TARGET_FLT_EVAL_METHOD						\
+  (TARGET_80387								\
+   ? (TARGET_MIX_SSE_I387 ? -1						\
+      : (TARGET_SSE_MATH ? (TARGET_SSE2 ? 0 : -1) : 2))			\
+   : 0)
 
 /* Whether to allow x87 floating-point arithmetic on MODE (one of
    SFmode, DFmode and XFmode) in the current excess precision