From e222fd42303a7eff3dbda2975c553cb849d75b8b Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Fri, 1 Aug 2003 02:44:55 +0000
Subject: [PATCH] we need config.h an another version of gthr-default.h

---
 tools/gcc/Makefile     | 4 +++-
 tools/gcc/mknative-gcc | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
index f507aa05d0e1..e6c624571dfe 100644
--- a/tools/gcc/Makefile
+++ b/tools/gcc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/07/29 06:48:14 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2003/08/01 02:44:55 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,8 @@ MODULE=		gcc
 FIND_ARGS=	\! \( -type d -name sim -prune \)
 
 CONFIGURE_ARGS=	--target=${MACHINE_GNU_PLATFORM} --disable-nls \
+		--disable-multilib \
+		--enable-threads \
 		--program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
 		--enable-languages="c c++ objc f77"
 
diff --git a/tools/gcc/mknative-gcc b/tools/gcc/mknative-gcc
index 8b64d6b80b94..e6857ff56a6c 100755
--- a/tools/gcc/mknative-gcc
+++ b/tools/gcc/mknative-gcc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.5 2003/07/30 05:10:06 mrg Exp $
+#	$NetBSD: mknative-gcc,v 1.6 2003/08/01 02:44:56 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/gnu/dist/toolchain.
@@ -131,6 +131,9 @@ get_libstdcxx_v3 () {
 			<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/$_PLATFORM/bits/$h
 	done
 
+	write_c gnu/lib/libstdc++-v3/arch/$MACHINE_ARCH/config.h \
+		<$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
+
 	{
 		# libmath
 		getvars $_PLATFORM/libstdc++-v3/libmath/Makefile \
@@ -183,7 +186,7 @@ get_gcc () {
 			F77_OBJS | sed 's/f\///g'
 	} | write_mk gnu/usr.bin/gcc3/arch/$MACHINE_ARCH/defs.mk
 
-	for f in auto-build auto-host configargs cs-hconfig gencheck hconfig; do
+	for f in auto-build auto-host configargs cs-hconfig gencheck hconfig gthr-default; do
 		write_c gnu/usr.bin/gcc3/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
 	done
 }