2002-04-02 David O'Brien <obrien@FreeBSD.org>

	* config.gcc (i386-dg-dgux, i386-go32-msdos , i386-go32-rtems,
	i386-ibm-aix, i386-moss-msdos, i386-ncr-sysv4, i386-next-,
	i386-pc-msdosdjgpp, i386-sequent-bsd, i386-sequent-ptx1,
	i386-sequent-ptx2, i386-sequent-ptx4, i386-sun-sunos,
	i386-wrs-vxworks, i386-*-aout, i386-*-beoself, i386-*-bsd,
	i386-*-bsdi, i386-*-chorusos, i386-*-coff, i386-*-elf,
	i386-*-freebsd5, i386-*-freebsd-aout, i386-*-gnu, i386-*-interix,
	i386-*-interix3, i386-*-isc, i386-*-linux, i386-*-linuxaout,
	i386-*-linuxoldld, i386-*-lynxos, i386-*-mach, i386-*-mingw32,
	i386-*-netbsd, i386-*-netbsdelf, i386-*-netware, i386-*-openbsd,
	i386-*-osf1, i386-*-osfrose, i386-*-pe , i386-*-rtems,
	i386-*-rtemscoff, i386-*-sco3.2v5, i386-*-solaris2, i386-*-sysv,
	i386-*-sysv4, i386-*-sysv5, i386-*-udk, i386-*-uwin, i386-*-vsta,
	i386-*-win32, x86_64-*-freebsd5, x86_64-*-linux, x86_64-*-netbsd):
	Include as many configury headers via tm_file as possible.  This
	includes among others i386/unix.h, i386/bsd.h, i386/gas.h.
	* config/openbsd-oldgas.h: New file.
	* config/i386/386bsd.h, config/i386/aix386ng.h, config/i386/att.h,
	config/i386/bsd.h, config/i386/djgpp.h, config/i386/freebsd-aout.h,
	config/i386/gas.h, config/i386/gstabs.h, config/i386/i386-aout.h,
	config/i386/i386-coff.h, config/i386/i386-interix.h,
	config/i386/iscdbx.h, config/i386/linux-aout.h,
	config/i386/linux-oldld.h, config/i386/lynx-ng.h, config/i386/lynx.h,
	config/i386/mach.h, config/i386/netbsd.h, config/i386/next.h,
	config/i386/openbsd.h, config/i386/osfelf.h, config/i386/osfrose.h,
	config/i386/sco5.h, config/i386/seq-gas.h, config/i386/seq-sysv3.h,
	config/i386/seq2-sysv3.h, config/i386/sequent.h, config/i386/sun.h,
	config/i386/sun386.h, config/i386/svr3dbx.h, config/i386/svr3gas.h,
	config/i386/sysv3.h, config/i386/uwin.h, config/i386/vsta.h,
	config/i386/vxi386.h: Do not directly include configury headers.
	* config/i386/cygwin.h, config/i386/djgpp.h, config/i386/win32.h:
	Directly include configury headers that are no longer automatically
	included by the above headers.
	* config/i386/att.h, config/i386/bsd.h (TARGET_VERSION): Do not define.
	* config/i386/386bsd.h, config/i386/aix386ng.h, config/i386/cygwin.h,
	config/i386/djgpp.h, config/i386/i386-aout.h, config/i386/i386-coff.h,
	config/i386/lynx-ng.h, config/i386/lynx.h, config/i386/mach.h,
	config/i386/netbsd.h, config/i386/openbsd.h, config/i386/rtems.h,
	config/i386/seq-sysv3.h, config/i386/sequent.h, config/i386/svr3gas.h,
	config/i386/sysv3.h, config/i386/vsta.h, config/i386/vxi386.h
	(TARGET_VERSION): Define.
	* config/i386/beos-elf.h, config/i386/freebsd.h,
	config/i386/i386-interix.h, config/i386/i386elf.h, config/i386/linux.h,
	config/i386/linux64.h, config/i386/netbsd-elf.h, config/i386/netbsd64.h,
	config/i386/osfelf.h, config/i386/osfrose.h, config/i386/ptx4-i.h,
	config/i386/sco5.h, config/i386/sysv4.h
	(TARGET_VERSION): Do not need to protect.
	* config/i386/freebsd64.h (TARGET_VERSION): Fix style.
	* config/i386/386bsd.h, config/i386/cygwin.h, config/i386/djgpp.h,
	config/i386/freebsd-aout.h, config/i386/i386-aout.h,
	config/i386/i386-interix.h, config/i386/linux-aout.h,
	config/i386/linux-oldld.h, config/i386/mach.h, config/i386/netbsd.h,
	config/i386/openbsd.h, config/i386/vsta.h, config/i386/win32.h
	(YES_UNDERSCORES): Do not define - not needed.
	* config/i386/bsd.h, config/i386/gas.h (LPREFIX,
	ASM_GENERATE_INTERNAL_LABEL, ASM_OUTPUT_INTERNAL_LABEL,
	USER_LABEL_PREFIX): Do not handle the "NO_UNDERSCORES" case.
	* config/i386/i386-coff.h, config/i386/lynx.h, config/i386/lynx-ng.h
	(LPREFIX, ASM_GENERATE_INTERNAL_LABEL, ASM_OUTPUT_INTERNAL_LABEL,
	USER_LABEL_PREFIX): Define. (handles the "NO_UNDERSCORES" case)
	* config/i386/isc.h: Preserve comment from config/i386/isccoff.h.
	* config/i386/isccoff.h, config/i386/v3gas.h: Remove.

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20020402190415.D29320@redhat.com>


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51791 138bc75d-0d04-0410-961f-82ee72b054a4

51 files changed, 181 insertions, 331 deletions

diff --git a/gcc/config/i386/386bsd.h b/gcc/config/i386/386bsd.h
index a34e6e5db10..e3bd08173c0 100644
--- a/gcc/config/i386/386bsd.h
+++ b/gcc/config/i386/386bsd.h
@@ -1,9 +1,6 @@
 /* Configuration for an i386 running 386BSD as the target machine.  */
 
