rs6000: Remove reg_or_none500mem_operand

	* config/rs6000/predicates.md (reg_or_mem_operand): Reformat.
	(reg_or_none500mem_operand): Delete.
	* config/rs6000/rs6000.md (extendsfdf2): Use reg_or_mem_operand
	instead of reg_or_none500mem_operand.

From-SVN: r248982

gcc/ChangeLog

 2017-06-07  Segher Boessenkool  <segher@kernel.crashing.org>
 
+	* config/rs6000/predicates.md (reg_or_mem_operand): Reformat.
+	(reg_or_none500mem_operand): Delete.
+	* config/rs6000/rs6000.md (extendsfdf2): Use reg_or_mem_operand
+	instead of reg_or_none500mem_operand.
+
+2017-06-07  Segher Boessenkool  <segher@kernel.crashing.org>
+
 	* config/rs6000/rs6000.c (rs6000_option_override_internal): Delete
 	handling of SPE flags.
 	* config/rs6000/rs6000.opt (-mspe, -mspe=no, -mspe=yes): Delete.

gcc/config/rs6000/predicates.md

@@ -970,19 +970,11 @@
 
 ;; Return 1 if the operand is a general non-special register or memory operand.
 (define_predicate "reg_or_mem_operand"
-     (ior (match_operand 0 "memory_operand")
-	  (ior (and (match_code "mem")
-		    (match_test "macho_lo_sum_memory_operand (op, mode)"))
-	       (ior (match_operand 0 "volatile_mem_operand")
-		    (match_operand 0 "gpc_reg_operand")))))
-
-;; Return 1 if the operand is either an easy FP constant or memory or reg.
-(define_predicate "reg_or_none500mem_operand"
-  (if_then_else (match_code "mem")
-     (ior (match_operand 0 "memory_operand")
-	  (match_test "macho_lo_sum_memory_operand (op, mode)")
-	  (match_operand 0 "volatile_mem_operand"))
-     (match_operand 0 "gpc_reg_operand")))
+  (ior (match_operand 0 "memory_operand")
+       (and (match_code "mem")
+	    (match_test "macho_lo_sum_memory_operand (op, mode)"))
+       (match_operand 0 "volatile_mem_operand")
+       (match_operand 0 "gpc_reg_operand")))
 
 ;; Return 1 if the operand is CONST_DOUBLE 0, register or memory operand.
 (define_predicate "zero_reg_mem_operand"

gcc/config/rs6000/rs6000.md

@@ -4638,7 +4638,7 @@
 ;; Floating point conversions
 (define_expand "extendsfdf2"
   [(set (match_operand:DF 0 "gpc_reg_operand")
-	(float_extend:DF (match_operand:SF 1 "reg_or_none500mem_operand")))]
+	(float_extend:DF (match_operand:SF 1 "reg_or_mem_operand")))]
   "TARGET_HARD_FLOAT && TARGET_DOUBLE_FLOAT"
 {
   if (HONOR_SNANS (SFmode))