diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7905fa34d51..86344e93006 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Eric Christopher  <echristo@redhat.com>
+
+	* diagnostic.c (output_format): Fix thinko.
+
 Thu Jun 13 22:34:33 2002  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* config/sh/coff.h (HAS_INIT_SECTION, INVOKE__MAIN): Don't define.
@@ -63,7 +67,7 @@ Thu Jun 13 18:18:17 CEST 2002  Jan Hubicka  <jh@suse.cz>
 2002-06-13  Gabriel Dos Reis  <gdr@codesourcery.com>
 
 	* tree-inline.c (expand_call_inline): Don' mess with _DECL
-	fields. 
+	fields.
 
 2002-06-13  Gabriel Dos Reis  <gdr@codesourcery.com>
 
@@ -121,6 +125,12 @@ Thu Jun 13 18:18:17 CEST 2002  Jan Hubicka  <jh@suse.cz>
 	(_cpp_create_trad_definition): scan_out_logical_line now sets
 	the output current position.
 
+2002-06-12  Eric Christopher  <echristo@redhat.com>
+
+	* config/mips/mips.md (prefetch, prefetch_di, prefetch_si): New
+	patterns.
+	* config/mips/mips.h (RTX_COSTS): Fix formatting.
+
 2002-06-12  Eric Christopher  <echristo@redhat.com>
 
 	From Chris Demetriou  <cgd@broadcom.com>
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 3132a3d6106..db051030d7e 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -584,7 +584,7 @@ output_format (buffer, text)
             output_add_string (buffer, "file '");
             output_add_string (buffer, locus->file);
             output_add_string (buffer, "', line ");
-            output_decimal (buffer, locus->file);
+            output_decimal (buffer, locus->line);
           }
           break;
 
@@ -892,7 +892,7 @@ diagnostic_count_diagnostic (context, kind)
     default:
       abort();
       break;
-      
+
     case DK_FATAL: case DK_ICE: case DK_SORRY:
     case DK_ANACHRONISM: case DK_NOTE:
       ++diagnostic_kind_count (context, kind);