-/* This is tested by i386gas.h.  */
-#define YES_UNDERSCORES
-
-#include "i386/gstabs.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, BSD syntax)"); 
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -D____386BSD____ -D__386BSD__ -DBSD_NET2 -Asystem=unix -Asystem=bsd"
diff --git a/gcc/config/i386/aix386ng.h b/gcc/config/i386/aix386ng.h
index 445d333f784..d1b936cee0d 100644
--- a/gcc/config/i386/aix386ng.h
+++ b/gcc/config/i386/aix386ng.h
@@ -1,5 +1,5 @@
 /* Definitions for IBM PS2 running AIX/386.
-   Copyright (C) 1988, 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996, 1998, 2002 Free Software Foundation, Inc.
    Contributed by Minh Tran-Le <TRANLE@intellicorp.com>.
 
 This file is part of GNU CC.
@@ -19,17 +19,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-
-#include "i386/i386.h"
-
-/* Get the generic definitions for system V.3.  */
-
-#include "svr3.h"
-
-/* Use the ATT assembler syntax.
-   This overrides at least one macro (USER_LABEL_PREFIX) from svr3.h.  */
-
-#include "i386/att.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, AIX)"); 
 
 /* Use crt1.o as a startup file and crtn.o as a closing file.  */
 
diff --git a/gcc/config/i386/att.h b/gcc/config/i386/att.h
index f16a5ea6233..70ae1641365 100644
--- a/gcc/config/i386/att.h
+++ b/gcc/config/i386/att.h
@@ -1,5 +1,6 @@
 /* Definitions for AT&T assembler syntax for the Intel 80386.
-   Copyright (C) 1988, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,10 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Include common aspects of all 386 Unix assemblers.  */
-#include "i386/unix.h"
-
-#define TARGET_VERSION fprintf (stderr, " (80386, ATT syntax)");
 
 /* Define the syntax of instructions and addresses.  */
 
diff --git a/gcc/config/i386/beos-elf.h b/gcc/config/i386/beos-elf.h
index be51b4a636c..208e2744d9f 100644
--- a/gcc/config/i386/beos-elf.h
+++ b/gcc/config/i386/beos-elf.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel x86 running BeOS
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -19,7 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 BeOS/ELF)");
 
 /* Change debugging to Dwarf2.  */
diff --git a/gcc/config/i386/bsd.h b/gcc/config/i386/bsd.h
index c58db1b3e8e..69ad1688bfb 100644
--- a/gcc/config/i386/bsd.h
+++ b/gcc/config/i386/bsd.h
@@ -1,7 +1,7 @@
 /* Definitions for BSD assembler syntax for Intel 386
    (actually AT&T syntax for insns and operands,
    adapted to BSD conventions for symbol names and debugging.)
-   Copyright (C) 1988, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -20,23 +20,15 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Include common aspects of all 386 Unix assemblers.  */
-#include "i386/unix.h"
-
 /* Use the Sequent Symmetry assembler syntax.  */
-
-#define TARGET_VERSION fprintf (stderr, " (80386, BSD syntax)");
 
 /* Define the syntax of pseudo-ops, labels and comments.  */
 
 /* Prefix for internally generated assembler labels.  If we aren't using
    underscores, we are using prefix `.'s to identify labels that should
    be ignored, as in `i386/gas.h' --karl@cs.umb.edu  */
-#ifdef NO_UNDERSCORES
-#define LPREFIX ".L"
-#else
+
 #define LPREFIX "L"
-#endif /* not NO_UNDERSCORES */
 
 /* Assembler pseudos to introduce constants of various size.  */
 
