--- a/gcc/config/s390/2084.md	Sun Aug 21 07:07:55 2011 +0900
+++ b/gcc/config/s390/2084.md	Fri Oct 27 22:46:09 2017 +0900
@@ -1,6 +1,5 @@
 ;; Scheduling description for z990 (cpu 2084).
-;;   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010
-;;   Free Software Foundation, Inc.
+;;   Copyright (C) 2003-2017 Free Software Foundation, Inc.
 ;;   Contributed by Hartmut Penner (hpenner@de.ibm.com) and
 ;;                  Ulrich Weigand (uweigand@de.ibm.com).
 
@@ -62,69 +61,69 @@
 ;;
 
 (define_insn_reservation "x_int" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (and (eq_attr "type" "integer")
             (eq_attr "atype" "reg")))
   "x-e1-st,x-wr-st")
 
 (define_insn_reservation "x_agen" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (and (eq_attr "type" "integer")
             (eq_attr "atype" "agen")))
   "x-e1-st,x-wr-st")
 
 (define_insn_reservation "x_lr" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "lr"))
   "x-e1-st,x-wr-st")
 
 (define_insn_reservation "x_la" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "la"))
   "x-e1-st,x-wr-st")
 
 (define_insn_reservation "x_larl" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "larl"))
   "x-e1-st,x-wr-st")
 
 (define_insn_reservation "x_load" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "load"))
   "x-e1-st+x-mem,x-wr-st")
 
 (define_insn_reservation "x_store" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "store"))
   "x-e1-st+x_store_tok,x-wr-st")
 
 (define_insn_reservation "x_branch" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "branch"))
   "x_e1_r,x_wr_r")
 
 (define_insn_reservation "x_call" 5
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "jsr"))
   "x-e1-np*5,x-wr-np")
 
 (define_insn_reservation "x_mul_hi" 2
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "imulhi"))
   "x-e1-np*2,x-wr-np")
 
 (define_insn_reservation "x_mul_sidi" 4
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "imulsi,imuldi"))
   "x-e1-np*4,x-wr-np")
 
 (define_insn_reservation "x_div" 10
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "idiv"))
   "x-e1-np*10,x-wr-np")
 
 (define_insn_reservation "x_sem" 17
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "sem"))
   "x-e1-np+x-mem,x-e1-np*16,x-wr-st")
 
@@ -133,27 +132,27 @@
 ;;
 
 (define_insn_reservation "x_cs" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "cs"))
   "x-e1-np,x-wr-np")
 
 (define_insn_reservation "x_vs" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "vs"))
   "x-e1-np*10,x-wr-np")
 
 (define_insn_reservation "x_stm" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "stm"))
   "(x-e1-np+x_store_tok)*10,x-wr-np")
 
 (define_insn_reservation "x_lm" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "lm"))
   "x-e1-np*10,x-wr-np")
 
 (define_insn_reservation "x_other" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "other"))
   "x-e1-np,x-wr-np")
 
@@ -162,88 +161,88 @@
 ;;
 
 (define_insn_reservation "x_fsimptf" 7
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fsimptf,fhex"))
   "x_e1_t*2,x-wr-fp")
 
 (define_insn_reservation "x_fsimpdf" 6
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fsimpdf,fmuldf,fmadddf,fhex"))
   "x_e1_t,x-wr-fp")
 
 (define_insn_reservation "x_fsimpsf" 6
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fsimpsf,fmulsf,fmaddsf,fhex"))
   "x_e1_t,x-wr-fp")
 
 
 (define_insn_reservation "x_fmultf" 33
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fmultf"))
   "x_e1_t*27,x-wr-fp")
 
 
 (define_insn_reservation "x_fdivtf" 82
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fdivtf,fsqrttf"))
   "x_e1_t*76,x-wr-fp")
 
 (define_insn_reservation "x_fdivdf" 36
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fdivdf,fsqrtdf"))
   "x_e1_t*30,x-wr-fp")
 
 (define_insn_reservation "x_fdivsf" 36
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fdivsf,fsqrtsf"))
   "x_e1_t*30,x-wr-fp")
 
 
 (define_insn_reservation "x_floadtf" 6
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "floadtf"))
   "x_e1_t,x-wr-fp")
 
 (define_insn_reservation "x_floaddf" 6
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "floaddf"))
   "x_e1_t,x-wr-fp")
 
 (define_insn_reservation "x_floadsf" 6
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "floadsf"))
   "x_e1_t,x-wr-fp")
 
 
 (define_insn_reservation "x_fstoredf" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fstoredf"))
   "x_e1_t,x-wr-fp")
 
 (define_insn_reservation "x_fstoresf" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "fstoresf"))
   "x_e1_t,x-wr-fp")
 
 
 (define_insn_reservation "x_ftrunctf" 16
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "ftrunctf"))
   "x_e1_t*10,x-wr-fp")
 
 (define_insn_reservation "x_ftruncdf" 11
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "ftruncdf"))
   "x_e1_t*5,x-wr-fp")
 
 
 (define_insn_reservation "x_ftoi" 1
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "ftoi"))
   "x_e1_t*3,x-wr-fp")
 
 (define_insn_reservation "x_itof" 7
-  (and (eq_attr "cpu" "z990,z9_109")
+  (and (eq_attr "cpu" "z990,z9_109,z9_ec")
        (eq_attr "type" "itoftf,itofdf,itofsf"))
   "x_e1_t*3,x-wr-fp")