[src/trunk]: src/tools/gcc fetch omp-device-properties.h and don't try to fet...

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

details:   https://anonhg.NetBSD.org/src/rev/dc7ae2bf12db
branches:  trunk
changeset: 961530:dc7ae2bf12db
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Apr 11 07:35:45 2021 +0000

description:
fetch omp-device-properties.h and don't try to fetch sanitizer
stuff automatically yet.

diffstat:

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

diffs (56 lines):

diff -r 51f0c3b2d9f5 -r dc7ae2bf12db tools/gcc/Makefile
--- a/tools/gcc/Makefile        Sun Apr 11 01:44:14 2021 +0000
+++ b/tools/gcc/Makefile        Sun Apr 11 07:35:45 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.100 2020/09/06 02:24:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.101 2021/04/11 07:35:45 mrg Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -8,7 +8,7 @@
 GCCDIST=       ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
 GNUHOSTDIST=   ${GCCDIST}
 
-.if ${HAVE_GCC} == 7
+.if ${HAVE_GCC} == 9
 MKNATIVE=              ${.CURDIR}/mknative-gcc.old
 .endif
 
@@ -233,6 +233,8 @@
        PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
                (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h); \
                (cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
+       PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
+               (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e omp-device-properties.h)
 .if defined(EXTRA_GCC_TARGETS)
        PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
                (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e ${EXTRA_GCC_TARGETS})
diff -r 51f0c3b2d9f5 -r dc7ae2bf12db tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Sun Apr 11 01:44:14 2021 +0000
+++ b/tools/gcc/mknative-gcc    Sun Apr 11 07:35:45 2021 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.113 2021/04/11 01:44:14 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.114 2021/04/11 07:35:45 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -401,7 +401,7 @@
                        | 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" ]
@@ -493,7 +493,8 @@
        get_gcc_libiberty gcc
        get_libobjc libobjc
        get_libstdcxx_v3 libstdc++-v3 gcc
-       get_libsanitizer libsanitizer
+       # wants libstdc++-v3 built
+       # get_libsanitizer libsanitizer
        get_libdecnumber libdecnumber
        get_libgomp libgomp
        get_libbacktrace libbacktrace