Update Makefile and mtree for clang internal headers, and update

OptionalObsoleteFiles.inc for added and removed files.

etc/mtree/BSD.usr.dist

@@ -39,6 +39,9 @@
         clang
             9.0.0
                 include
+                    cuda_wrappers
+                    openmp_wrappers
+                    ppc_wrappers
                     sanitizer
                     ..
                 ..

lib/clang/headers/Makefile

@@ -4,7 +4,11 @@
 
 .PATH:		${CLANG_SRCS}/lib/Headers
 
+INCSGROUPS=	INCS CUDA OMP PPC
 INCSDIR=	${LIBDIR}/clang/9.0.0/include
+CUDADIR=	${INCSDIR}/cuda_wrappers
+OMPDIR=		${INCSDIR}/openmp_wrappers
+PPCDIR=		${INCSDIR}/ppc_wrappers
 
 GENINCS+=	arm_fp16.h
 GENINCS+=	arm_neon.h
@@ -27,6 +31,7 @@ INCS+=		arm64intr.h
 INCS+=		arm_acle.h
 INCS+=		armintr.h
 INCS+=		avx2intrin.h
+INCS+=		avx512bf16intrin.h
 INCS+=		avx512bitalgintrin.h
 INCS+=		avx512bwintrin.h
 INCS+=		avx512cdintrin.h
@@ -39,6 +44,7 @@ INCS+=		avx512pfintrin.h
 INCS+=		avx512vbmi2intrin.h
 INCS+=		avx512vbmiintrin.h
 INCS+=		avx512vbmivlintrin.h
+INCS+=		avx512vlbf16intrin.h
 INCS+=		avx512vlbitalgintrin.h
 INCS+=		avx512vlbwintrin.h
 INCS+=		avx512vlcdintrin.h
@@ -46,7 +52,9 @@ INCS+=		avx512vldqintrin.h
 INCS+=		avx512vlintrin.h
 INCS+=		avx512vlvbmi2intrin.h
 INCS+=		avx512vlvnniintrin.h
+INCS+=		avx512vlvp2intersectintrin.h
 INCS+=		avx512vnniintrin.h
+INCS+=		avx512vp2intersectintrin.h
 INCS+=		avx512vpopcntdqintrin.h
 INCS+=		avx512vpopcntdqvlintrin.h
 INCS+=		avxintrin.h
@@ -59,6 +67,7 @@ INCS+=		clwbintrin.h
 INCS+=		clzerointrin.h
 INCS+=		cpuid.h
 INCS+=		emmintrin.h
+INCS+=		enqcmdintrin.h
 INCS+=		f16cintrin.h
 INCS+=		fma4intrin.h
 INCS+=		fmaintrin.h
@@ -79,6 +88,7 @@ INCS+=		movdirintrin.h
 INCS+=		msa.h
 INCS+=		mwaitxintrin.h
 INCS+=		nmmintrin.h
+INCS+=		opencl-c-base.h
 INCS+=		opencl-c.h
 INCS+=		pconfigintrin.h
 INCS+=		pkuintrin.h
@@ -130,6 +140,20 @@ INCS+=		unwind.h
 INCS+=		varargs.h
 .endif
 
+CUDA+=		cuda_wrappers/algorithm
+CUDA+=		cuda_wrappers/complex
+CUDA+=		cuda_wrappers/new
+
+OMP+=		openmp_wrappers/__clang_openmp_math.h
+OMP+=		openmp_wrappers/__clang_openmp_math_declares.h
+OMP+=		openmp_wrappers/cmath
+OMP+=		openmp_wrappers/math.h
+
+PPC+=		ppc_wrappers/emmintrin.h
+PPC+=		ppc_wrappers/mm_malloc.h
+PPC+=		ppc_wrappers/mmintrin.h
+PPC+=		ppc_wrappers/xmmintrin.h
+
 arm_fp16.h: ${CLANG_SRCS}/include/clang/Basic/arm_fp16.td
 	${CLANG_TBLGEN} -gen-arm-fp16 \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \

tools/build/mk/OptionalObsoleteFiles.inc

@@ -1381,12 +1381,25 @@ OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/llvm-tblgen
+OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/algorithm
+OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/complex
+OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/new
+OLD_DIRS+=usr/lib/clang/9.0.0/include/cuda_wrappers
+OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/cmath
+OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/math.h
+OLD_DIRS+=usr/lib/clang/9.0.0/include/openmp_wrappers
+OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/emmintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mm_malloc.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mmintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/xmmintrin.h
+OLD_DIRS+=usr/lib/clang/9.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/dfsan_interface.h
-OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/lsan_interface.h
@@ -1416,6 +1429,7 @@ OLD_FILES+=usr/lib/clang/9.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512cdintrin.h
@@ -1428,6 +1442,7 @@ OLD_FILES+=usr/lib/clang/9.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmivlintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlcdintrin.h
@@ -1435,7 +1450,9 @@ OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvnniintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vnniintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avxintrin.h
@@ -1448,7 +1465,9 @@ OLD_FILES+=usr/lib/clang/9.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/float.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fxsrintrin.h
@@ -1457,7 +1476,11 @@ OLD_FILES+=usr/lib/clang/9.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/immintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/intrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/inttypes.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/invpcidintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/iso646.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/limits.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm3dnow.h
@@ -1468,6 +1491,7 @@ OLD_FILES+=usr/lib/clang/9.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pkuintrin.h
@@ -1481,10 +1505,20 @@ OLD_FILES+=usr/lib/clang/9.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/stdalign.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/stdarg.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/stdatomic.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/stdbool.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/stddef.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/stdint.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/tgmath.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/unwind.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vaesintrin.h
+OLD_FILES+=usr/lib/clang/9.0.0/include/varargs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/waitpkgintrin.h