[src/trunk]: src/tools/gcc gcc 10 is now in gcc.old, make mknative-gcc.old gc...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3d87cc35f7d0
branches:  trunk
changeset: 378253:3d87cc35f7d0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 28 08:05:29 2023 +0000

description:
gcc 10 is now in gcc.old, make mknative-gcc.old gcc-10 happy.

diffstat:

 tools/gcc/Makefile         |   4 ++--
 tools/gcc/mknative-gcc.old |  24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diffs (93 lines):

diff -r 3ac8a0664b74 -r 3d87cc35f7d0 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Fri Jul 28 07:17:30 2023 +0000
+++ b/tools/gcc/Makefile        Fri Jul 28 08:05:29 2023 +0000
@@ -1,4 +1,4 @@
-#      $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>
 
@@ -8,7 +8,7 @@ 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
 
diff -r 3ac8a0664b74 -r 3d87cc35f7d0 tools/gcc/mknative-gcc.old
--- a/tools/gcc/mknative-gcc.old        Fri Jul 28 07:17:30 2023 +0000
+++ b/tools/gcc/mknative-gcc.old        Fri Jul 28 08:05:29 2023 +0000
@@ -1,10 +1,10 @@
 #!/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
 
@@ -234,8 +234,10 @@ get_libstdcxx_v3 () {
        _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
@@ -274,12 +276,10 @@ get_libstdcxx_v3 () {
                        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=/' \
-                           -e 's/codecvt.cc/c11-codecvt.cc/'
+                       sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/'
                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=/' \
-                           -e 's/codecvt.cc/c98-codecvt.cc/'
+                       sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/'
                getvars $_PLATFORM/libstdc++-v3/src/filesystem/Makefile \
                        libstdc__fs_la_SOURCES | \
                        sed -e 's/^G_libstdc__fs_la_SOURCES=/G_FILESYSTEM_SOURCES=/'
@@ -312,9 +312,11 @@ get_libsanitizer () {
                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
@@ -399,7 +401,7 @@ get_gcc () {
                        | 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" ]
@@ -491,7 +493,7 @@ 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