Update to a new snapshot and migrate to the llvm monorepo.

We now always download everthing so apply all patches (except the ELFv2
patches) unconditionally.  Don't imply CLANG fo ELFV2 since the patches
will always apply.

Install llvm-devel.mk for CROSS_TOOLCHAIN support subsuming the
role of xtoolchain-llvm-devel.  This means that users will get the
dependency for CROSS_TOOLCHAIN=llvm-devel by installing llvm-devel.
To avoid unnecessicary churn in other xtoolchain-llvm* ports, leave
xtoolchain-llvm-devel in place and make it IGNORE in the -devel case.
Once llvm90 (and maybe llvm80) are updated I'll remove it or move it as
appropriate.

Always install a link from ld.lld to ld as was done by
xtoolchain-llvm-devel.

Sponsored by:	DARPA, AFRL

18 files changed, 128 insertions, 138 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 35761e3980f7..9d5e1bfd5f31 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -10,9 +10,10 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
+LICENSE_DIR=	${WRKSRC}/llvm
 .include "Makefile.LICENSE"
 LICENSE+=	LLVM2
-LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE.TXT
+LICENSE_FILE_LLVM2=	${LICENSE_DIR}/LICENSE.TXT
 LICENSE_NAME_LLVM2= 	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE:=	${LICENSE:NARM}
@@ -29,16 +30,18 @@ USES=		cmake compiler:c++11-lib libedit perl5 \
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 _USES_PYTHON?=	python:build,3.6+
 USES+=		${_USES_PYTHON}
-SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
-		tools/opt-viewer/optrecord.py \
-		tools/opt-viewer/opt-diff.py \
-		tools/opt-viewer/opt-stats.py \
-		tools/opt-viewer/opt-viewer.py
+SHEBANG_FILES=	llvm/utils/lit/lit.py \
+		llvm/utils/llvm-lit/llvm-lit.in \
+		llvm/tools/opt-viewer/optrecord.py \
+		llvm/tools/opt-viewer/opt-diff.py \
+		llvm/tools/opt-viewer/opt-stats.py \
+		llvm/tools/opt-viewer/opt-viewer.py
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
+CMAKE_SOURCE_PATH=	${WRKSRC}/llvm
 CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
@@ -61,8 +64,9 @@ CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	llvm-mirror
-GH_TAGNAME=	${LLVM_COMMIT}
+GH_PROJECT=	llvm-project
+GH_ACCOUNT=	llvm
+GH_TAGNAME=	${LLVM_PROJECT_COMMIT}
 
 .include "Makefile.snapshot"
 
@@ -79,19 +83,20 @@ LIB_DEPENDS=
 PLIST_FILES=
 
 CLANG_DESC=	Build clang
-CLANG_EXTRA_PATCHES=	${PATCHDIR}/clang
 CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
-CLANG_GH_PROJECT=	clang:clang
-CLANG_GH_SUBDIR=	tools/clang:clang
-CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \
 			-DCLANG_LINK_LLVM_DYLIB=ON
 CLANG_PORTDOCS=		clang
+CLANG_PLIST_FILES=	share/toolchains/llvm-devel.mk
+CLANG_SUB_FILES=	xtoolchain.mk
+CLANG_SUB_LIST=		XCC=clang${XCC} \
+			XCXX=clang++${XCXX} \
+			XCPP=clang-cpp${XCPP} \
+			XLD=${LLVM_PREFIX}/bin/ld.lld \
+			X_COMPILER_TYPE=clang
 CLANG_USE=		GNOME=libxml2
 COMPILER_RT_DESC=	Sanitizer libraries
 COMPILER_RT_IMPLIES=	CLANG
-COMPILER_RT_GH_PROJECT=	compiler-rt:compiler_rt
-COMPILER_RT_GH_TAGNAME=	${COMPILER_RT_COMMIT}:compiler_rt
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
 DOCS_PORTDOCS=		llvm
@@ -104,35 +109,20 @@ DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_IMPLIES=		CLANG
-EXTRAS_GH_PROJECT=	clang-tools-extra:extras
-EXTRAS_GH_SUBDIR=	tools/clang/tools/extra:extras
-EXTRAS_GH_TAGNAME=	${EXTRAS_COMMIT}:extras
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
-LLD_GH_PROJECT=		lld:lld
-LLD_GH_SUBDIR=		tools/lld:lld
-LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
 LLDB_BUILD_DEPENDS=	swig3.0:devel/swig30
-LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb
 LLDB_DESC=		Install lldb, the LLVM debugger
-LLDB_GH_PROJECT=	lldb:lldb
-LLDB_GH_SUBDIR=		tools/lldb:lldb
-LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 LLDB_IMPLIES=		CLANG
 LLDB_PORTDOCS=		lldb
 LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
-OPENMP_GH_PROJECT=	openmp:openmp
-OPENMP_GH_SUBDIR=	projects/openmp:openmp
-OPENMP_GH_TAGNAME=	${OPENMP_COMMIT}:openmp
-OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 ELFV2_DESC=		[PowerPC64] Use OpenPOWER ELF ABI v2 by default
 ELFV2_EXTRA_PATCHES=	${PATCHDIR}/ppc64-elfv2
-ELFV2_IMPLIES=		CLANG
 
 PLIST_SUB+=	LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE}
@@ -230,29 +220,32 @@ CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${
 # ----------- end of sync block --------------------
 
 .if ${PORT_OPTIONS:MCLANG}
+LLVM_ENABLE_PROJECTS+=	clang
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	clang.1 \
 		diagtool.1 \
 		scan-build.1
 CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
-SHEBANG_FILES+= tools/clang/tools/clang-format/git-clang-format \
-		tools/clang/tools/clang-format/clang-format-diff.py \
-		tools/clang/tools/scan-view/bin/scan-view \
-		tools/clang/utils/hmaptool/hmaptool
+SHEBANG_FILES+= clang/tools/clang-format/git-clang-format \
+		clang/tools/clang-format/clang-format-diff.py \
+		clang/tools/scan-view/bin/scan-view \
+		clang/utils/hmaptool/hmaptool
 USES+=	gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
+LLVM_ENABLE_PROJECTS+=	compiler-rt
 COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer)
 .endif
 
 .if ${PORT_OPTIONS:MEXTRAS}
+LLVM_ENABLE_PROJECTS+=	clang-tools-extra
 COMMANDS+=	${EXTRAS_COMMANDS}
 MAN1SRCS+=	extraclangtools.1
 PORTDOCS+=	clang-tools
-SHEBANG_FILES+=	tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
-		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
-		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py
+SHEBANG_FILES+=	clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
+		clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py \
+		clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
@@ -260,16 +253,25 @@ MAN1SRCS+=	lit.1 FileCheck.1
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
+LLVM_ENABLE_PROJECTS+=	lld
 COMMANDS+=	${LLD_COMMANDS}
 PORTDOCS+=	lld
 .endif
 
 .if ${PORT_OPTIONS:MLLDB}
+LLVM_ENABLE_PROJECTS+=	lldb
 COMMANDS+=	${LLDB_COMMANDS}
 .endif
 
+.if ${PORT_OPTIONS:MOPENMP}
+LLVM_ENABLE_PROJECTS+=	openmp
+.endif
 OPENMP_PATTERN=	lib[ig]*omp|omp.h|ompt.h|omp-tools.h
 
+.if defined(LLVM_ENABLE_PROJECTS)
+CMAKE_ARGS+=	-DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
+.endif
+
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.COMMANDS"
 
@@ -279,7 +281,7 @@ STRIP=
 .endif
 
 _CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd
-_CRTBLDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/share
+_CRTBLDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/%%LLVM_RELEASE%%/share
 _COMPILER_RT_BLACKLISTS=	cfi_blacklist.txt
 .if ${ARCH} == "amd64"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
@@ -366,25 +368,17 @@ post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
 	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
