diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a2c5bee1c9c..88e427371b7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,11 @@
-Tue Sep  8 23:46:04 1998  Hans-Peter Nilsson  <hp@axis.se>
+Wed Nov  4 23:43:08 1998  Graham  <grahams@rcp.co.uk>
+
+        * toplev.c (output_lang_identify): Make definition dependent on
+	ASM_IDENTIFY_LANGUAGE.
+
+        * print-rtl.c (spaces): Make static.
+
+Wed Nov  4 22:16:36 1998  Hans-Peter Nilsson  <hp@axis.se>
 
 	* extend.texi: Clarify proper uses for register clobbers in asms.
 
diff --git a/gcc/toplev.c b/gcc/toplev.c
index c17be4dabd8..c79c4dff12a 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -197,7 +197,9 @@ static void vsorry PROTO((char *, va_list));
 static void v_really_sorry PROTO((char *, va_list)) ATTRIBUTE_NORETURN;
 static void float_signal PROTO((int)) ATTRIBUTE_NORETURN;
 static void pipe_closed PROTO((int)) ATTRIBUTE_NORETURN;
+#ifdef ASM_IDENTIFY_LANGUAGE
 static void output_lang_identify PROTO((FILE *));
+#endif
 static void open_dump_file PROTO((char *, char *));
 static void close_dump_file PROTO((void (*) (FILE *, rtx), rtx));
 static void dump_rtl PROTO((char *, tree, void (*) (FILE *, rtx), rtx));
@@ -2427,8 +2429,8 @@ output_file_directive (asm_file, input_name)
 #endif
 }
 
+#ifdef ASM_IDENTIFY_LANGUAGE
 /* Routine to build language identifier for object file.  */
-
 static void
 output_lang_identify (asm_out_file)
      FILE *asm_out_file;
@@ -2438,6 +2440,7 @@ output_lang_identify (asm_out_file)
   sprintf (s, "__gnu_compiled_%s", lang_identify ());
   ASM_OUTPUT_LABEL (asm_out_file, s);
 }
+#endif
 
 /* Routine to open a dump file.  */
 static void