From 1f2cd13074d447dbfb251208fbfa2f661de94cab Mon Sep 17 00:00:00 2001
From: Kelley Cook <kelleycook@wideopenwest.com>
Date: Fri, 13 Jun 2003 23:18:50 +0000
Subject: [PATCH] bsd.h: Remove ASM_FILE_START.

* config/i386/bsd.h: Remove ASM_FILE_START.
* config/i386/djgpp.h: Likewise.
* config/i386/gas.h (ASM_FILE_START): Output .file before .intel_syntax.

* config/i386/djgpp.h: Move included unix.h, bsd.h, gas.h to ...
* config.gcc (i[34567]86-pc-msdosdjgpp): ... here.

From-SVN: r67919
---
 gcc/ChangeLog           |  9 +++++++++
 gcc/config/i386/bsd.h   |  7 -------
 gcc/config/i386/djgpp.h | 15 ---------------
 gcc/config/i386/gas.h   |  2 +-
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f0db24ab8be..b117b9d8684 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-13  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* config/i386/bsd.h: Remove ASM_FILE_START.
+	* config/i386/djgpp.h: Likewise.
+	* config/i386/gas.h (ASM_FILE_START): Output .file before .intel_syntax. 
+
+	* config/i386/djgpp.h: Move included unix.h, bsd.h, gas.h to ...
+	* config.gcc (i[34567]86-pc-msdosdjgpp): ... here.
+
 2003-06-13  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR bootstrap/10835
diff --git a/gcc/config/i386/bsd.h b/gcc/config/i386/bsd.h
index 0089d8483c7..41cb6677552 100644
--- a/gcc/config/i386/bsd.h
+++ b/gcc/config/i386/bsd.h
@@ -36,13 +36,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_LONG "\t.long\t"
 #define ASM_QUAD "\t.quad\t"  /* Should not be used for 32bit compilation.  */
 
-/* Output at beginning of assembler file.
-   ??? I am skeptical of this -- RMS.  */
-
-#define ASM_FILE_START(FILE) \
-  do {	output_file_directive (FILE, main_input_filename);	\
-  } while (0)
-
 /* This was suggested, but it shouldn't be right for DBX output. -- RMS
    #define ASM_OUTPUT_SOURCE_FILENAME(FILE, NAME) */
 
diff --git a/gcc/config/i386/djgpp.h b/gcc/config/i386/djgpp.h
index 00443969e69..d2fcd6fce42 100644
--- a/gcc/config/i386/djgpp.h
+++ b/gcc/config/i386/djgpp.h
@@ -30,10 +30,6 @@ Boston, MA 02111-1307, USA.  */
 /* Enable parsing of #pragma pack(push,<n>) and #pragma pack(pop).  */
 #define HANDLE_PRAGMA_PACK_PUSH_POP 1
 
-#include "i386/unix.h"
-#include "i386/bsd.h"
-#include "i386/gas.h"
-
 /* If defined, a C expression whose value is a string containing the
    assembler operation to identify the following data as
    uninitialized global data.  If not defined, and neither
@@ -130,17 +126,6 @@ Boston, MA 02111-1307, USA.  */
 /* Switch into a generic section.  */
 #define TARGET_ASM_NAMED_SECTION  default_coff_asm_named_section
 
-/* Output at beginning of assembler file.  */
-/* The .file command should always begin the output.  */
-
-#undef ASM_FILE_START
-#define ASM_FILE_START(FILE)						\
-  do {									\
-	if (ix86_asm_dialect == ASM_INTEL)				\
-	  fputs ("\t.intel_syntax\n", FILE);				\
-	output_file_directive (FILE, main_input_filename);		\
-  } while (0)
-
 /* This is how to output an assembler line
    that says to advance the location counter
    to a multiple of 2**LOG bytes.  */
diff --git a/gcc/config/i386/gas.h b/gcc/config/i386/gas.h
index 075d7498f3e..6dec86e08a4 100644
--- a/gcc/config/i386/gas.h
+++ b/gcc/config/i386/gas.h
@@ -126,7 +126,7 @@ Boston, MA 02111-1307, USA.  */
 #undef ASM_FILE_START
 #define ASM_FILE_START(FILE)						\
   do {									\
+        output_file_directive (FILE, main_input_filename);		\
 	if (ix86_asm_dialect == ASM_INTEL)				\
 	  fputs ("\t.intel_syntax\n", FILE);				\
-        output_file_directive (FILE, main_input_filename);		\
   } while (0)