@@ -93,32 +85,18 @@ Boston, MA 02111-1307, USA.  */
    PREFIX is the class of label and NUM is the number within the class.
    This is suitable for output with `assemble_name'.  */
 
-#ifdef NO_UNDERSCORES
-#define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)	\
-    sprintf ((BUF), "*.%s%ld", (PREFIX), (long)(NUMBER))
-#else
 #define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)	\
     sprintf ((BUF), "*%s%ld", (PREFIX), (long)(NUMBER))
-#endif
 
 /* This is how to output an internal numbered label where
    PREFIX is the class of label and NUM is the number within the class.  */
 
-#ifdef NO_UNDERSCORES
-#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)	\
-  fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
-#else
 #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)	\
   fprintf (FILE, "%s%d:\n", PREFIX, NUM)
-#endif
 
 /* The prefix to add to user-visible assembler symbols.  */
 
-#ifdef NO_UNDERSCORES
-#define USER_LABEL_PREFIX ""
-#else
 #define USER_LABEL_PREFIX "_"
-#endif /* not NO_UNDERSCORES */
 
 /* Sequent has some changes in the format of DBX symbols.  */
 #define DBX_NO_XREFS 1
diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 1e2ff7b15e9..efdb70e48a1 100644
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -20,15 +20,17 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#define YES_UNDERSCORES
-
 #define DBX_DEBUGGING_INFO 
 #define SDB_DEBUGGING_INFO 
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
+#define TARGET_VERSION fprintf (stderr, " (x86 Cygwin)"); 
 #define TARGET_EXECUTABLE_SUFFIX ".exe"
 
 #include <stdio.h>
+#include "i386/i386.h"
+#include "i386/unix.h"
+#include "i386/bsd.h"
 #include "i386/gas.h"
 #include "dbxcoff.h"
 
diff --git a/gcc/config/i386/djgpp.h b/gcc/config/i386/djgpp.h
index 600a11e2168..240877ca0e2 100644
--- a/gcc/config/i386/djgpp.h
+++ b/gcc/config/i386/djgpp.h
@@ -1,5 +1,6 @@
 /* Configuration for an i386 running MS-DOS with DJGPP.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "dbxcoff.h"
-
 /* Support generation of DWARF2 debugging info.  */
 #define DWARF2_DEBUGGING_INFO
 
@@ -31,8 +30,8 @@ Boston, MA 02111-1307, USA.  */
 /* Enable parsing of #pragma pack(push,<n>) and #pragma pack(pop).  */
 #define HANDLE_PRAGMA_PACK_PUSH_POP 1
 
-#define YES_UNDERSCORES
-
+#include "i386/unix.h"
+#include "i386/bsd.h"
 #include "i386/gas.h"
 
 /* If defined, a C expression whose value is a string containing the
@@ -186,6 +185,8 @@ Boston, MA 02111-1307, USA.  */
 #undef MASK_BNU210
 #define MASK_BNU210 (0x40000000)
 
+#define TARGET_VERSION fprintf (stderr, " (80386, MS-DOS DJGPP)"); 
+
 #undef SUBTARGET_SWITCHES
 #define SUBTARGET_SWITCHES \
   { "no-bnu210", -MASK_BNU210, "Ignored (obsolete)" }, \
diff --git a/gcc/config/i386/freebsd-aout.h b/gcc/config/i386/freebsd-aout.h
index 0a3c6d7263e..7b1d96a55ba 100644
--- a/gcc/config/i386/freebsd-aout.h
+++ b/gcc/config/i386/freebsd-aout.h
@@ -1,8 +1,9 @@
 /* Definitions of target machine for GNU compiler for Intel 80386
    running FreeBSD.
-   Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2002 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2002
+   Free Software Foundation, Inc.
    Contributed by Poul-Henning Kamp <phk@login.dkuug.dk>
+   Continued development by David O'Brien <obrien@NUXI.org>
 
 This file is part of GNU CC.
 
@@ -21,14 +22,9 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This is tested by i386gas.h.  */
-#define YES_UNDERSCORES
-
 /* Don't assume anything about the header files.  */
 #define NO_IMPLICIT_EXTERN_C
 
-#include "i386/gstabs.h"
-
 /* This goes away when the math-emulator is fixed */
 #undef TARGET_SUBTARGET_DEFAULT
 #define TARGET_SUBTARGET_DEFAULT \
diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h
index 1fd41ca85a8..0d51f2a4e08 100644
--- a/gcc/config/i386/freebsd.h
+++ b/gcc/config/i386/freebsd.h
@@ -22,7 +22,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#undef TARGET_VERSION
+
 #define TARGET_VERSION fprintf (stderr, " (i386 FreeBSD/ELF)");
 
 /* Override the default comment-starter of "/".  */
diff --git a/gcc/config/i386/freebsd64.h b/gcc/config/i386/freebsd64.h
index ebd6618ca78..699f4c4d344 100644
--- a/gcc/config/i386/freebsd64.h
+++ b/gcc/config/i386/freebsd64.h
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#undef TARGET_VERSION
+#undef  TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (FreeBSD/x86-64 ELF)");
 
 /* Provide a LINK_SPEC appropriate for the FreeBSD/x86-64 ELF target.
diff --git a/gcc/config/i386/gas.h b/gcc/config/i386/gas.h
index 6c01b0737ac..4c8402368c8 100644
--- a/gcc/config/i386/gas.h
+++ b/gcc/config/i386/gas.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 using GAS.
-   Copyright (C) 1988, 1993, 1994, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1996, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -21,13 +21,6 @@ Boston, MA 02111-1307, USA.  */
 /* Note that i386/seq-gas.h is a GAS configuration that does not use this
    file.  */
 
-#include "i386/i386.h"
-
-#ifndef YES_UNDERSCORES
-/* Define this now, because i386/bsd.h tests it.  */
-#define NO_UNDERSCORES
-#endif
-
 /* Use the bsd assembler syntax.  */
 /* we need to do this because gas is really a bsd style assembler,
  * and so doesn't work well this these att-isms:
@@ -44,8 +37,6 @@ Boston, MA 02111-1307, USA.  */
  * people who want both form will have to compile twice.
  */
 
-#include "i386/bsd.h"
-
 /* these come from i386/bsd.h, but are specific to sequent */
 #undef DBX_NO_XREFS
 #undef DBX_CONTIN_LENGTH
@@ -139,28 +130,6 @@ Boston, MA 02111-1307, USA.  */
 /* Print opcodes the way that GAS expects them.  */
 #define GAS_MNEMONICS 1
 
-#ifdef NO_UNDERSCORES /* If user-symbols don't have underscores,
-			 then it must take more than `L' to identify
-			 a label that should be ignored.  */
-
-/* This is how to store into the string BUF
-   the symbol_ref name of an internal numbered label where
-   PREFIX is the class of label and NUM is the number within the class.
-   This is suitable for output with `assemble_name'.  */
-
-#undef ASM_GENERATE_INTERNAL_LABEL
-#define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)	\
-    sprintf ((BUF), ".%s%ld", (PREFIX), (long)(NUMBER))
-
-/* This is how to output an internal numbered label where
-   PREFIX is the class of label and NUM is the number within the class.  */
-
-#undef ASM_OUTPUT_INTERNAL_LABEL
-#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)	\
-  fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
-
-#endif /* NO_UNDERSCORES */
-
 /* Output at beginning of assembler file.  */
 /* The .file command should always begin the output.  */
 #undef ASM_FILE_START
diff --git a/gcc/config/i386/gstabs.h b/gcc/config/i386/gstabs.h
index 5f0ae348f15..716e37a21f3 100644
--- a/gcc/config/i386/gstabs.h
+++ b/gcc/config/i386/gstabs.h
@@ -1,5 +1,3 @@
-#include "i386/gas.h"
-
 /* We do not want to output SDB debugging information.  */
 
 #undef SDB_DEBUGGING_INFO
diff --git a/gcc/config/i386/i386-aout.h b/gcc/config/i386/i386-aout.h
index 7385bec6d7c..824414fcc18 100644
--- a/gcc/config/i386/i386-aout.h
+++ b/gcc/config/i386/i386-aout.h
@@ -1,7 +1,7 @@
 /* Definitions for "naked" Intel 386 using a.out (or coff encap'd
    a.out) object format and stabs debugging info.
 
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -21,10 +21,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-/* This is tested by gas.h.  */
-#define YES_UNDERSCORES
-
-#include "i386/gstabs.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, BSD a.out syntax)"); 
 
 /* Specify predefined symbols in preprocessor.  */
 
diff --git a/gcc/config/i386/i386-coff.h b/gcc/config/i386/i386-coff.h
index c1ae670e117..5f3ed142866 100644
--- a/gcc/config/i386/i386-coff.h
+++ b/gcc/config/i386/i386-coff.h
@@ -1,7 +1,7 @@
 /* Definitions for "naked" Intel 386 using coff object format files
    and coff debugging info.
 
-   Copyright (C) 1994, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -21,8 +21,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include "i386/gas.h"
-#include "dbxcoff.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, COFF BSD syntax)"); 
 
 /* Specify predefined symbols in preprocessor.  */
 
@@ -40,4 +39,36 @@ Boston, MA 02111-1307, USA.  */
 /* Switch into a generic section.  */
 #define TARGET_ASM_NAMED_SECTION  default_coff_asm_named_section
 
