diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6839fda90ce..d0929184b94 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-02  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR tree-optimization/53805
+	* fold-const.c (invert_tree_comparison): Invert ORDERED_EXPR and
+	UNORDERED_EXPR even for trapping floating point.
+
 2012-08-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR middle-end/53321
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index c1369601fff..dfc01cc39a5 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -2094,12 +2094,14 @@ pedantic_non_lvalue_loc (location_t loc, tree x)
 
 /* Given a tree comparison code, return the code that is the logical inverse.
    It is generally not safe to do this for floating-point comparisons, except
-   for EQ_EXPR and NE_EXPR, so we return ERROR_MARK in this case.  */
+   for EQ_EXPR, NE_EXPR, ORDERED_EXPR and UNORDERED_EXPR, so we return
+   ERROR_MARK in this case.  */
 
 enum tree_code
 invert_tree_comparison (enum tree_code code, bool honor_nans)
 {
-  if (honor_nans && flag_trapping_math && code != EQ_EXPR && code != NE_EXPR)
+  if (honor_nans && flag_trapping_math && code != EQ_EXPR && code != NE_EXPR
+      && code != ORDERED_EXPR && code != UNORDERED_EXPR)
     return ERROR_MARK;
 
   switch (code)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4198578994c..8ef8e789b38 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-02  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR tree-optimization/53805
+	* gcc.dg/fold-notunord.c: New testcase.
+
 2012-08-02  Mikael Morin  <mikael@gcc.gnu.org>
 
 	PR fortran/48820
diff --git a/gcc/testsuite/gcc.dg/fold-notunord.c b/gcc/testsuite/gcc.dg/fold-notunord.c
new file mode 100644
index 00000000000..edfe3cd0292
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/fold-notunord.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O -ftrapping-math -fdump-tree-optimized" } */
+
+int f (double d)
+{
+  return !__builtin_isnan (d);
+}
+
+/* { dg-final { scan-tree-dump " ord " "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */