From 66c4fd196ef971e601810699e8b8ba5abc6ed81e Mon Sep 17 00:00:00 2001
From: tv <tv@NetBSD.org>
Date: Tue, 26 Feb 2002 20:56:29 +0000
Subject: [PATCH] Make hconfig.h common as simply a redirect to config.h; these
 are identical on a native build.  (Simplifies mknative for generating the
 arch-dependent bits.)

---
 gnu/usr.bin/gcc/Makefile.inc           |  3 ++-
 gnu/usr.bin/gcc/arch/alpha/hconfig.h   | 21 ---------------------
 gnu/usr.bin/gcc/arch/arm/hconfig.h     | 18 ------------------
 gnu/usr.bin/gcc/arch/i386/hconfig.h    | 18 ------------------
 gnu/usr.bin/gcc/arch/m68k/hconfig.h    | 18 ------------------
 gnu/usr.bin/gcc/arch/mipseb/hconfig.h  | 18 ------------------
 gnu/usr.bin/gcc/arch/mipsel/hconfig.h  | 18 ------------------
 gnu/usr.bin/gcc/arch/powerpc/hconfig.h | 18 ------------------
 gnu/usr.bin/gcc/arch/sparc/hconfig.h   | 18 ------------------
 gnu/usr.bin/gcc/arch/sparc64/hconfig.h | 21 ---------------------
 gnu/usr.bin/gcc/arch/vax/hconfig.h     | 18 ------------------
 gnu/usr.bin/gcc/hconfig.h              |  4 ++++
 12 files changed, 6 insertions(+), 187 deletions(-)
 delete mode 100644 gnu/usr.bin/gcc/arch/alpha/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/arm/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/i386/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/m68k/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/mipseb/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/mipsel/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/powerpc/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/sparc/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/sparc64/hconfig.h
 delete mode 100644 gnu/usr.bin/gcc/arch/vax/hconfig.h
 create mode 100644 gnu/usr.bin/gcc/hconfig.h

diff --git a/gnu/usr.bin/gcc/Makefile.inc b/gnu/usr.bin/gcc/Makefile.inc
index 8747451c2db5..8984ab5aafb9 100644
--- a/gnu/usr.bin/gcc/Makefile.inc
+++ b/gnu/usr.bin/gcc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.2 2001/11/26 18:19:48 jmc Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2002/02/26 20:58:46 tv Exp $
 
 TOP=		${.CURDIR}/../../..
 DIST=		${TOP}/dist/toolchain
@@ -6,5 +6,6 @@ DIST=		${TOP}/dist/toolchain
 GCCARCH=	${.CURDIR}/../arch/${MACHINE_ARCH}
 
 CPPFLAGS+=	-DLOCALEDIR=\"/usr/share/locale\" -DNETBSD_NATIVE
+HOST_CPPFLAGS+=	-I${.CURDIR}/..
 
 .include "${GCCARCH}/defs.mk"
diff --git a/gnu/usr.bin/gcc/arch/alpha/hconfig.h b/gnu/usr.bin/gcc/arch/alpha/hconfig.h
deleted file mode 100644
index 407bc487225a..000000000000
--- a/gnu/usr.bin/gcc/arch/alpha/hconfig.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.13 2001/12/05 22:37:40 rafal Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "alpha/xm-alpha.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "xm-target64.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/arm/hconfig.h b/gnu/usr.bin/gcc/arch/arm/hconfig.h
deleted file mode 100644
index 3e81e878eaf1..000000000000
--- a/gnu/usr.bin/gcc/arch/arm/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.12 2001/08/14 05:17:59 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "arm/xm-arm.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/i386/hconfig.h b/gnu/usr.bin/gcc/arch/i386/hconfig.h
deleted file mode 100644
index 5c233634f94a..000000000000
--- a/gnu/usr.bin/gcc/arch/i386/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.14 2002/01/22 13:13:00 mrg Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "i386/xm-i386.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/m68k/hconfig.h b/gnu/usr.bin/gcc/arch/m68k/hconfig.h
deleted file mode 100644
index 5745ba61dca2..000000000000
--- a/gnu/usr.bin/gcc/arch/m68k/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.12 2001/08/14 05:17:59 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "m68k/xm-m68k.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/mipseb/hconfig.h b/gnu/usr.bin/gcc/arch/mipseb/hconfig.h
deleted file mode 100644
index ac60d140025c..000000000000
--- a/gnu/usr.bin/gcc/arch/mipseb/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.12 2001/08/14 05:17:59 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "mips/xm-mips.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/mipsel/hconfig.h b/gnu/usr.bin/gcc/arch/mipsel/hconfig.h
deleted file mode 100644
index 8bf61e95282c..000000000000
--- a/gnu/usr.bin/gcc/arch/mipsel/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.1 2001/06/18 16:07:07 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "mips/xm-mips.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/powerpc/hconfig.h b/gnu/usr.bin/gcc/arch/powerpc/hconfig.h
deleted file mode 100644
index 3fbf68077f42..000000000000
--- a/gnu/usr.bin/gcc/arch/powerpc/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.12 2001/08/14 05:17:59 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "rs6000/xm-sysv4.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/sparc/hconfig.h b/gnu/usr.bin/gcc/arch/sparc/hconfig.h
deleted file mode 100644
index 2055ae5fece3..000000000000
--- a/gnu/usr.bin/gcc/arch/sparc/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.12 2001/08/14 05:17:59 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "sparc/xm-sparc.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/sparc64/hconfig.h b/gnu/usr.bin/gcc/arch/sparc64/hconfig.h
deleted file mode 100644
index 5e0a8ae06466..000000000000
--- a/gnu/usr.bin/gcc/arch/sparc64/hconfig.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.12 2001/08/14 05:17:59 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "sparc/xm-sp64.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "xm-target64.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/arch/vax/hconfig.h b/gnu/usr.bin/gcc/arch/vax/hconfig.h
deleted file mode 100644
index 76b33e42a7ff..000000000000
--- a/gnu/usr.bin/gcc/arch/vax/hconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: 	NetBSD: toolchain2netbsd,v 1.12 2001/08/14 05:17:59 tv Exp  */
-
-#ifdef IN_GCC
-#include "auto-host.h"
-#endif
-#ifdef IN_GCC
-#include "gansidecl.h"
-#endif
-#ifdef IN_GCC
-#include "vax/xm-vax.h"
-#endif
-#ifdef IN_GCC
-#include "xm-netbsd.h"
-#endif
-#ifdef IN_GCC
-#include "hwint.h"
-#endif
diff --git a/gnu/usr.bin/gcc/hconfig.h b/gnu/usr.bin/gcc/hconfig.h
new file mode 100644
index 000000000000..de79736fe70c
--- /dev/null
+++ b/gnu/usr.bin/gcc/hconfig.h
@@ -0,0 +1,4 @@
+/*	$NetBSD: hconfig.h,v 1.1 2002/02/26 20:58:46 tv Exp $	*/
+
+/* On native builds, hconfig.h == config.h. */
+#include "config.h"