config.gcc, bsd386.h: Do not directly include i386/386bsd.h.

2001-06-05  David O'Brien  <obrien@FreeBSD.org>
	* config.gcc, config/i386/bsd386.h:  Do not directly include
	i386/386bsd.h.  Instead do it via tm_file.

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20010604154739.F25044@redhat.com>

From-SVN: r42925

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ad9c7de..5c342bd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2001-06-05  David O'Brien  <obrien@FreeBSD.org>
 
+       * config.gcc, config/i386/bsd386.h:  Do not directly include
+       i386/386bsd.h.  Instead do it via tm_file.
+
+2001-06-05  David O'Brien  <obrien@FreeBSD.org>
+
        * elfos.h (USING_ELFOS_H):  Identify the use of elfos.h in the same
        way svr4.h does.
 

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6976455..600a693 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1039,7 +1039,7 @@ i[34567]86-*-beoself* | i[34567]86-*-beos*)
        extra_parts='crtbegin.o crtend.o'
        ;;
 i[34567]86-*-bsdi* | i[34567]86-*-bsd386*)
-       tm_file=i386/bsd386.h
+       tm_file="i386/386bsd.h i386/bsd386.h"
 #      tmake_file=t-libc-ok
        ;;
 i[34567]86-*-bsd*)

diff --git a/gcc/config/i386/bsd386.h b/gcc/config/i386/bsd386.h
index caef05c..8e0a6a1 100644 (file)
--- a/gcc/config/i386/bsd386.h
+++ b/gcc/config/i386/bsd386.h
@@ -1,8 +1,6 @@
 /* Configuration for an i386 running BSDI's BSD/OS (formerly known as BSD/386)
    as the target machine.  */
 
-#include "i386/386bsd.h"
-
 /* We exist mostly to add -Dbsdi and such to the predefines. */
 
 #undef CPP_PREDEFINES