diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e299f31c691..8c2ce0453ca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,18 @@
+Thu Dec 18 17:05:10 1997  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+ 
+        * mips.c (fatal): Remove declaration.
+
+1997-12-18  Mark Mitchell  <mmitchell@usa.net>
+
+	* integrate.c (get_label_from_map): New function.
+	(expand_inline_function): Use it.  Initialize the label_map to
+	NULL_RTX instead of gen_label_rtx.
+	(copy_rtx_and_substitute): Use get_label_from_map.
+	* integrate.h (get_label_from_map): New function.
+	(set_label_from_map): New macro.
+	* unroll.c (unroll_loop): Use them.
+	(copy_loop_body): Ditto.
+
 Thu Dec 18 19:19:57 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mips/mips.h (INIT_SUBTARGET_OPTABS): Define if not defined.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 78639d46bf7..6e01a92df50 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -79,7 +79,6 @@ extern char  *mktemp ();
 extern rtx    adj_offsettable_operand ();
 extern rtx    copy_to_reg ();
 extern void   error ();
-extern void   fatal ();
 extern tree   lookup_name ();
 extern void   pfatal_with_name ();
 extern void   warning ();