+/* Prefix for internally generated assembler labels.  If we aren't using
+   underscores, we are using prefix `.'s to identify labels that should
+   be ignored, as in `i386/gas.h' --karl@cs.umb.edu  */
+
+#undef  LPREFIX
+#define LPREFIX ".L"
+
+/* The prefix to add to user-visible assembler symbols.  */
+
+#undef  USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
+
+/* If user-symbols don't have underscores,
+   then it must take more than `L' to identify
+   a label that should be ignored.  */
+
+/* This is how to store into the string BUF
+   the symbol_ref name of an internal numbered label where
+   PREFIX is the class of label and NUM is the number within the class.
+   This is suitable for output with `assemble_name'.  */
+
+#undef  ASM_GENERATE_INTERNAL_LABEL
+#define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)	\
+  sprintf ((BUF), ".%s%ld", (PREFIX), (long)(NUMBER))
+
+/* This is how to output an internal numbered label where
+   PREFIX is the class of label and NUM is the number within the class.  */
+
+#undef  ASM_OUTPUT_INTERNAL_LABEL
+#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)	\
+  fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
+
 /* end of i386-coff.h */
diff --git a/gcc/config/i386/i386-interix.h b/gcc/config/i386/i386-interix.h
index 495d9628351..a97646c5472 100644
--- a/gcc/config/i386/i386-interix.h
+++ b/gcc/config/i386/i386-interix.h
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80386 running Interix
-   Parts Copyright (C) 1991, 1999, 2000 Free Software Foundation, Inc.
+   Parts Copyright (C) 1991, 1999, 2000, 2002 Free Software Foundation, Inc.
 
    Parts:
      by Douglas B. Rupp (drupp@cs.washington.edu).
@@ -24,10 +24,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#define YES_UNDERSCORES
-
-/* YES_UNDERSCORES must precede gas.h */
-#include <i386/gas.h>
 /* The rest must follow.  */
 
 #define DBX_DEBUGGING_INFO
@@ -85,7 +81,6 @@ Boston, MA 02111-1307, USA.  */
 %{posix:-D_POSIX_SOURCE} \
 -isystem %$INTERIX_ROOT/usr/include"
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 Interix)");
 
 /* The global __fltused is necessary to cause the printf/scanf routines
diff --git a/gcc/config/i386/i386elf.h b/gcc/config/i386/i386elf.h
index ddf19b67e7c..924f8d0ce3e 100644
--- a/gcc/config/i386/i386elf.h
+++ b/gcc/config/i386/i386elf.h
@@ -1,5 +1,6 @@
 /* Target definitions for GNU compiler for Intel 80386 using ELF
-   Copyright (C) 1988, 1991, 1995, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1991, 1995, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    Derived from sysv4.h written by Ron Guilmette (rfg@netcom.com).
 
@@ -24,7 +25,6 @@ Boston, MA 02111-1307, USA.  */
 #undef  PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 bare ELF target)");
 
 /* By default, target has a 80387, uses IEEE compatible arithmetic,
diff --git a/gcc/config/i386/isc.h b/gcc/config/i386/isc.h
index eea98118fb6..171918c60dd 100644
--- a/gcc/config/i386/isc.h
+++ b/gcc/config/i386/isc.h
@@ -1,6 +1,11 @@
 /* Assembler-independent definitions for an Intel 386 running
-   Interactive Unix System V. Specifically, this is for recent versions
-   that support POSIX.  */
+   Interactive Unix System V.  Specifically, this is for recent versions
+   that support POSIX;
+   for version 2.0.2, use configuration option i386-sysv instead.
+   (But set TARGET_DEFAULT to (MASK_80307 | MASK_FLOAT_RETURNS)
+   if you do that, if you don't have a real 80387.)  */
+
+/* Mostly it's like AT&T Unix System V.  */
 
 /* Use crt1.o, not crt0.o, as a startup file, and crtn.o as a closing file.  */
 #undef STARTFILE_SPEC
diff --git a/gcc/config/i386/isccoff.h b/gcc/config/i386/isccoff.h
deleted file mode 100644
index 9efd9ad4ffa..00000000000
--- a/gcc/config/i386/isccoff.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Definitions for Intel 386 running Interactive Unix System V.
-   Specifically, this is for recent versions that support POSIX;
-   for version 2.0.2, use configuration option i386-sysv instead.
-   (But set TARGET_DEFAULT to (MASK_80307 | MASK_FLOAT_RETURNS)
-   if you do that, if you don't have a real 80387.)  */
-
-/* Mostly it's like AT&T Unix System V.  */
-
-#include "i386/sysv3.h"
-
-/* But with a few changes.  */
-#include "i386/isc.h"
diff --git a/gcc/config/i386/iscdbx.h b/gcc/config/i386/iscdbx.h
index 6d1f341f15e..09de0fddb86 100644
--- a/gcc/config/i386/iscdbx.h
+++ b/gcc/config/i386/iscdbx.h
@@ -1,7 +1,7 @@
 /* Definitions for Intel 386 running Interactive Unix System V,
    using dbx-in-coff encapsulation.
    Specifically, this is for recent versions that support POSIX.
-   Copyright (C) 1992, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Mostly it's like AT&T Unix System V with dbx-in-coff.  */
 
-#include "i386/svr3dbx.h"
-
 /* But with a few changes.  */
 #undef ENDFILE_SPEC
 #include "i386/isc.h"
diff --git a/gcc/config/i386/linux-aout.h b/gcc/config/i386/linux-aout.h
index 302ee69a32a..9bcbfe7045c 100644
--- a/gcc/config/i386/linux-aout.h
+++ b/gcc/config/i386/linux-aout.h
@@ -1,5 +1,6 @@
 /* Definitions for Intel 386 running Linux-based GNU systems using a.out.
-   Copyright (C) 1992, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 1995, 1997, 1998, 2002
+   Free Software Foundation, Inc.
    Contributed by H.J. Lu (hjl@nynexst.com)
 
 This file is part of GNU CC.
@@ -19,12 +20,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This is tested by i386/gas.h.  */
-#define YES_UNDERSCORES
-
-#include <i386/gstabs.h>
-#include <linux-aout.h>	/* some common stuff */
-
 #undef ASM_COMMENT_START
 #define ASM_COMMENT_START "#"
 
diff --git a/gcc/config/i386/linux-oldld.h b/gcc/config/i386/linux-oldld.h
index 6102aa8cd9f..6a6139683e8 100644
--- a/gcc/config/i386/linux-oldld.h
+++ b/gcc/config/i386/linux-oldld.h
@@ -20,12 +20,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This is tested by i386/gas.h.  */
-#define YES_UNDERSCORES
-
-#include <i386/gstabs.h>
-#include <linux-aout.h>	/* some common stuff */
-
 #undef ASM_COMMENT_START
 #define ASM_COMMENT_START "#"
 
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index de634d3a4e7..282a11b05a7 100644
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -33,7 +33,6 @@ Boston, MA 02111-1307, USA.  */
 	  fputs ("\t.intel_syntax\n", FILE);				\
   } while (0)
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 Linux/ELF)");
 
 /* The svr4 ABI for the i386 says that records and unions are returned
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
index 925cc20d1e8..a969ab9906e 100644
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -1,5 +1,5 @@
 /* Definitions for AMD x86-64 running Linux-based GNU systems with ELF format.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    Contributed by Jan Hubicka <jh@suse.cz>, based on linux.h.
 
 This file is part of GNU CC.
@@ -21,7 +21,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define LINUX_DEFAULT_ELF
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (x86-64 Linux/ELF)");
 
 #undef CPP_PREDEFINES
diff --git a/gcc/config/i386/lynx-ng.h b/gcc/config/i386/lynx-ng.h
index 49150a307b3..1ef22fb23dc 100644
--- a/gcc/config/i386/lynx-ng.h
+++ b/gcc/config/i386/lynx-ng.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running LynxOS, using Lynx's old as and ld.
-   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,8 +18,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include <i386/gstabs.h>
-#include <lynx-ng.h>
+#define TARGET_VERSION fprintf (stderr, " (80386, LYNX BSD syntax)"); 
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -DI386 -DLynx -DIBITS32 \
@@ -36,3 +35,35 @@ Boston, MA 02111-1307, USA.  */
 #define CALL_USED_REGISTERS \
 /*ax,dx,cx,bx,si,di,bp,sp,st,st1,st2,st3,st4,st5,st6,st7,arg*/ \
 {  1, 1, 1, 1, 0, 0, 0, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1 }
