diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9f64f5683b..0ee9124f193 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 28 14:46:58 MET DST 2000  Jan Hubicka  <jh@suse.cz>
+
+	* i386.md (prologue_set_got): Set length_immediate field.
+	(testqi_ccno_1):  Add missing '@' character.
+
 2000-06-27  Jason Merrill  <jason@redhat.com>
 
 	* dwarf2out.c (expand_builtin_init_dwarf_reg_sizes): Use
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index f0846450294..3a5143f23f5 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -4806,7 +4806,8 @@
 			      (match_operand:QI 1 "nonmemory_operand" "n,n,qn,n"))
 		      (const_int 0)))]
   ""
-  "test{b}\\t{%1, %0|%0, %1} 
+  "@
+   test{b}\\t{%1, %0|%0, %1} 
    test{b}\\t{%1, %0|%0, %1} 
    test{b}\\t{%1, %0|%0, %1} 
    test{l}\\t{%1, %0|%0, %1}"
@@ -8452,6 +8453,9 @@
     return \"add{l}\\t{%1+[.-%X2], %0|%0, %a1+(.-%X2)}\";
 }"
   [(set_attr "type" "alu")
+   ; Since this insn may have two constant operands, we must set the
+   ; length manually.
+   (set_attr "length_immediate" "4")
    (set_attr "mode" "SI")])
 
 (define_insn "prologue_get_pc"