config.gcc (*-*-gnu*, [...]): Specify needed platform specific files in tm_file.

2001-01-09  David O'Brien  <obrien@BSDi.com>
	* config.gcc (*-*-gnu*, i[34567]86-*-elf*, i[34567]86-*-linux*libc1,
	i[34567]86-*-linux*, i[34567]86-*-moss*): Specify needed platform specific
	files in tm_file.
	* config/i386/gnu.h: Don't include required platform specific .h files,
	tm.h will do it instead.
	* config/i386/i386elf.h: Likewise.
	* config/i386/linux.h: Likewise.
	* config/i386/moss.h: Likewise.
	* config/mips/gnu.h: Likewise.

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20010107030000.A24090@redhat.com>

From-SVN: r38842

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f32906a264b770754e38a66f8214c615baf4254..e7cb0d24badb54923109960e9b8c72a28be48dc8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2001-01-09  David O'Brien  <obrien@BSDi.com>
+
+       * config.gcc (*-*-gnu*, i[34567]86-*-elf*, i[34567]86-*-linux*libc1,
+       i[34567]86-*-linux*, i[34567]86-*-moss*): Specify needed platform specific
+       files in tm_file.
+       * config/i386/gnu.h: Don't include required platform specific .h files,
+       tm.h will do it instead.
+       * config/i386/i386elf.h: Likewise.
+       * config/i386/linux.h: Likewise.
+       * config/i386/moss.h: Likewise.
+       * config/mips/gnu.h: Likewise.
+
 2001-01-09  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
        * config.gcc (powerpc-*-beos*): Include ${tm_file} and rs6000/aix.h.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5f47b245d5d81401ed3e3e769bcbf5cf20b87a4f..1408777be0afc4d4999a9e446b2d6653f8f9e812 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -265,7 +265,7 @@ case $machine in
        # each different CPU.  The specific machines that we
        # support are matched above and just set $cpu_type.
        xm_file="xm-gnu.h ${xm_file}"
-       tm_file=${cpu_type}/gnu.h
+       tm_file="${cpu_type}/gnu.h"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        # GNU always uses ELF.
        elf=yes
@@ -276,6 +276,14 @@ case $machine in
        xmake_file=x-linux
        # But here we need a little extra magic.
        tmake_file="t-linux t-gnu"
+       case $machine in
+       i[34567]86-*-*)
+               tm_file="${cpu_type}/${cpu_type}.h i386/att.h linux.h i386/linux.h gnu.h ${tm_file}"
+               ;;
+       mips*-*-*)
+               tm_file="svr4.h ${cpu_type}/${cpu_type}.h ${tm_file}"
+               ;;
+       esac
        ;;
 *-*-openbsd*)
        tm_file=${cpu_type}/openbsd.h
@@ -971,7 +979,7 @@ i370-*-linux*)
        ;;
 i[34567]86-*-elf*)
        xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h"
-       tm_file=i386/i386elf.h
+       tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h"
        tmake_file=i386/t-i386elf
        xmake_file=x-svr4
        ;;
@@ -1158,7 +1166,7 @@ i[34567]86-*-linux*libc1) # Intel 80386's running GNU/Linux
                                # with ELF format using the
                                # GNU/Linux C library 5
        xmake_file=x-linux      
-       tm_file=i386/linux.h    
+       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
        tmake_file="t-linux t-linux-gnulibc1 i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1171,7 +1179,7 @@ i[34567]86-*-linux*)      # Intel 80386's running GNU/Linux
                        # with ELF format using glibc 2
                        # aka GNU/Linux C library 6
        xmake_file=x-linux
-       tm_file=i386/linux.h
+       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
        tmake_file="t-linux i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1202,7 +1210,7 @@ i[34567]86-pc-msdosdjgpp*)
        esac
        ;;
 i[34567]86-moss-msdos* | i[34567]86-*-moss*)
-       tm_file=i386/moss.h
+       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h i386/moss.h"
        tmake_file=t-libc-ok
        gnu_ld=yes
        gas=yes

diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
index 0acc4f30dfd59d2981ce85af98202c542804ac71..1c776096484447506af7b58ec9b05ca15f960fec 100644 (file)
--- a/gcc/config/i386/gnu.h
+++ b/gcc/config/i386/gnu.h
@@ -1,11 +1,5 @@
 /* Configuration for an i386 running GNU with ELF as the target machine.  */
 
-/* This does it mostly for us.  */
-#include <i386/linux.h>
-
-/* Get machine-independent configuration parameters for the GNU system.  */
-#include <gnu.h>
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
 

diff --git a/gcc/config/i386/i386elf.h b/gcc/config/i386/i386elf.h
index 714196d660b58f2409eaf1d334beb078be0d406f..d333551f2b83e3c2b313cab26cec46e4e9216387 100644 (file)
--- a/gcc/config/i386/i386elf.h
+++ b/gcc/config/i386/i386elf.h
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80386 using ELF
-   Copyright (C) 1988, 1991, 1995, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1991, 1995, 2000, 2001 Free Software Foundation, Inc.
 
    Derived from sysv4.h written by Ron Guilmette (rfg@netcom.com).
 
@@ -20,12 +20,9 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Use stabs instead of DWARF debug format.  */
+#undef  PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#include "i386/i386.h"
-#include "i386/att.h"
-#include "elfos.h"
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 bare ELF target)");
 

diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index 5f8e0f39dc1195fa11d84ae15f9055df9b7c8ffb..0ad1c3ac0cb603a43483c80f2cb1e36cf766bc68 100644 (file)
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running Linux-based GNU systems with ELF format.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
    Contributed by Eric Youngdale.
    Modified for stabs-in-ELF by H.J. Lu.
 
@@ -22,13 +22,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define LINUX_DEFAULT_ELF
 
-/* A lie, I guess, but the general idea behind linux/ELF is that we are
-   supposed to be outputting something that will assemble under SVr4.
-   This gets us pretty close.  */
-#include <i386/i386.h> /* Base i386 target machine definitions */
-#include <i386/att.h>  /* Use the i386 AT&T assembler syntax */
-#include <linux.h>     /* some common stuff */
-
 /* Output at beginning of assembler file.  */
 /* The .file command should always begin the output.  */
 #undef ASM_FILE_START

diff --git a/gcc/config/i386/moss.h b/gcc/config/i386/moss.h
index b8fda5c80f98d3e9a22abf41d387906332ff7f8c..200cae0edcccca14bb60b971dfc650c4a332b82f 100644 (file)
--- a/gcc/config/i386/moss.h
+++ b/gcc/config/i386/moss.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running MOSS
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001 Free Software Foundation, Inc.
    Contributed by Bryan Ford <baford@cs.utah.edu>
 
 This file is part of GNU CC.
@@ -19,9 +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.  */
 
-/* I believe in reuse... */
-#include "i386/linux.h"
-
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__ELF__ -Dmoss -Asystem=posix"