rs6000_cbranch_operator now is just comparison_operator, so just use
that directly.
2017-06-06 Segher Boessenkool <seg...@kernel.crashing.org>
* config/rs6000/predicated.md (rs6000_cbranch_operator): Delete.
* config/rs6000/rs6000.md: Replace rs6000_cbranch_operator by
comparison_operator.
---
gcc/config/rs6000/predicates.md | 4 ----
gcc/config/rs6000/rs6000.md | 8 ++++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index dd961a7..11aecbd 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -1238,10 +1238,6 @@ (define_predicate "branch_comparison_operator"
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
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -11430,7 +11430,7 @@ (define_insn "probe_stack_range<P:mode>"
;; 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"
}")
(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_unsigned_imm"
})
(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"
})
(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"))]
--
1.9.3
