Update LLVM build system for 249b40b558955afe5ac2b549edcf2d7f859c8cc9

This enables the use of modules for a significant build performance gain
when building with clang as host compiler or when using HAVE_LLVM=yes.
Switch libc++ to using the copy from the mono-repo.

distrib/sets/lists/base/mi

@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1279 2021/05/07 21:51:21 nia Exp $
+# $NetBSD: mi,v 1.1280 2021/05/30 01:56:44 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1121,6 +1121,10 @@
 ./usr/include/c++				base-cxx-usr
 ./usr/include/c++/experimental			base-cxx-usr
 ./usr/include/c++/ext				base-cxx-usr
+./usr/include/c++/__iterator			base-cxx-usr
+./usr/include/c++/__memory			base-cxx-usr
+./usr/include/c++/__ranges			base-cxx-usr
+./usr/include/c++/__utility			base-cxx-usr
 ./usr/include/cdk				base-obsolete		obsolete
 ./usr/include/clang-3.4				base-obsolete		obsolete
 ./usr/include/clang-3.5				base-obsolete		obsolete
@@ -1129,7 +1133,8 @@
 ./usr/include/clang-4.0				base-obsolete		obsolete
 ./usr/include/clang-5.0				base-obsolete		obsolete
 ./usr/include/clang-7.0				base-obsolete		obsolete
-./usr/include/clang-9.0				base-c-usr
+./usr/include/clang-9.0				base-obsolete		obsolete
+./usr/include/clang-13.0			base-c-usr
 ./usr/include/compat				base-obsolete		obsolete
 ./usr/include/crypto				base-c-usr
 ./usr/include/dev				base-c-usr

distrib/sets/lists/comp/ad.aarch64

@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.45 2021/04/12 02:08:59 mrg Exp $
+# $NetBSD: ad.aarch64,v 1.46 2021/05/30 01:56:45 joerg Exp $
 ./usr/include/aarch64				comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -120,9 +120,13 @@
 ./usr/include/clang-7.0/arm64intr.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/arm_acle.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/arm_neon.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/arm64intr.h		comp-c-include		llvm
+./usr/include/clang-9.0/arm64intr.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/arm_acle.h		comp-c-include		llvm
+./usr/include/clang-9.0/arm_acle.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/arm_neon.h		comp-c-include		llvm
+./usr/include/clang-9.0/arm_neon.h		comp-obsolete		obsolete
+./usr/include/clang-13.0/arm64intr.h		comp-c-include		llvm
+./usr/include/clang-13.0/arm_acle.h		comp-c-include		llvm
+./usr/include/clang-13.0/arm_cmse.h		comp-c-include		llvm
+./usr/include/clang-13.0/arm_neon.h		comp-c-include		llvm
 ./usr/include/evbarm				comp-c-include
 ./usr/include/evbarm/disklabel.h		comp-c-include
 ./usr/include/evbarm/intr.h			comp-c-include

distrib/sets/lists/comp/ad.arm

@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.105 2021/04/12 02:08:59 mrg Exp $
+# $NetBSD: ad.arm,v 1.106 2021/05/30 01:56:45 joerg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/include/acorn26				comp-obsolete		obsolete
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
@@ -306,8 +306,11 @@
 ./usr/include/clang-5.0/arm_neon.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/arm_acle.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/arm_neon.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/arm_acle.h		comp-c-include		llvm
+./usr/include/clang-9.0/arm_acle.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/arm_neon.h		comp-c-include		llvm
+./usr/include/clang-9.0/arm_neon.h		comp-obsolete		obsolete
+./usr/include/clang-13.0/arm_acle.h		comp-c-include		llvm
+./usr/include/clang-13.0/arm_cmse.h		comp-c-include		llvm
+./usr/include/clang-13.0/arm_neon.h		comp-c-include		llvm
 ./usr/include/epoc32				comp-c-include
 ./usr/include/epoc32/ansi.h			comp-obsolete		obsolete
 ./usr/include/epoc32/aout_machdep.h		comp-obsolete		obsolete

distrib/sets/lists/comp/ad.mips

@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.89 2021/04/25 22:30:29 christos Exp $
+# $NetBSD: ad.mips,v 1.90 2021/05/30 01:56:45 joerg Exp $
 -./usr/lib/64/libgomp.a
 -./usr/lib/64/libgomp.so
 -./usr/lib/64/libgomp.so.1
@@ -13,7 +13,8 @@
 ./usr/include/clang-4.0/msa.h			comp-obsolete		obsolete
 ./usr/include/clang-5.0/msa.h			comp-obsolete		obsolete
 ./usr/include/clang-7.0/msa.h			comp-obsolete		obsolete
-./usr/include/clang-9.0/msa.h			comp-c-include		llvm
+./usr/include/clang-9.0/msa.h			comp-obsolete		obsolete
+./usr/include/clang-13.0/msa.h			comp-c-include		llvm
 ./usr/include/g++/bits/mips32			comp-c-include		compat,arch64
 ./usr/include/g++/bits/mips32/c++config.h	comp-c-include		compat,arch64,gcc
 ./usr/include/g++/bits/mips64			comp-c-include		compat,arch64

distrib/sets/lists/comp/ad.powerpc

@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.101 2021/04/12 02:08:59 mrg Exp $
+# $NetBSD: ad.powerpc,v 1.102 2021/05/30 01:56:45 joerg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb
 ./usr/include/altivec.h				comp-obsolete		obsolete
@@ -17,9 +17,12 @@
 ./usr/include/clang-7.0/altivec.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/htmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/htmxlintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/altivec.h		comp-c-include		llvm
+./usr/include/clang-9.0/altivec.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/htmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/htmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/htmxlintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/htmxlintrin.h		comp-obsolete		obsolete
+./usr/include/clang-13.0/altivec.h		comp-c-include		llvm
+./usr/include/clang-13.0/htmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/htmxlintrin.h		comp-c-include		llvm
 ./usr/include/g++/bits/powerpc			comp-c-include		compat
 ./usr/include/g++/bits/powerpc/c++config.h	comp-c-include		compat,gcc
 ./usr/include/g++/bits/powerpc64		comp-c-include		compat

distrib/sets/lists/comp/md.amd64

@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.286 2021/04/30 13:55:18 christos Exp $
+# $NetBSD: md.amd64,v 1.287 2021/05/30 01:56:45 joerg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -411,90 +411,182 @@
 ./usr/include/clang-7.0/xsaveoptintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/xsavesintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/xtestintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-9.0/adxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-9.0/ammintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/adxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512bf16intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512bitalgintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512bf16intrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512bwintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512bitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512cdintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512bwintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512dqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512cdintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512erintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512dqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512fintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512erintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512ifmaintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512fintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512ifmavlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512ifmaintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512pfintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512ifmavlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vbmi2intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512pfintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vbmiintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vbmivlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vbmiintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlbf16intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vbmivlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlbitalgintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlbf16intrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlbwintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlbitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlcdintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlbwintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vldqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlcdintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vldqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlvbmi2intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlvnniintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlvbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlvp2intersectintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vnniintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlvp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vp2intersectintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vnniintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vpopcntdqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vpopcntdqvlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vpopcntdqvlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/bmi2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/bmiintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/cetintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/cldemoteintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/cetintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/clflushoptintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/cldemoteintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/clwbintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/clflushoptintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/clzerointrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/clwbintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/cpuid.h			comp-obsolete		obsolete
-./usr/include/clang-9.0/clzerointrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/emmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/cpuid.h			comp-c-include		llvm
+./usr/include/clang-9.0/enqcmdintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/f16cintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/enqcmdintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/fma4intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/fmaintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/fxsrintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/gfniintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/fxsrintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/ia32intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/gfniintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/immintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/ia32intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/invpcidintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/lwpintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/invpcidintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/lzcntintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/lwpintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/mm3dnow.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/mmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-9.0/mm_malloc.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-9.0/movdirintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/mwaitxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/movdirintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/nmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mwaitxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/pconfigintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/pkuintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/pconfigintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/pmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/pkuintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/popcntintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/prfchwintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/ptwriteintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/prfchwintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/rdseedintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/ptwriteintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/rtmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/rdseedintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/sgxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/shaintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/sgxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/smmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/shaintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/tbmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/tmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/tbmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/vaesintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/vpclmulqdqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/vaesintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/waitpkgintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/vpclmulqdqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/wbnoinvdintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/waitpkgintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/__wmmintrin_aes.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/wbnoinvdintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/wmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/x86intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xopintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xsavecintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xsavecintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xsaveintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xsaveintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xsaveoptintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/xsaveoptintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/xsavesintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xsavesintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xtestintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xtestintrin.h		comp-obsolete		obsolete
+./usr/include/clang-13.0/adxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/avx512bf16intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512bitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512bwintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512cdintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512dqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512erintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512fintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512ifmaintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512ifmavlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512pfintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vbmiintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vbmivlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlbf16intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlbitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlbwintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlcdintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vldqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlvbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlvp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vnniintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vpopcntdqvlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/amxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/avxvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/cetintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/cldemoteintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/clflushoptintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/clwbintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/clzerointrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/cpuid.h		comp-c-include		llvm
+./usr/include/clang-13.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/enqcmdintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/fxsrintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/gfniintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/hresetintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/ia32intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/invpcidintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/keylockerintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/lwpintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-13.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-13.0/movdirintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/mwaitxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/pconfigintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/pkuintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/prfchwintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/ptwriteintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/rdseedintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/serializeintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/sgxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/shaintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/tbmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/tsxldtrkintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/uintrintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/vaesintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/vpclmulqdqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/waitpkgintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/wbnoinvdintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-13.0/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-13.0/x86gprintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xsavecintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xsaveintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xsaveoptintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/xsavesintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xtestintrin.h		comp-c-include		llvm
 ./usr/include/dev/nvmm/x86			comp-c-include		nvmm
 ./usr/include/dev/nvmm/x86/nvmm_x86.h		comp-c-include		nvmm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete

distrib/sets/lists/comp/md.i386

@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.202 2021/04/30 13:55:18 christos Exp $
+# $NetBSD: md.i386,v 1.203 2021/05/30 01:56:45 joerg Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -340,90 +340,182 @@
 ./usr/include/clang-7.0/xsaveoptintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/xsavesintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/xtestintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-9.0/adxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-9.0/ammintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/adxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512bf16intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512bitalgintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512bf16intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512bwintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512bitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512cdintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512bwintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512dqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512cdintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512erintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512dqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512fintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512erintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512ifmaintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512fintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512ifmavlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512ifmaintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512pfintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512ifmavlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vbmi2intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512pfintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vbmiintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vbmivlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vbmiintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlbf16intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vbmivlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlbitalgintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlbf16intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlbwintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlbitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlcdintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlbwintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vldqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlcdintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vldqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlvbmi2intrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlvnniintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlvbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vlvp2intersectintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vnniintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vlvp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vp2intersectintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vnniintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vpopcntdqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avx512vpopcntdqvlintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/avx512vpopcntdqvlintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/bmi2intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/bmiintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/cetintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/cldemoteintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/cetintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/clflushoptintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/cldemoteintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/clwbintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/clflushoptintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/clzerointrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/clwbintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/cpuid.h			comp-obsolete		obsolete
-./usr/include/clang-9.0/clzerointrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/emmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/cpuid.h			comp-c-include		llvm
+./usr/include/clang-9.0/enqcmdintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/f16cintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/enqcmdintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/fma4intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/fmaintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/fxsrintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/gfniintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/fxsrintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/ia32intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/gfniintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/immintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/ia32intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/invpcidintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/lwpintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/invpcidintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/lzcntintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/lwpintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/mm3dnow.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/mmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-9.0/mm_malloc.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-9.0/movdirintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/mwaitxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/movdirintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/nmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/mwaitxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/pconfigintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/pkuintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/pconfigintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/pmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/pkuintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/popcntintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/prfchwintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/ptwriteintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/prfchwintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/rdseedintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/ptwriteintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/rtmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/rdseedintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/sgxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/shaintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/sgxintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/smmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/shaintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/tbmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/tmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/tbmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/vaesintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/vpclmulqdqintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/vaesintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/waitpkgintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/vpclmulqdqintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/wbnoinvdintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/waitpkgintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/__wmmintrin_aes.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/wbnoinvdintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/wmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/x86intrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xopintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xsavecintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xsavecintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xsaveintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xsaveintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xsaveoptintrin.h	comp-c-include		llvm
+./usr/include/clang-9.0/xsaveoptintrin.h	comp-obsolete		obsolete
-./usr/include/clang-9.0/xsavesintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xsavesintrin.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/xtestintrin.h		comp-c-include		llvm
+./usr/include/clang-9.0/xtestintrin.h		comp-obsolete		obsolete
+./usr/include/clang-13.0/adxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/avx2intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/avx512bf16intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512bitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512bwintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512cdintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512dqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512erintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512fintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512ifmaintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512ifmavlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512pfintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vbmiintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vbmivlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlbf16intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlbitalgintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlbwintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlcdintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vldqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlvbmi2intrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vlvp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vnniintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vp2intersectintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vpopcntdqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/avx512vpopcntdqvlintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/amxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/avxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/avxvnniintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/bmi2intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/bmiintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/cetintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/cldemoteintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/clflushoptintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/clwbintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/clzerointrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/cpuid.h		comp-c-include		llvm
+./usr/include/clang-13.0/emmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/enqcmdintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/f16cintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/fma4intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/fmaintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/fxsrintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/gfniintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/hresetintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/ia32intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/invpcidintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/keylockerintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/lwpintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/lzcntintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-13.0/mmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-13.0/movdirintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/mwaitxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/nmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/pconfigintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/pkuintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/popcntintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/prfchwintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/ptwriteintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/rdseedintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/rtmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/serializeintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/sgxintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/shaintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/smmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/tbmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/tmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/tsxldtrkintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/uintrintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/vaesintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/vpclmulqdqintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/waitpkgintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/wbnoinvdintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-13.0/wmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/__wmmintrin_pclmul.h	comp-c-include		llvm
+./usr/include/clang-13.0/x86gprintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/x86intrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xmmintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xopintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xsavecintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xsaveintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xsaveoptintrin.h	comp-c-include		llvm
+./usr/include/clang-13.0/xsavesintrin.h		comp-c-include		llvm
+./usr/include/clang-13.0/xtestintrin.h		comp-c-include		llvm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.1/emmintrin.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.1/mm_malloc.h		comp-obsolete		obsolete

distrib/sets/lists/comp/mi

@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2387 2021/05/17 04:07:41 yamaguchi Exp $
+#	$NetBSD: mi,v 1.2388 2021/05/30 01:56:45 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -211,26 +211,71 @@
 ./usr/include/bm.h				comp-c-include
 ./usr/include/bozohttpd.h			comp-c-include
 ./usr/include/bzlib.h				comp-c-include
+./usr/include/c++/__availability		comp-cxx-include	libcxx
 ./usr/include/c++/__bit_reference		comp-cxx-include	libcxx
+./usr/include/c++/__bits			comp-cxx-include	libcxx
+./usr/include/c++/__bsd_locale_defaults.h	comp-cxx-include	libcxx
+./usr/include/c++/__bsd_locale_fallbacks.h	comp-cxx-include	libcxx
 ./usr/include/c++/__config			comp-cxx-include	libcxx
+./usr/include/c++/__config_site			comp-cxx-include	libcxx
 ./usr/include/c++/__debug			comp-cxx-include	libcxx
+./usr/include/c++/__errc			comp-cxx-include	libcxx
 ./usr/include/c++/__functional_03		comp-cxx-include	libcxx
 ./usr/include/c++/__functional_base		comp-cxx-include	libcxx
 ./usr/include/c++/__functional_base_03		comp-cxx-include	libcxx
 ./usr/include/c++/__hash_table			comp-cxx-include	libcxx
+./usr/include/c++/__iterator			comp-cxx-include	libcxx
+./usr/include/c++/__iterator/concepts.h		comp-cxx-include	libcxx
+./usr/include/c++/__iterator/incrementable_traits.h	comp-cxx-include	libcxx
+./usr/include/c++/__iterator/iter_move.h	comp-cxx-include	libcxx
+./usr/include/c++/__iterator/iterator_traits.h	comp-cxx-include	libcxx
+./usr/include/c++/__iterator/readable_traits.h	comp-cxx-include	libcxx
+./usr/include/c++/__libcpp_version		comp-cxx-include	libcxx
 ./usr/include/c++/__locale			comp-cxx-include	libcxx
+./usr/include/c++/__memory/addressof.h		comp-cxx-include	libcxx
+./usr/include/c++/__memory/allocation_guard.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/allocator.h		comp-cxx-include	libcxx
+./usr/include/c++/__memory/allocator_traits.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/auto_ptr.h		comp-cxx-include	libcxx
+./usr/include/c++/__memory/base.h		comp-cxx-obsolete	obsolete
+./usr/include/c++/__memory/compressed_pair.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/construct_at.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/pointer_safety.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/pointer_traits.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/raw_storage_iterator.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/shared_ptr.h		comp-cxx-include	libcxx
+./usr/include/c++/__memory/temporary_buffer.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/uninitialized_algorithms.h	comp-cxx-include	libcxx
+./usr/include/c++/__memory/unique_ptr.h		comp-cxx-include	libcxx
+./usr/include/c++/__memory/utilities.h		comp-cxx-obsolete	obsolete
 ./usr/include/c++/__mutex_base			comp-cxx-include	libcxx
+./usr/include/c++/__node_handle			comp-cxx-include	libcxx
+./usr/include/c++/__nullptr			comp-cxx-include	libcxx
+./usr/include/c++/__ranges/access.h		comp-cxx-include	libcxx
+./usr/include/c++/__ranges/concepts.h		comp-cxx-include	libcxx
+./usr/include/c++/__ranges/data.h		comp-cxx-include	libcxx
+./usr/include/c++/__ranges/empty.h		comp-cxx-include	libcxx
+./usr/include/c++/__ranges/enable_borrowed_range.h	comp-cxx-include	libcxx
+./usr/include/c++/__ranges/size.h		comp-cxx-include	libcxx
+./usr/include/c++/__ranges/view.h		comp-cxx-include	libcxx
 ./usr/include/c++/__split_buffer		comp-cxx-include	libcxx
-./usr/include/c++/__sso_allocator		comp-cxx-include	libcxx
+./usr/include/c++/__sso_allocator		comp-cxx-obsolete	obsolete
 ./usr/include/c++/__std_stream			comp-cxx-include	libcxx
+./usr/include/c++/__string			comp-cxx-include	libcxx
+./usr/include/c++/__threading_support		comp-cxx-include	libcxx
 ./usr/include/c++/__tree			comp-cxx-include	libcxx
 ./usr/include/c++/__tuple			comp-cxx-include	libcxx
 ./usr/include/c++/__tuple_03			comp-obsolete		obsolete
-./usr/include/c++/__undef___deallocate		comp-cxx-include	libcxx
+./usr/include/c++/__undef___deallocate		comp-obsolete		obsolete
-./usr/include/c++/__undef_min_max		comp-cxx-include	libcxx
+./usr/include/c++/__undef_macros		comp-cxx-include	libcxx
+./usr/include/c++/__undef_min_max		comp-obsolete		obsolete
+./usr/include/c++/__utility/to_underlying.h	comp-cxx-include	libcxx
 ./usr/include/c++/algorithm			comp-cxx-include	libcxx
