diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 47c6ca9333a..25fa8e1f061 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-20  Bob Wilson  <bob.wilson@acm.org>
+
+	* config/xtensa/xtensa.md: Remove unused type attributes.
+	(adddi_carry, subddi_carry): Change type attribute to "multi".
+
 2002-03-19 Dale Johannesen  <dalej@apple.com>
 
 	PR optimization/5999, middle-end/5731
diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
index abf8307f8bb..e261b77effe 100644
--- a/gcc/config/xtensa/xtensa.md
+++ b/gcc/config/xtensa/xtensa.md
@@ -46,7 +46,7 @@
 ;;
 
 (define_attr "type"
-  "unknown,branch,jump,call,load,store,move,arith,multi,nop,misc,farith,fmadd,fdiv,fsqrt,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,udef_move,udef_loadi,udef_storei,udef_loadiu,udef_storeiu,udef_conv,udef_conv_loadiu,udef_conv_storeiu" 
+  "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fdiv,fsqrt,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr"
   (const_string "unknown"))
 
 (define_attr "mode"
@@ -122,7 +122,7 @@
 		 (match_dup 0)))]
   ""
   "bgeu\\t%1, %2, 0f\;addi\\t%0, %0, 1\;0:"
-  [(set_attr "type"	"arith")
+  [(set_attr "type"	"multi")
    (set_attr "mode"	"SI")
    (set_attr "length"	"6")])
 
@@ -221,7 +221,7 @@
 			  (match_operand:SI 2 "register_operand" "r"))))]
   ""
   "bgeu\\t%1, %2, 0f\;addi\\t%0, %0, -1\;0:"
-  [(set_attr "type"	"arith")
+  [(set_attr "type"	"multi")
    (set_attr "mode"	"SI")
    (set_attr "length"	"6")])