1 files changed, 7 insertions, 101 deletions
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 8c37087..b6ec023 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -135,7 +135,9 @@
 
 
 ;; Processor type.  This attribute must exactly match the processor_type
-;; enumeration in s390.h.
+;; enumeration in s390.h.  The current machine description does not
+;; distinguish between g5 and g6, but there are differences between the two
+;; CPUs could in theory be modeled.
 
 (define_attr "cpu" "g5,g6,z900,z990"
   (const (symbol_ref "s390_tune")))
@@ -182,107 +184,11 @@
          (eq_attr "op_type" "SIY") (const_string "agen")]
   (const_string "reg")))
 
-;; Generic pipeline function unit.
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "none") 0 0)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "integer") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fsimpd") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fsimps") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "load") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "floadd") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "floads") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "la") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "larl") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "lr") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "branch") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "store") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fstored") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fstores") 1 1)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "lm") 2 2)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "stm") 2 2)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "cs") 5 5)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "vs") 30 30)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "jsr") 5 5)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "imul") 7 7)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fmuld") 6 6)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fmuls") 6 6)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "idiv") 33 33)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fdivd") 33 33)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fdivs") 33 33)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fsqrtd") 30 30)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "fsqrts") 30 30)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "ftoi") 2 2)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "itof") 2 2)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "o2") 2 2)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "o3") 3 3)
-
-(define_function_unit "integer" 1 0
-  (eq_attr "type" "other") 5 5)
-
-;; Pipeline description for z900
-
+;; Pipeline description for z900.  For lack of anything better,
+;; this description is also used for the g5 and g6.
 (include "2064.md")
+
+;; Pipeline description for z990. 
 (include "2084.md")
 
 ;; Length in bytes.