 @@ -1,20 +1,20 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc.old,v 1.10 2021/04/11 01:44:14 mrg Exp $
+#	$NetBSD: mknative-gcc.old,v 1.11 2023/07/28 08:05:29 mrg Exp $
+#
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
+#
-# This version is for GCC 9.3
+# This version is for GCC 10.3
 # initialise
 _TMPDIR=$2
 _TOP=$3
 _SRC=$4
 _PLATFORM=$5
 _MACHINE_ARCH=$6
 _DESTDIR=$7
 _TOOLDIR=$8
 _VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ 	]*,,'`
 _GNU_DIST=`cd ${_VPATH}; pwd`
 @@ -224,28 +224,30 @@ get_libstdcxx_v3 () {
 	_ver="$2"
 	mkdir -p $_OUTDIR/lib/$_subdir/arch/$_MACHINE_ARCH
 	_build_headers="c++config.h cxxabi_tweaks.h"
 	_headers1="backward_headers c_base_headers_extra"
 	_headers1="$_headers1 c_base_headers_extra_install"
 	_headers1="$_headers1 tr1_headers tr2_headers"
 	_headers1="$_headers1 decimal_headers c_compatibility_headers_install"
 	_headers1="$_headers1 debug_headers parallel_headers"
 	_headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
 	_headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
 	_headers1="$_headers1 bits_headers ext_headers host_headers"
-	_headers1="$_headers1 thread_host_headers pstl_headers"
+	_headers1="$_headers1 pstl_headers"
 	_headers1="$_headers1 profile_headers profile_impl_headers"
 	_headers1="$_headers1 experimental_headers experimental_bits_headers"
 	_headers1="$_headers1 ext_host_headers"
 	# build files
 	for h in $_build_headers; do
 		write_c $_OUTDIRBASE/lib/$_subdir/arch/$_MACHINE_ARCH/$h \
 			<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/$_PLATFORM/bits/$h
 	done
 	write_c $_OUTDIRBASE/lib/$_subdir/arch/$_MACHINE_ARCH/gstdint.h \
 		<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/gstdint.h
 	write_c $_OUTDIRBASE/lib/$_subdir/arch/$_MACHINE_ARCH/symver-config.h \
 		<$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
+	{
 @@ -264,32 +266,30 @@ get_libstdcxx_v3 () {
 		# includes
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
 			c_base_headers std_headers | sed -e 's#/[^ 	][^ 	]*/##g' -e 's/\${GNUHOSTDIST}//g'
 		# src
 		getvars $_PLATFORM/libstdc++-v3/src/Makefile \
 			libstdc___la_SOURCES | sed 's/^G_libstdc___la_SOURCES=/G_SRC_SOURCES=/'
 		getvars $_PLATFORM/libstdc++-v3/src/c++17/Makefile \
 			libc__17convenience_la_SOURCES | \
 			sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
 		getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
 			libc__11convenience_la_SOURCES | \
-			sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/' \
+			sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/'
 			    -e 's/codecvt.cc/c11-codecvt.cc/'
 		getvars $_PLATFORM/libstdc++-v3/src/c++98/Makefile \
 			GLIBCXX_ABI_FLAGS libc__98convenience_la_SOURCES | \
-			sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/' \
+			sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/'
 			    -e 's/codecvt.cc/c98-codecvt.cc/'
 		getvars $_PLATFORM/libstdc++-v3/src/filesystem/Makefile \
 			libstdc__fs_la_SOURCES | \
 			sed -e 's/^G_libstdc__fs_la_SOURCES=/G_FILESYSTEM_SOURCES=/'
 		getvars $_PLATFORM/libstdc++-v3/Makefile ATOMICITY_SRCDIR \
 			BASIC_FILE_CC CLOCALE_CC CCODECVT_CC CCOLLATE_CC \
 			CCTYPE_CC  CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC \
 			CPU_OPT_BITS_RANDOM
 		# includes
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
 			$_headers1 | \
 				sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' \
 				    -e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
 @@ -302,29 +302,31 @@ get_libstdcxx_v3 () {
 ##### lib/libsanitizer #####
 get_libsanitizer () {
 	_subdir="$1"
 	mkdir -p $_OUTDIR/lib/$_subdir/arch/$_MACHINE_ARCH
+	{
 		getvars $_PLATFORM/libsanitizer/asan/Makefile \
 			asan_files
 		getvars $_PLATFORM/libsanitizer/lsan/Makefile \
 			lsan_files
 		getvars $_PLATFORM/libsanitizer/tsan/Makefile \
-			tsan_plugin_files
+			tsan_files
 		getvars $_PLATFORM/libsanitizer/ubsan/Makefile \
-			ubsan_plugin_files
+			ubsan_files
 		getvars $_PLATFORM/libsanitizer/interception/Makefile \
 			interception_files
 	} | sanitise_includes \
 	  | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$_MACHINE_ARCH/defs.mk
+}
 ##### usr.bin/gcc* #####
 get_gcc_bootstrap () {
 	_subdir="$1"
 	mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$_MACHINE_ARCH
 	for f in auto-host tm config; do
 		write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$_MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
 	done
 @@ -389,27 +391,27 @@ get_gcc () {
 	getvars gcc/Makefile \
 		EXTRA_HEADERS \
 			| write_mk $_OUTDIRBASE/usr.bin/include/arch/$_MACHINE_ARCH.mk
 	getvars gcc/Makefile \
 		OBJS-libcommon \
 			| write_mk $_OUTDIRBASE/usr.bin/common/defs.mk
 	getvars gcc/Makefile \
 		OBJS-libcommon-target \
 			| write_mk $_OUTDIRBASE/usr.bin/common-target/arch/$_MACHINE_ARCH.mk
 	write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$_MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
-	hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
+	hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm omp-device-properties'
 	for f in $hfiles; do
 		write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$_MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
 		if [ "${_MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ]
 		then
 			ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$_MACHINE_ARCH/$f.h
 /configuration_arguments/ s/$//
 ya
+i
 #ifdef _SOFT_FLOAT
+.
 pu
 s/";$/ -with-float=soft";/
+a
 @@ -481,27 +483,27 @@ libgcc*-bootstrap)
 libstdc++-bootstrap)
 	get_libstdcxx_v3 libstdc++-v3 gcc
 	exit 0
 	;;
 gcc*)
 	get_gcc gcc
 	get_libgcc gcc
 	get_libgcov gcc $_PLATFORM/libgcc/Makefile
 	get_gcc_bootstrap gcc
 	get_gcc_libiberty gcc
 	get_libobjc libobjc
 	get_libstdcxx_v3 libstdc++-v3 gcc
-	# XXX not yet
+	# wants libstdc++-v3 built
 	# get_libsanitizer libsanitizer
 	get_libdecnumber libdecnumber
 	get_libgomp libgomp
 	get_libbacktrace libbacktrace
 	exit 0
 	;;
 *)
 	echo invalid arguments;
 	exit 1
 	;;
 esac

 @@ -1,24 +1,24 @@
-#	$NetBSD: Makefile,v 1.105 2021/09/18 01:47:10 christos Exp $
+#	$NetBSD: Makefile,v 1.106 2023/07/28 08:05:29 mrg Exp $
 .include <bsd.hostinit.mk>
 GCC_LANGUAGES=c c++ objc
 MODULE=		${EXTERNAL_GCC_SUBDIR}
 GCCDIST=	${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
 GNUHOSTDIST=	${GCCDIST}
-.if ${HAVE_GCC} == 9
+.if ${HAVE_GCC} == 10
 MKNATIVE=		${.CURDIR}/mknative-gcc.old
 .endif
 # Defaults
 CC_FOR_BUILD=		${HOST_CXX:Q}
 MKNATIVE?=		${.CURDIR}/mknative-gcc
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
 MULTILIB_ARGS= --enable-multilib
 .else
 MULTILIB_ARGS= --disable-multilib
 .endif