+./usr/include/c++/any				comp-cxx-include	libcxx
 ./usr/include/c++/array				comp-cxx-include	libcxx
 ./usr/include/c++/atomic			comp-cxx-include	libcxx
+./usr/include/c++/barrier			comp-cxx-include	libcxx
+./usr/include/c++/bit				comp-cxx-include	libcxx
 ./usr/include/c++/bitset			comp-cxx-include	libcxx
 ./usr/include/c++/cassert			comp-cxx-include	libcxx
 ./usr/include/c++/ccomplex			comp-cxx-include	libcxx
@@ -238,6 +283,7 @@
 ./usr/include/c++/cerrno			comp-cxx-include	libcxx
 ./usr/include/c++/cfenv				comp-cxx-include	libcxx
 ./usr/include/c++/cfloat			comp-cxx-include	libcxx
+./usr/include/c++/charconv			comp-cxx-include	libcxx
 ./usr/include/c++/chrono			comp-cxx-include	libcxx
 ./usr/include/c++/cinttypes			comp-cxx-include	libcxx
 ./usr/include/c++/ciso646			comp-cxx-include	libcxx
@@ -245,8 +291,10 @@
 ./usr/include/c++/clocale			comp-cxx-include	libcxx
 ./usr/include/c++/cmath				comp-cxx-include	libcxx
 ./usr/include/c++/codecvt			comp-cxx-include	libcxx
+./usr/include/c++/compare			comp-cxx-include	libcxx
 ./usr/include/c++/complex			comp-cxx-include	libcxx
 ./usr/include/c++/complex.h			comp-cxx-include	libcxx
+./usr/include/c++/concepts			comp-cxx-include	libcxx
 ./usr/include/c++/condition_variable		comp-cxx-include	libcxx
 ./usr/include/c++/csetjmp			comp-cxx-include	libcxx
 ./usr/include/c++/csignal			comp-cxx-include	libcxx
@@ -259,59 +307,102 @@
 ./usr/include/c++/cstring			comp-cxx-include	libcxx
 ./usr/include/c++/ctgmath			comp-cxx-include	libcxx
 ./usr/include/c++/ctime				comp-cxx-include	libcxx
+./usr/include/c++/ctype.h			comp-cxx-include	libcxx
 ./usr/include/c++/cwchar			comp-cxx-include	libcxx
 ./usr/include/c++/cwctype			comp-cxx-include	libcxx
 ./usr/include/c++/cxxabi.h			comp-cxx-include	libcxx
 ./usr/include/c++/deque				comp-cxx-include	libcxx
 ./usr/include/c++/dynarray			comp-obsolete		obsolete
+./usr/include/c++/errno.h			comp-cxx-include	libcxx
 ./usr/include/c++/exception			comp-cxx-include	libcxx
+./usr/include/c++/execution			comp-cxx-include	libcxx
 ./usr/include/c++/experimental/__config		comp-cxx-include	libcxx
+./usr/include/c++/experimental/__memory		comp-cxx-include	libcxx
 ./usr/include/c++/experimental/algorithm	comp-cxx-include	libcxx
-./usr/include/c++/experimental/chrono		comp-cxx-include	libcxx
+./usr/include/c++/experimental/chrono		comp-obsolete		obsolete
-./usr/include/c++/experimental/dynarray		comp-cxx-include	libcxx
+./usr/include/c++/experimental/coroutine	comp-cxx-include	libcxx
-./usr/include/c++/experimental/optional		comp-cxx-include	libcxx
+./usr/include/c++/experimental/deque		comp-cxx-include	libcxx
-./usr/include/c++/experimental/ratio		comp-cxx-include	libcxx
+./usr/include/c++/experimental/dynarray		comp-obsolete		obsolete
-./usr/include/c++/experimental/string_view	comp-cxx-include	libcxx
+./usr/include/c++/experimental/filesystem	comp-cxx-include	libcxx
-./usr/include/c++/experimental/system_error	comp-cxx-include	libcxx
+./usr/include/c++/experimental/forward_list	comp-cxx-include	libcxx
-./usr/include/c++/experimental/tuple		comp-cxx-include	libcxx
+./usr/include/c++/experimental/functional	comp-cxx-include	libcxx
+./usr/include/c++/experimental/iterator		comp-cxx-include	libcxx
+./usr/include/c++/experimental/list		comp-cxx-include	libcxx
+./usr/include/c++/experimental/map		comp-cxx-include	libcxx
+./usr/include/c++/experimental/memory_resource	comp-cxx-include	libcxx
+./usr/include/c++/experimental/optional		comp-obsolete		obsolete
+./usr/include/c++/experimental/propagate_const	comp-cxx-include	libcxx
+./usr/include/c++/experimental/ratio		comp-obsolete		obsolete
+./usr/include/c++/experimental/regex		comp-cxx-include	libcxx
+./usr/include/c++/experimental/set		comp-cxx-include	libcxx
+./usr/include/c++/experimental/simd		comp-cxx-include	libcxx
+./usr/include/c++/experimental/string		comp-cxx-include	libcxx
+./usr/include/c++/experimental/string_view	comp-obsolete		obsolete
+./usr/include/c++/experimental/system_error	comp-obsolete		obsolete
+./usr/include/c++/experimental/tuple		comp-obsolete		obsolete
 ./usr/include/c++/experimental/type_traits	comp-cxx-include	libcxx
+./usr/include/c++/experimental/unordered_map	comp-cxx-include	libcxx
+./usr/include/c++/experimental/unordered_set	comp-cxx-include	libcxx
 ./usr/include/c++/experimental/utility		comp-cxx-include	libcxx
+./usr/include/c++/experimental/vector		comp-cxx-include	libcxx
 ./usr/include/c++/ext/__hash			comp-cxx-include	libcxx
 ./usr/include/c++/ext/hash_map			comp-cxx-include	libcxx
 ./usr/include/c++/ext/hash_set			comp-cxx-include	libcxx
+./usr/include/c++/fenv.h			comp-cxx-include	libcxx
+./usr/include/c++/filesystem			comp-cxx-include	libcxx
+./usr/include/c++/float.h			comp-cxx-include	libcxx
+./usr/include/c++/format			comp-cxx-include	libcxx
 ./usr/include/c++/forward_list			comp-cxx-include	libcxx
 ./usr/include/c++/fstream			comp-cxx-include	libcxx
 ./usr/include/c++/functional			comp-cxx-include	libcxx
 ./usr/include/c++/future			comp-cxx-include	libcxx
 ./usr/include/c++/initializer_list		comp-cxx-include	libcxx
+./usr/include/c++/inttypes.h			comp-cxx-include	libcxx
 ./usr/include/c++/iomanip			comp-cxx-include	libcxx
 ./usr/include/c++/ios				comp-cxx-include	libcxx
 ./usr/include/c++/iosfwd			comp-cxx-include	libcxx
 ./usr/include/c++/iostream			comp-cxx-include	libcxx
 ./usr/include/c++/istream			comp-cxx-include	libcxx
 ./usr/include/c++/iterator			comp-cxx-include	libcxx
+./usr/include/c++/latch				comp-cxx-include	libcxx
 ./usr/include/c++/limits			comp-cxx-include	libcxx
+./usr/include/c++/limits.h			comp-cxx-include	libcxx
 ./usr/include/c++/list				comp-cxx-include	libcxx
 ./usr/include/c++/locale			comp-cxx-include	libcxx
+./usr/include/c++/locale.h			comp-cxx-include	libcxx
 ./usr/include/c++/map				comp-cxx-include	libcxx
+./usr/include/c++/math.h			comp-cxx-include	libcxx
 ./usr/include/c++/memory			comp-cxx-include	libcxx
+./usr/include/c++/module.modulemap		comp-cxx-include	libcxx
 ./usr/include/c++/mutex				comp-cxx-include	libcxx
 ./usr/include/c++/new				comp-cxx-include	libcxx
+./usr/include/c++/numbers			comp-cxx-include	libcxx
 ./usr/include/c++/numeric			comp-cxx-include	libcxx
-./usr/include/c++/optional			comp-obsolete		obsolete
+./usr/include/c++/optional			comp-cxx-include	libcxx
 ./usr/include/c++/ostream			comp-cxx-include	libcxx
 ./usr/include/c++/queue				comp-cxx-include	libcxx
 ./usr/include/c++/random			comp-cxx-include	libcxx
+./usr/include/c++/ranges			comp-cxx-include	libcxx
 ./usr/include/c++/ratio				comp-cxx-include	libcxx
 ./usr/include/c++/regex				comp-cxx-include	libcxx
 ./usr/include/c++/scoped_allocator		comp-cxx-include	libcxx
+./usr/include/c++/semaphore			comp-cxx-include	libcxx
 ./usr/include/c++/set				comp-cxx-include	libcxx
+./usr/include/c++/setjmp.h			comp-cxx-include	libcxx
 ./usr/include/c++/shared_mutex			comp-cxx-include	libcxx
+./usr/include/c++/span				comp-cxx-include	libcxx
 ./usr/include/c++/sstream			comp-cxx-include	libcxx
 ./usr/include/c++/stack				comp-cxx-include	libcxx
+./usr/include/c++/stdbool.h			comp-cxx-include	libcxx
+./usr/include/c++/stddef.h			comp-cxx-include	libcxx
 ./usr/include/c++/stdexcept			comp-cxx-include	libcxx
+./usr/include/c++/stdint.h			comp-cxx-include	libcxx
+./usr/include/c++/stdio.h			comp-cxx-include	libcxx
+./usr/include/c++/stdlib.h			comp-cxx-include	libcxx
 ./usr/include/c++/streambuf			comp-cxx-include	libcxx
 ./usr/include/c++/string			comp-cxx-include	libcxx
+./usr/include/c++/string.h			comp-cxx-include	libcxx
+./usr/include/c++/string_view			comp-cxx-include	libcxx
 ./usr/include/c++/strstream			comp-cxx-include	libcxx
 ./usr/include/c++/system_error			comp-cxx-include	libcxx
 ./usr/include/c++/tgmath.h			comp-cxx-include	libcxx
@@ -324,7 +415,11 @@
 ./usr/include/c++/unordered_set			comp-cxx-include	libcxx
 ./usr/include/c++/utility			comp-cxx-include	libcxx
 ./usr/include/c++/valarray			comp-cxx-include	libcxx
+./usr/include/c++/variant			comp-cxx-include	libcxx
 ./usr/include/c++/vector			comp-cxx-include	libcxx
+./usr/include/c++/version			comp-cxx-include	libcxx
+./usr/include/c++/wchar.h			comp-cxx-include	libcxx
+./usr/include/c++/wctype.h			comp-cxx-include	libcxx
 ./usr/include/cbor				comp-c-include
 ./usr/include/cbor.h				comp-c-include
 ./usr/include/cbor/arrays.h			comp-c-include
@@ -373,6 +468,8 @@
 ./usr/include/cdk/swindow.h			comp-obsolete		obsolete
 ./usr/include/cdk/template.h			comp-obsolete		obsolete
 ./usr/include/cdk/viewer.h			comp-obsolete		obsolete
+./usr/include/clang-13.0/stdatomic.h		comp-c-include		llvm
+./usr/include/clang-13.0/tgmath.h		comp-c-include		llvm
 ./usr/include/clang-3.6/stdalign.h		comp-obsolete		obsolete
 ./usr/include/clang-3.6/stdatomic.h		comp-obsolete		obsolete
 ./usr/include/clang-3.6/stdnoreturn.h		comp-obsolete		obsolete
@@ -384,7 +481,7 @@
 ./usr/include/clang-4.0/stdnoreturn.h		comp-obsolete		obsolete
 ./usr/include/clang-5.0/stdatomic.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/stdatomic.h		comp-obsolete		obsolete
-./usr/include/clang-9.0/stdatomic.h		comp-c-include		llvm
+./usr/include/clang-9.0/stdatomic.h		comp-obsolete		obsolete
 ./usr/include/complex.h				comp-c-include
 ./usr/include/cpio.h				comp-c-include
 ./usr/include/crypto/cryptodev.h		comp-c-include

etc/mtree/NetBSD.dist.base

@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.235 2021/04/12 02:09:27 mrg Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.236 2021/05/30 01:56:45 joerg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -113,8 +113,12 @@
 ./usr/include/c++
 ./usr/include/c++/experimental
 ./usr/include/c++/ext
+./usr/include/c++/__iterator
+./usr/include/c++/__memory
+./usr/include/c++/__ranges
+./usr/include/c++/__utility
 ./usr/include/cbor
-./usr/include/clang-9.0
+./usr/include/clang-13.0
 ./usr/include/crypto
 ./usr/include/dev
 ./usr/include/dev/apm

external/apache2/llvm/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:57 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:45 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -16,6 +16,9 @@ SUBDIR+= \
 	bin
 .endif
 
+prepare-import:
+	cd ${LLVM_TOPLEVEL}/dist && rm -rf */test */unittests */www
+
 .include "Makefile.inc"
 
 .include <bsd.subdir.mk>

external/apache2/llvm/Makefile.inc

@@ -1,16 +1,16 @@
-#	$NetBSD: Makefile.inc,v 1.4 2019/11/28 23:01:22 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2021/05/30 01:56:45 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
 
 .include <bsd.own.mk>
 
-COMMON_REVISION=	01f3a59fb3e2542fce74c768718f594d0debd0da
+COMMON_REVISION=	249b40b558955afe5ac2b549edcf2d7f859c8cc9
 CLANG_REVISION=		${COMMON_REVISION}
 LLVM_REVISION=		${COMMON_REVISION}
 
-LLVM_VERSION=		9.0.0
+LLVM_VERSION=		13.0.0
-CLANG_VERSION=		9.0.0
+CLANG_VERSION=		13.0.0
 
 CLANG_SRCDIR:=	${.PARSEDIR}/dist/clang
 LLVM_SRCDIR:=	${.PARSEDIR}/dist/llvm
@@ -22,20 +22,32 @@ CPPFLAGS+=	-I. -I${CLANG_SRCDIR}/include -I${LLVM_SRCDIR}/include
 # Bogus warning with -O2 in GCC 7 and 8.
 CWARNFLAGS.gcc+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} < 9:? -Wno-stringop-overflow :}
 
+MODULES_CXXFLAGS=	-fmodules -fcxx-modules -Werror=incomplete-umbrella \
+			-fmodules-validate-system-headers \
+			-Xclang -fmodules-local-submodule-visibility \
+			-fmodules-cache-path=${LLVM_MODULE_CACHE:Q}
+
 .if defined(HOSTLIB) || defined(HOSTPROG) || defined(_BSD_HOSTINIT_MK_)
 LLVM_INCLUDE_CONFIG=	${LLVM_TOOLCONF_OBJDIR}/config/include
 CLANG_INCLUDE_CONFIG=	${LLVM_TOOLCONF_OBJDIR}/config/tools/clang/include
 LLVM_INCLUDE_OBJDIR!=	cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR}
 LLVM_TOOLCONF_OBJDIR!=	cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
+LLVM_MODULE_CACHE=	${LLVM_TOOLCONF_OBJDIR}/module.cache
 HOST_CPPFLAGS+=	${CPPFLAGS}
 HOST_CXXFLAGS+=	-O2 -fno-rtti -fno-exceptions -fno-strict-aliasing
+.sinclude "${LLVM_TOOLCONF_OBJDIR}/support-modules"
+.if ${HOST_SUPPORTS_MODULES:Uno} == "yes"
+HOST_CXXFLAGS+=	${MODULES_CXXFLAGS}
+.endif
 HOST_CPPFLAGS+=	-std=c++14
 LLVM_TARGETS=	x86,powerpc,sparc,aarch64,arm,mips
 .else
 LLVM_INCLUDE_CONFIG=	${LLVM_TOPLEVEL}/config
 CLANG_INCLUDE_CONFIG=	${LLVM_TOPLEVEL}/config
 LLVM_INCLUDE_OBJDIR!=	cd ${LLVM_TOPLEVEL}/include && ${PRINTOBJDIR}
+LLVM_MODULE_CACHE=	${LLVM_INCLUDE_OBJDIR}/module.cache
 LLVM_TARGETS=	x86,powerpc,sparc,aarch64,arm,mips,amdgpu
+CXXFLAGS+=		${${ACTIVE_CC} == "clang":? ${MODULES_CXXFLAGS} :}
 
 CXXFLAGS+=	-std=c++14
 CXXFLAGS+=	-fno-rtti -fno-exceptions ${${ACTIVE_CC} == "gcc" :? -fno-strict-aliasing :}

external/apache2/llvm/autoconf/autoconf/aclocal.m4

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

external/apache2/llvm/autoconf/autoconf/configure.ac

@@ -1276,6 +1276,7 @@ AC_ARG_WITH(clang-default-openmp-runtime,
 AC_DEFINE_UNQUOTED(CLANG_ENABLE_ARCMT, 1, [Build ARCMT])
 AC_DEFINE_UNQUOTED(CLANG_ENABLE_OBJC_REWRITER, 1, [Build ObjC rewriter])
 AC_DEFINE_UNQUOTED(CLANG_ENABLE_STATIC_ANALYZER, 1, [Build Static analyzer])
+AC_DEFINE_UNQUOTED(CLANG_SPAWN_CC1, 1, [Whether clang should use a new process for the CC1 invocation])
 
 AC_DEFINE_UNQUOTED(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER, 0,
                    [Enable the experimental new pass manager by default])
@@ -1296,6 +1297,8 @@ AC_DEFINE_UNQUOTED(CLANG_DEFAULT_UNWINDLIB, "none",
                    [Default unwind library to use.])
 AC_DEFINE_UNQUOTED(CLANG_DEFAULT_OPENMP_RUNTIME, "libomp",
                    [Default OpenMP runtime used by -fopenmp.])
+AC_DEFINE_UNQUOTED(CLANG_SYSTEMZ_DEFAULT_ARCH, "z10",
+                   [SystemZ Default Arch])
 AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX, "",
                    [Multilib suffix for libdir.])
 AC_DEFINE_UNQUOTED(DEFAULT_SYSROOT, "",
@@ -1698,7 +1701,7 @@ AC_HEADER_STAT
 AC_HEADER_TIME
 
 AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h inttypes.h link.h])
-AC_CHECK_HEADERS([signal.h stdint.h termios.h unistd.h])
+AC_CHECK_HEADERS([signal.h stdint.h sysexits.h termios.h unistd.h])
 AC_CHECK_HEADERS([sys/mman.h sys/param.h sys/resource.h sys/time.h sys/uio.h])
 AC_CHECK_HEADERS([sys/ioctl.h malloc/malloc.h mach/mach.h])
 AC_CHECK_HEADERS([valgrind/valgrind.h])

external/apache2/llvm/autoconf/configure

@@ -5738,6 +5738,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define CLANG_SPAWN_CC1 1
+_ACEOF
+
+
 
 cat >>confdefs.h <<_ACEOF
 #define ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER 0
@@ -5785,6 +5790,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define CLANG_SYSTEMZ_DEFAULT_ARCH "z10"
+_ACEOF
+
+
 cat >>confdefs.h <<_ACEOF
 #define CLANG_LIBDIR_SUFFIX ""
 _ACEOF
@@ -8776,7 +8786,7 @@ fi
 
 done
 
-for ac_header in signal.h stdint.h termios.h unistd.h
+for ac_header in signal.h stdint.h sysexits.h termios.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