+
+/* Prefix for internally generated assembler labels.  If we aren't using
+   underscores, we are using prefix `.'s to identify labels that should
+   be ignored, as in `i386/gas.h' --karl@cs.umb.edu  */
+
+#undef  LPREFIX
+#define LPREFIX ".L"
+
+/* The prefix to add to user-visible assembler symbols.  */
+
+#undef  USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
+
+/* If user-symbols don't have underscores,
+   then it must take more than `L' to identify
+   a label that should be ignored.  */
+
+/* This is how to store into the string BUF
+   the symbol_ref name of an internal numbered label where
+   PREFIX is the class of label and NUM is the number within the class.
+   This is suitable for output with `assemble_name'.  */
+
+#undef  ASM_GENERATE_INTERNAL_LABEL
+#define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)	\
+  sprintf ((BUF), ".%s%ld", (PREFIX), (long)(NUMBER))
+
+/* This is how to output an internal numbered label where
+   PREFIX is the class of label and NUM is the number within the class.  */
+
+#undef  ASM_OUTPUT_INTERNAL_LABEL
+#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)	\
+  fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
diff --git a/gcc/config/i386/lynx.h b/gcc/config/i386/lynx.h
index 91ed31e0bf7..00fc0ac7417 100644
--- a/gcc/config/i386/lynx.h
+++ b/gcc/config/i386/lynx.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running LynxOS.
-   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,8 +18,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include <i386/gstabs.h>
-#include <lynx.h>
+#define TARGET_VERSION fprintf (stderr, " (80386, LYNX BSD syntax)"); 
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-DI386 -DLynx -DIBITS32 -Asystem=unix -Asystem=lynx"
@@ -37,3 +36,35 @@ Boston, MA 02111-1307, USA.  */
 #define CALL_USED_REGISTERS \
 /*ax,dx,cx,bx,si,di,bp,sp,st,st1,st2,st3,st4,st5,st6,st7,arg*/ \
 {  1, 1, 1, 1, 0, 0, 0, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1 }
+
+/* Prefix for internally generated assembler labels.  If we aren't using
+   underscores, we are using prefix `.'s to identify labels that should
+   be ignored, as in `i386/gas.h' --karl@cs.umb.edu  */
+
+#undef  LPREFIX
+#define LPREFIX ".L"
+
+/* The prefix to add to user-visible assembler symbols.  */
+
+#undef  USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
+
+/* If user-symbols don't have underscores,
+   then it must take more than `L' to identify
+   a label that should be ignored.  */
+
+/* This is how to store into the string BUF
+   the symbol_ref name of an internal numbered label where
+   PREFIX is the class of label and NUM is the number within the class.
+   This is suitable for output with `assemble_name'.  */
+
+#undef  ASM_GENERATE_INTERNAL_LABEL
+#define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)	\
+  sprintf ((BUF), ".%s%ld", (PREFIX), (long)(NUMBER))
+
+/* This is how to output an internal numbered label where
+   PREFIX is the class of label and NUM is the number within the class.  */
+
+#undef  ASM_OUTPUT_INTERNAL_LABEL
+#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)	\
+  fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
diff --git a/gcc/config/i386/mach.h b/gcc/config/i386/mach.h
index 7e2b1cc267d..29039f39948 100644
--- a/gcc/config/i386/mach.h
+++ b/gcc/config/i386/mach.h
@@ -1,10 +1,6 @@
 /* Configuration for an i386 running Mach as the target machine.  */
 
