diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ddb2300b841..4540ec42c897 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/i386/i386.c (ix86_valid_target_attribute_tree): Use
+	enum_opts_set when testing if attributes have set -mfpmath=.
+
 2011-05-17  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* config/mips/mips.c (mips_handle_option): Remove unused variable.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index ee8c37beda9d..87d5650405f7 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -4692,7 +4692,7 @@ ix86_valid_target_attribute_tree (tree args)
       || target_flags != def->x_target_flags
       || option_strings[IX86_FUNCTION_SPECIFIC_ARCH]
       || option_strings[IX86_FUNCTION_SPECIFIC_TUNE]
-      || ix86_fpmath != def->x_ix86_fpmath)
+      || enum_opts_set.x_ix86_fpmath)
     {
       /* If we are using the default tune= or arch=, undo the string assigned,
 	 and use the default.  */