summaryrefslogtreecommitdiff
path: root/tools/gcc
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2021-04-11 07:35:45 +0000
committermrg <mrg@NetBSD.org>2021-04-11 07:35:45 +0000
commit528466e8bbc18f6f2164affc529669fd0904e14c (patch)
tree43ee66db23c40e8c92b6582e1a3ad855e19c96f0 /tools/gcc
parent98a846c88cb2620ba94f8b34a9a2f879d3847117 (diff)
fetch omp-device-properties.h and don't try to fetch sanitizer
stuff automatically yet.
Diffstat (limited to 'tools/gcc')
-rw-r--r--tools/gcc/Makefile6
-rwxr-xr-xtools/gcc/mknative-gcc7
2 files changed, 8 insertions, 5 deletions
diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
index dc6ef2de451..0a307ed046e 100644
--- a/tools/gcc/Makefile
+++ b/tools/gcc/Makefile
@@ -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 @@ MODULE= ${EXTERNAL_GCC_SUBDIR}
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 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
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 --git a/tools/gcc/mknative-gcc b/tools/gcc/mknative-gcc
index 2df9003d3fb..37980dc4289 100755
--- a/tools/gcc/mknative-gcc
+++ b/tools/gcc/mknative-gcc
@@ -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 @@ 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" ]
@@ -493,7 +493,8 @@ gcc*)
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