diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6fc6b3996f8..2ce31e7d208 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-17  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* config/h8300/h8300.md (cmpqi): Remove mode from compare.
+	(cmphi): Likewise.
+	(*cmphi_h8300): Likewise.
+	(*cmphi_h8300hs): Likewise.
+	(cmpsi): Likewise.
+	(7 peephole2): Likewise.
+
 Sun Feb 16 23:07:52 CET 2003  Jan Hubicka  <jh@suse.cz>
 
 	* c-typeck.c (build_c_cast):  Fold constant variables into
diff --git a/gcc/config/h8300/h8300.md b/gcc/config/h8300/h8300.md
index 7144b6e587f..8bcba0ee0bc 100644
--- a/gcc/config/h8300/h8300.md
+++ b/gcc/config/h8300/h8300.md
@@ -703,8 +703,8 @@
 
 (define_insn "cmpqi"
   [(set (cc0)
-	(compare:QI (match_operand:QI 0 "register_operand" "r")
-		    (match_operand:QI 1 "nonmemory_operand" "rn")))]
+	(compare (match_operand:QI 0 "register_operand" "r")
+		 (match_operand:QI 1 "nonmemory_operand" "rn")))]
   ""
   "cmp.b	%X1,%X0"
   [(set_attr "length" "2")
@@ -712,8 +712,8 @@
 
 (define_expand "cmphi"
   [(set (cc0)
-	(compare:HI (match_operand:HI 0 "register_operand" "")
-		    (match_operand:HI 1 "nonmemory_operand" "")))]
+	(compare (match_operand:HI 0 "register_operand" "")
+		 (match_operand:HI 1 "nonmemory_operand" "")))]
   ""
   "
 {
@@ -723,19 +723,19 @@
     operands[1] = force_reg (HImode, operands[1]);
 }")
 
-(define_insn ""
+(define_insn "*cmphi_h8300"
   [(set (cc0)
-	(compare:HI (match_operand:HI 0 "register_operand" "r")
-		    (match_operand:HI 1 "register_operand" "r")))]
+	(compare (match_operand:HI 0 "register_operand" "r")
+		 (match_operand:HI 1 "register_operand" "r")))]
   "TARGET_H8300"
   "cmp.w	%T1,%T0"
   [(set_attr "length" "2")
    (set_attr "cc" "compare")])
 
-(define_insn ""
+(define_insn "*cmphi_h8300hs"
   [(set (cc0)
-	(compare:HI (match_operand:HI 0 "register_operand" "r,r")
-		    (match_operand:HI 1 "nonmemory_operand" "r,n")))]
+	(compare (match_operand:HI 0 "register_operand" "r,r")
+		 (match_operand:HI 1 "nonmemory_operand" "r,n")))]
   "TARGET_H8300H || TARGET_H8300S"
   "cmp.w	%T1,%T0"
   [(set_attr "length" "2,4")
@@ -743,8 +743,8 @@
 
 (define_insn "cmpsi"
   [(set (cc0)
-	(compare:SI (match_operand:SI 0 "register_operand" "r,r")
-		    (match_operand:SI 1 "nonmemory_operand" "r,i")))]
+	(compare (match_operand:SI 0 "register_operand" "r,r")
+		 (match_operand:SI 1 "nonmemory_operand" "r,i")))]
   "TARGET_H8300H || TARGET_H8300S"
   "cmp.l	%S1,%S0"
   [(set_attr "length" "2,6")
@@ -3446,7 +3446,7 @@
 		      (pc)))]
   "")
 
-;; (compare:SI (reg) (const_int)) takes 6 bytes, so we try to achieve
+;; (compare (reg:SI) (const_int)) takes 6 bytes, so we try to achieve
 ;; the equivalent with shorter sequences.  Here is the summary.
 ;;
 ;; reg  const_int                 use     insn
@@ -3481,8 +3481,8 @@
 
 (define_peephole2
   [(set (cc0)
-	(compare:HI (match_operand:HI 0 "register_operand" "")
-		    (match_operand:HI 1 "const_int_le_2_operand" "")))
+	(compare (match_operand:HI 0 "register_operand" "")
+		 (match_operand:HI 1 "const_int_le_2_operand" "")))
    (set (pc)
 	(if_then_else (match_operator 3 "eqne_operator"
 			[(cc0) (const_int 0)])
@@ -3503,8 +3503,8 @@
 
 (define_peephole2
   [(set (cc0)
-	(compare:SI (match_operand:SI 0 "register_operand" "")
-		    (match_operand:SI 1 "const_int_le_6_operand" "")))
+	(compare (match_operand:SI 0 "register_operand" "")
+		 (match_operand:SI 1 "const_int_le_6_operand" "")))
    (set (pc)
 	(if_then_else (match_operator 3 "eqne_operator"
 			[(cc0) (const_int 0)])
@@ -3527,8 +3527,8 @@
 
 (define_peephole2
   [(set (cc0)
-	(compare:SI (match_operand:SI 0 "register_operand" "")
-		    (match_operand:SI 1 "const_int_operand" "")))
+	(compare (match_operand:SI 0 "register_operand" "")
+		 (match_operand:SI 1 "const_int_operand" "")))
    (set (pc)
 	(if_then_else (match_operator 3 "eqne_operator"
 			[(cc0) (const_int 0)])
@@ -3557,8 +3557,8 @@
 
 (define_peephole2
   [(set (cc0)
-	(compare:SI (match_operand:SI 0 "register_operand" "")
-		    (match_operand:SI 1 "const_int_operand" "")))
+	(compare (match_operand:SI 0 "register_operand" "")
+		 (match_operand:SI 1 "const_int_operand" "")))
    (set (pc)
 	(if_then_else (match_operator 2 "gtuleu_operator"
 			[(cc0) (const_int 0)])
@@ -3592,8 +3592,8 @@
 
 (define_peephole2
   [(set (cc0)
-	(compare:HI (match_operand:HI 0 "register_operand" "")
-		    (const_int 255)))
+	(compare (match_operand:HI 0 "register_operand" "")
+		 (const_int 255)))
    (set (pc)
 	(if_then_else (match_operator 1 "gtuleu_operator"
 			[(cc0) (const_int 0)])
@@ -3615,8 +3615,8 @@
 
 (define_peephole2
   [(set (cc0)
-	(compare:SI (match_operand:SI 0 "register_operand" "")
-		    (const_int 65535)))
+	(compare (match_operand:SI 0 "register_operand" "")
+		 (const_int 65535)))
    (set (pc)
 	(if_then_else (match_operator 1 "gtuleu_operator"
 			[(cc0) (const_int 0)])
@@ -3642,8 +3642,8 @@
 (define_peephole2
   [(match_scratch:SI 4 "r")
    (set (cc0)
-	(compare:SI (match_operand:SI 0 "register_operand" "")
-		    (match_operand:SI 1 "incdec_operand" "")))
+	(compare (match_operand:SI 0 "register_operand" "")
+		 (match_operand:SI 1 "incdec_operand" "")))
    (set (pc)
 	(if_then_else (match_operator 3 "eqne_operator"
 			[(cc0) (const_int 0)])