external/apache2/llvm/autoconf/include/clang/Config/config.h.in

@@ -42,6 +42,9 @@
 /* Directory where gcc is installed. */
 #undef GCC_INSTALL_PREFIX
 
+/* Whether clang should use a new process for the CC1 invocation */
+#undef CLANG_SPAWN_CC1
+
 /* Define if we have libxml2 */
 #undef CLANG_HAVE_LIBXML
 
@@ -62,5 +65,6 @@
 
 #undef ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER
 #undef CLANG_OPENMP_NVPTX_DEFAULT_ARCH
+#undef CLANG_SYSTEMZ_DEFAULT_ARCH
 
 #endif

external/apache2/llvm/autoconf/include/llvm/Config/config.h.in

@@ -49,6 +49,12 @@
 /* Relative directory for resource files */
 #undef CLANG_RESOURCE_DIR
 
+/* Whether clang should use a new process for the CC1 invocation */
+#undef CLANG_SPAWN_CC1
+
+/* SystemZ Default Arch */
+#undef CLANG_SYSTEMZ_DEFAULT_ARCH
+
 /* Directories clang will search for headers */
 #undef C_INCLUDE_DIRS
 
@@ -279,6 +285,9 @@
 /* Define to 1 if you have the `sysconf' function. */
 #undef HAVE_SYSCONF
 
+/* Define to 1 if you have the <sysexits.h> header file. */
+#undef HAVE_SYSEXITS_H
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 #undef HAVE_SYS_DIR_H

external/apache2/llvm/autoconf/include/llvm/Config/llvm-config.h.in

@@ -80,4 +80,9 @@
 /* LLVM version string */
 #undef LLVM_VERSION_STRING
 
+/* Define to 1 if you have the <sysexits.h> header file. */
+#undef HAVE_SYSEXITS_H
+
+#define LLVM_ENABLE_NEW_PASS_MANAGER 0
+
 #endif

external/apache2/llvm/autoconf/run-autoconf

@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
 autoconf/AutoRegen.sh
-rm -rf autom4te.cache autoconf/autom4te.cache
+rm -rf autom4te.cache autoconf/autom4te.cache include/llvm/Config/config.h.in~

external/apache2/llvm/bin/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/06/09 21:50:32 kamil Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 01:56:46 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,7 @@ SUBDIR=	clang \
 SUBDIR+= \
 	bugpoint \
 	clang-format \
+	clang-repl \
 	clang-rename \
 	llc \
 	lli \

external/apache2/llvm/bin/bugpoint/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:46 joerg Exp $
 
 PROG_CXX=	bugpoint
 NOMAN=		yes
@@ -21,6 +21,7 @@ LLVM_LIBS+= \
 	TransformsAggressiveInstCombine \
 	ObjCARC \
 	ipo \
+	FrontendOpenMP \
 	IRReader \
 	AsmParser \
 	BitReader \
@@ -57,8 +58,8 @@ LLVM_LIBS+= \
 	X86CodeGen \
 	X86MCTargetDesc \
 	X86TargetInfo \
-	X86Utils \
 	X86AsmParser \
+	TransformsCFGuard \
 	GlobalISel \
 	SelectionDAG \
 	AsmPrinter \
@@ -76,11 +77,12 @@ LLVM_LIBS+= \
 	MCDisassembler \
 	MCParser \
 	MC \
+	TransformsUtils \
 	Analysis \
 	Object \
 	Linker \
-	TransformsUtils \
 	IR \
+	Remarks \
 	Option \
 	BinaryFormat \
 	Support \

external/apache2/llvm/bin/clang-rename/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:46 joerg Exp $
 
 PROG_CXX=	clang-rename
 NOMAN=		yes
@@ -32,8 +32,10 @@ LLVM_LIBS+= \
 	BitReader \
 	BitstreamReader \
 	IR \
+	FrontendOpenMP \
 	MCParser \
 	MC \
+	BinaryFormat \
 	Option \
 	Support \
 	Demangle

external/apache2/llvm/bin/clang-repl/Makefile

@@ -0,0 +1,133 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:46 joerg Exp $
+
+PROG_CXX=	clang-repl
+NOMAN=		yes
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/tools/clang-repl
+
+SRCS=	ClangRepl.cpp
+
+.include "${.PARSEDIR}/../../link.mk"
+
+CLANG_LIBS+= \
+	clangInterpreter \
+	clangFrontendTool \
+	clangFrontend \
+	clangARCMigrate \
+	clangStaticAnalyzerFrontend \
+	clangStaticAnalyzerCheckers \
+	clangStaticAnalyzerCore \
+	clangToolingCore \
+	clangCrossTU \
+	clangIndex \
+	clangASTMatchers \
+	clangCodeGen \
+	clangFrontendRewrite \
+	clangFrontend \
+	clangSerialization \
+	clangParse \
+	clangSema \
+	clangAnalysis \
+	clangEdit \
+	clangDriver \
+	clangRewrite \
+	clangAST \
+	clangLex \
+	clangBasic
+
+LLVM_LIBS+= \
+	FrontendOpenMP \
+	TransformsCoroutines \
+	ProfileDataCoverage \
+	LTO \
+	ObjCARC \
+	Passes \
+	TransformsAggressiveInstCombine \
+	ipo \
+	IRReader \
+	AsmParser \
+	BitstreamReader \
+	BitReader \
+	BitWriter
+
+.if !defined(HOSTPROG)
+LLVM_LIBS+= \
+	AMDGPUCodeGen \
+	AMDGPUTargetInfo \
+	AMDGPUAsmParser \
+	AMDGPUMCTargetDesc \
+	AMDGPUUtils \
+	MIRParser
+.endif
+
+LLVM_LIBS+= \
+	Orc \
+	ExecutionEngineJITLink \
+	ExecutionEngineOrcTargetProcess \
+	ExecutionEngineOrcShared \
+	ExecutionEngine \
+	RuntimeDyld \
+	AArch64CodeGen \
+	AArch64TargetInfo \
+	AArch64AsmParser \
+	AArch64MCTargetDesc \
+	AArch64Utils \
+	ARMCodeGen \
+	ARMTargetInfo \
+	ARMMCTargetDesc \
+	ARMAsmParser \
+	ARMUtils \
+	MipsCodeGen \
+	MipsTargetInfo \
+	MipsAsmParser \
+	MipsMCTargetDesc \
+	PowerPCCodeGen \
+	PowerPCTargetInfo \
+	PowerPCMCTargetDesc \
+	PowerPCAsmParser \
+	SparcCodeGen \
+	SparcTargetInfo \
+	SparcMCTargetDesc \
+	SparcAsmParser \
+	X86CodeGen \
+	X86MCTargetDesc \
+	X86TargetInfo \
+	X86AsmParser \
+	GlobalISel \
+	SelectionDAG \
+	AsmPrinter \
+	DebugInfoDWARF \
+	DebugInfoCodeView \
+	DebugInfoMSF \
+	CodeGen \
+	Vectorize \
+	Target \
+	InstCombine \
+	Instrumentation \
+	ScalarOpts \
+	ProfileData \
+	MCDisassembler \
+	MCParser \
+	MC \
+	TransformsUtils \
+	Analysis \
+	Object \
+	TextAPI \
+	Linker \
+	TransformsCFGuard \
+	IR \
+	Remarks \
+	LineEditor \
+	Option \
+	BinaryFormat \
+	Support \
+	Demangle
+
+.include "${.PARSEDIR}/../../link.mk"
+
+LDADD+=	-lz -ledit
+DPADD+=	${LIBZ} ${LIBEDIT}
+
+.include <bsd.prog.mk>

external/apache2/llvm/bin/clang-tblgen/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:46 joerg Exp $
 
 PROG_CXX=	clang-tblgen
 NOMAN=		yes
@@ -7,20 +7,25 @@ NOMAN=		yes
 
 .PATH: ${CLANG_SRCDIR}/utils/TableGen
 
-SRCS=	ClangASTNodesEmitter.cpp \
+SRCS=	ASTTableGen.cpp \
+	ClangASTNodesEmitter.cpp \
+	ClangASTPropertiesEmitter.cpp \
 	ClangAttrEmitter.cpp \
 	ClangCommentCommandInfoEmitter.cpp \
 	ClangCommentHTMLNamedCharacterReferenceEmitter.cpp \
 	ClangCommentHTMLTagsEmitter.cpp \
 	ClangDataCollectorsEmitter.cpp \
 	ClangDiagnosticsEmitter.cpp \
-	ClangOpenCLBuiltinEmitter.cpp \
 	ClangOpcodesEmitter.cpp \
+	ClangOpenCLBuiltinEmitter.cpp \
 	ClangOptionDocEmitter.cpp \
 	ClangSACheckersEmitter.cpp \
+	ClangSyntaxEmitter.cpp \
 	ClangTypeNodesEmitter.cpp \
 	MveEmitter.cpp \
 	NeonEmitter.cpp \
+	RISCVVEmitter.cpp \
+	SveEmitter.cpp \
 	TableGen.cpp
 
 LLVM_LIBS+= \

external/apache2/llvm/bin/clang/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:46 joerg Exp $
 
 PROG_CXX=	clang
 NOMAN=		yes
@@ -24,6 +24,7 @@ CLANG_LIBS+= \
 	clangStaticAnalyzerFrontend \
 	clangStaticAnalyzerCheckers \
 	clangStaticAnalyzerCore \
+	clangToolingCore \
 	clangCrossTU \
 	clangIndex \
 	clangASTMatchers \
@@ -42,6 +43,7 @@ CLANG_LIBS+= \
 	clangBasic
 
 LLVM_LIBS+= \
+	FrontendOpenMP \
 	TransformsAggressiveInstCombine \
 	TransformsCoroutines \
 	ProfileDataCoverage \
@@ -91,7 +93,6 @@ LLVM_LIBS+= \
 	X86CodeGen \
 	X86MCTargetDesc \
 	X86TargetInfo \
-	X86Utils \
 	X86AsmParser \
 	GlobalISel \
 	SelectionDAG \
@@ -109,12 +110,12 @@ LLVM_LIBS+= \
 	MCDisassembler \
 	MCParser \
 	MC \
+	TransformsUtils \
 	Analysis \
 	Object \
 	TextAPI \
 	Linker \
 	TransformsCFGuard \
-	TransformsUtils \
 	IR \
 	Remarks \
 	Option \

external/apache2/llvm/bin/llc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:46 joerg Exp $
 
 PROG_CXX=	llc
 NOMAN=		yes
@@ -52,8 +52,10 @@ LLVM_LIBS+= \
 	X86TargetInfo \
 	X86MCTargetDesc \
 	X86AsmParser \
-	X86Utils \
+	Passes \
+	TransformsCFGuard \
 	ipo \
+	FrontendOpenMP \
 	GlobalISel \
 	MCDisassembler \
 	Object \

external/apache2/llvm/bin/lli/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:46 joerg Exp $
 
 PROG_CXX=	lli
 NOMAN=		yes
@@ -7,15 +7,19 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/lli
 
-SRCS=	lli.cpp
+SRCS=	lli.cpp \
+	ExecutionUtils.cpp
 
 LLVM_LIBS+= \
 	Orc \
+	ExecutionEngineJITLink \
+	ExecutionEngineOrcTargetProcess \
+	ExecutionEngineOrcShared \
 	X86CodeGen \
 	X86TargetInfo \
 	X86MCTargetDesc \
 	X86AsmParser \
-	X86Utils \
+	TransformsCFGuard \
 	AsmPrinter \
 	GlobalISel \
 	IRReader \
@@ -23,6 +27,7 @@ LLVM_LIBS+= \
 	DebugInfoCodeView \
 	DebugInfoDWARF \
 	Object \
+	TextAPI \
 	MCParser \
 	BitWriter \
 	BitReader \
@@ -42,6 +47,7 @@ LLVM_LIBS+= \
 	Target \
 	MC \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-ar/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-ar
 NOMAN=		yes
@@ -36,7 +36,6 @@ LLVM_LIBS+= \
 	X86AsmParser \
 	X86CodeGen \
 	X86MCTargetDesc \
-	X86Utils \
 	X86TargetInfo \
 	CodeGen \
 	MCDisassembler \
@@ -46,6 +45,7 @@ LLVM_LIBS+= \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Option \
 	Support \

external/apache2/llvm/bin/llvm-as/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-as
 NOMAN=		yes
@@ -17,6 +17,7 @@ LLVM_LIBS+= \
 	MCParser \
 	MC \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-cov/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-cov
 NOMAN=		yes
@@ -24,11 +24,13 @@ LLVM_LIBS+= \
 	ProfileDataCoverage \
 	ProfileData \
 	Object \
+	TextAPI \
 	MCParser \
 	MC \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-cxxdump/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-cxxdump
 NOMAN=		yes
@@ -19,11 +19,13 @@ LLVM_LIBS+= \
 	SparcTargetInfo \
 	X86TargetInfo \
 	Object \
+	TextAPI \
 	BitReader \
 	BitstreamReader \
 	MCParser \
 	MC \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-diff/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-diff
 NOMAN=		yes
@@ -18,6 +18,7 @@ LLVM_LIBS+= \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-dis/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-dis
 NOMAN=		yes
@@ -14,6 +14,7 @@ LLVM_LIBS+= \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-dwarfdump/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-dwarfdump
 NOMAN=		yes
@@ -7,8 +7,9 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/llvm-dwarfdump
 
-SRCS=	Statistics.cpp \
+SRCS=	llvm-dwarfdump.cpp \
-	llvm-dwarfdump.cpp
+	SectionSizes.cpp \
+	Statistics.cpp \
 
 LLVM_LIBS+= \
 	AArch64TargetInfo \
@@ -28,16 +29,17 @@ LLVM_LIBS+= \
 	SparcMCTargetDesc \
 	X86TargetInfo \
 	X86MCTargetDesc \
-	X86Utils \
 	DebugInfoDWARF \
 	Object \
+	TextAPI \
 	BitReader \
 	BitstreamReader \
 	IR \
-	BinaryFormat \
 	MCDisassembler \
 	MCParser \
 	MC \
+	Remarks \
+	BinaryFormat \
 	Support \
 	Demangle
 

external/apache2/llvm/bin/llvm-dwp/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-dwp
 NOMAN=		yes
@@ -36,7 +36,8 @@ LLVM_LIBS+= \
 	X86CodeGen \
 	X86MCTargetDesc \
 	X86TargetInfo \
-	X86Utils \
+	Passes \
+	TransformsCFGuard \
 	MIRParser \
 	Vectorize \
 	MCDisassembler \
@@ -58,6 +59,7 @@ LLVM_LIBS+= \
 	TransformsUtils \
 	Analysis \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-extract/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:47 joerg Exp $
 
 PROG_CXX=	llvm-extract
 NOMAN=		yes
@@ -24,6 +24,7 @@ LLVM_LIBS+= \
 	ProfileData \
 	Target \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-link/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:48 joerg Exp $
 
 PROG_CXX=	llvm-link
 NOMAN=		yes
@@ -24,6 +24,7 @@ LLVM_LIBS+= \
 	Analysis \
 	Target \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-mc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:48 joerg Exp $
 
 PROG_CXX=	llvm-mc
 NOMAN=		yes
@@ -50,7 +50,6 @@ LLVM_LIBS+= \
 	X86TargetInfo \
 	X86MCTargetDesc \
 	X86Disassembler \
-	X86Utils \
 	MCDisassembler \
 	Object \
 	SelectionDAG \

external/apache2/llvm/bin/llvm-nm/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:48 joerg Exp $
 
 PROG_CXX=	llvm-nm
 NOMAN=		yes
@@ -34,16 +34,17 @@ LLVM_LIBS+= \
 	X86AsmParser \
 	X86CodeGen \
 	X86MCTargetDesc \
-	X86Utils \
 	X86TargetInfo \
 	CodeGen \
 	MCDisassembler \
 	Object \
+	TextAPI \
 	MCParser \
 	MC \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-objcopy/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:48 joerg Exp $
 
 PROG_CXX=	llvm-objcopy
 NOMAN=		yes
@@ -9,9 +9,8 @@ NOMAN=		yes
 
 CPPFLAGS+=	-I${LLVM_SRCDIR}/tools/llvm-objcopy
 
-SRCS=	Buffer.cpp \
+SRCS=	llvm-objcopy.cpp \
-	CopyConfig.cpp \
+	ConfigManager.cpp
-	llvm-objcopy.cpp
 
 .PATH: ${LLVM_SRCDIR}/tools/llvm-objcopy/COFF
 SRCS+=	COFFObjcopy.cpp \
@@ -20,8 +19,7 @@ SRCS+=	COFFObjcopy.cpp \
 	Writer.cpp
 
 .PATH: ${LLVM_SRCDIR}/tools/llvm-objcopy/ELF
-SRCS+=	ELFConfig.cpp \
+SRCS+=	ELFObjcopy.cpp \
-	ELFObjcopy.cpp \
 	ELFObject.cpp
 
 ELFObject.cpp: ${LLVM_SRCDIR}/tools/llvm-objcopy/ELF/Object.cpp
@@ -41,6 +39,19 @@ MachOObject.cpp: ${LLVM_SRCDIR}/tools/llvm-objcopy/MachO/Object.cpp
 
 CPPFLAGS.MachOObject.cpp+=	-I${LLVM_SRCDIR}/tools/llvm-objcopy/MachO
 
+.PATH: ${LLVM_SRCDIR}/tools/llvm-objcopy/wasm
+SRCS+=	WasmObjcopy.cpp \
+	WasmObject.cpp \
+	wasmReader.cpp \
+	wasmWriter.cpp
+
+WasmObject.cpp: ${LLVM_SRCDIR}/tools/llvm-objcopy/wasm/Object.cpp
+	cat ${LLVM_SRCDIR}/tools/llvm-objcopy/wasm/Object.cpp > WasmObject.cpp
+WasmReader.cpp: ${LLVM_SRCDIR}/tools/llvm-objcopy/wasm/Reader.cpp
+	cat ${LLVM_SRCDIR}/tools/llvm-objcopy/wasm/Reader.cpp > WasmReader.cpp
+WasmWriter.cpp: ${LLVM_SRCDIR}/tools/llvm-objcopy/wasm/Writer.cpp
+	cat ${LLVM_SRCDIR}/tools/llvm-objcopy/wasm/Writer.cpp > WasmWriter.cpp
+
 TABLEGEN_SRC=		CommonOpts.td ObjcopyOpts.td StripOpts.td
 
 TABLEGEN_OUTPUT.CommonOpts.td= \

external/apache2/llvm/bin/llvm-objdump/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:48 joerg Exp $
 
 PROG_CXX=	llvm-objdump
 NOMAN=		yes
@@ -11,7 +11,19 @@ SRCS=	llvm-objdump.cpp \
 	COFFDump.cpp \
 	ELFDump.cpp \
 	MachODump.cpp \
-	WasmDump.cpp
+	SourcePrinter.cpp \
+	WasmDump.cpp \
+	XCOFFDump.cpp
+
+TABLEGEN_SRC=	ObjdumpOpts.td OtoolOpts.td
+
+TABLEGEN_OUTPUT.ObjdumpOpts.td= \
+	ObjdumpOpts.inc|-gen-opt-parser-defs
+
+TABLEGEN_OUTPUT.OtoolOpts.td= \
+	OtoolOpts.inc|-gen-opt-parser-defs
+
+.include "${.PARSEDIR}/../../tablegen.mk"
 
 LLVM_LIBS+= \
 	AArch64Disassembler \
