config.gcc (ns32k-*-netbsd*): Set tm_file to "${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"

* config.gcc (ns32k-*-netbsd*): Set tm_file to
"${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
* config/ns32k/netbsd.h: Don't include ns32k/ns32k.h,
netbsd.h, or netbsd-aout.h.

From-SVN: r54082

gcc/ChangeLog

 2002-05-31  Jason Thorpe  <thorpej@wasabisystems.com>
 
+	* config.gcc (ns32k-*-netbsd*): Set tm_file to
+	"${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
+	* config/ns32k/netbsd.h: Don't include ns32k/ns32k.h,
+	netbsd.h, or netbsd-aout.h.
+
+2002-05-31  Jason Thorpe  <thorpej@wasabisystems.com>
+
 	* longlong.h (count_trailing_zeros): Add missing \, and clean up
 	whitespace in __ns32000__ case.
 

gcc/config.gcc

@@ -1935,7 +1935,7 @@ ns32k-*-netbsdelf*)
 	echo "GCC does not yet support the ${machine} target"; exit 1
 	;;
 ns32k-*-netbsd*)
-	tm_file=ns32k/netbsd.h
+	tm_file="${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
 	# On NetBSD, the headers are already okay, except for math.h.
 	tmake_file=t-netbsd
 	use_collect2=yes

gcc/config/ns32k/netbsd.h

@@ -16,11 +16,7 @@ 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 <ns32k/ns32k.h>
+Boston, MA 02111-1307, USA.  */
 
 /* Compile for the floating point unit & 32532 by default;
    Don't assume SB is zero;
@@ -64,10 +60,6 @@ Boston, MA 02111-1307, USA.
 
 #define MOVD_FLOAT_OK
 
-/* Get generic NetBSD definitions. */
-#include <netbsd.h>
-#include <netbsd-aout.h>
-
 /* Names to predefine in the preprocessor for this target machine.  */
 
 #undef CPP_PREDEFINES