s390.md (cpu_facility): Add cpu_zarch.

2013-06-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* config/s390/s390.md (cpu_facility): Add cpu_zarch.
	("*movmem_short", "*clrmem_short", "*cmpmem_short): Use cpu_zarch
	for last alternative in the cpu_facility attribute.

From-SVN: r199819

gcc/ChangeLog

+2013-06-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/s390/s390.md (cpu_facility): Add cpu_zarch.
+	("*movmem_short", "*clrmem_short", "*cmpmem_short): Use cpu_zarch
+	for last alternative in the cpu_facility attribute.
+
 2013-06-07  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	PR target/56315

gcc/config/s390/s390.md

@@ -277,7 +277,8 @@
 (define_attr "cpu" "g5,g6,z900,z990,z9_109,z9_ec,z10,z196,zEC12"
   (const (symbol_ref "s390_tune_attr")))
 
-(define_attr "cpu_facility" "standard,ieee,zarch,longdisp,extimm,dfp,z10,z196,zEC12"
+(define_attr "cpu_facility"
+  "standard,ieee,zarch,cpu_zarch,longdisp,extimm,dfp,z10,z196,zEC12"
   (const_string "standard"))
 
 (define_attr "enabled" ""
@@ -304,6 +305,10 @@
 	      (match_test "TARGET_DFP"))
 	 (const_int 1)
 
+         (and (eq_attr "cpu_facility" "cpu_zarch")
+              (match_test "TARGET_CPU_ZARCH"))
+	 (const_int 1)
+
          (and (eq_attr "cpu_facility" "z10")
               (match_test "TARGET_Z10"))
 	 (const_int 1)
@@ -2690,7 +2695,7 @@
   "(GET_MODE (operands[2]) == Pmode || GET_MODE (operands[2]) == VOIDmode)"
   "#"
   [(set_attr "type"         "cs")
-   (set_attr "cpu_facility" "*,*,z10,zarch")])
+   (set_attr "cpu_facility" "*,*,z10,cpu_zarch")])
 
 (define_split
   [(set (match_operand:BLK 0 "memory_operand" "")
@@ -2899,7 +2904,7 @@
   "(GET_MODE (operands[1]) == Pmode || GET_MODE (operands[1]) == VOIDmode)"
   "#"
   [(set_attr "type" "cs")
-   (set_attr "cpu_facility" "*,*,z10,zarch")])
+   (set_attr "cpu_facility" "*,*,z10,cpu_zarch")])
 
 (define_split
   [(set (match_operand:BLK 0 "memory_operand" "")
@@ -3075,7 +3080,7 @@
   "(GET_MODE (operands[2]) == Pmode || GET_MODE (operands[2]) == VOIDmode)"
   "#"
   [(set_attr "type" "cs")
-   (set_attr "cpu_facility" "*,*,z10,zarch")])
+   (set_attr "cpu_facility" "*,*,z10,cpu_zarch")])
 
 (define_split
   [(set (reg:CCU CC_REGNUM)