diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a73095b6b6e..30288a00474 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2019-11-08  Jakub Jelinek  <jakub@redhat.com>
+2019-11-07  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* config/rs6000/rs6000.c (validate_condition_mode): Don't assert for
+	valid conditions.
+
+2019-11-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* ipa-utils.c (ipa_merge_profiles): Fix fprintf format string
 	typo - mistmatch -> mismatch.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index d9d275b01c0..d48157a975c 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -10250,14 +10250,6 @@ validate_condition_mode (enum rtx_code code, machine_mode mode)
 		  && code != UNGT && code != UNLT
 		  && code != UNGE && code != UNLE));
 
-  /* These should never be generated except for
-     flag_finite_math_only.  */
-  gcc_assert (mode != CCFPmode
-	      || flag_finite_math_only
-	      || (code != LE && code != GE
-		  && code != UNEQ && code != LTGT
-		  && code != UNGT && code != UNLT));
-
   /* These are invalid; the information is not there.  */
   gcc_assert (mode != CCEQmode || code == EQ || code == NE);
 }