rs6000: Remove rs6000_cbranch_operator

rs6000_cbranch_operator now is just comparison_operator, so just use
that directly.

	* config/rs6000/predicated.md (rs6000_cbranch_operator): Delete.
	* config/rs6000/rs6000.md: Replace rs6000_cbranch_operator by
	comparison_operator.

From-SVN: r248977

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01c5e4c..bce2601 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2017-06-07  Segher Boessenkool  <segher@kernel.crashing.org>
 
+       * config/rs6000/predicated.md (rs6000_cbranch_operator): Delete.
+       * config/rs6000/rs6000.md: Replace rs6000_cbranch_operator by
+       comparison_operator.
+
+2017-06-07  Segher Boessenkool  <segher@kernel.crashing.org>
+
        * config/rs6000/rs6000.c: Remove everything related to -mfloat-gprs.
        * config/rs6000/rs6000.opt: Ditto.
        * config/rs6000/t-rtems: Ditto.

diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index dd961a7..11aecbd 100644 (file)
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -1238,10 +1238,6 @@
                                                   GET_MODE (XEXP (op, 0))),
                          1"))))
 
-;; Return 1 if OP is a valid comparison operator for "cbranch" instructions.
-(define_predicate "rs6000_cbranch_operator"
-  (match_operand 0 "comparison_operator"))
-
 ;; Return 1 if OP is an unsigned comparison operator.
 (define_predicate "unsigned_comparison_operator"
   (match_code "ltu,gtu,leu,geu"))

diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index efca26c..108ad8f 100644 (file)
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -11430,7 +11430,7 @@
 ;; insns, and branches.
 
 (define_expand "cbranch<mode>4"
-  [(use (match_operator 0 "rs6000_cbranch_operator"
+  [(use (match_operator 0 "comparison_operator"
          [(match_operand:GPR 1 "gpc_reg_operand" "")
           (match_operand:GPR 2 "reg_or_short_operand" "")]))
    (use (match_operand 3 ""))]
@@ -11453,7 +11453,7 @@
 }")
 
 (define_expand "cbranch<mode>4"
-  [(use (match_operator 0 "rs6000_cbranch_operator"
+  [(use (match_operator 0 "comparison_operator"
          [(match_operand:FP 1 "gpc_reg_operand" "")
           (match_operand:FP 2 "gpc_reg_operand" "")]))
    (use (match_operand 3 ""))]
@@ -11683,7 +11683,7 @@
 })
 
 (define_expand "cstore<mode>4"
-  [(use (match_operator 1 "rs6000_cbranch_operator"
+  [(use (match_operator 1 "comparison_operator"
          [(match_operand:GPR 2 "gpc_reg_operand")
           (match_operand:GPR 3 "reg_or_short_operand")]))
    (clobber (match_operand:GPR 0 "gpc_reg_operand"))]
@@ -11746,7 +11746,7 @@
 })
 
 (define_expand "cstore<mode>4"
-  [(use (match_operator 1 "rs6000_cbranch_operator"
+  [(use (match_operator 1 "comparison_operator"
          [(match_operand:FP 2 "gpc_reg_operand")
           (match_operand:FP 3 "gpc_reg_operand")]))
    (clobber (match_operand:SI 0 "gpc_reg_operand"))]