-/* We do want to add an underscore to the front of each user symbol.
-   i386/gas.h checks this.  */
-#define YES_UNDERSCORES
-
-#include "i386/gstabs.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, Mach)"); 
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -DMACH -Asystem=unix -Asystem=mach"
diff --git a/gcc/config/i386/netbsd-elf.h b/gcc/config/i386/netbsd-elf.h
index 30267dfa0c3..e6b6de4f8b4 100644
--- a/gcc/config/i386/netbsd-elf.h
+++ b/gcc/config/i386/netbsd-elf.h
@@ -114,5 +114,4 @@ Boston, MA 02111-1307, USA.  */
    we don't care about compatibility with older gcc versions.  */
 #define DEFAULT_PCC_STRUCT_RETURN 1
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (NetBSD/i386 ELF)");
diff --git a/gcc/config/i386/netbsd.h b/gcc/config/i386/netbsd.h
index 1d95de2f6c3..765e6793d08 100644
--- a/gcc/config/i386/netbsd.h
+++ b/gcc/config/i386/netbsd.h
@@ -1,11 +1,4 @@
-/* This is tested by i386gas.h.  */
-#define YES_UNDERSCORES
-
-#include <i386/gstabs.h>
-
-/* Get generic NetBSD definitions.  */
-#include <netbsd.h>
-#include <netbsd-aout.h>
+#define TARGET_VERSION fprintf (stderr, " (NetBSD/i386 a.out)");
 
 /* This goes away when the math-emulator is fixed */
 #undef TARGET_SUBTARGET_DEFAULT
diff --git a/gcc/config/i386/netbsd64.h b/gcc/config/i386/netbsd64.h
index 74862af9d6e..813422a59cf 100644
--- a/gcc/config/i386/netbsd64.h
+++ b/gcc/config/i386/netbsd64.h
@@ -62,5 +62,4 @@ Boston, MA 02111-1307, USA.  */
 }
 
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (NetBSD/x86_64 ELF)");
diff --git a/gcc/config/i386/next.h b/gcc/config/i386/next.h
index 3081fdebf8c..80f9b0ce217 100644
--- a/gcc/config/i386/next.h
+++ b/gcc/config/i386/next.h
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel x86 CPU running NeXTSTEP
-   Copyright (C) 1993, 1995, 1996, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,9 +18,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/gas.h"
-#include "nextstep.h"
-
 /* By default, target has a 80387, with IEEE FP.  */
 
 #undef	TARGET_SUBTARGET_DEFAULT
diff --git a/gcc/config/i386/openbsd.h b/gcc/config/i386/openbsd.h
index a07ee1524b8..93ff01e25ca 100644
--- a/gcc/config/i386/openbsd.h
+++ b/gcc/config/i386/openbsd.h
@@ -1,5 +1,5 @@
 /* Configuration for an OpenBSD i386 target.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,14 +18,8 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This is tested by i386gas.h.  */
-#define YES_UNDERSCORES
 
-#include <i386/gstabs.h>
-
-/* Get generic OpenBSD definitions.  */
-#define OBSD_OLD_GAS
-#include <openbsd.h>
+#define TARGET_VERSION fprintf (stderr, " (OpenBSD/i386)");
 
 /* This goes away when the math-emulator is fixed */
 #undef TARGET_SUBTARGET_DEFAULT
diff --git a/gcc/config/i386/osfelf.h b/gcc/config/i386/osfelf.h
index 886dd1a4c29..095749079d5 100644
--- a/gcc/config/i386/osfelf.h
+++ b/gcc/config/i386/osfelf.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Intel 386 (OSF/1 with ELF) version.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -19,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "config/i386/osfrose.h"
-
 #undef	CPP_PREDEFINES
 #define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Asystem=xpg4"
 
@@ -68,7 +66,6 @@ Boston, MA 02111-1307, USA.  */
 			%{!noshrlib: %{!pic-none: -dy}}}}}}}}"
 
 #undef TARGET_VERSION_INTERNAL
-#undef TARGET_VERSION
 
 #undef	I386_VERSION
 #define I386_VERSION " 80386, ELF objects"
diff --git a/gcc/config/i386/osfrose.h b/gcc/config/i386/osfrose.h
index 7338191293e..0264575c171 100644
--- a/gcc/config/i386/osfrose.h
+++ b/gcc/config/i386/osfrose.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Intel 386 (OSF/1 with OSF/rose) version.
-   Copyright (C) 1991, 1992, 1993, 1996, 1998, 1999, 2000
+   Copyright (C) 1991, 1992, 1993, 1996, 1998, 1999, 2000, 2002
    Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -20,9 +20,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "halfpic.h"
-#include "i386/gstabs.h"
-
 #define OSF_OS
 
 #undef  WORD_SWITCH_TAKES_ARG
@@ -149,7 +146,6 @@ Boston, MA 02111-1307, USA.  */
 #define STARTFILE_SPEC "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}"
 
 #undef TARGET_VERSION_INTERNAL
-#undef TARGET_VERSION
 
 #define I386_VERSION " 80386, OSF/rose objects"
 
diff --git a/gcc/config/i386/ptx4-i.h b/gcc/config/i386/ptx4-i.h
index 0c51703f6e8..d29bdade144 100644
--- a/gcc/config/i386/ptx4-i.h
+++ b/gcc/config/i386/ptx4-i.h
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80386 running Dynix/ptx v4
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2002 Free Software Foundation, Inc.
 
    Modified from sysv4.h
    Originally written by Ron Guilmette (rfg@netcom.com).
@@ -23,7 +23,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 Sequent Dynix/ptx Version 4)");
 
 /* The svr4 ABI for the i386 says that records and unions are returned
diff --git a/gcc/config/i386/rtems.h b/gcc/config/i386/rtems.h
index c2381c79f6e..9e8fab73a11 100644
--- a/gcc/config/i386/rtems.h
+++ b/gcc/config/i386/rtems.h
@@ -24,6 +24,9 @@ Boston, MA 02111-1307, USA.  */
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__rtems__ -Asystem=rtems"
 
+#undef  TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (80386, RTEMS)"); 
+
 /* Generate calls to memcpy, memcmp and memset.  */
 #ifndef TARGET_MEM_FUNCTIONS
 #define TARGET_MEM_FUNCTIONS
diff --git a/gcc/config/i386/sco5.h b/gcc/config/i386/sco5.h
index e449e866e9c..1682eda49df 100644
--- a/gcc/config/i386/sco5.h
+++ b/gcc/config/i386/sco5.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running SCO Unix System V 3.2 Version 5.
-   Copyright (C) 1992, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright (C) 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2002
    Free Software Foundation, Inc.
    Contributed by Kean Johnston (hug@netcom.com)
 
@@ -20,10 +20,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/i386.h"	/* Base i386 target definitions */
-#include "i386/att.h"	/* Use AT&T i386 assembler syntax */
-
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386, SCO OpenServer 5 Syntax)");
 
 #undef LPREFIX
