diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d930f45fb46..fbe10900b32 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-22  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/s390/s390.md ("*movdi_64"): Fix op_type attribute.
+	("*movdf_64"): Likewise.
+	("*lshrdi3_64"): Likewise.
+	("blockage"): Add length attribute.
+	("lit"): Likewise.
+
 Tue Oct 22 23:51:34 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
 	* i386.md: FIx typo.
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index e998c4de763..d6a1dc52ec8 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -921,7 +921,7 @@
    ld\\t%0,%1
    std\\t%1,%0
    mvc\\t%O0(8,%R0),%1"
-  [(set_attr "op_type" "RR,RXE,RXE,RR,RX,RX,SS")
+  [(set_attr "op_type" "RRE,RXE,RXE,RR,RX,RX,SS")
    (set_attr "atype"   "reg,mem,mem,reg,mem,mem,mem")])
 
 (define_insn "*movdi_31"
@@ -1197,7 +1197,7 @@
    lg\\t%0,%1
    stg\\t%1,%0
    mvc\\t%O0(8,%R0),%1"
-  [(set_attr "op_type" "RR,RX,RX,RR,RXE,RXE,SS")
+  [(set_attr "op_type" "RR,RX,RX,RRE,RXE,RXE,SS")
    (set_attr "atype"   "reg,mem,mem,reg,mem,mem,mem")])
 
 (define_insn "*movdf_31"
@@ -5514,7 +5514,7 @@
   "@
    srlg\\t%0,%1,%c2
    srlg\\t%0,%1,0(%2)"
-  [(set_attr "op_type"  "RS,RS")])
+  [(set_attr "op_type"  "RSE,RSE")])
 
 ;
 ; lshrsi3 instruction pattern(s).
@@ -6160,7 +6160,8 @@
   [(unspec_volatile [(const_int 0)] 0)]
   ""
   ""
-  [(set_attr "type"    "none")])
+  [(set_attr "type"    "none")
+   (set_attr "length"  "0")])
 
 
 
@@ -6784,6 +6785,7 @@
    return \"\";
 }"
   [(set_attr "op_type" "NN")
+   (set_attr "length"  "6")
    (set_attr "type"    "integer")])