config.gcc, bsd.h: Do not directly include sparc/sparc.h.

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

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20010604154759.G25044@redhat.com>

From-SVN: r42927

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dc127dad57c70fda60a30c60e44a8496f4965fc..3c7cf35bb776ba6bca9443f1ebebe60a8cc9b4fd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-05  David O'Brien  <obrien@FreeBSD.org>
+
+       * config.gcc, config/sparc/bsd.h:  Do not directly include
+       sparc/sparc.h.  Instead do it via tm_file.
+
 2001-06-05  Richard Henderson  <rth@redhat.com>
 
        * dwarf2.h (DW_EH_PE_aligned): New.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 600a693d857b76731a98c3d430c21bf6fed53f54..df7f574338c7bceba7efbb58796c457f15fa73f4 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2811,7 +2811,7 @@ sparc-*-openbsd*)
        use_collect2=yes
        ;;
 sparc-*-bsd*)
-       tm_file=sparc/bsd.h
+       tm_file="${tm_file} sparc/bsd.h"
        ;;
 sparc-*-chorusos*)
        tm_file="sparc/sol2.h sparc/elf.h sparc/chorus.h"

diff --git a/gcc/config/sparc/bsd.h b/gcc/config/sparc/bsd.h
index 761abe2671b8835aa9cb104c8b9f7797233438d5..41f83081399a00d89c1cfa366c48f0cd2bf58099 100644 (file)
--- a/gcc/config/sparc/bsd.h
+++ b/gcc/config/sparc/bsd.h
@@ -1,5 +1,3 @@
-#include "sparc/sparc.h"
-
 #undef LIB_SPEC
 #define LIB_SPEC       "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"