diff --git a/gcc/config/i386/seq-gas.h b/gcc/config/i386/seq-gas.h
index d11c4c1f388..dde1f058d50 100644
--- a/gcc/config/i386/seq-gas.h
+++ b/gcc/config/i386/seq-gas.h
@@ -1,10 +1,8 @@
 /* Definitions for Sequent Intel 386 using GAS.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2002 Free Software Foundation, Inc.
 
 /* Mostly it's like a Sequent 386 without GAS.  */
 
-#include "i386/sequent.h"
-
 /* A C statement or statements which output an assembler instruction
    opcode to the stdio stream STREAM.  The macro-operand PTR is a
    variable of type `char *' which points to the opcode name in its
diff --git a/gcc/config/i386/seq-sysv3.h b/gcc/config/i386/seq-sysv3.h
index c8e75927dfc..f30cf77c197 100644
--- a/gcc/config/i386/seq-sysv3.h
+++ b/gcc/config/i386/seq-sysv3.h
@@ -1,6 +1,6 @@
 /* Sequent DYNIX/ptx 1.x (SVr3) */
 
-#include "i386/sysv3.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, ATT syntax)"); 
 
 /* Sequent Symmetry SVr3 doesn't have crtn.o; crt1.o doesn't work
    but crt0.o does.  */
diff --git a/gcc/config/i386/seq2-sysv3.h b/gcc/config/i386/seq2-sysv3.h
index dd43af707a0..a759e8b3185 100644
--- a/gcc/config/i386/seq2-sysv3.h
+++ b/gcc/config/i386/seq2-sysv3.h
@@ -1,7 +1,5 @@
 /* Sequent DYNIX/ptx 2.x (SVr3) */
 
-#include "i386/seq-sysv3.h"
-
 /* Use atexit for static destructors, instead of defining
    our own exit function.  */
 #undef NEED_ATEXIT
diff --git a/gcc/config/i386/sequent.h b/gcc/config/i386/sequent.h
index cffc50ae1e2..bc16b19102c 100644
--- a/gcc/config/i386/sequent.h
+++ b/gcc/config/i386/sequent.h
@@ -1,5 +1,8 @@
-/* Definitions for Sequent Intel 386.
-   Copyright (C) 1988, 1994, 1999, 2000 Free Software Foundation, Inc.
+/* Definitions for Sequent Intel 386 using BSD assembler syntax
+   (actually AT&T syntax for insns and operands,
+   adapted to BSD conventions for symbol names and debugging.)
+   Copyright (C) 1988, 1994, 1996, 1999, 2000, 2002
+   Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,11 +21,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/i386.h"
-
-/* Use the BSD assembler syntax.  */
-
-#include "i386/bsd.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, BSD syntax)"); 
 
 /* By default, don't use IEEE compatible arithmetic comparisons
    because the assembler can't handle the fucom insn.
diff --git a/gcc/config/i386/sun.h b/gcc/config/i386/sun.h
index de40abb35a3..c4390e27023 100644
--- a/gcc/config/i386/sun.h
+++ b/gcc/config/i386/sun.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running SunOS 4.0.
-   Copyright (C) 1988, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1995, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,12 +18,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-
-#include "i386/i386.h"
-
-/* Use the Sun assembler syntax.  */
-
-#include "i386/sun386.h"
+/* Use's the Sun assembler syntax.  */
 
 /* Use crt0.o as a startup file.  */
 
diff --git a/gcc/config/i386/sun386.h b/gcc/config/i386/sun386.h
index d280d583cbe..0c107c70a63 100644
--- a/gcc/config/i386/sun386.h
+++ b/gcc/config/i386/sun386.h
@@ -1,5 +1,5 @@
 /* Definitions for Sun assembler syntax for the Intel 80386.
-   Copyright (C) 1988, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -19,9 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-/* Include common aspects of all 386 Unix assemblers.  */
-#include "i386/unix.h"
-
 #define TARGET_VERSION fprintf (stderr, " (80386, Sun syntax)");
 
 /* Define the syntax of instructions and addresses.  */
diff --git a/gcc/config/i386/svr3dbx.h b/gcc/config/i386/svr3dbx.h
index b0e4237aa4a..3357d68591d 100644
--- a/gcc/config/i386/svr3dbx.h
+++ b/gcc/config/i386/svr3dbx.h
@@ -1,5 +1,5 @@
-/* Definitions for Intel 386 running system V, using dbx-in-coff encapsulation.
-   Copyright (C) 1992, 1995 Free Software Foundation, Inc.
+/* Definitions for Intel 385 running system V, using dbx-in-coff encapsulation.
+   Copyright (C) 1992, 1995, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,8 +18,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/svr3gas.h"
-
 /* We do not want to output SDB debugging information.  */
 
 #undef SDB_DEBUGGING_INFO
diff --git a/gcc/config/i386/svr3gas.h b/gcc/config/i386/svr3gas.h
index 08ada117284..00dd408f7c6 100644
--- a/gcc/config/i386/svr3gas.h
+++ b/gcc/config/i386/svr3gas.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running system V, using gas.
-   Copyright (C) 1992, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,7 +18,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/gas.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, ATT syntax)"); 
 
 /* Add stuff that normally comes from i386/sysv3.h */
 
diff --git a/gcc/config/i386/sysv3.h b/gcc/config/i386/sysv3.h
index 8eb4bec8db2..09121cda18a 100644
--- a/gcc/config/i386/sysv3.h
+++ b/gcc/config/i386/sysv3.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running system V.
-   Copyright (C) 1988, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,17 +18,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-
-#include "i386/i386.h"
-
-/* Use default settings for system V.3.  */
-
-#include "svr3.h"
-
-/* Use the ATT assembler syntax.
-   This overrides at least one macro (USER_LABEL_PREFIX) from svr3.h.  */
-
-#include "i386/att.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, ATT syntax)"); 
 
 /* Use crt1.o as a startup file and crtn.o as a closing file.  */
 
diff --git a/gcc/config/i386/sysv4.h b/gcc/config/i386/sysv4.h
index 7dc0ac1b0a1..5b92fff4a2f 100644
--- a/gcc/config/i386/sysv4.h
+++ b/gcc/config/i386/sysv4.h
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80386 running System V.4
-   Copyright (C) 1991, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2001, 2002 Free Software Foundation, Inc.
 
    Written by Ron Guilmette (rfg@netcom.com).
 