-	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py
+	    ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py
 	${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
-	    ${WRKSRC}/CMakeLists.txt
+	    ${WRKSRC}/llvm/CMakeLists.txt
 
 post-patch-CLANG-on:
 	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
-	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
+	    ${PATCH_WRKSRC}/clang/lib/Driver/ToolChains/CommonArgs.cpp
 	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
-	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \
-	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \
-	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
-
-post-build-COMPILER_RT-on:
-	${MKDIR} ${WRKDIR}/compiler-rt-build
-	cd ${WRKDIR}/compiler-rt-build && \
-	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
-	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
-	    ${WRKSRC_compiler_rt} && \
-	${MAKE_ENV} ${MAKE_CMD}
+	    ${PATCH_WRKSRC}/clang/tools/clang-format/clang-format.py \
+	    ${PATCH_WRKSRC}/clang/tools/clang-format/clang-format-sublime.py \
+	    ${PATCH_WRKSRC}/clang/tools/clang-format/git-clang-format
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
@@ -420,20 +414,17 @@ post-install-DOCS-off:
 post-install-CLANG-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
+	@${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
+	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
 
 post-install-COMPILER_RT-on:
-	cd ${WRKDIR}/compiler-rt-build && \
-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
 .if ${ARCH} == "amd64"
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}/lib/freebsd/libclang_rt*i386*
 .endif
-	${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \
-	    ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd
 
 post-install-LIT-on:
-	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
+	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/llvm/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
@@ -442,13 +433,16 @@ post-install-LIT-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
-	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
+	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
 
+post-install-LLD-on:
+	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
+
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
@@ -485,10 +479,10 @@ build-plist:
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	awk '{ \
-	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /${OPENMP_PATTERN}|${EXTRAS_PATTERN}|${COMPILER_RT_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
-	    if ($$0 ~ /lld|wasm-ld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 8c0e3a8f59f4..5e524e135f3d 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,6 @@
 #
 LLVM_MAJOR=	10
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20191029
+SNAPDATE=	20191108
 
-LLVM_COMMIT=		2c4ca6832fa6b306ee6a7010bfb80a3f2596f824
-CLANG_COMMIT=		65acf43270ea2894dffa0d0b292b92402f80c8cb
-COMPILER_RT_COMMIT=	69445f095c22aac2388f939bedebf224a6efcdaf
-EXTRAS_COMMIT=		5c40544fa40bfb85ec888b6a03421b3905e4a4e7
-LLD_COMMIT=		64b024a57c56c3528d6be3d14be5e3da42614a6f
-LLDB_COMMIT=		d01083a850f577b85501a0902b52fd0930de72c7
-OPENMP_COMMIT=		56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b
+LLVM_PROJECT_COMMIT=		db797bfb2bd24e40d8f0ed422fd4087894ed0eab
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 07f598c864e3..eb70960c831f 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,3 @@
-TIMESTAMP = 1572371098
-SHA256 (llvm-mirror-llvm-10.0.d20191029-2c4ca6832fa6b306ee6a7010bfb80a3f2596f824_GH0.tar.gz) = 228859642c1b07e25b91b3581a12808fe4584d21add13d814a939ceb587fd40b
-SIZE (llvm-mirror-llvm-10.0.d20191029-2c4ca6832fa6b306ee6a7010bfb80a3f2596f824_GH0.tar.gz) = 51961491
-SHA256 (llvm-mirror-clang-65acf43270ea2894dffa0d0b292b92402f80c8cb_GH0.tar.gz) = 07e307ed8e540e81812db4b335f656a9b53b33bc88cd9afba94d87c4e77eb247
-SIZE (llvm-mirror-clang-65acf43270ea2894dffa0d0b292b92402f80c8cb_GH0.tar.gz) = 19603384
-SHA256 (llvm-mirror-compiler-rt-69445f095c22aac2388f939bedebf224a6efcdaf_GH0.tar.gz) = c09c6522bb3d998c3eab09eae8cbf1bc17c99f1b1fc4173ffd436a22b9c575f7
-SIZE (llvm-mirror-compiler-rt-69445f095c22aac2388f939bedebf224a6efcdaf_GH0.tar.gz) = 3453859
-SHA256 (llvm-mirror-clang-tools-extra-5c40544fa40bfb85ec888b6a03421b3905e4a4e7_GH0.tar.gz) = ef9443d7502d0a274efc7f488ce3fe6ad62c3e42cbe900f2fe9f953ddf14e076
-SIZE (llvm-mirror-clang-tools-extra-5c40544fa40bfb85ec888b6a03421b3905e4a4e7_GH0.tar.gz) = 3008864
-SHA256 (llvm-mirror-lld-64b024a57c56c3528d6be3d14be5e3da42614a6f_GH0.tar.gz) = 05d444d2aaf5d08caed1912441d022584596c5138af7a763704127229653ed75
-SIZE (llvm-mirror-lld-64b024a57c56c3528d6be3d14be5e3da42614a6f_GH0.tar.gz) = 1607912
-SHA256 (llvm-mirror-lldb-d01083a850f577b85501a0902b52fd0930de72c7_GH0.tar.gz) = bcaa323f9d6c34b28ee63a195d6efbc6e0388ef3220eaaeb14edfc634e46e418
-SIZE (llvm-mirror-lldb-d01083a850f577b85501a0902b52fd0930de72c7_GH0.tar.gz) = 13377188
-SHA256 (llvm-mirror-openmp-56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b_GH0.tar.gz) = 88a04ad329b0c4685d93d3e787a7bfa524987e3535045a47360f6ce4c8ec4348
-SIZE (llvm-mirror-openmp-56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b_GH0.tar.gz) = 1475009
+TIMESTAMP = 1573256148
+SHA256 (llvm-llvm-project-10.0.d20191108-db797bfb2bd24e40d8f0ed422fd4087894ed0eab_GH0.tar.gz) = e98efa6ceb558254d95d7d664c2d4ef3e2b32184b356742521622cc3097c09ed
+SIZE (llvm-llvm-project-10.0.d20191108-db797bfb2bd24e40d8f0ed422fd4087894ed0eab_GH0.tar.gz) = 116802459
diff --git a/devel/llvm-devel/files/gen-Makefile.snapshot.sh b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
index 5d626af5fb55..a8e3de09b6e4 100644
--- a/devel/llvm-devel/files/gen-Makefile.snapshot.sh
+++ b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
@@ -6,7 +6,7 @@
 
 get_repo_sha()
 {
-	curl https://api.github.com/repos/llvm-mirror/$1/branches/master | \
+	curl https://api.github.com/repos/llvm/$1/branches/master | \
 	    jq -r '.commit.sha'
 }
 
@@ -21,11 +21,5 @@ LLVM_MAJOR=	10
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	$(date +%Y%m%d)
 
-LLVM_COMMIT=		$(get_repo_sha llvm)
-CLANG_COMMIT=		$(get_repo_sha clang)
-COMPILER_RT_COMMIT=	$(get_repo_sha compiler-rt)
-EXTRAS_COMMIT=		$(get_repo_sha clang-tools-extra)
-LLD_COMMIT=		$(get_repo_sha lld)
-LLDB_COMMIT=		$(get_repo_sha lldb)
-OPENMP_COMMIT=		$(get_repo_sha openmp)
+LLVM_PROJECT_COMMIT=		$(get_repo_sha llvm-project)
 EOF
diff --git a/devel/llvm-devel/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt b/devel/llvm-devel/files/patch-clang_lib_Headers_CMakeLists.txt
index 17043c6072cf..dbc563df92a0 100644
--- a/devel/llvm-devel/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt
+++ b/devel/llvm-devel/files/patch-clang_lib_Headers_CMakeLists.txt
@@ -1,5 +1,5 @@
---- tools/clang/lib/Headers/CMakeLists.txt.orig
-+++ tools/clang/lib/Headers/CMakeLists.txt
+--- clang/lib/Headers/CMakeLists.txt.orig
++++ clang/lib/Headers/CMakeLists.txt
 @@ -56,7 +56,6 @@
    intrin.h
    inttypes.h
diff --git a/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py b/devel/llvm-devel/files/patch-clang_tools_clang-format_clang-format-sublime.py
index 2c8909f1e1d1..8b2d60b49a8f 100644
--- a/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py
+++ b/devel/llvm-devel/files/patch-clang_tools_clang-format_clang-format-sublime.py
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- tools/clang/tools/clang-format/clang-format-sublime.py.orig
-+++ tools/clang/tools/clang-format/clang-format-sublime.py
+--- clang/tools/clang-format/clang-format-sublime.py.orig
++++ clang/tools/clang-format/clang-format-sublime.py
 @@ -18,7 +18,7 @@
  import subprocess
  
diff --git a/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format.py b/devel/llvm-devel/files/patch-clang_tools_clang-format_clang-format.py
index 2962d3f4cbcb..b002166e0a24 100644
--- a/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_clang-format.py
+++ b/devel/llvm-devel/files/patch-clang_tools_clang-format_clang-format.py
@@ -1,5 +1,5 @@
---- tools/clang/tools/clang-format/clang-format.py.orig	2015-09-08 20:44:00 UTC
-+++ tools/clang/tools/clang-format/clang-format.py
+--- clang/tools/clang-format/clang-format.py.orig	2015-09-08 20:44:00 UTC
++++ clang/tools/clang-format/clang-format.py
 @@ -34,7 +34,7 @@ import vim
  
  # set g:clang_format_path to the path to clang-format if it is not on the path
diff --git a/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_git-clang-format b/devel/llvm-devel/files/patch-clang_tools_clang-format_git-clang-format
index 5c5ae3581228..51ac95abc524 100644
--- a/devel/llvm-devel/files/clang/patch-tools_clang_tools_clang-format_git-clang-format
+++ b/devel/llvm-devel/files/patch-clang_tools_clang-format_git-clang-format
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- tools/clang/tools/clang-format/git-clang-format.orig
-+++ tools/clang/tools/clang-format/git-clang-format
+--- clang/tools/clang-format/git-clang-format.orig
++++ clang/tools/clang-format/git-clang-format
 @@ -90,7 +90,7 @@
      usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,
      description=desc)
diff --git a/devel/llvm-devel/files/patch-cmake_modules_AddSphinxTarget.cmake b/devel/llvm-devel/files/patch-cmake_modules_AddSphinxTarget.cmake
index f4fc8f25e306..d704925d393d 100644
--- a/devel/llvm-devel/files/patch-cmake_modules_AddSphinxTarget.cmake
+++ b/devel/llvm-devel/files/patch-cmake_modules_AddSphinxTarget.cmake
@@ -1,5 +1,5 @@
---- cmake/modules/AddSphinxTarget.cmake.orig
-+++ cmake/modules/AddSphinxTarget.cmake
+--- llvm/cmake/modules/AddSphinxTarget.cmake.orig
++++ llvm/cmake/modules/AddSphinxTarget.cmake
 @@ -29,6 +29,8 @@
    endif()
  
diff --git a/devel/llvm-devel/files/clang/patch-fformat_extensions.diff b/devel/llvm-devel/files/patch-fformat_extensions.diff
index 0a852534e583..3f0d5b0d6bc6 100644
--- a/devel/llvm-devel/files/clang/patch-fformat_extensions.diff
+++ b/devel/llvm-devel/files/patch-fformat_extensions.diff
@@ -1,5 +1,5 @@
---- tools/clang/include/clang/Driver/Options.td.orig	2019-10-21 21:45:02.000000000 +0100
-+++ tools/clang/include/clang/Driver/Options.td	2019-10-22 00:00:39.833390000 +0100
+--- clang/include/clang/Driver/Options.td.orig	2019-10-21 21:45:02.000000000 +0100
++++ clang/include/clang/Driver/Options.td	2019-10-22 00:00:39.833390000 +0100
 @@ -1186,6 +1186,8 @@
    Flags<[CC1Option]>;
  def fno_use_line_directives : Flag<["-"], "fno-use-line-directives">, Group<f_Group>;
diff --git a/devel/llvm-devel/files/clang/patch-fopenmp.diff b/devel/llvm-devel/files/patch-fopenmp.diff
index 18932bd0d19c..f521ac6e8d85 100644
--- a/devel/llvm-devel/files/clang/patch-fopenmp.diff
+++ b/devel/llvm-devel/files/patch-fopenmp.diff
@@ -1,5 +1,5 @@
---- tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-05-10 17:18:56.000000000 +0000
-+++ tools/clang/lib/Driver/ToolChains/CommonArgs.cpp	2017-05-10 23:01:17.087686000 +0000
+--- clang/lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-05-10 17:18:56.000000000 +0000
++++ clang/lib/Driver/ToolChains/CommonArgs.cpp	2017-05-10 23:01:17.087686000 +0000
 @@ -441,7 +441,10 @@
  
    switch (TC.getDriver().getOpenMPRuntime(Args)) {
diff --git a/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py b/devel/llvm-devel/files/patch-llvm-build_llvmbuild_main.py
index f4b92136a16b..a6dd4abba22c 100644
--- a/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py
+++ b/devel/llvm-devel/files/patch-llvm-build_llvmbuild_main.py
@@ -1,5 +1,5 @@
---- utils/llvm-build/llvmbuild/main.py.orig	2015-10-02 16:42:59 UTC
-+++ utils/llvm-build/llvmbuild/main.py
+--- llvm/utils/llvm-build/llvmbuild/main.py.orig	2015-10-02 16:42:59 UTC
++++ llvm/utils/llvm-build/llvmbuild/main.py
 @@ -747,7 +747,17 @@ def add_magic_target_components(parser, 
  
      # We handle a few special cases of target names here for historical
diff --git a/devel/llvm-devel/files/openmp/patch-projects_openmp_libomptarget_src_omptarget.cpp b/devel/llvm-devel/files/patch-openmp_libomptarget_src_omptarget.cpp
index 85cd7b17abf1..6ebaa3f948eb 100644
--- a/devel/llvm-devel/files/openmp/patch-projects_openmp_libomptarget_src_omptarget.cpp
+++ b/devel/llvm-devel/files/patch-openmp_libomptarget_src_omptarget.cpp
@@ -1,5 +1,5 @@
---- projects/openmp/libomptarget/src/omptarget.cpp.orig
-+++ projects/openmp/libomptarget/src/omptarget.cpp
+--- openmp/libomptarget/src/omptarget.cpp.orig
++++ openmp/libomptarget/src/omptarget.cpp
 @@ -12,6 +12,7 @@
  //
  //===----------------------------------------------------------------------===//
diff --git a/devel/llvm-devel/files/lldb/patch-tools_lldb_docs_conf.py b/devel/llvm-devel/files/patch-tools_lldb_docs_conf.py
index 6fd373c5e775..80007ecd83ba 100644
--- a/devel/llvm-devel/files/lldb/patch-tools_lldb_docs_conf.py
+++ b/devel/llvm-devel/files/patch-tools_lldb_docs_conf.py
@@ -1,5 +1,5 @@
---- tools/lldb/docs/conf.py.orig
-+++ tools/lldb/docs/conf.py
+--- lldb/docs/conf.py.orig
++++ lldb/docs/conf.py
 @@ -97,9 +97,9 @@
  # Theme options are theme-specific and customize the look and feel of a theme
  # further.  For a list of options available for each theme, see the
diff --git a/devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp b/devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
index b0a1482581c9..ff0dba234b50 100644
--- a/devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
+++ b/devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
@@ -1,5 +1,5 @@
---- lib/Target/PowerPC/PPCTargetMachine.cpp.orig	2019-07-04 07:43:51 UTC
-+++ lib/Target/PowerPC/PPCTargetMachine.cpp
+--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp.orig	2019-07-04 07:43:51 UTC
++++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
 @@ -209,6 +209,20 @@ static PPCTargetMachine::PPCABI computeTargetABI(const
    if (TT.isMacOSX())
      return PPCTargetMachine::PPC_ABI_UNKNOWN;
diff --git a/devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h b/devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
index 5b6460a0afba..f94c408d60c4 100644
--- a/devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
+++ b/devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
@@ -1,5 +1,5 @@
---- tools/clang/lib/Basic/Targets/PPC.h.orig	2019-07-09 13:32:26 UTC
-+++ tools/clang/lib/Basic/Targets/PPC.h
+--- clang/lib/Basic/Targets/PPC.h.orig	2019-07-09 13:32:26 UTC
++++ clang/lib/Basic/Targets/PPC.h
 @@ -374,12 +374,29 @@ class LLVM_LIBRARY_VISIBILITY PPC64TargetInfo : public
      IntMaxType = SignedLong;
      Int64Type = SignedLong;
diff --git a/devel/llvm-devel/files/xtoolchain.mk.in b/devel/llvm-devel/files/xtoolchain.mk.in
new file mode 100644
index 000000000000..6cecf71f4812
--- /dev/null
+++ b/devel/llvm-devel/files/xtoolchain.mk.in
@@ -0,0 +1,6 @@
+XCC=%%LOCALBASE%%/bin/%%XCC%%
+XCXX=%%LOCALBASE%%/bin/%%XCXX%%
+XCPP=%%LOCALBASE%%/bin/%%XCPP%%
+XLD=%%XLD%%
+CROSS_BINUTILS_PREFIX=/var/empty
+X_COMPILER_TYPE=%%X_COMPILER_TYPE%%
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 4e67c5993d6f..7851034f63ac 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -143,6 +143,7 @@ llvm-devel/bin/dsymutil
 %%EXTRAS%%llvm-devel/bin/find-all-symbols
 %%CLANG%%llvm-devel/bin/git-clang-format
 %%CLANG%%llvm-devel/bin/hmaptool
+%%LLD%%llvm-devel/bin/ld
 %%LLD%%llvm-devel/bin/ld.lld
 %%LLD%%llvm-devel/bin/ld64.lld
 llvm-devel/bin/llc
@@ -518,6 +519,10 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/XRayInstr.h
 %%CLANG%%llvm-devel/include/clang/Basic/XRayLists.h
 %%CLANG%%llvm-devel/include/clang/Basic/arm_fp16.inc
+%%CLANG%%llvm-devel/include/clang/Basic/arm_mve_builtin_aliases.inc
+%%CLANG%%llvm-devel/include/clang/Basic/arm_mve_builtin_cg.inc
+%%CLANG%%llvm-devel/include/clang/Basic/arm_mve_builtin_sema.inc
+%%CLANG%%llvm-devel/include/clang/Basic/arm_mve_builtins.inc
 %%CLANG%%llvm-devel/include/clang/Basic/arm_neon.inc
 %%CLANG%%llvm-devel/include/clang/CodeGen/BackendUtil.h
 %%CLANG%%llvm-devel/include/clang/CodeGen/CGFunctionInfo.h
@@ -762,6 +767,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningService.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
+%%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DiagnosticsYaml.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Execution.h
 %%CLANG%%llvm-devel/include/clang/Tooling/FileMatchTrie.h
@@ -808,7 +814,6 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Transformer/SourceCodeBuilders.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Transformer/Stencil.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Transformer/Transformer.h
-%%COMPILER_RT%%llvm-devel/include/fuzzer/FuzzedDataProvider.h
 %%LLD%%llvm-devel/include/lld/Common/Args.h
 %%LLD%%llvm-devel/include/lld/Common/DWARF.h
 %%LLD%%llvm-devel/include/lld/Common/Driver.h
@@ -1387,6 +1392,7 @@ llvm-devel/include/llvm/ADT/DenseMapInfo.h
 llvm-devel/include/llvm/ADT/DenseSet.h
 llvm-devel/include/llvm/ADT/DepthFirstIterator.h
 llvm-devel/include/llvm/ADT/DirectedGraph.h
+llvm-devel/include/llvm/ADT/EnumeratedArray.h
 llvm-devel/include/llvm/ADT/EpochTracker.h
 llvm-devel/include/llvm/ADT/EquivalenceClasses.h
 llvm-devel/include/llvm/ADT/FoldingSet.h
@@ -1710,6 +1716,7 @@ llvm-devel/include/llvm/CodeGen/MachineRegionInfo.h
 llvm-devel/include/llvm/CodeGen/MachineRegisterInfo.h
 llvm-devel/include/llvm/CodeGen/MachineSSAUpdater.h
 llvm-devel/include/llvm/CodeGen/MachineScheduler.h
+llvm-devel/include/llvm/CodeGen/MachineSizeOpts.h
 llvm-devel/include/llvm/CodeGen/MachineTraceMetrics.h
 llvm-devel/include/llvm/CodeGen/MacroFusion.h
 llvm-devel/include/llvm/CodeGen/ModuloSchedule.h
@@ -2046,10 +2053,10 @@ llvm-devel/include/llvm/ExecutionEngine/Orc/OrcError.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
-llvm-devel/include/llvm/ExecutionEngine/Orc/RPCSerialization.h
-llvm-devel/include/llvm/ExecutionEngine/Orc/RPCUtils.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/RPC/RPCSerialization.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/RPC/RPCUtils.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/RPC/RawByteChannel.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
-llvm-devel/include/llvm/ExecutionEngine/Orc/RawByteChannel.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/SpeculateAnalyses.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/Speculation.h
@@ -2367,6 +2374,7 @@ llvm-devel/include/llvm/Remarks/BitstreamRemarkParser.h
 llvm-devel/include/llvm/Remarks/BitstreamRemarkSerializer.h
 llvm-devel/include/llvm/Remarks/Remark.h
 llvm-devel/include/llvm/Remarks/RemarkFormat.h
+llvm-devel/include/llvm/Remarks/RemarkLinker.h
 llvm-devel/include/llvm/Remarks/RemarkParser.h
 llvm-devel/include/llvm/Remarks/RemarkSerializer.h
 llvm-devel/include/llvm/Remarks/RemarkStringTable.h
@@ -2583,6 +2591,7 @@ llvm-devel/include/llvm/TextAPI/MachO/TextAPIWriter.h
 llvm-devel/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 llvm-devel/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 llvm-devel/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
+llvm-devel/include/llvm/Transforms/CFGuard.h
 llvm-devel/include/llvm/Transforms/Coroutines.h
 llvm-devel/include/llvm/Transforms/IPO.h
 llvm-devel/include/llvm/Transforms/IPO/AlwaysInliner.h
@@ -2702,6 +2711,7 @@ llvm-devel/include/llvm/Transforms/Utils/CanonicalizeAliases.h
 llvm-devel/include/llvm/Transforms/Utils/Cloning.h
 llvm-devel/include/llvm/Transforms/Utils/CodeExtractor.h
 llvm-devel/include/llvm/Transforms/Utils/CtorUtils.h
+llvm-devel/include/llvm/Transforms/Utils/Debugify.h
 llvm-devel/include/llvm/Transforms/Utils/EntryExitInstrumenter.h
 llvm-devel/include/llvm/Transforms/Utils/EscapeEnumerator.h
 llvm-devel/include/llvm/Transforms/Utils/Evaluator.h
@@ -2765,23 +2775,6 @@ llvm-devel/include/llvm/XRay/RecordPrinter.h
 llvm-devel/include/llvm/XRay/Trace.h
 llvm-devel/include/llvm/XRay/XRayRecord.h
 llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/allocator_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/asan_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/common_interface_defs.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/coverage_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/dfsan_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/hwasan_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/linux_syscall_hooks.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/netbsd_syscall_hooks.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/scudo_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/ubsan_interface.h
-%%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h
-%%COMPILER_RT%%llvm-devel/include/xray/xray_log_interface.h
-%%COMPILER_RT%%llvm-devel/include/xray/xray_records.h
 %%GOLD%%llvm-devel/lib/LLVMgold.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
@@ -2800,6 +2793,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm64intr.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_acle.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_fp16.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_mve.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/armintr.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
@@ -2847,6 +2841,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/float.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fuzzer/FuzzedDataProvider.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/gfniintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
@@ -2892,6 +2887,20 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/allocator_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/asan_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/common_interface_defs.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/coverage_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/dfsan_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/hwasan_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/linux_syscall_hooks.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/lsan_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/msan_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/netbsd_syscall_hooks.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/scudo_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/tsan_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/tsan_interface_atomic.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/ubsan_interface.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
@@ -2909,6 +2918,9 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_log_interface.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_records.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsaveintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsaveoptintrin.h
@@ -2980,6 +2992,7 @@ llvm-devel/lib/libLLVMBinaryFormat.a
 llvm-devel/lib/libLLVMBitReader.a
 llvm-devel/lib/libLLVMBitWriter.a
 llvm-devel/lib/libLLVMBitstreamReader.a
+llvm-devel/lib/libLLVMCFGuard.a
 llvm-devel/lib/libLLVMCodeGen.a
 llvm-devel/lib/libLLVMCore.a
 llvm-devel/lib/libLLVMCoroutines.a
@@ -3036,6 +3049,7 @@ llvm-devel/lib/libLLVMObjCARCOpts.a
 llvm-devel/lib/libLLVMObject.a
 llvm-devel/lib/libLLVMObjectYAML.a
 llvm-devel/lib/libLLVMOption.a
+llvm-devel/lib/libLLVMOrcError.a
 llvm-devel/lib/libLLVMOrcJIT.a
 llvm-devel/lib/libLLVMPasses.a
 llvm-devel/lib/libLLVMPowerPCAsmParser.a