@@ -46,20 +58,21 @@ LLVM_LIBS+= \
 	X86CodeGen \
 	X86MCTargetDesc \
 	X86TargetInfo \
-	X86Utils \
 	CodeGen \
 	MCDisassembler \
 	DebugInfoDWARF \
 	DebugInfoSymbolize \
 	DebugInfoPDB \
-	DebugInfoPDBNative \
 	Object \
+	TextAPI \
 	BitReader \
 	BitstreamReader \
 	MCParser \
 	MC \
 	IR \
+	Remarks \
 	BinaryFormat \
+	Option \
 	Support \
 	Demangle
 

external/apache2/llvm/bin/llvm-profdata/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:48 joerg Exp $
 
 PROG_CXX=	llvm-profdata
 NOMAN=		yes
@@ -12,6 +12,7 @@ SRCS=	llvm-profdata.cpp
 LLVM_LIBS+= \
 	ProfileData \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-readobj/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:48 joerg Exp $
 
 PROG_CXX=	llvm-readobj
 NOMAN=		yes
@@ -12,7 +12,6 @@ SRCS=	llvm-readobj.cpp \
 	COFFDumper.cpp \
 	COFFImportDumper.cpp \
 	ELFDumper.cpp \
-	Error.cpp \
 	MachODumper.cpp \
 	ObjDumper.cpp \
 	WasmDumper.cpp \
@@ -31,15 +30,20 @@ LLVM_LIBS+= \
 	DebugInfoCodeView \
 	DebugInfoMSF \
 	Object \
+	TextAPI \
 	MCParser \
 	MC \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle
 
+LDADD+=	-lz
+DPADD+=	${LIBZ}
+
 .include "${.PARSEDIR}/../../link.mk"
 
 .include <bsd.prog.mk>

external/apache2/llvm/bin/llvm-reduce/Makefile

@@ -0,0 +1,48 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:48 joerg Exp $
+
+PROG_CXX=	llvm-size
+NOMAN=		yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-reduce
+
+SRCS=	DeltaManager.cpp \
+	TestRunner.cpp \
+	llvm-reduce.cpp
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-reduce/deltas
+
+SRCS+=	Delta.cpp \
+	ReduceAliases.cpp \
+	ReduceArguments.cpp \
+	ReduceAttributes.cpp \
+	ReduceBasicBlocks.cpp \
+	ReduceFunctionBodies.cpp \
+	ReduceFunctions.cpp \
+	ReduceGlobalValues.cpp \
+	ReduceGlobalVarInitializers.cpp \
+	ReduceGlobalVars.cpp \
+	ReduceInstructions.cpp \
+	ReduceMetadata.cpp \
+	ReduceModuleInlineAsm.cpp \
+	ReduceOperandBundles.cpp \
+	ReduceSpecialGlobals.cpp
+
+
+LLVM_LIBS+= \
+	Object \
+	TextAPI \
+	MCParser \
+	MC \
+	BitReader \
+	BitstreamReader \
+	IR \
+	Remarks \
+	BinaryFormat \
+	Support \
+	Demangle
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>

external/apache2/llvm/bin/llvm-size/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:49 joerg Exp $
 
 PROG_CXX=	llvm-size
 NOMAN=		yes
@@ -11,11 +11,13 @@ SRCS=	llvm-size.cpp
 
 LLVM_LIBS+= \
 	Object \
+	TextAPI \
 	MCParser \
 	MC \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/llvm-symbolizer/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/06/09 21:50:32 kamil Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 01:56:49 joerg Exp $
 
 PROG_CXX=	llvm-symbolizer
 NOMAN=		yes
@@ -13,22 +13,31 @@ LLVM_LIBS+= \
 	DebugInfoSymbolize \
 	DebugInfoDWARF \
 	DebugInfoPDB \
-	DebugInfoPDBNative \
+	DebugInfoMSF \
+	DebugInfoCodeView \
 	Object \
+	TextAPI \
 	MCParser \
 	MC \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	ObjectYAML \
 	TextAPI \
+	Option \
 	Support \
 	Demangle
 
 LDADD+=	-lz
 DPADD+=	${LIBZ}
 
+TABLEGEN_SRC=	Opts.td
+TABLEGEN_OUTPUT.Opts.td= \
+	Opts.inc|-gen-opt-parser-defs
+
+.include "${.PARSEDIR}/../../tablegen.mk"
 .include "${.PARSEDIR}/../../link.mk"
 
 .include <bsd.prog.mk>

external/apache2/llvm/bin/llvm-xray/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:49 joerg Exp $
 
 PROG_CXX=	llvm-xray
 NOMAN=		yes
@@ -24,12 +24,15 @@ LLVM_LIBS+= \
 	DebugInfoSymbolize \
 	DebugInfoDWARF \
 	DebugInfoPDB \
-	DebugInfoPDBNative \
+	DebugInfoMSF \
+	DebugInfoCodeView \
 	Object \
+	TextAPI \
 	BitReader \
 	BitstreamReader \
 	MCParser \
 	IR \
+	Remarks \
 	MC \
 	BinaryFormat \
 	Support \

external/apache2/llvm/bin/opt/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:49 joerg Exp $
 
 PROG_CXX=	opt
 NOMAN=		yes
@@ -9,7 +9,6 @@ NOMAN=		yes
 
 SRCS=	AnalysisWrappers.cpp \
 	BreakpointPrinter.cpp \
-	Debugify.cpp \
 	GraphPrinters.cpp \
 	NewPMDriver.cpp \
 	PassPrinters.cpp \
@@ -21,6 +20,7 @@ LLVM_LIBS+= \
 	Passes \
 	ObjCARC \
 	ipo \
+	FrontendOpenMP \
 	Linker \
 	Object \
 	IRReader \
@@ -59,7 +59,7 @@ LLVM_LIBS+= \
 	X86AsmParser \
 	X86MCTargetDesc \
 	X86TargetInfo \
-	X86Utils \
+	TransformsCFGuard \
 	MIRParser \
 	GlobalISel \
 	TransformsCoroutines \

external/apache2/llvm/bin/sancov/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:49 joerg Exp $
 
 PROG_CXX=	sancov
 NOMAN=		yes
@@ -7,7 +7,7 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/sancov
 
-SRCS=	sancov.cc
+SRCS=	sancov.cpp
 
 LLVM_LIBS+= \
 	AArch64Disassembler \
@@ -36,16 +36,18 @@ LLVM_LIBS+= \
 	X86CodeGen \
 	X86MCTargetDesc \
 	X86TargetInfo \
-	X86Utils \
 	MCDisassembler \
 	DebugInfoSymbolize \
 	DebugInfoDWARF \
 	DebugInfoPDB \
-	DebugInfoPDBNative \
+	DebugInfoMSF \
+	DebugInfoCodeView \
 	Object \
+	TextAPI \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	MCParser \
 	MC \
 	BinaryFormat \

external/apache2/llvm/bin/sanstats/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:49 joerg Exp $
 
 PROG_CXX=	sanstats
 NOMAN=		yes
@@ -7,19 +7,22 @@ NOMAN=		yes
 
 .PATH: ${LLVM_SRCDIR}/tools/sanstats
 
-SRCS=	sanstats.cc
+SRCS=	sanstats.cpp
 
 LLVM_LIBS+= \
 	DebugInfoSymbolize \
 	DebugInfoDWARF \
 	DebugInfoPDB \
-	DebugInfoPDBNative \
+	DebugInfoMSF \
+	DebugInfoCodeView \
 	Object \
+	TextAPI \
 	MCParser \
 	MC \
 	BitReader \
 	BitstreamReader \
 	IR \
+	Remarks \
 	BinaryFormat \
 	Support \
 	Demangle

external/apache2/llvm/bin/tblgen/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:49 joerg Exp $
 
 PROG_CXX=	llvm-tblgen
 NOMAN=		yes
@@ -12,6 +12,7 @@ SRCS=	AsmMatcherEmitter.cpp \
 	AsmWriterInst.cpp \
 	Attributes.cpp \
 	CallingConvEmitter.cpp \
+	CodeBeadsGen.cpp \
 	CodeEmitterGen.cpp \
 	CodeGenDAGPatterns.cpp \
 	CodeGenHwModes.cpp \
@@ -28,6 +29,7 @@ SRCS=	AsmMatcherEmitter.cpp \
 	DAGISelMatcherOpt.cpp \
 	DFAEmitter.cpp \
 	DFAPacketizerEmitter.cpp \
+	DirectiveEmitter.cpp \
 	DisassemblerEmitter.cpp \
 	ExegesisEmitter.cpp \
 	FastISelEmitter.cpp \
@@ -38,7 +40,9 @@ SRCS=	AsmMatcherEmitter.cpp \
 	InstrDocsEmitter.cpp \
 	InstrInfoEmitter.cpp \
 	IntrinsicEmitter.cpp \
+	OptEmitter.cpp \
 	OptParserEmitter.cpp \
+	OptRSTEmitter.cpp \
 	PredicateExpander.cpp \
 	PseudoLoweringEmitter.cpp \
 	RegisterBankEmitter.cpp \
@@ -58,7 +62,14 @@ SRCS=	AsmMatcherEmitter.cpp \
 	X86RecognizableInstr.cpp
 
 .PATH: ${LLVM_SRCDIR}/utils/TableGen/GlobalISel
-SRCS+=	CodeExpander.cpp
+SRCS+=	CodeExpander.cpp \
+	GIMatchDag.cpp \
+	GIMatchDagEdge.cpp \
+	GIMatchDagInstr.cpp \
+	GIMatchDagOperands.cpp \
+	GIMatchDagPredicate.cpp \
+	GIMatchDagPredicateDependencyEdge.cpp \
+	GIMatchTree.cpp
 
 LLVM_LIBS+= \
 	TableGen \

external/apache2/llvm/config/clang/Config/config.h

@@ -35,7 +35,7 @@
 #define CLANG_RESOURCE_DIR ""
 
 /* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "/usr/include/clang-9.0:/usr/include"
+#define C_INCLUDE_DIRS "/usr/include/clang-13.0:/usr/include"
 
 /* Default <path> to all compiler invocations for --sysroot=<path>. */
 #define DEFAULT_SYSROOT ""
@@ -43,6 +43,9 @@
 /* Directory where gcc is installed. */
 #define GCC_INSTALL_PREFIX ""
 
+/* Whether clang should use a new process for the CC1 invocation */
+#define CLANG_SPAWN_CC1 1
+
 /* Define if we have libxml2 */
 /* #undef CLANG_HAVE_LIBXML */
 
@@ -63,5 +66,6 @@
 
 #define ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER 0
 #define CLANG_OPENMP_NVPTX_DEFAULT_ARCH "sm_35"
+#define CLANG_SYSTEMZ_DEFAULT_ARCH "z10"
 
 #endif

external/apache2/llvm/config/llvm/Config/config.h.in

@@ -50,8 +50,14 @@
 /* Relative directory for resource files */
 #define CLANG_RESOURCE_DIR ""
 
+/* Whether clang should use a new process for the CC1 invocation */
+#define CLANG_SPAWN_CC1 1
+
+/* SystemZ Default Arch */
+#define CLANG_SYSTEMZ_DEFAULT_ARCH "z10"
+
 /* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "/usr/include/clang-9.0:/usr/include"
+#define C_INCLUDE_DIRS "/usr/include/clang-13.0:/usr/include"
 
 /* Default <path> to all compiler invocations for --sysroot=<path>. */
 #define DEFAULT_SYSROOT ""
@@ -280,6 +286,9 @@
 /* Define to 1 if you have the `sysconf' function. */
 #define HAVE_SYSCONF 1
 
+/* Define to 1 if you have the <sysexits.h> header file. */
+#define HAVE_SYSEXITS_H 1
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 /* #undef HAVE_SYS_DIR_H */

external/apache2/llvm/config/llvm/Config/llvm-config.h.in

@@ -81,4 +81,9 @@
 /* LLVM version string */
 #define LLVM_VERSION_STRING "4.0.0svn"
 
+/* Define to 1 if you have the <sysexits.h> header file. */
+#define HAVE_SYSEXITS_H 1
+
+#define LLVM_ENABLE_NEW_PASS_MANAGER 0
+
 #endif

external/apache2/llvm/config/llvm/module.modulemap

@@ -0,0 +1,13 @@
+// This is copied into the build area for a $src != $build compilation.
+module LLVM_Support_DataTypes {
+  header "Support/DataTypes.h"
+  export *
+}
+module LLVM_Config_ABI_Breaking {
+  header "Config/abi-breaking.h"
+  export *
+}
+module LLVM_Config_Config {
+  header "Config/llvm-config.h"
+  export *
+}

external/apache2/llvm/include/Makefile

@@ -1,19 +1,17 @@
-#	$NetBSD: Makefile,v 1.2 2021/04/25 15:06:49 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 01:56:50 joerg Exp $
 
 .include <bsd.init.mk>
 
 .if ${MKLLVM} != "no"
 .PATH:	${CLANG_SRCDIR}/lib/Headers
 
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 INCS=	adxintrin.h \
 	ammintrin.h \
+	amxintrin.h \
 	avx2intrin.h \
 	avx512bf16intrin.h \
-	avx512vlbf16intrin.h \
-	avx512vlvp2intersectintrin.h \
-	avx512vp2intersectintrin.h \
-	enqcmdintrin.h \
 	avx512bitalgintrin.h \
 	avx512bwintrin.h \
 	avx512cdintrin.h \
@@ -26,6 +24,7 @@ INCS=	adxintrin.h \
 	avx512vbmi2intrin.h \
 	avx512vbmiintrin.h \
 	avx512vbmivlintrin.h \
+	avx512vlbf16intrin.h \
 	avx512vlbitalgintrin.h \
 	avx512vlbwintrin.h \
 	avx512vlcdintrin.h \
@@ -33,10 +32,13 @@ INCS=	adxintrin.h \
 	avx512vlintrin.h \
 	avx512vlvbmi2intrin.h \
 	avx512vlvnniintrin.h \
+	avx512vlvp2intersectintrin.h \
 	avx512vnniintrin.h \
+	avx512vp2intersectintrin.h \
 	avx512vpopcntdqintrin.h \
 	avx512vpopcntdqvlintrin.h \
 	avxintrin.h \
+	avxvnniintrin.h \
 	bmi2intrin.h \
 	bmiintrin.h \
 	cetintrin.h \
@@ -46,14 +48,17 @@ INCS=	adxintrin.h \
 	clzerointrin.h \
 	cpuid.h \
 	emmintrin.h \
+	enqcmdintrin.h \
 	f16cintrin.h \
 	fma4intrin.h \
 	fmaintrin.h \
 	fxsrintrin.h \
 	gfniintrin.h \
+	hresetintrin.h \
 	ia32intrin.h \
 	immintrin.h \
 	invpcidintrin.h \
+	keylockerintrin.h \
 	lwpintrin.h \
 	lzcntintrin.h \
 	mm3dnow.h \
@@ -70,18 +75,22 @@ INCS=	adxintrin.h \
 	ptwriteintrin.h \
 	rdseedintrin.h \
 	rtmintrin.h \
+	serializeintrin.h \
 	sgxintrin.h \
 	shaintrin.h \
 	smmintrin.h \
 	tbmintrin.h \
 	tmmintrin.h \
+	tsxldtrkintrin.h \
+	uintrintrin.h \
 	vaesintrin.h \
 	vpclmulqdqintrin.h \
 	waitpkgintrin.h \
 	wbnoinvdintrin.h \
-	wmmintrin.h \
 	__wmmintrin_aes.h \
+	wmmintrin.h \
 	__wmmintrin_pclmul.h \
+	x86gprintrin.h \
 	x86intrin.h \
 	xmmintrin.h \
 	xopintrin.h \