@@ -21,7 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 System V Release 4)");
 
 /* The svr4 ABI for the i386 says that records and unions are returned
diff --git a/gcc/config/i386/uwin.h b/gcc/config/i386/uwin.h
index ca39ffd9493..cc2f93b8cc6 100644
--- a/gcc/config/i386/uwin.h
+++ b/gcc/config/i386/uwin.h
@@ -2,7 +2,7 @@
    hosting on U/WIN (Windows32), using GNU tools and the Windows32 API 
    Library, as distinct from winnt.h, which is used to build GCC for use 
    with a windows style library and tool set and uses the Microsoft tools.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
    Contributed by Mumit Khan  <khan@xraylith.wisc.edu>.
 
 This file is part of GNU CC.
@@ -25,8 +25,6 @@ Boston, MA 02111-1307, USA.  */
 /* Most of this is the same as for Cygwin32, except for changing some
    specs.  */
 
-#include "i386/cygwin.h"
-
 #define STANDARD_INCLUDE_COMPONENT "UWIN"
 #define SYSTEM_INCLUDE_DIR "/usr/gnu/include"
 #undef MD_STARTFILE_PREFIX
diff --git a/gcc/config/i386/v3gas.h b/gcc/config/i386/v3gas.h
deleted file mode 100644
index a350ab40bcd..00000000000
--- a/gcc/config/i386/v3gas.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Definitions for Intel 386 running system V, using gas.
-   Copyright (C) 1992, 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include <i386/gas.h>
-
-/* Add stuff that normally comes from i386v.h */
-
-/* longjmp may fail to restore the registers if called from the same
-   function that called setjmp.  To compensate, the compiler avoids
-   putting variables in registers in functions that use both setjmp
-   and longjmp.  */
-
-#define NON_SAVING_SETJMP \
-  (current_function_calls_setjmp && current_function_calls_longjmp)
-
-/* longjmp may fail to restore the stack pointer if the saved frame
-   pointer is the same as the caller's frame pointer.  Requiring a frame
-   pointer in any function that calls setjmp or longjmp avoids this
-   problem, unless setjmp and longjmp are called from the same function.
-   Since a frame pointer will be required in such a function, it is OK
-   that the stack pointer is not restored.  */
-
-#undef SUBTARGET_FRAME_POINTER_REQUIRED
-#define SUBTARGET_FRAME_POINTER_REQUIRED \
-  (current_function_calls_setjmp || current_function_calls_longjmp)
-
-/* Modify ASM_OUTPUT_LOCAL slightly to test -msvr3-shlib, adapted to gas  */
-#undef ASM_OUTPUT_LOCAL
-#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE, ROUNDED)	\
-  do {							\
-    int align = exact_log2 (ROUNDED);			\
-    if (align > 2) align = 2;				\
-    if (TARGET_SVR3_SHLIB)				\
-      {							\
-	data_section ();				\
-	ASM_OUTPUT_ALIGN ((FILE), align == -1 ? 2 : align); \
-	ASM_OUTPUT_LABEL ((FILE), (NAME));		\
-	fprintf ((FILE), "\t.set .,.+%u\n", (ROUNDED));	\
-      }							\
-    else						\
-      {							\
-	fputs (".lcomm ", (FILE));			\
-	assemble_name ((FILE), (NAME));			\
-	fprintf ((FILE), ",%u\n", (ROUNDED));		\
-      }							\
-  } while (0)
-
-/* Add stuff that normally comes from i386v.h via svr3.h */
-
-/* Define the actual types of some ANSI-mandated types.  These
-   definitions should work for most SVR3 systems.  */
-
-#undef SIZE_TYPE
-#define SIZE_TYPE "unsigned int"
-
-#undef PTRDIFF_TYPE
-#define PTRDIFF_TYPE "int"
-
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "long int"
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE BITS_PER_WORD
diff --git a/gcc/config/i386/vsta.h b/gcc/config/i386/vsta.h
index 1bb897d7279..24e257324dd 100644
--- a/gcc/config/i386/vsta.h
+++ b/gcc/config/i386/vsta.h
@@ -1,5 +1,5 @@
 /* Configuration for an i386 running VSTa micro-kernel.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002 Free Software Foundation, Inc.
    Contributed by Rob Savoye (rob@cygnus.com).
 
 This file is part of GNU CC.
@@ -19,9 +19,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#define YES_UNDERSCORES
-
-#include "i386/gas.h"
+#define TARGET_VERSION fprintf (stderr, " (80386, BSD syntax)"); 
 
 #ifdef CPP_PREDEFINES
 #undef CPP_PREDEFINES
diff --git a/gcc/config/i386/vxi386.h b/gcc/config/i386/vxi386.h
index c050ca76412..a4b5944e957 100644
--- a/gcc/config/i386/vxi386.h
+++ b/gcc/config/i386/vxi386.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  VxWorks i386 version.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,6 +18,9 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#undef  TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (80386, VxWorks BSD syntax)"); 
+
 #undef CPP_CPU_SPEC
 #define CPP_CPU_SPEC "\
 -Asystem=unix -Acpu=i386 -Amachine=i386 \
@@ -35,8 +38,6 @@ Boston, MA 02111-1307, USA.  */
  %{mcpu=pentiumpro:-DCPU=PENTIUM -DCPU_VARIANT=PENTIUMPRO %(cpp_686)} \
  %{!mcpu*:%{!m486:%{!mpentium*:-DCPU=I80386 %(cpp_cpu_default)}}}}"
 
-#include "i386/i386-aout.h"
-
 #define HANDLE_SYSV_PRAGMA
 
 #undef CPP_PREDEFINES
diff --git a/gcc/config/i386/win32.h b/gcc/config/i386/win32.h
index da1821d877c..f6f32149d33 100644
--- a/gcc/config/i386/win32.h
+++ b/gcc/config/i386/win32.h
@@ -22,8 +22,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#define YES_UNDERSCORES
-
 /* Enable parsing of #pragma pack(push,<n>) and #pragma pack(pop).  */
 #define HANDLE_PRAGMA_PACK_PUSH_POP 1
 
@@ -31,6 +29,8 @@ Boston, MA 02111-1307, USA.  */
 #define SDB_DEBUGGING_INFO 
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
+#include "i386/unix.h"
+#include "i386/bsd.h"
 #include "i386/gas.h"
 #include "dbxcoff.h"