12 files changed, 33 insertions, 19 deletions
diff --git a/gcc/config/i386/xm-beos.h b/gcc/config/i386/xm-beos.h
index 8877c30e8a3..6a5a670e674 100644
--- a/gcc/config/i386/xm-beos.h
+++ b/gcc/config/i386/xm-beos.h
@@ -20,8 +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/xm-i386.h>
-
 /* Include <sys/wait.h> to define the exit status access macros.  */
 #ifndef inhibit_libc
 #include <sys/wait.h>
diff --git a/gcc/config/i386/xm-bsd386.h b/gcc/config/i386/xm-bsd386.h
deleted file mode 100644
index 6b8eee7db03..00000000000
--- a/gcc/config/i386/xm-bsd386.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Configuration for GCC for Intel i386 running BSDI's BSD/386 as host.  */
-
-#include "i386/xm-i386.h"
diff --git a/gcc/config/i386/xm-dgux.h b/gcc/config/i386/xm-dgux.h
new file mode 100644
index 00000000000..881c5c7be9d
--- /dev/null
+++ b/gcc/config/i386/xm-dgux.h
@@ -0,0 +1,4 @@
+/* Configuration for GCC for Intel i386 running DG/ux */
+
+/* looks just like sysv4 for now */
+#include "xm-svr4.h"
diff --git a/gcc/config/i386/xm-djgpp.h b/gcc/config/i386/xm-djgpp.h
index 95d55fb9c13..52124683ffa 100644
--- a/gcc/config/i386/xm-djgpp.h
+++ b/gcc/config/i386/xm-djgpp.h
@@ -20,8 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define __MSDOS__ 1
 
-#include "i386/xm-i386.h"
-
 /* Use semicolons to separate elements of a path.  */
 #define PATH_SEPARATOR ';'
 
diff --git a/gcc/config/i386/xm-dos.h b/gcc/config/i386/xm-dos.h
index 2abdbfce794..d28a1ffc7dc 100644
--- a/gcc/config/i386/xm-dos.h
+++ b/gcc/config/i386/xm-dos.h
@@ -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/xm-i386.h"
-
 /* Use semicolons to separate elements of a path.  */
 #define PATH_SEPARATOR ';'
 
diff --git a/gcc/config/i386/xm-gnu.h b/gcc/config/i386/xm-gnu.h
new file mode 100644
index 00000000000..6b1797c4c51
--- /dev/null
+++ b/gcc/config/i386/xm-gnu.h
@@ -0,0 +1,2 @@
+/* Configuration for GCC for Intel i386 running GNU as host.  */
+#include <xm-gnu.h>
diff --git a/gcc/config/i386/xm-i386-interix.h b/gcc/config/i386/xm-i386-interix.h
index 8bfd5e2d915..bd010e47bc5 100644
--- a/gcc/config/i386/xm-i386-interix.h
+++ b/gcc/config/i386/xm-i386-interix.h
@@ -21,8 +21,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/xm-i386.h>
-
 #define HOST_BITS_PER_WIDEST_INT HOST_BITS_PER_LONGLONG
 #ifdef __GNUC__
 #   define HOST_WIDEST_INT long long
diff --git a/gcc/config/i386/xm-linux.h b/gcc/config/i386/xm-linux.h
index 84c9f6737e2..93c5576b16c 100644
--- a/gcc/config/i386/xm-linux.h
+++ b/gcc/config/i386/xm-linux.h
@@ -19,5 +19,4 @@ 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/xm-i386.h>
 #include <xm-linux.h>
diff --git a/gcc/config/i386/xm-next.h b/gcc/config/i386/xm-next.h
index bf903281a0d..e0b53f2e04f 100644
--- a/gcc/config/i386/xm-next.h
+++ b/gcc/config/i386/xm-next.h
@@ -1,5 +1,3 @@
-#include "i386/xm-i386.h"
-
 /* malloc does better with chunks the size of a page.  */ 
 
 #define OBSTACK_CHUNK_SIZE (getpagesize ())
diff --git a/gcc/config/i386/xm-i386.h b/gcc/config/i386/xm-openbsd.h
index 9f5b5500fc7..9704479472d 100644
--- a/gcc/config/i386/xm-i386.h
+++ b/gcc/config/i386/xm-openbsd.h
@@ -1,5 +1,5 @@
-/* Configuration for GNU C-compiler for Intel 80386.
-   Copyright (C) 1988, 1993, 2001 Free Software Foundation, Inc.
+/* Configuration file for i386 hosts running OpenBSD.
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,6 +18,4 @@ 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.  */
 
-#ifndef __i386__
-#define __i386__ 1
-#endif
+#include <xm-openbsd.h>
diff --git a/gcc/config/i386/xm-sun.h b/gcc/config/i386/xm-sun.h
new file mode 100644
index 00000000000..6c0f0a25630
--- /dev/null
+++ b/gcc/config/i386/xm-sun.h
@@ -0,0 +1,21 @@
+/* Configuration for GNU C-compiler for Intel 80386 running SunOS 4.0.
+   Copyright (C) 1988, 1997 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.  */
+
+#define USG
diff --git a/gcc/config/i386/xm-sysv3.h b/gcc/config/i386/xm-sysv3.h
new file mode 100644
index 00000000000..9a655443ff5
--- /dev/null
+++ b/gcc/config/i386/xm-sysv3.h
@@ -0,0 +1,3 @@
+/* Configuration for GCC for Intel i386 running System V Release 3.  */
+
+#include "xm-svr3.h"