diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4367373f87c..812d9cc1c84 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  1 02:12:33 1998  Robert Lipe  <robertl@dgii.com>
+
+	* i386.c (asm_output_function_prefix): Make 686 function
+	prologues not issue .types for non-global lables.
+
 Tue Jun 30 23:46:53 1998  Dmitrij Tejblum <tejblum@arc.hq.cti.ru>
 
 	* i386/freebsd.h (WCHAR_TYPE): Chagne to an "int".
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index cd37f54fc37..336bb675cb6 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -1914,9 +1914,16 @@ asm_output_function_prefix (file, name)
 
       prologue_node = make_node (FUNCTION_DECL);
       DECL_RESULT (prologue_node) = 0;
-#ifdef ASM_DECLARE_FUNCTION_NAME
-      ASM_DECLARE_FUNCTION_NAME (file, pic_label_name, prologue_node);
-#endif
+
+      /* This used to call ASM_DECLARE_FUNCTION_NAME() but since it's an
+	 internal (non-global) label that's being emitted, it didn't make
+	 sense to have .type information for local labels.   This caused
+	 the SCO OpenServer 5.0.4 ELF assembler grief (why are you giving
+  	 me debug info for a label that you're declaring non-global?) this
+	 was changed to call ASM_OUTPUT_LABEL() instead. */
+
+
+      ASM_OUTPUT_LABEL (file, pic_label_name); 
       output_asm_insn ("movl (%1),%0", xops);
       output_asm_insn ("ret", xops);
     }