@@ -97,6 +106,7 @@ INCS=	altivec.h \
 	htmxlintrin.h
 .elif ${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "aarch64"
 INCS=	arm_acle.h \
+	arm_cmse.h \
 	arm_neon.h
 .  if ${MACHINE_CPU} == "aarch64"
 INCS+=	arm64intr.h
@@ -104,30 +114,58 @@ INCS+=	arm64intr.h
 .elif ${MACHINE_CPU} == "mips"
 INCS=	msa.h
 .endif
-INCS+=	stdatomic.h
+INCS+=	stdatomic.h tgmath.h
 INCSDIR=	/usr/include/clang-${CLANG_VERSION:R}
 .endif # MKLLVM
 
-.PATH:	${LLVM_SRCDIR}/include/llvm/IR \
+.PATH:	${LLVM_SRCDIR}/include/llvm/IR
+.PATH:	${LLVM_SRCDIR}/include/llvm/Frontend/OpenACC
+.PATH:	${LLVM_SRCDIR}/include/llvm/Frontend/OpenMP
 
-TABLEGEN_SRC=	Attributes.td Intrinsics.td Options.td
+TABLEGEN_SRC=	Attributes.td Intrinsics.td Options.td ACC.td OMP.td
 
 TABLEGEN_OUTPUT.Attributes.td= \
 	llvm/IR/Attributes.inc|-gen-attrs
 
 TABLEGEN_OUTPUT.Intrinsics.td= \
 	llvm/IR/IntrinsicEnums.inc|-gen-intrinsic-enums \
-	llvm/IR/IntrinsicImpl.inc|-gen-intrinsic-impl
+	llvm/IR/IntrinsicImpl.inc|-gen-intrinsic-impl \
+	llvm/IR/IntrinsicsAArch64.h|-gen-intrinsic-enums^-intrinsic-prefix=aarch64 \
+	llvm/IR/IntrinsicsAMDGPU.h|-gen-intrinsic-enums^-intrinsic-prefix=amdgcn \
+	llvm/IR/IntrinsicsARM.h|-gen-intrinsic-enums^-intrinsic-prefix=arm \
+	llvm/IR/IntrinsicsBPF.h|-gen-intrinsic-enums^-intrinsic-prefix=bpf \
+	llvm/IR/IntrinsicsHexagon.h|-gen-intrinsic-enums^-intrinsic-prefix=hexagon \
+	llvm/IR/IntrinsicsMips.h|-gen-intrinsic-enums^-intrinsic-prefix=mips \
+	llvm/IR/IntrinsicsNVPTX.h|-gen-intrinsic-enums^-intrinsic-prefix=nvvm \
+	llvm/IR/IntrinsicsPowerPC.h|-gen-intrinsic-enums^-intrinsic-prefix=ppc \
+	llvm/IR/IntrinsicsR600.h|-gen-intrinsic-enums^-intrinsic-prefix=r600 \
+	llvm/IR/IntrinsicsRISCV.h|-gen-intrinsic-enums^-intrinsic-prefix=riscv \
+	llvm/IR/IntrinsicsS390.h|-gen-intrinsic-enums^-intrinsic-prefix=s390 \
+        llvm/IR/IntrinsicsVE.h|-gen-intrinsic-enums^-intrinsic-prefix=ve \
+	llvm/IR/IntrinsicsWebAssembly.h|-gen-intrinsic-enums^-intrinsic-prefix=wasm \
+	llvm/IR/IntrinsicsX86.h|-gen-intrinsic-enums^-intrinsic-prefix=x86 \
+	llvm/IR/IntrinsicsXCore.h|-gen-intrinsic-enums^-intrinsic-prefix=xcore \
+
+TABLEGEN_OUTPUT.OMP.td=	\
+	llvm/Frontend/OpenMP/OMP.h.inc|--gen-directive-decl \
+	llvm/Frontend/OpenMP/OMP.inc|--gen-directive-impl
+
+TABLEGEN_OUTPUT.ACC.td=	\
+	llvm/Frontend/OpenACC/ACC.h.inc|--gen-directive-decl \
+	llvm/Frontend/OpenACC/ACC.inc|--gen-directive-impl
 
 .if ${MKLLVM} != "no"
 .PATH:	${CLANG_SRCDIR}/include/clang/AST \
 	${CLANG_SRCDIR}/include/clang/Basic \
 	${CLANG_SRCDIR}/include/clang/Driver \
-	${CLANG_SRCDIR}/include/clang/StaticAnalyzer/Checkers
+	${CLANG_SRCDIR}/include/clang/StaticAnalyzer/Checkers \
+	${CLANG_SRCDIR}/include/clang/Tooling/Syntax
 CLANG_TABLEGEN_SRC=	\
+	arm_cde.td \
 	arm_fp16.td \
-	arm_neon.td \
 	arm_mve.td \
+	arm_neon.td \
+	arm_sve.td \
 	Attr.td \
 	Checkers.td \
 	CommentCommands.td \
@@ -136,9 +174,13 @@ CLANG_TABLEGEN_SRC=	\
 	CommentNodes.td \
 	DeclNodes.td \
 	Diagnostic.td \
+	Nodes.td \
+	PropertiesBase.td \
+	riscv_vector.td \
 	StmtDataCollectors.td \
 	StmtNodes.td \
-	TypeNodes.td
+	TypeNodes.td \
+	TypeProperties.td
 
 CLANG_TABLEGEN_INCLUDES.Attr.td=	-I${CLANG_SRCDIR}/include
 CLANG_TABLEGEN_OUTPUT.Attr.td= \
@@ -160,17 +202,30 @@ CLANG_TABLEGEN_OUTPUT.Attr.td= \
 	clang/Serialization/AttrPCHRead.inc|-gen-clang-attr-pch-read \
 	clang/Serialization/AttrPCHWrite.inc|-gen-clang-attr-pch-write
 
+CLANG_TABLEGEN_OUTPUT.PropertiesBase.td= \
+	clang/AST/AbstractBasicReader.inc|-gen-clang-basic-reader \
+	clang/AST/AbstractBasicWriter.inc|-gen-clang-basic-writer
+CLANG_TABLEGEN_INCLUDES.PropertiesBase.td=	-I${CLANG_SRCDIR}/include
+
+CLANG_TABLEGEN_OUTPUT.TypeProperties.td= \
+	clang/AST/AbstractTypeReader.inc|-gen-clang-type-reader \
+	clang/AST/AbstractTypeWriter.inc|-gen-clang-type-writer
+CLANG_TABLEGEN_INCLUDES.TypeProperties.td=	-I${CLANG_SRCDIR}/include
+
 CLANG_TABLEGEN_OUTPUT.StmtNodes.td= \
 	clang/AST/StmtNodes.inc|-gen-clang-stmt-nodes
+CLANG_TABLEGEN_INCLUDES.StmtNodes.td=	-I${CLANG_SRCDIR}/include
 
 CLANG_TABLEGEN_OUTPUT.StmtDataCollectors.td= \
 	clang/AST/StmtDataCollectors.inc|-gen-clang-data-collectors
 
 CLANG_TABLEGEN_OUTPUT.DeclNodes.td= \
 	clang/AST/DeclNodes.inc|-gen-clang-decl-nodes
+CLANG_TABLEGEN_INCLUDES.DeclNodes.td=	-I${CLANG_SRCDIR}/include
 
 CLANG_TABLEGEN_OUTPUT.CommentNodes.td= \
 	clang/AST/CommentNodes.inc|-gen-clang-comment-nodes
+CLANG_TABLEGEN_INCLUDES.CommentNodes.td=	-I${CLANG_SRCDIR}/include
 
 CLANG_TABLEGEN_OUTPUT.CommentCommands.td= \
 	clang/AST/CommentCommandInfo.inc|-gen-clang-comment-command-info \
@@ -183,8 +238,14 @@ CLANG_TABLEGEN_OUTPUT.CommentHTMLTags.td= \
 CLANG_TABLEGEN_OUTPUT.CommentHTMLNamedCharacterReferences.td= \
 	clang/AST/CommentHTMLNamedCharacterReferences.inc|-gen-clang-comment-html-named-character-references
 
+CLANG_TABLEGEN_INCLUDES.Nodes.td=	-I${CLANG_SRCDIR}/include
+CLANG_TABLEGEN_OUTPUT.Nodes.td= \
+	clang/Tooling/Syntax/NodeClasses.inc|-gen-clang-syntax-node-classes \
+	clang/Tooling/Syntax/Nodes.inc|-gen-clang-syntax-node-list
+
 CLANG_TABLEGEN_OUTPUT.TypeNodes.td= \
 	clang/AST/TypeNodes.inc|-gen-clang-type-nodes
+CLANG_TABLEGEN_INCLUDES.TypeNodes.td=	-I${CLANG_SRCDIR}/include
 
 CLANG_TABLEGEN_INCLUDES.Diagnostic.td=	-I${CLANG_SRCDIR}/include/clang/Basic
 CLANG_TABLEGEN_OUTPUT.Diagnostic.td= \
@@ -203,6 +264,19 @@ CLANG_TABLEGEN_OUTPUT.Diagnostic.td= \
 	clang/Basic/DiagnosticSemaKinds.inc|-gen-clang-diags-defs^-clang-component=Sema \
 	clang/Basic/DiagnosticSerializationKinds.inc|-gen-clang-diags-defs^-clang-component=Serialization
 
+CLANG_TABLEGEN_INCLUDES.arm_cde.td=	-I${CLANG_SRCDIR}/include/clang/Basic
+CLANG_TABLEGEN_OUTPUT.arm_cde.td= \
+	clang/Basic/arm_cde_builtins.inc|-gen-arm-cde-builtin-def \
+	clang/Basic/arm_cde_builtin_cg.inc|-gen-arm-cde-builtin-codegen \
+	clang/Basic/arm_cde_builtin_sema.inc|-gen-arm-cde-builtin-sema \
+	clang/Basic/arm_cde_builtin_aliases.inc|-gen-arm-cde-builtin-aliases
+
+CLANG_TABLEGEN_INCLUDES.arm_sve.td=	-I${CLANG_SRCDIR}/include/clang/Basic
+CLANG_TABLEGEN_OUTPUT.arm_sve.td= \
+	clang/Basic/arm_sve_builtins.inc|-gen-arm-sve-builtins \
+	clang/Basic/arm_sve_builtin_cg.inc|-gen-arm-sve-builtin-codegen \
+	clang/Basic/arm_sve_sema_rangechecks.inc|-gen-arm-sve-sema-rangechecks \
+	clang/Basic/arm_sve_typeflags.inc|-gen-arm-sve-typeflags
 
 CLANG_TABLEGEN_INCLUDES.arm_neon.td=	-I${CLANG_SRCDIR}/include/clang/Basic
 CLANG_TABLEGEN_OUTPUT.arm_neon.td= \
@@ -219,6 +293,11 @@ CLANG_TABLEGEN_OUTPUT.arm_mve.td= \
 	clang/Basic/arm_mve_builtin_cg.inc|-gen-arm-mve-builtin-codegen \
 	clang/Basic/arm_mve_builtin_sema.inc|-gen-arm-mve-builtin-sema \
 
+#CLANG_TABLEGEN_INCLUDES.riscv_vector.td=	-I${CLANG_SRCDIR}/include/clang/Basic
+CLANG_TABLEGEN_OUTPUT.riscv_vector.td= \
+	clang/Basic/riscv_vector_builtins.inc|-gen-riscv-vector-builtins \
+	clang/Basic/riscv_vector_builtin_cg.inc|-gen-riscv-vector-builtin-codegen
+
 CLANG_TABLEGEN_INCLUDES.Checkers.td=	\
 	-I${CLANG_SRCDIR}/include \
 	-I${CLANG_SRCDIR}/include/clang/StaticAnalyzer/Checkers
@@ -228,6 +307,7 @@ CLANG_TABLEGEN_OUTPUT.Checkers.td= \
 TABLEGEN_INCLUDES.Options.td=	-I${CLANG_SRCDIR}/include/clang/Driver
 TABLEGEN_OUTPUT.Options.td= \
 	clang/Driver/Options.inc|-gen-opt-parser-defs
+
 .endif # MKLLVM
 
 .include "${.PARSEDIR}/../tablegen.mk"
@@ -363,8 +443,21 @@ run-configure:
 	rm -r tmp
 	mv ${LLVM_INCLUDE_CONFIG}/llvm/Config/config.h \
 	    ${LLVM_INCLUDE_CONFIG}/llvm/Config/config.h.in
+	cp ${.CURDIR}/module.modulemap ${LLVM_INCLUDE_CONFIG}/llvm/module.modulemap
 .endif
 
+DPSRCS+=	llvm/Support/Extension.def
+CLEANFILES+=	llvm/Support/Extension.def
+
+llvm/Support/Extension.def:
+	mkdir -p ${.TARGET:H}
+	printf '//extension handlers\n#undef HANDLE_EXTENSION\n' > ${.TARGET}
+
 includes depend dependall all: ${DPSRCS}
 
+depend dependall: clean-modulecache
+
+clean-modulecache:
+	rm -rf ${LLVM_MODULE_CACHE}
+
 .include <bsd.prog.mk>

external/apache2/llvm/include/module.modulemap

@@ -0,0 +1,13 @@
+// This is copied into the build area for a $src != $build compilation.
+module LLVM_Support_DataTypes {
+  header "Support/DataTypes.h"
+  export *
+}
+module LLVM_Config_ABI_Breaking {
+  header "Config/abi-breaking.h"
+  export *
+}
+module LLVM_Config_Config {
+  header "Config/llvm-config.h"
+  export *
+}

external/apache2/llvm/lib/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/06/09 21:50:32 kamil Exp $
+# $NetBSD: Makefile,v 1.4 2021/05/30 01:56:50 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -15,6 +15,7 @@ SUBDIR=	\
 	libLLVMDebugInfoDWARF \
 	libLLVMDebugInfoMSF \
 	libLLVMDemangle \
+	libLLVMFrontendOpenMP \
 	libLLVMGlobalISel \
 	libLLVMIR \
 	libLLVMIRReader \
@@ -103,14 +104,17 @@ SUBDIR+= \
 	libLLVMX86AsmParser \
 	libLLVMX86Disassembler \
 	libLLVMX86MCTargetDesc \
-	libLLVMX86TargetInfo \
+	libLLVMX86TargetInfo
-	libLLVMX86Utils
 
 .if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
 SUBDIR+= \
 	libLLVMAMDGPUDisassembler \
 	libLLVMExecutionEngine \
 	libLLVMExecutionEngineJITLink \
+	libLLVMExecutionEngineOrcShared \
+	libLLVMExecutionEngineOrcTargetProcess \
+	libLLVMFileCheck \
+	libLLVMInterfaceStub \
 	libLLVMMCJIT \
 	libLLVMOrc \
 	libLLVMRuntimeDyld
@@ -119,7 +123,6 @@ SUBDIR+= \
 .if !defined(HOSTLIB) && !defined(_BSD_HOSTINIT_MK_)
 SUBDIR+= \
 	libLLVMDebugInfoPDB \
-	libLLVMDebugInfoPDBNative \
 	libLLVMDebugInfoSymbolize \
 	libLLVMObjectYAML
 .endif
@@ -156,15 +159,19 @@ SUBDIR+= \
 	libclangSerialization \
 	libclangStaticAnalyzerCheckers \
 	libclangStaticAnalyzerCore \
+	libclangToolingCore \
 	.WAIT \
 	libclangStaticAnalyzerFrontend
 
 .if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
 SUBDIR+= \
+	libclangAPINotes \
 	libclangASTMatchersDynamic \
 	libclangFormat \
+	libclangIndexSerialization \
+	libclangInterpreter \
+	libclangTesting \
 	libclangTooling \
-	libclangToolingCore \
 	libclangToolingDependencyScanning \
 	libclangToolingInclusions \
 	libclangToolingRefactoring \

external/apache2/llvm/lib/libLLVMAArch64CodeGen/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:50 joerg Exp $
 
 LIB=	LLVMAArch64CodeGen
 
@@ -14,7 +14,6 @@ SRCS+=	AArch64A53Fix835769.cpp \
 	AArch64AsmPrinter.cpp \
 	AArch64BranchTargets.cpp \
 	AArch64CallingConvention.cpp \
-	AArch64CallLowering.cpp \
 	AArch64CleanupLocalDynamicTLSPass.cpp \
 	AArch64CollectLOH.cpp \
 	AArch64CompressJumpTables.cpp \
@@ -28,29 +27,42 @@ SRCS+=	AArch64A53Fix835769.cpp \
 	AArch64FastISel.cpp \
 	AArch64FrameLowering.cpp \
 	AArch64InstrInfo.cpp \
-	AArch64InstructionSelector.cpp \
 	AArch64ISelDAGToDAG.cpp \
 	AArch64ISelLowering.cpp \
-	AArch64LegalizerInfo.cpp \
 	AArch64LoadStoreOptimizer.cpp \
+	AArch64LowerHomogeneousPrologEpilog.cpp \
+	AArch64MachineFunctionInfo.cpp \
 	AArch64MacroFusion.cpp \
 	AArch64MCInstLower.cpp \
 	AArch64PBQPRegAlloc.cpp \
-	AArch64PreLegalizerCombiner.cpp \
 	AArch64PromoteConstant.cpp \
 	AArch64RedundantCopyElimination.cpp \
-	AArch64RegisterBankInfo.cpp \
 	AArch64RegisterInfo.cpp \
 	AArch64SelectionDAGInfo.cpp \
 	AArch64SIMDInstrOpt.cpp \
+	AArch64SLSHardening.cpp \
 	AArch64SpeculationHardening.cpp \
-	AArch64StackTaggingPreRA.cpp \
 	AArch64StackTagging.cpp \
+	AArch64StackTaggingPreRA.cpp \
 	AArch64StorePairSuppress.cpp \
 	AArch64Subtarget.cpp \
 	AArch64TargetMachine.cpp \
 	AArch64TargetObjectFile.cpp \
-	AArch64TargetTransformInfo.cpp
+	AArch64TargetTransformInfo.cpp \
+	SVEIntrinsicOpts.cpp
+
+.PATH: ${LLVM_SRCDIR}/lib/Target/AArch64/GISel
+
+SRCS+=	AArch64CallLowering.cpp \
+	AArch64GlobalISelUtils.cpp \
+	AArch64InstructionSelector.cpp \
+	AArch64LegalizerInfo.cpp \
+	AArch64O0PreLegalizerCombiner.cpp \
+	AArch64PostLegalizerCombiner.cpp \
+	AArch64PostLegalizerLowering.cpp \
+	AArch64PostSelectOptimize.cpp \
+	AArch64PreLegalizerCombiner.cpp \
+	AArch64RegisterBankInfo.cpp
 
 TABLEGEN_SRC=		AArch64.td
 TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/Target/AArch64
@@ -61,16 +73,22 @@ TABLEGEN_OUTPUT= \
 	AArch64GenCallingConv.inc|-gen-callingconv \
 	AArch64GenDAGISel.inc|-gen-dag-isel \
 	AArch64GenDisassemblerTables.inc|-gen-disassembler \
+	AArch64GenExegesis.inc|-gen-exegesis \
 	AArch64GenFastISel.inc|-gen-fast-isel \
 	AArch64GenGICombiner.inc|-gen-global-isel-combiner^-combiners=AArch64PreLegalizerCombinerHelper \
 	AArch64GenGlobalISel.inc|-gen-global-isel \
 	AArch64GenInstrInfo.inc|-gen-instr-info \
 	AArch64GenMCCodeEmitter.inc|-gen-emitter \
 	AArch64GenMCPseudoLowering.inc|-gen-pseudo-lowering \
+	AArch64GenO0PreLegalizeGICombiner.inc|-gen-global-isel-combiner^-combiners=AArch64O0PreLegalizerCombinerHelper \
+	AArch64GenPreLegalizeGICombiner.inc|-gen-global-isel-combiner^-combiners=AArch64PreLegalizerCombinerHelper \
+	AArch64GenPostLegalizeGICombiner.inc|-gen-global-isel-combiner^-combiners=AArch64PostLegalizerCombinerHelper \
+	AArch64GenPostLegalizeGILowering.inc|-gen-global-isel-combiner^-combiners=AArch64PostLegalizerLoweringHelper \
 	AArch64GenRegisterBank.inc|-gen-register-bank \
 	AArch64GenRegisterInfo.inc|-gen-register-info \
 	AArch64GenSubtargetInfo.inc|-gen-subtarget \
-	AArch64GenSystemOperands.inc|-gen-searchable-tables \
+	AArch64GenSystemOperands.inc|-gen-searchable-tables
+
 
 .include "${.PARSEDIR}/../../tablegen.mk"
 

external/apache2/llvm/lib/libLLVMAMDGPUCodeGen/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:03 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:50 joerg Exp $
 
 LIB=	LLVMAMDGPUCodeGen
 
@@ -17,32 +17,39 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	AMDGPUAtomicOptimizer.cpp \
 	AMDGPUCallLowering.cpp \
 	AMDGPUCodeGenPrepare.cpp \
+	AMDGPUExportClustering.cpp \
 	AMDGPUFixFunctionBitcasts.cpp \
 	AMDGPUFrameLowering.cpp \
+	AMDGPUGlobalISelUtils.cpp \
 	AMDGPUHSAMetadataStreamer.cpp \
-	AMDGPUInline.cpp \
+	AMDGPUInstCombineIntrinsic.cpp \
 	AMDGPUInstrInfo.cpp \
 	AMDGPUInstructionSelector.cpp \
 	AMDGPUISelDAGToDAG.cpp \
 	AMDGPUISelLowering.cpp \
+	AMDGPULateCodeGenPrepare.cpp \
 	AMDGPULegalizerInfo.cpp \
 	AMDGPULibCalls.cpp \
 	AMDGPULibFunc.cpp \
 	AMDGPULowerIntrinsics.cpp \
 	AMDGPULowerKernelArguments.cpp \
 	AMDGPULowerKernelAttributes.cpp \
+	AMDGPULowerModuleLDSPass.cpp \
 	AMDGPUMachineCFGStructurizer.cpp \
 	AMDGPUMachineFunction.cpp \
 	AMDGPUMachineModuleInfo.cpp \
 	AMDGPUMacroFusion.cpp \
 	AMDGPUMCInstLower.cpp \
+	AMDGPUMIRFormatter.cpp \
 	AMDGPUOpenCLEnqueuedBlockLowering.cpp \
 	AMDGPUPerfHintAnalysis.cpp \
+	AMDGPUPostLegalizerCombiner.cpp \
+	AMDGPUPreLegalizerCombiner.cpp \
 	AMDGPUPrintfRuntimeBinding.cpp \
 	AMDGPUPromoteAlloca.cpp \
 	AMDGPUPropagateAttributes.cpp \
+	AMDGPURegBankCombiner.cpp \
 	AMDGPURegisterBankInfo.cpp \
-	AMDGPURegisterInfo.cpp \
 	AMDGPURewriteOutArguments.cpp \
 	AMDGPUSubtarget.cpp \
 	AMDGPUTargetMachine.cpp \
@@ -57,7 +64,6 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	GCNIterativeScheduler.cpp \
 	GCNMinRegStrategy.cpp \
 	GCNNSAReassign.cpp \
-	GCNRegBankReassign.cpp \
 	GCNRegPressure.cpp \
 	GCNSchedStrategy.cpp \
 	R600AsmPrinter.cpp \
@@ -74,18 +80,17 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	R600OptimizeVectorRegisters.cpp \
 	R600Packetizer.cpp \
 	R600RegisterInfo.cpp \
-	SIAddIMGInit.cpp \
 	SIAnnotateControlFlow.cpp \
 	SIFixSGPRCopies.cpp \
-	SIFixupVectorISel.cpp \
 	SIFixVGPRCopies.cpp \
 	SIFoldOperands.cpp \
 	SIFormMemoryClauses.cpp \
 	SIFrameLowering.cpp \
-	SIInsertSkips.cpp \
+	SIInsertHardClauses.cpp \
 	SIInsertWaitcnts.cpp \
 	SIInstrInfo.cpp \
 	SIISelLowering.cpp \
+	SILateBranchLowering.cpp \
 	SILoadStoreOptimizer.cpp \
 	SILowerControlFlow.cpp \
 	SILowerI1Copies.cpp \
@@ -97,12 +102,15 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	SIOptimizeExecMasking.cpp \
 	SIOptimizeExecMaskingPreRA.cpp \
 	SIPeepholeSDWA.cpp \
+	SIPostRABundler.cpp \
 	SIPreAllocateWWMRegs.cpp \
+	SIPreEmitPeephole.cpp \
+	SIProgramInfo.cpp \
 	SIRegisterInfo.cpp \
 	SIShrinkInstructions.cpp \
 	SIWholeQuadMode.cpp
 
-TABLEGEN_SRC=		AMDGPU.td AMDGPUGISel.td R600.td
+TABLEGEN_SRC=		AMDGPU.td AMDGPUGISel.td InstCombineTables.td R600.td
 TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/Target/AMDGPU
 TABLEGEN_OUTPUT.AMDGPU.td= \
 	AMDGPUGenAsmMatcher.inc|-gen-asm-matcher \
@@ -111,8 +119,6 @@ TABLEGEN_OUTPUT.AMDGPU.td= \
 	AMDGPUGenDAGISel.inc|-gen-dag-isel \
 	AMDGPUGenDisassemblerTables.inc|-gen-disassembler \
 	AMDGPUGenInstrInfo.inc|-gen-instr-info \
-	AMDGPUGenIntrinsicEnums.inc|-gen-tgt-intrinsic-enums \
-	AMDGPUGenIntrinsicImpl.inc|-gen-tgt-intrinsic-impl \
 	AMDGPUGenMCCodeEmitter.inc|-gen-emitter \
 	AMDGPUGenMCPseudoLowering.inc|-gen-pseudo-lowering \
 	AMDGPUGenRegisterBank.inc|-gen-register-bank \
@@ -120,8 +126,15 @@ TABLEGEN_OUTPUT.AMDGPU.td= \
 	AMDGPUGenSearchableTables.inc|-gen-searchable-tables \
 	AMDGPUGenSubtargetInfo.inc|-gen-subtarget
 
+TABLEGEN_OUTPUT.InstCombineTables.td= \
+	InstCombineTables.inc|-gen-searchable-tables
+
 TABLEGEN_OUTPUT.AMDGPUGISel.td= \
-	AMDGPUGenGlobalISel.inc|-gen-global-isel
+	AMDGPUGenGICombiner.inc|-gen-global-isel-combiner^-combiners=AMDGPUPreLegalizerCombinerHelper \
+	AMDGPUGenGlobalISel.inc|-gen-global-isel \
+	AMDGPUGenPostLegalizeGICombiner.inc|-gen-global-isel-combiner^-combiners=AMDGPUPostLegalizerCombinerHelper \
+	AMDGPUGenPreLegalizeGICombiner.inc|-gen-global-isel-combiner^-combiners=AMDGPUPreLegalizerCombinerHelper \
+        AMDGPUGenRegBankGICombiner.inc|-gen-global-isel-combiner^-combiners=AMDGPURegBankCombinerHelper
 
 TABLEGEN_OUTPUT.R600.td= \
 	R600GenAsmWriter.inc|-gen-asm-writer \

external/apache2/llvm/lib/libLLVMAMDGPUUtils/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:03 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:50 joerg Exp $
 
 LIB=	LLVMAMDGPUUtils
 
@@ -13,6 +13,7 @@ CPPFLAGS+=	-I${LLVM_SRCDIR}/lib/Target/AMDGPU
 
 SRCS+=	AMDGPUAsmUtils.cpp \
 	AMDGPUBaseInfo.cpp \
+	AMDGPULDSUtils.cpp \
 	AMDGPUPALMetadata.cpp \
 	AMDKernelCodeTUtils.cpp
 

external/apache2/llvm/lib/libLLVMARMCodeGen/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:04 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:50 joerg Exp $
 
 LIB=	LLVMARMCodeGen
 
@@ -10,12 +10,12 @@ CPPFLAGS+=	-I${LLVM_SRCDIR}/lib/Target/ARM
 
 SRCS+=	A15SDOptimizer.cpp \
 	ARMAsmPrinter.cpp \
-	ARMBasicBlockInfo.cpp \
 	ARMBaseInstrInfo.cpp \
 	ARMBaseRegisterInfo.cpp \
+	ARMBasicBlockInfo.cpp \
+	ARMBlockPlacement.cpp \
 	ARMCallingConv.cpp \
 	ARMCallLowering.cpp \
-	ARMCodeGenPrepare.cpp \
 	ARMConstantIslandPass.cpp \
 	ARMConstantPoolValue.cpp \
 	ARMExpandPseudoInsts.cpp \
@@ -37,12 +37,16 @@ SRCS+=	A15SDOptimizer.cpp \
 	ARMRegisterBankInfo.cpp \
 	ARMRegisterInfo.cpp \
 	ARMSelectionDAGInfo.cpp \
+	ARMSLSHardening.cpp \
 	ARMSubtarget.cpp \
 	ARMTargetMachine.cpp \
 	ARMTargetObjectFile.cpp \
 	ARMTargetTransformInfo.cpp \
 	MLxExpansionPass.cpp \
+	MVEGatherScatterLowering.cpp \
+	MVELaneInterleavingPass.cpp \
 	MVETailPredication.cpp \
+	MVETPAndVPTOptimisationsPass.cpp \
 	MVEVPTBlockPass.cpp \
 	Thumb1FrameLowering.cpp \
 	Thumb1InstrInfo.cpp \

external/apache2/llvm/lib/libLLVMAnalysis/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/09/07 00:18:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 01:56:50 joerg Exp $
 
 LIB=	LLVMAnalysis
 
@@ -11,6 +11,7 @@ SRCS+=	AliasAnalysis.cpp \
 	AliasAnalysisSummary.cpp \
 	AliasSetTracker.cpp \
 	Analysis.cpp \
+	AssumeBundleQueries.cpp \
 	AssumptionCache.cpp \
 	BasicAliasAnalysis.cpp \
 	BlockFrequencyInfo.cpp \
@@ -28,26 +29,35 @@ SRCS+=	AliasAnalysis.cpp \
 	CmpInstAnalysis.cpp \
 	CodeMetrics.cpp \
 	ConstantFolding.cpp \
+	ConstraintSystem.cpp \
 	CostModel.cpp \
 	DDG.cpp \
+	DDGPrinter.cpp \
 	Delinearization.cpp \
 	DemandedBits.cpp \
 	DependenceAnalysis.cpp \
 	DependenceGraphBuilder.cpp \
+	DevelopmentModeInlineAdvisor.cpp \
 	DivergenceAnalysis.cpp \
 	DominanceFrontier.cpp \
 	DomPrinter.cpp \
 	DomTreeUpdater.cpp \
 	EHPersonalities.cpp \
+	FunctionPropertiesAnalysis.cpp \
 	GlobalsModRef.cpp \
 	GuardUtils.cpp \
+	HeatUtils.cpp \
+	ImportedFunctionsInliningStatistics.cpp \
 	IndirectCallPromotionAnalysis.cpp \
+	InlineAdvisor.cpp \
 	InlineCost.cpp \
+	InlineSizeEstimatorAnalysis.cpp \
 	InstCount.cpp \
 	InstructionPrecedenceTracking.cpp \
 	InstructionSimplify.cpp \
 	Interval.cpp \
 	IntervalPartition.cpp \
+	IRSimilarityIdentifier.cpp \
 	IVDescriptors.cpp \
 	IVUsers.cpp \
 	LazyBlockFrequencyInfo.cpp \
@@ -61,6 +71,7 @@ SRCS+=	AliasAnalysis.cpp \
 	LoopAnalysisManager.cpp \
 	LoopCacheAnalysis.cpp \
 	LoopInfo.cpp \
+	LoopNestAnalysis.cpp \
 	LoopPass.cpp \
 	LoopUnrollAnalyzer.cpp \
 	MemDepPrinter.cpp \
@@ -70,6 +81,7 @@ SRCS+=	AliasAnalysis.cpp \
 	MemoryLocation.cpp \
 	MemorySSA.cpp \
 	MemorySSAUpdater.cpp \
+	MLInlineAdvisor.cpp \
 	ModuleDebugInfoPrinter.cpp \
 	ModuleSummaryAnalysis.cpp \
 	MustExecute.cpp \
@@ -77,8 +89,7 @@ SRCS+=	AliasAnalysis.cpp \
 	ObjCARCAnalysisUtils.cpp \
 	ObjCARCInstKind.cpp \
 	OptimizationRemarkEmitter.cpp \
-	OrderedBasicBlock.cpp \
+	OverflowInstAnalysis.cpp \
-	OrderedInstructions.cpp \
 	PHITransAddr.cpp \
 	PhiValues.cpp \
 	PostDominators.cpp \
@@ -87,24 +98,28 @@ SRCS+=	AliasAnalysis.cpp \
 	RegionInfo.cpp \
 	RegionPass.cpp \
 	RegionPrinter.cpp \
+	ReleaseModeModelRunner.cpp \
+	ReplayInlineAdvisor.cpp \
 	ScalarEvolutionAliasAnalysis.cpp \
 	ScalarEvolution.cpp \
-	ScalarEvolutionExpander.cpp \
+	ScalarEvolutionDivision.cpp \
 	ScalarEvolutionNormalization.cpp \
 	ScopedNoAliasAA.cpp \
+	StackLifetime.cpp \
 	StackSafetyAnalysis.cpp \
 	SyncDependenceAnalysis.cpp \
 	SyntheticCountsUtils.cpp \
 	TargetLibraryInfo.cpp \
 	TargetTransformInfo.cpp \
+	TFUtils.cpp \
 	Trace.cpp \
 	TypeBasedAliasAnalysis.cpp \
 	TypeMetadataUtils.cpp \
-	VFABIDemangling.cpp \
 	ValueLattice.cpp \
 	ValueLatticeUtils.cpp \
 	ValueTracking.cpp \
-	VectorUtils.cpp
+	VectorUtils.cpp \
+	VFABIDemangling.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

external/apache2/llvm/lib/libLLVMAsmPrinter/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:50 joerg Exp $
 
 LIB=	LLVMAsmPrinter
 
@@ -8,6 +8,7 @@ LIB=	LLVMAsmPrinter
 
 SRCS+=	AccelTable.cpp \
 	AddressPool.cpp \
+	AIXException.cpp \
 	ARMException.cpp \
 	AsmPrinter.cpp \
 	AsmPrinterDwarf.cpp \
@@ -28,6 +29,7 @@ SRCS+=	AccelTable.cpp \
 	EHStreamer.cpp \
 	ErlangGCPrinter.cpp \
 	OcamlGCPrinter.cpp \
+	PseudoProbePrinter.cpp \
 	WasmException.cpp \
 	WinCFGuard.cpp \
 	WinException.cpp

external/apache2/llvm/lib/libLLVMBinaryFormat/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:51 joerg Exp $
 
 LIB=	LLVMBinaryFormat
 
@@ -8,13 +8,15 @@ LIB=	LLVMBinaryFormat
 
 SRCS+=	AMDGPUMetadataVerifier.cpp \
 	Dwarf.cpp \
+	MachO.cpp \
 	Magic.cpp \
 	Minidump.cpp \
 	MsgPackDocument.cpp \
 	MsgPackDocumentYAML.cpp \
 	MsgPackReader.cpp \
 	MsgPackWriter.cpp \
-	Wasm.cpp
+	Wasm.cpp \
+	XCOFF.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

external/apache2/llvm/lib/libLLVMCodeGen/Makefile

@@ -1,27 +1,29 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:51 joerg Exp $
 
 LIB=	LLVMCodeGen
 
 .include <bsd.init.mk>
 
 .PATH: ${LLVM_SRCDIR}/lib/CodeGen
-
+.PATH: ${LLVM_SRCDIR}/lib/CodeGen/LiveDebugValues
 
 SRCS+=	AggressiveAntiDepBreaker.cpp \
 	AllocationOrder.cpp \
 	Analysis.cpp \
 	AtomicExpandPass.cpp \
+	BasicBlockSections.cpp \
 	BasicTargetTransformInfo.cpp \
 	BranchFolding.cpp \
 	BranchRelaxation.cpp \
 	BreakFalseDeps.cpp \
-	BuiltinGCs.cpp \
 	CalcSpillWeights.cpp \
 	CallingConvLower.cpp \
 	CFGuardLongjmp.cpp \
 	CFIInstrInserter.cpp \
 	CodeGen.cpp \
+	CodeGenPassBuilder.cpp \
 	CodeGenPrepare.cpp \
+	CommandFlags.cpp \
 	CriticalAntiDepBreaker.cpp \
 	DeadMachineInstructionElim.cpp \
 	DetectDeadLanes.cpp \
@@ -29,24 +31,27 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	DwarfEHPrepare.cpp \
 	EarlyIfConversion.cpp \
 	EdgeBundles.cpp \
+	EHContGuardCatchret.cpp \
 	ExecutionDomainFix.cpp \
 	ExpandMemCmp.cpp \
 	ExpandPostRAPseudos.cpp \
 	ExpandReductions.cpp \
+	ExpandVectorPredication.cpp \
 	FaultMaps.cpp \
 	FEntryInserter.cpp \
 	FinalizeISel.cpp \
+	FixupStatepointCallerSaved.cpp \
 	FuncletLayout.cpp \
 	GCMetadata.cpp \
 	GCMetadataPrinter.cpp \
 	GCRootLowering.cpp \
-	GCStrategy.cpp \
 	GlobalMerge.cpp \
 	HardwareLoops.cpp \
 	IfConversion.cpp \
 	ImplicitNullChecks.cpp \
 	IndirectBrExpandPass.cpp \
 	InlineSpiller.cpp \
+	InstrRefBasedImpl.cpp \
 	InterferenceCache.cpp \
 	InterleavedAccessPass.cpp \
 	InterleavedLoadCombinePass.cpp \
@@ -56,6 +61,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	LexicalScopes.cpp \
 	LiveDebugValues.cpp \
 	LiveDebugVariables.cpp \
+	LiveIntervalCalc.cpp \
 	LiveInterval.cpp \
 	LiveIntervals.cpp \
 	LiveIntervalUnion.cpp \
@@ -76,15 +82,18 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	MachineBlockFrequencyInfo.cpp \
 	MachineBlockPlacement.cpp \
 	MachineBranchProbabilityInfo.cpp \
+	MachineCheckDebugify.cpp \
 	MachineCombiner.cpp \
 	MachineCopyPropagation.cpp \
 	MachineCSE.cpp \
+	MachineDebugify.cpp \
 	MachineDominanceFrontier.cpp \
 	MachineDominators.cpp \
 	MachineFrameInfo.cpp \
 	MachineFunction.cpp \
 	MachineFunctionPass.cpp \
 	MachineFunctionPrinterPass.cpp \
+	MachineFunctionSplitter.cpp \
 	MachineInstrBundle.cpp \
 	MachineInstr.cpp \
 	MachineLICM.cpp \
@@ -95,6 +104,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	MachineOperand.cpp \
 	MachineOptimizationRemarkEmitter.cpp \
 	MachineOutliner.cpp \
+	MachinePassManager.cpp \
 	MachinePipeliner.cpp \
 	MachinePostDominators.cpp \
 	MachineRegionInfo.cpp \
@@ -103,15 +113,22 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	MachineSink.cpp \
 	MachineSizeOpts.cpp \
 	MachineSSAUpdater.cpp \
+	MachineStableHash.cpp \
+	MachineStripDebug.cpp \
 	MachineTraceMetrics.cpp \
 	MachineVerifier.cpp \
 	MacroFusion.cpp \
+	MBFIWrapper.cpp \
 	MIRCanonicalizerPass.cpp \
+	MIRFSDiscriminator.cpp \
 	MIRNamerPass.cpp \
 	MIRPrinter.cpp \
 	MIRPrintingPass.cpp \
 	MIRVRegNamerUtils.cpp \
+	MIRYamlMapping.cpp \
 	ModuloSchedule.cpp \
+	MultiHazardRecognizer.cpp \
+	NonRelocatableStringpool.cpp \
 	OptimizePHIs.cpp \
 	ParallelCG.cpp \
 	PatchableFunction.cpp \
@@ -123,7 +140,11 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	PreISelIntrinsicLowering.cpp \
 	ProcessImplicitDefs.cpp \
 	PrologEpilogInserter.cpp \
+	PseudoProbeInserter.cpp \
 	PseudoSourceValue.cpp \
+	RDFGraph.cpp \
+	RDFLiveness.cpp \
+	RDFRegisters.cpp \
 	ReachingDefAnalysis.cpp \
 	RegAllocBase.cpp \
 	RegAllocBasic.cpp \
@@ -138,11 +159,10 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	RegUsageInfoCollector.cpp \
 	RegUsageInfoPropagate.cpp \
 	RenameIndependentSubregs.cpp \
+	ReplaceWithVeclib.cpp \
 	ResetMachineFunctionPass.cpp \
-	SafeStackColoring.cpp \
 	SafeStack.cpp \
 	SafeStackLayout.cpp \
-	ScalarizeMaskedMemIntrin.cpp \
 	ScheduleDAG.cpp \
 	ScheduleDAGInstrs.cpp \
 	ScheduleDAGPrinter.cpp \
@@ -172,8 +192,10 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	TargetSchedule.cpp \
 	TargetSubtargetInfo.cpp \
 	TwoAddressInstructionPass.cpp \
+	TypePromotion.cpp \
 	UnreachableBlockElim.cpp \
 	ValueTypes.cpp \
+	VarLocBasedImpl.cpp \
 	VirtRegMap.cpp \
 	WasmEHPrepare.cpp \
 	WinEHPrepare.cpp \

external/apache2/llvm/lib/libLLVMDWARFLinker/Makefile

@@ -0,0 +1,18 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:51 joerg Exp $
+
+LIB=	LLVMDWARFLinker
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/DWARFLinker
+
+SRCS+=	DWARFLinker.cpp \
+	DWARFLinkerCompileUnit.cpp \
+	DWARFLinkerDeclContext.cpp \
+	DWARFStreamer.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

external/apache2/llvm/lib/libLLVMDebugInfoDWARF/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:51 joerg Exp $
 
 LIB=	LLVMDebugInfoDWARF
 
@@ -29,6 +29,7 @@ SRCS+=	DWARFAbbreviationDeclaration.cpp \
 	DWARFFormValue.cpp \
 	DWARFGdbIndex.cpp \
 	DWARFListTable.cpp \
+	DWARFLocationExpression.cpp \
 	DWARFTypeUnit.cpp \
 	DWARFUnit.cpp \
 	DWARFUnitIndex.cpp \

external/apache2/llvm/lib/libLLVMDebugInfoGSYM/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:51 joerg Exp $
 
 LIB=	LLVMDebugInfoGSYM
 
@@ -6,13 +6,15 @@ LIB=	LLVMDebugInfoGSYM
 
 .PATH: ${LLVM_SRCDIR}/lib/DebugInfo/GSYM
 
-SRCS+=	FileWriter.cpp \
+SRCS+=	DwarfTransformer.cpp \
+	FileWriter.cpp \
 	FunctionInfo.cpp \
 	GsymCreator.cpp \
 	GsymReader.cpp \
 	Header.cpp \
 	InlineInfo.cpp \
 	LineTable.cpp \
+	LookupResult.cpp \
 	Range.cpp
 
 .if defined(HOSTLIB)

external/apache2/llvm/lib/libLLVMDebugInfoPDB/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:51 joerg Exp $
 
 LIB=	LLVMDebugInfoPDB
 
@@ -47,6 +47,60 @@ SRCS+=	GenericError.cpp \
 	PDBSymDumper.cpp \
 	UDTLayout.cpp
 
+.PATH: ${LLVM_SRCDIR}/lib/DebugInfo/PDB/Native
+
+
+SRCS+=	DbiModuleDescriptorBuilder.cpp \
+	DbiModuleDescriptor.cpp \
+	DbiModuleList.cpp \
+	DbiStreamBuilder.cpp \
+	DbiStream.cpp \
+	EnumTables.cpp \
+	GlobalsStream.cpp \
+	GSIStreamBuilder.cpp \
+	Hash.cpp \
+	HashTable.cpp \
+	InfoStreamBuilder.cpp \
+	InfoStream.cpp \
+	InjectedSourceStream.cpp \
+	ModuleDebugStream.cpp \
+	NamedStreamMap.cpp \
+	NativeCompilandSymbol.cpp \
+	NativeEnumGlobals.cpp \
+	NativeEnumInjectedSources.cpp \
+	NativeEnumLineNumbers.cpp \
+	NativeEnumModules.cpp \
+	NativeEnumSymbols.cpp \
+	NativeEnumTypes.cpp \
+	NativeExeSymbol.cpp \
+	NativeFunctionSymbol.cpp \
+	NativeInlineSiteSymbol.cpp \
+	NativeLineNumber.cpp \
+	NativePublicSymbol.cpp \
+	NativeRawSymbol.cpp \
+	NativeSession.cpp \
+	NativeSourceFile.cpp \
+	NativeSymbolEnumerator.cpp \
+	NativeTypeArray.cpp \
+	NativeTypeBuiltin.cpp \
+	NativeTypeEnum.cpp \
+	NativeTypeFunctionSig.cpp \
+	NativeTypePointer.cpp \
+	NativeTypeTypedef.cpp \
+	NativeTypeUDT.cpp \
+	NativeTypeVTShape.cpp \
+	PDBFileBuilder.cpp \
+	PDBFile.cpp \
+	PDBStringTableBuilder.cpp \
+	PDBStringTable.cpp \
+	PublicsStream.cpp \
+	RawError.cpp \
+	SymbolCache.cpp \
+	SymbolStream.cpp \
+	TpiHashing.cpp \
+	TpiStreamBuilder.cpp \
+	TpiStream.cpp
+
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
 .else

external/apache2/llvm/lib/libLLVMDebugInfoPDBDIA/Makefile

@@ -1,22 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:06 joerg Exp $
-
-LIB=	LLVMDebugInfoPDBDIA
-
-.include <bsd.init.mk>
-
-.PATH: ${LLVM_SRCDIR}/lib/DebugInfo/PDB/DIA
-
-SRCS+=	DIAEnumFrameData.cpp \
-	DIAEnumInjectedSources.cpp \
-	DIAEnumSectionContribs.cpp \
-	DIAEnumTables.cpp \
-	DIAFrameData.cpp \
-	DIAInjectedSource.cpp \
-	DIASectionContrib.cpp \
-	DIATable.cpp
-
-.if defined(HOSTLIB)
-.include <bsd.hostlib.mk>
-.else
-.include <bsd.lib.mk>
-.endif

external/apache2/llvm/lib/libLLVMDebugInfoPDBNative/Makefile

@@ -1,57 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:06 joerg Exp $
-
-LIB=	LLVMDebugInfoPDBNative
-
-.include <bsd.init.mk>
-
-.PATH: ${LLVM_SRCDIR}/lib/DebugInfo/PDB/Native
-
-SRCS+=	DbiModuleDescriptorBuilder.cpp \
-	DbiModuleDescriptor.cpp \
-	DbiModuleList.cpp \
-	DbiStreamBuilder.cpp \
-	DbiStream.cpp \
-	EnumTables.cpp \
-	GlobalsStream.cpp \
-	GSIStreamBuilder.cpp \
-	Hash.cpp \
-	HashTable.cpp \
-	InfoStreamBuilder.cpp \
-	InfoStream.cpp \
-	InjectedSourceStream.cpp \
-	ModuleDebugStream.cpp \
-	NamedStreamMap.cpp \
-	NativeCompilandSymbol.cpp \
-	NativeEnumGlobals.cpp \
-	NativeEnumInjectedSources.cpp \
-	NativeEnumModules.cpp \
-	NativeEnumTypes.cpp \
-	NativeExeSymbol.cpp \
-	NativeRawSymbol.cpp \
-	NativeSession.cpp \
-	NativeSymbolEnumerator.cpp \
-	NativeTypeArray.cpp \
-	NativeTypeBuiltin.cpp \
-	NativeTypeEnum.cpp \
-	NativeTypeFunctionSig.cpp \
-	NativeTypePointer.cpp \
-	NativeTypeTypedef.cpp \
-	NativeTypeUDT.cpp \
-	NativeTypeVTShape.cpp \
-	PDBFileBuilder.cpp \
-	PDBFile.cpp \
-	PDBStringTableBuilder.cpp \
-	PDBStringTable.cpp \
-	PublicsStream.cpp \
-	RawError.cpp \
-	SymbolCache.cpp \
-	SymbolStream.cpp \
-	TpiHashing.cpp \
-	TpiStreamBuilder.cpp \
-	TpiStream.cpp
-
-.if defined(HOSTLIB)
-.include <bsd.hostlib.mk>
-.else
-.include <bsd.lib.mk>
-.endif

external/apache2/llvm/lib/libLLVMDemangle/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:52 joerg Exp $
 
 LIB=	LLVMDemangle
 
@@ -9,7 +9,8 @@ LIB=	LLVMDemangle
 SRCS+=	Demangle.cpp \
 	ItaniumDemangle.cpp \
 	MicrosoftDemangle.cpp \
-	MicrosoftDemangleNodes.cpp
+	MicrosoftDemangleNodes.cpp \
+	RustDemangle.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

external/apache2/llvm/lib/libLLVMExecutionEngineJITLink/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:52 joerg Exp $
 
 LIB=	LLVMExecutionEngineJITLink
 
@@ -7,14 +7,16 @@ LIB=	LLVMExecutionEngineJITLink
 .PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/JITLink
 
 SRCS+=	EHFrameSupport.cpp \
+	ELF.cpp \
+	ELF_x86_64.cpp \
 	JITLink.cpp \
 	JITLinkGeneric.cpp \
 	JITLinkMemoryManager.cpp \
 	MachO_arm64.cpp \
-	MachOAtomGraphBuilder.cpp \
 	MachO.cpp \
 	MachOLinkGraphBuilder.cpp \
-	MachO_x86_64.cpp
+	MachO_x86_64.cpp \
+	x86_64.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

external/apache2/llvm/lib/libLLVMExecutionEngineOrcShared/Makefile

@@ -0,0 +1,17 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:52 joerg Exp $
+
+LIB=	LLVMExecutionEngineOrcShared
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/Orc/Shared
+
+SRCS+=	OrcError.cpp \
+	RPCError.cpp \
+	TargetProcessControlTypes.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

external/apache2/llvm/lib/libLLVMExecutionEngineOrcTargetProcess/Makefile

@@ -0,0 +1,17 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:52 joerg Exp $
+
+LIB=	LLVMExecutionEngineOrcTargetProcess
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/Orc/TargetProcess
+
+SRCS+=	JITLoaderGDB.cpp \
+	RegisterEHFrames.cpp \
+	TargetExecutionUtils.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

external/apache2/llvm/lib/libLLVMFileCheck/Makefile

@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:52 joerg Exp $
+
+LIB=	LLVMFileCheck
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/FileCheck
+
+SRCS+=	FileCheck.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

external/apache2/llvm/lib/libLLVMFrontendOpenACC/Makefile

@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:52 joerg Exp $
+
+LIB=	LLVMFrontendOpenACC
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/Frontend/OpenACC
+
+SRCS+=	ACC.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

external/apache2/llvm/lib/libLLVMFrontendOpenMP/Makefile

@@ -0,0 +1,17 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:52 joerg Exp $
+
+LIB=	LLVMFrontendOpenMP
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/Frontend/OpenMP
+
+SRCS+=	OMP.cpp \
+	OMPContext.cpp \
+	OMPIRBuilder.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

external/apache2/llvm/lib/libLLVMGlobalISel/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:52 joerg Exp $
 
 LIB=	LLVMGlobalISel
 
@@ -14,6 +14,7 @@ SRCS+=	CallLowering.cpp \
 	GISelChangeObserver.cpp \
 	GISelKnownBits.cpp \
 	GlobalISel.cpp \
+	InlineAsmLowering.cpp \
 	InstructionSelect.cpp \
 	InstructionSelector.cpp \
 	IRTranslator.cpp \
@@ -23,6 +24,7 @@ SRCS+=	CallLowering.cpp \
 	LegalizerHelper.cpp \
 	LegalizerInfo.cpp \
 	Localizer.cpp \
+	LostDebugLocObserver.cpp \
 	MachineIRBuilder.cpp \
 	RegBankSelect.cpp \
 	RegisterBank.cpp \

external/apache2/llvm/lib/libLLVMIR/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:52 joerg Exp $
 
 LIB=	LLVMIR
 
@@ -6,17 +6,15 @@ LIB=	LLVMIR
 
 .PATH: ${LLVM_SRCDIR}/lib/IR
 
-TABLEGEN_SRC=		AttributesCompatFunc.td
-TABLEGEN_OUTPUT= \
-	AttributesCompatFunc.inc|-gen-attrs
-
 .include "${.PARSEDIR}/../../tablegen.mk"
 
 SRCS+=	AbstractCallSite.cpp \
 	AsmWriter.cpp \
+	Assumptions.cpp \
 	Attributes.cpp \
 	AutoUpgrade.cpp \
 	BasicBlock.cpp \
+	BuiltinGCs.cpp \
 	Comdat.cpp \
 	ConstantFold.cpp \
 	ConstantRange.cpp \
@@ -31,7 +29,9 @@ SRCS+=	AbstractCallSite.cpp \
 	DiagnosticPrinter.cpp \
 	DIBuilder.cpp \
 	Dominators.cpp \
+	FPEnv.cpp \
 	Function.cpp \
+	GCStrategy.cpp \
 	Globals.cpp \
 	GVMaterializer.cpp \
 	InlineAsm.cpp \
@@ -43,6 +43,7 @@ SRCS+=	AbstractCallSite.cpp \
 	LegacyPassManager.cpp \
 	LLVMContext.cpp \
 	LLVMContextImpl.cpp \
+	LLVMRemarkStreamer.cpp \
 	Mangler.cpp \
 	MDBuilder.cpp \
 	Metadata.cpp \
@@ -55,10 +56,13 @@ SRCS+=	AbstractCallSite.cpp \
 	PassManager.cpp \
 	PassRegistry.cpp \
 	PassTimingInfo.cpp \
+	PrintPasses.cpp \
 	ProfileSummary.cpp \
-	RemarkStreamer.cpp \
+	PseudoProbe.cpp \
+	ReplaceConstant.cpp \
 	SafepointIRVerifier.cpp \
 	Statepoint.cpp \
+	StructuralHash.cpp \
 	Type.cpp \
 	TypeFinder.cpp \
 	Use.cpp \

external/apache2/llvm/lib/libLLVMInstCombine/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/09/07 00:18:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMInstCombine
 
@@ -6,12 +6,6 @@ LIB=	LLVMInstCombine
 
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/InstCombine
 
-TABLEGEN_SRC=		InstCombineTables.td
-TABLEGEN_OUTPUT= \
-	InstCombineTables.inc|-gen-searchable-tables
-
-.include "${.PARSEDIR}/../../tablegen.mk"
-
 SRCS+=	InstCombineAddSub.cpp \
 	InstCombineAndOrXor.cpp \
 	InstCombineAtomicRMW.cpp \
@@ -20,6 +14,7 @@ SRCS+=	InstCombineAddSub.cpp \
 	InstCombineCompares.cpp \
 	InstCombineLoadStoreAlloca.cpp \
 	InstCombineMulDivRem.cpp \
+	InstCombineNegator.cpp \
 	InstCombinePHI.cpp \
 	InstCombineSelect.cpp \
 	InstCombineShifts.cpp \

external/apache2/llvm/lib/libLLVMInstrumentation/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/09/07 00:18:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMInstrumentation
 
@@ -18,6 +18,7 @@ SRCS+=	AddressSanitizer.cpp \
 	InstrProfiling.cpp \
 	Instrumentation.cpp \
 	MemorySanitizer.cpp \
+	MemProfiler.cpp \
 	PGOInstrumentation.cpp \
 	PGOMemOPSizeOpt.cpp \
 	PoisonChecking.cpp \

external/apache2/llvm/lib/libLLVMInterfaceStub/Makefile

@@ -0,0 +1,17 @@
+#	$NetBSD: Makefile,v 1.1 2021/05/30 01:56:53 joerg Exp $
+
+LIB=	LLVMInterfaceStub
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/InterfaceStub
+
+SRCS+=	ELFObjHandler.cpp \
+	ELFStub.cpp \
+	TBEHandler.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif

external/apache2/llvm/lib/libLLVMMC/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:08 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMMC
 
@@ -20,7 +20,6 @@ SRCS+=	ConstantPools.cpp \
 	MCAsmStreamer.cpp \
 	MCAssembler.cpp \
 	MCCodeEmitter.cpp \
-	MCCodePadder.cpp \
 	MCCodeView.cpp \
 	MCContext.cpp \
 	MCDwarf.cpp \
@@ -32,6 +31,7 @@ SRCS+=	ConstantPools.cpp \
 	MCInstPrinter.cpp \
 	MCInstrAnalysis.cpp \
 	MCInstrDesc.cpp \
+	MCInstrInfo.cpp \
 	MCLabel.cpp \
 	MCLinkerOptimizationHint.cpp \
 	MCMachObjectTargetWriter.cpp \
@@ -40,6 +40,7 @@ SRCS+=	ConstantPools.cpp \
 	MCObjectFileInfo.cpp \
 	MCObjectStreamer.cpp \
 	MCObjectWriter.cpp \
+	MCPseudoProbe.cpp \
 	MCRegisterInfo.cpp \
 	MCSchedule.cpp \
 	MCSectionCOFF.cpp \
@@ -52,6 +53,8 @@ SRCS+=	ConstantPools.cpp \
 	MCSubtargetInfo.cpp \
 	MCSymbol.cpp \
 	MCSymbolELF.cpp \
+	MCSymbolXCOFF.cpp \
+	MCTargetOptionsCommandFlags.cpp \
 	MCTargetOptions.cpp \
 	MCValue.cpp \
 	MCWasmObjectTargetWriter.cpp \

external/apache2/llvm/lib/libLLVMMCA/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:08 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMMCA
 
@@ -9,6 +9,7 @@ LIB=	LLVMMCA
 SRCS+=	CodeEmitter.cpp \
 	Context.cpp \
 	HWEventListener.cpp \
+	InOrderIssueStage.cpp \
 	InstrBuilder.cpp \
 	Instruction.cpp \
 	Pipeline.cpp \

external/apache2/llvm/lib/libLLVMMCParser/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:09 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMMCParser
 
@@ -9,8 +9,10 @@ LIB=	LLVMMCParser
 SRCS+=	AsmLexer.cpp \
 	AsmParser.cpp \
 	COFFAsmParser.cpp \
+	COFFMasmParser.cpp \
 	DarwinAsmParser.cpp \
 	ELFAsmParser.cpp \
+	MasmParser.cpp \
 	MCAsmLexer.cpp \
 	MCAsmParser.cpp \
 	MCAsmParserExtension.cpp \

external/apache2/llvm/lib/libLLVMObject/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:09 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMObject
 
@@ -16,18 +16,20 @@ SRCS+=	Archive.cpp \
 	ELF.cpp \
 	ELFObjectFile.cpp \
 	Error.cpp \
+	FaultMapParser.cpp \
 	IRObjectFile.cpp \
 	IRSymtab.cpp \
 	MachOObjectFile.cpp \
 	MachOUniversal.cpp \
+	MachOUniversalWriter.cpp \
 	Minidump.cpp \
 	ModuleSymbolTable.cpp \
 	Object.cpp \
 	ObjectFile.cpp \
 	RecordStreamer.cpp \
 	RelocationResolver.cpp \
-	SymbolSize.cpp \
 	SymbolicFile.cpp \
+	SymbolSize.cpp \
 	TapiFile.cpp \
 	TapiUniversal.cpp \
 	WasmObjectFile.cpp \

external/apache2/llvm/lib/libLLVMObjectYAML/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMObjectYAML
 
@@ -6,14 +6,15 @@ LIB=	LLVMObjectYAML
 
 .PATH: ${LLVM_SRCDIR}/lib/ObjectYAML
 
-SRCS+=	CodeViewYAMLDebugSections.cpp \
+SRCS+=	ArchiveEmitter.cpp \
+	ArchiveYAML.cpp \
+	CodeViewYAMLDebugSections.cpp \
 	CodeViewYAMLSymbols.cpp \
 	CodeViewYAMLTypeHashing.cpp \
 	CodeViewYAMLTypes.cpp \
 	COFFEmitter.cpp \
 	COFFYAML.cpp \
 	DWARFEmitter.cpp \
-	DWARFVisitor.cpp \
 	DWARFYAML.cpp \
 	ELFEmitter.cpp \
 	ELFYAML.cpp \

external/apache2/llvm/lib/libLLVMOrc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:53 joerg Exp $
 
 LIB=	LLVMOrc
 
@@ -9,6 +9,8 @@ LIB=	LLVMOrc
 SRCS+=	CompileOnDemandLayer.cpp \
 	CompileUtils.cpp \
 	Core.cpp \
+	DebugObjectManagerPlugin.cpp \
+	DebugUtils.cpp \
 	ExecutionUtils.cpp \
 	IndirectionUtils.cpp \
 	IRCompileLayer.cpp \
@@ -16,19 +18,21 @@ SRCS+=	CompileOnDemandLayer.cpp \
 	JITTargetMachineBuilder.cpp \
 	Layer.cpp \
 	LazyReexports.cpp \
-	Legacy.cpp \
 	LLJIT.cpp \
-	NullResolver.cpp \
+	MachOPlatform.cpp \
+	Mangling.cpp \
 	ObjectLinkingLayer.cpp \
 	ObjectTransformLayer.cpp \
 	OrcABISupport.cpp \
-	OrcCBindings.cpp \
+	OrcV2CBindings.cpp \
-	OrcError.cpp \
-	OrcMCJITReplacement.cpp \
-	RPCUtils.cpp \
 	RTDyldObjectLinkingLayer.cpp \
 	SpeculateAnalyses.cpp \
 	Speculation.cpp \
-	ThreadSafeModule.cpp
+	TargetProcessControl.cpp \
+	ThreadSafeModule.cpp \
+	TPCDebugObjectRegistrar.cpp \
+	TPCDynamicLibrarySearchGenerator.cpp \
+	TPCEHFrameRegistrar.cpp \
+	TPCIndirectionUtils.cpp
 
 .include <bsd.lib.mk>

external/apache2/llvm/lib/libLLVMPasses/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMPasses
 
@@ -7,6 +7,7 @@ LIB=	LLVMPasses
 .PATH: ${LLVM_SRCDIR}/lib/Passes
 
 SRCS+=	PassBuilder.cpp \
+	PassBuilderBindings.cpp \
 	PassPlugin.cpp \
 	StandardInstrumentations.cpp
 

external/apache2/llvm/lib/libLLVMPowerPCCodeGen/Makefile

@@ -1,9 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMPowerPCCodeGen
 
 .include <bsd.init.mk>
 
+CPPFLAGS+=	-I${LLVM_SRCDIR}/lib/Target/PowerPC
+
 .PATH: ${LLVM_SRCDIR}/lib/Target/PowerPC
 
 SRCS+=	PPCAsmPrinter.cpp \
@@ -21,13 +23,14 @@ SRCS+=	PPCAsmPrinter.cpp \
 	PPCInstrInfo.cpp \
 	PPCISelDAGToDAG.cpp \
 	PPCISelLowering.cpp \
-	PPCLoopPreIncPrep.cpp \
+	PPCLoopInstrFormPrep.cpp \
+	PPCLowerMASSVEntries.cpp \
 	PPCMachineFunctionInfo.cpp \
 	PPCMachineScheduler.cpp \
+	PPCMacroFusion.cpp \
 	PPCMCInstLower.cpp \
 	PPCMIPeephole.cpp \
 	PPCPreEmitPeephole.cpp \
-	PPCQPXLoadSplat.cpp \
 	PPCReduceCRLogicals.cpp \
 	PPCRegisterInfo.cpp \
 	PPCSubtarget.cpp \
@@ -40,6 +43,13 @@ SRCS+=	PPCAsmPrinter.cpp \
 	PPCVSXFMAMutate.cpp \
 	PPCVSXSwapRemoval.cpp
 
+.PATH: ${LLVM_SRCDIR}/lib/Target/PowerPC/GISel
+
+SRCS+=	PPCCallLowering.cpp \
+	PPCInstructionSelector.cpp \
+	PPCLegalizerInfo.cpp \
+	PPCRegisterBankInfo.cpp
+
 TABLEGEN_SRC=		PPC.td
 TABLEGEN_INCLUDES=	-I${LLVM_SRCDIR}/lib/Target/PowerPC
 TABLEGEN_OUTPUT= \
@@ -50,8 +60,10 @@ TABLEGEN_OUTPUT= \
 	PPCGenDAGISel.inc|-gen-dag-isel \
 	PPCGenDisassemblerTables.inc|-gen-disassembler \
 	PPCGenFastISel.inc|-gen-fast-isel \
+	PPCGenGlobalISel.inc|-gen-global-isel \
 	PPCGenInstrInfo.inc|-gen-instr-info \
 	PPCGenMCCodeEmitter.inc|-gen-emitter \
+	PPCGenRegisterBank.inc|-gen-register-bank \
 	PPCGenRegisterInfo.inc|-gen-register-info \
 	PPCGenSubtargetInfo.inc|-gen-subtarget
 

external/apache2/llvm/lib/libLLVMPowerPCMCTargetDesc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMPowerPCMCTargetDesc
 
@@ -10,15 +10,16 @@ CPPFLAGS+=	-I${PPC_OBJDIR} -I${LLVM_SRCDIR}/lib/Target/PowerPC
 .PATH: ${LLVM_SRCDIR}/lib/Target/PowerPC/MCTargetDesc
 
 SRCS+=	PPCAsmBackend.cpp \
-	PPCMCAsmInfo.cpp \
 	PPCELFObjectWriter.cpp \
+	PPCELFStreamer.cpp \
 	PPCInstPrinter.cpp \
+	PPCMCAsmInfo.cpp \
 	PPCMCCodeEmitter.cpp \
 	PPCMCExpr.cpp \
 	PPCMCTargetDesc.cpp \
-	PPCMachObjectWriter.cpp \
 	PPCPredicates.cpp \
-	PPCXCOFFObjectWriter.cpp
+	PPCXCOFFObjectWriter.cpp \
+	PPCXCOFFStreamer.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>

external/apache2/llvm/lib/libLLVMRemarks/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:11 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMRemarks
 
@@ -10,8 +10,10 @@ SRCS+=	BitstreamRemarkParser.cpp \
 	BitstreamRemarkSerializer.cpp \
 	Remark.cpp \
 	RemarkFormat.cpp \
+	RemarkLinker.cpp \
 	RemarkParser.cpp \
 	RemarkSerializer.cpp \
+	RemarkStreamer.cpp \
 	RemarkStringTable.cpp \
 	YAMLRemarkParser.cpp \
 	YAMLRemarkSerializer.cpp

external/apache2/llvm/lib/libLLVMScalarOpts/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:11 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMScalarOpts
 
@@ -8,10 +8,11 @@ LIB=	LLVMScalarOpts
 
 SRCS+=	ADCE.cpp \
 	AlignmentFromAssumptions.cpp \
+	AnnotationRemarks.cpp \
 	BDCE.cpp \
 	CallSiteSplitting.cpp \
 	ConstantHoisting.cpp \
-	ConstantProp.cpp \
+	ConstraintElimination.cpp \
 	CorrelatedValuePropagation.cpp \
 	DCE.cpp \
 	DeadStoreElimination.cpp \
@@ -34,6 +35,7 @@ SRCS+=	ADCE.cpp \
 	LoopDataPrefetch.cpp \
 	LoopDeletion.cpp \
 	LoopDistribute.cpp \
+	LoopFlatten.cpp \
 	LoopFuse.cpp \
 	LoopIdiomRecognize.cpp \
 	LoopInstSimplify.cpp \
@@ -54,6 +56,7 @@ SRCS+=	ADCE.cpp \
 	LowerConstantIntrinsics.cpp \
 	LowerExpectIntrinsic.cpp \
 	LowerGuardIntrinsic.cpp \
+	LowerMatrixIntrinsics.cpp \
 	LowerWidenableCondition.cpp \
 	MakeGuardsExplicit.cpp \
 	MemCpyOptimizer.cpp \
@@ -67,6 +70,7 @@ SRCS+=	ADCE.cpp \
 	Reg2Mem.cpp \
 	RewriteStatepointsForGC.cpp \
 	Scalar.cpp \
+	ScalarizeMaskedMemIntrin.cpp \
 	Scalarizer.cpp \
 	SCCP.cpp \
 	SeparateConstOffsetFromGEP.cpp \

external/apache2/llvm/lib/libLLVMSupport/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:12 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMSupport
 
@@ -10,6 +10,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	ABIBreak.cpp \
 	Allocator.cpp \
 	AMDGPUMetadata.cpp \
+	APFixedPoint.cpp \
 	APFloat.cpp \
 	APInt.cpp \
 	APSInt.cpp \
@@ -17,6 +18,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	ARMBuildAttrs.cpp \
 	ARMTargetParser.cpp \
 	ARMWinEH.cpp \
+	AutoConvert.cpp \
 	BinaryStreamError.cpp \
 	BinaryStreamReader.cpp \
 	BinaryStreamRef.cpp \
@@ -41,9 +43,11 @@ SRCS+=	AArch64TargetParser.cpp \
 	Debug.cpp \
 	DeltaAlgorithm.cpp \
 	DJB.cpp \
+	ELFAttributeParser.cpp \
+	ELFAttributes.cpp \
 	Error.cpp \
 	ErrorHandling.cpp \
-	FileCheck.cpp \
+	ExtensibleRTTI.cpp \
 	FileCollector.cpp \
 	FileOutputBuffer.cpp \
 	FileUtilities.cpp \
@@ -53,6 +57,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	GraphWriter.cpp \
 	Hashing.cpp \
 	InitLLVM.cpp \
+	InstructionCost.cpp \
 	IntEqClasses.cpp \
 	IntervalMap.cpp \
 	ItaniumManglingCanonicalizer.cpp \
@@ -66,10 +71,12 @@ SRCS+=	AArch64TargetParser.cpp \
 	ManagedStatic.cpp \
 	MathExtras.cpp \
 	MD5.cpp \
+	MemAlloc.cpp \
 	MemoryBuffer.cpp \
+	MemoryBufferRef.cpp \
 	NativeFormatting.cpp \
+	OptimizedStructLayout.cpp \
 	Optional.cpp \
-	Options.cpp \
 	Parallel.cpp \
 	PluginLoader.cpp \
 	PrettyStackTrace.cpp \
@@ -81,8 +88,11 @@ SRCS+=	AArch64TargetParser.cpp \
 	regexec.c \
 	regfree.c \
 	regstrlcpy.c \
+	RISCVAttributeParser.cpp \
+	RISCVAttributes.cpp \
 	ScopedPrinter.cpp \
 	SHA1.cpp \
+	SHA256.cpp \
 	Signposts.cpp \
 	SmallPtrSet.cpp \
 	SmallVector.cpp \
@@ -91,9 +101,9 @@ SRCS+=	AArch64TargetParser.cpp \
 	Statistic.cpp \
 	StringExtras.cpp \
 	StringMap.cpp \
-	StringPool.cpp \
 	StringRef.cpp \
 	StringSaver.cpp \
+	SuffixTree.cpp \
 	SymbolRemappingReader.cpp \
 	SystemUtils.cpp \
 	TargetParser.cpp \
@@ -105,12 +115,14 @@ SRCS+=	AArch64TargetParser.cpp \
 	TrigramIndex.cpp \
 	Triple.cpp \
 	Twine.cpp \
+	TypeSize.cpp \
 	UnicodeCaseFold.cpp \
 	Unicode.cpp \
 	VersionTuple.cpp \
 	VirtualFileSystem.cpp \
 	Watchdog.cpp \
 	WithColor.cpp \
+	X86TargetParser.cpp \
 	xxhash.cpp \
 	YAMLParser.cpp \
 	YAMLTraits.cpp \

external/apache2/llvm/lib/libLLVMTableGen/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:12 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMTableGen
 
@@ -6,13 +6,15 @@ LIB=	LLVMTableGen
 
 .PATH: ${LLVM_SRCDIR}/lib/TableGen
 
-SRCS+=	Error.cpp \
+SRCS+=	DetailedRecordsBackend.cpp \
+	Error.cpp \
 	JSONBackend.cpp \
 	Main.cpp \
 	Record.cpp \
 	SetTheory.cpp \
 	StringMatcher.cpp \
 	TableGenBackend.cpp \
+	TableGenBackendSkeleton.cpp \
 	TGLexer.cpp \
 	TGParser.cpp
 

external/apache2/llvm/lib/libLLVMTextAPI/Makefile

@@ -1,15 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:12 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:54 joerg Exp $
 
 LIB=	LLVMTextAPI
 
 .include <bsd.init.mk>
 
-.PATH: ${LLVM_SRCDIR}/lib/TextAPI/ELF
+.PATH: ${LLVM_SRCDIR}/lib/TextAPI
-
-SRCS+=	ELFStub.cpp \
-	TBEHandler.cpp
-
-.PATH: ${LLVM_SRCDIR}/lib/TextAPI/MachO
 SRCS+=	Architecture.cpp \
 	ArchitectureSet.cpp \
 	InterfaceFile.cpp \

external/apache2/llvm/lib/libLLVMTransformsUtils/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:13 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:55 joerg Exp $
 
 LIB=	LLVMTransformsUtils
 
@@ -7,52 +7,65 @@ LIB=	LLVMTransformsUtils
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/Utils
 
 SRCS+=	AddDiscriminators.cpp \
+	AMDGPUEmitPrintf.cpp \
 	ASanStackFrameLayout.cpp \
+	AssumeBundleBuilder.cpp \
+	AutoInitRemark.cpp \
 	BasicBlockUtils.cpp \
 	BreakCriticalEdges.cpp \
 	BuildLibCalls.cpp \
 	BypassSlowDivision.cpp \
+	CallGraphUpdater.cpp \
 	CallPromotionUtils.cpp \
 	CanonicalizeAliases.cpp \
+	CanonicalizeFreezeInLoops.cpp \
 	CloneFunction.cpp \
 	CloneModule.cpp \
 	CodeExtractor.cpp \
+	CodeMoverUtils.cpp \
 	CtorUtils.cpp \
+	Debugify.cpp \
 	DemoteRegToStack.cpp \
 	EntryExitInstrumenter.cpp \
 	EscapeEnumerator.cpp \
 	Evaluator.cpp \
+	FixIrreducible.cpp \
 	FlattenCFG.cpp \
 	FunctionComparator.cpp \
 	FunctionImportUtils.cpp \
 	GlobalStatus.cpp \
 	GuardUtils.cpp \
-	ImportedFunctionsInliningStatistics.cpp \
+	HelloWorld.cpp \
+	InjectTLIMappings.cpp \
 	InlineFunction.cpp \
 	InstructionNamer.cpp \
 	IntegerDivision.cpp \
 	LCSSA.cpp \
 	LibCallsShrinkWrap.cpp \
 	Local.cpp \
+	LoopPeel.cpp \
 	LoopRotationUtils.cpp \
 	LoopSimplify.cpp \
 	LoopUnrollAndJam.cpp \
 	LoopUnroll.cpp \
-	LoopUnrollPeel.cpp \
 	LoopUnrollRuntime.cpp \
 	LoopUtils.cpp \
 	LoopVersioning.cpp \
 	LowerInvoke.cpp \
 	LowerMemIntrinsics.cpp \
 	LowerSwitch.cpp \
+	MatrixUtils.cpp \
 	Mem2Reg.cpp \
 	MetaRenamer.cpp \
-	MisExpect.cpp \
 	ModuleUtils.cpp \
 	NameAnonGlobals.cpp \
 	PredicateInfo.cpp \
 	PromoteMemoryToRegister.cpp \
+	RelLookupTableConverter.cpp \
+	SampleProfileLoaderBaseUtil.cpp \
 	SanitizerStats.cpp \
+	ScalarEvolutionExpander.cpp \
+	SCCPSolver.cpp \
 	SimplifyCFG.cpp \
 	SimplifyIndVar.cpp \
 	SimplifyLibCalls.cpp \
@@ -64,6 +77,7 @@ SRCS+=	AddDiscriminators.cpp \
 	StripNonLineTableDebugInfo.cpp \
 	SymbolRewriter.cpp \
 	UnifyFunctionExitNodes.cpp \
+	UnifyLoopExits.cpp \
 	Utils.cpp \
 	ValueMapper.cpp \
 	VNCoercion.cpp

external/apache2/llvm/lib/libLLVMVectorize/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:13 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:55 joerg Exp $
 
 LIB=	LLVMVectorize
 
@@ -10,12 +10,13 @@ SRCS+=	LoadStoreVectorizer.cpp \
 	LoopVectorizationLegality.cpp \
 	LoopVectorize.cpp \
 	SLPVectorizer.cpp \
+	VectorCombine.cpp \
 	Vectorize.cpp \
 	VPlan.cpp \
 	VPlanHCFGBuilder.cpp \
-	VPlanHCFGTransforms.cpp \
 	VPlanPredicator.cpp \
 	VPlanSLP.cpp \
+	VPlanTransforms.cpp \
 	VPlanVerifier.cpp
 
 .if defined(HOSTLIB)

external/apache2/llvm/lib/libLLVMX86CodeGen/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:13 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 01:56:55 joerg Exp $
 
 LIB=	LLVMX86CodeGen
 
@@ -13,12 +13,12 @@ SRCS+=	X86AsmPrinter.cpp \
 	X86CallingConv.cpp \
 	X86CallLowering.cpp \
 	X86CmovConversion.cpp \
-	X86CondBrFolding.cpp \
 	X86DiscriminateMemOps.cpp \
 	X86DomainReassignment.cpp \
 	X86EvexToVex.cpp\
 	X86ExpandPseudo.cpp \
 	X86FastISel.cpp \
+	X86FastTileConfig.cpp \
 	X86FixupBWInsts.cpp \
 	X86FixupLEAs.cpp \
 	X86FixupSetCC.cpp \
@@ -26,7 +26,10 @@ SRCS+=	X86AsmPrinter.cpp \
 	X86FloatingPoint.cpp \
 	X86FrameLowering.cpp \
 	X86IndirectBranchTracking.cpp \
+	X86IndirectThunks.cpp \
 	X86InsertPrefetch.cpp \
+	X86InsertWait.cpp \
+	X86InstCombineIntrinsic.cpp \
 	X86InstrFMA3Info.cpp \
 	X86InstrFoldTables.cpp \
 	X86InstrInfo.cpp \
@@ -35,21 +38,30 @@ SRCS+=	X86AsmPrinter.cpp \
 	X86ISelDAGToDAG.cpp \
 	X86ISelLowering.cpp \
 	X86LegalizerInfo.cpp \
+	X86LoadValueInjectionLoadHardening.cpp \
+	X86LoadValueInjectionRetHardening.cpp \
+	X86LowerAMXIntrinsics.cpp \
+	X86LowerAMXType.cpp \
+	X86LowerTileCopy.cpp \
 	X86MachineFunctionInfo.cpp \
 	X86MacroFusion.cpp \
 	X86MCInstLower.cpp \
 	X86OptimizeLEAs.cpp \
 	X86PadShortFunction.cpp \
+	X86PartialReduction.cpp \
+	X86PreAMXConfig.cpp \
+	X86PreTileConfig.cpp \
 	X86RegisterBankInfo.cpp \
 	X86RegisterInfo.cpp \
-	X86RetpolineThunks.cpp \
 	X86SelectionDAGInfo.cpp \
 	X86ShuffleDecodeConstantPool.cpp \
+	X86SpeculativeExecutionSideEffectSuppression.cpp \
 	X86SpeculativeLoadHardening.cpp \
 	X86Subtarget.cpp \
 	X86TargetMachine.cpp \
 	X86TargetObjectFile.cpp \
 	X86TargetTransformInfo.cpp \
+	X86TileConfig.cpp \
 	X86VZeroUpper.cpp \
 	X86WinAllocaExpander.cpp \
 	X86WinEHState.cpp