Update to a newer snapshot.

Adjust the way *_blacklist.txt is added to the package to address
increasing divergence.

Pull in wrapper change from D14727 to fix use when symlinking to them
in ${LOCALBASE}/bin.

5 files changed, 146 insertions, 35 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 9e65bdb2f932..b9967b31c92d 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -71,7 +71,8 @@ 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_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
+			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
 DOCS_PORTDOCS=		llvm
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
@@ -113,6 +114,7 @@ PLIST_SUB+=	LLVM_LIB_VER=${LLVM_MAJOR:C/\..*//} \
 		LLVM_RELEASE=${LLVM_RELEASE}
 
 COMMANDS=	bugpoint \
+		dsymutil \
 		llc \
 		lli \
 		llvm-ar \
@@ -224,7 +226,7 @@ CLANG_PATTERN=	(c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|so
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
-COMPILER_RT_PATTERN=	(_blacklist.txt|sanitizer|include.xray)
+COMPILER_RT_PATTERN=	(sanitizer|include.xray)
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
@@ -267,7 +269,7 @@ PLIST_SUB+=	OPENMP="@comment "
 MAN1SRCS+=	bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \
 		llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \
-		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \
+		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-mca.1 llvm-nm.1 \
 		llvm-pdbutil.1 \
 		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
 		opt.1 tblgen.1
@@ -285,7 +287,11 @@ STRIP=
 .endif
 
 _CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd
+_CRTBLDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/share
+_COMPILER_RT_BLACKLISTS=	cfi_blacklist.txt
 .if ${ARCH} == "amd64"
+_COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
+_COMPILER_RT_BLACKLISTS+=	msan_blacklist.txt
 _COMPILER_RT_LIBS= \
 	libclang_rt.asan-preinit-x86_64.a \
 	libclang_rt.asan-x86_64.a \
@@ -299,6 +305,11 @@ _COMPILER_RT_LIBS= \
 	libclang_rt.fuzzer-x86_64.a \
 	libclang_rt.fuzzer_no_main-x86_64.a \
 	libclang_rt.lsan-x86_64.a \
+	libclang_rt.msan-x86_64.a \
+	libclang_rt.msan-x86_64.a.syms \
+	libclang_rt.msan_cxx-x86_64.a \
+	libclang_rt.msan_cxx-x86_64.a.syms \
+	libclang_rt.xray-x86_64.a \
 	libclang_rt.profile-x86_64.a \
 	libclang_rt.safestack-x86_64.a \
 	libclang_rt.stats-x86_64.a \
@@ -317,6 +328,7 @@ _COMPILER_RT_LIBS= \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
 .endif
 .if ${ARCH} == "i386"
+_COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
 _COMPILER_RT_LIBS+= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
@@ -378,7 +390,9 @@ post-install:
 .endfor
 
 post-install-DOCS-on:
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/* ${STAGEDIR}${DOCSDIR}
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
 .for _man in ${MAN1SRCS}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
@@ -429,9 +443,6 @@ post-install-LIT-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
 
-post-install-LLDB-on:
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/API
-
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
@@ -453,6 +464,7 @@ build-plist:
 	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||}/bin/${command} >> ${PLIST}.tmp
 .endfor
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
+	    ${GREP} -v '_blacklist.txt$$' | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 03bfff65f373..3a60f76ef34d 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	7.0
 LLVM_RELEASE=	${LLVM_MAJOR}.0
-SNAPDATE=	20180225
+SNAPDATE=	20180321
 
-LLVM_COMMIT=		1cb64026709ddf4b7cbb090faef8457968df581a
-CLANG_COMMIT=		46ed3ffb907035a04dc4c9ec2347a5ea19f0080f
-COMPILER_RT_COMMIT=	241e7ddf993d8a9140649384f9ca7b4c32ddd73e
-EXTRAS_COMMIT=		53a136cb793c24b1cc299e71dcee62e370fa37e7
-LLD_COMMIT=		73cf9483e0e073af61fe9d94e104678f26b7628f
-LLDB_COMMIT=		ebf42bd6cff0c7beaf646460161e5c00bf6c39a7
-OPENMP_COMMIT=		3954610539a7fdbf6e09e1cb7a23a2012418b0ba
+LLVM_COMMIT=		2ff763c8ed2587663934050d06b118386b824e3e
+CLANG_COMMIT=		440ae10990a4c227674ec4f21f3e002baa0e7c95
+COMPILER_RT_COMMIT=	52411af60152548a1f25237339abaf2b9db0fbba
+EXTRAS_COMMIT=		75b2e0516c500630f6d8c26cf7adfd3f7ae19d0d
+LLD_COMMIT=		21dc00e6ebf755e9e7cc9cfe659d72f6719bb3ab
+LLDB_COMMIT=		c7491328c11fe1d21e7ded80d8eb5e2dbda487e9
+OPENMP_COMMIT=		a2d302c99ba387e37d5ea638d00991a330d74cb3
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 68fdaf99196f..7bc7b48e35cf 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1519581041
-SHA256 (llvm-mirror-llvm-7.0.d20180225-1cb64026709ddf4b7cbb090faef8457968df581a_GH0.tar.gz) = 86cf093e941f81de6cbda90e53ad2f13387cad001f45fea6329eb0dc7efbe8b2
-SIZE (llvm-mirror-llvm-7.0.d20180225-1cb64026709ddf4b7cbb090faef8457968df581a_GH0.tar.gz) = 38848091
-SHA256 (llvm-mirror-clang-46ed3ffb907035a04dc4c9ec2347a5ea19f0080f_GH0.tar.gz) = 5bcf99fd03a5100526c4fadbc7d19e8cd1e768e97eca901cd37b1c6f58858921
-SIZE (llvm-mirror-clang-46ed3ffb907035a04dc4c9ec2347a5ea19f0080f_GH0.tar.gz) = 16974985
-SHA256 (llvm-mirror-compiler-rt-241e7ddf993d8a9140649384f9ca7b4c32ddd73e_GH0.tar.gz) = b91226539d2052da91d35dc3b4c1ea75c41bcd419fbc0599efbc4c2bc2cb8241
-SIZE (llvm-mirror-compiler-rt-241e7ddf993d8a9140649384f9ca7b4c32ddd73e_GH0.tar.gz) = 3009002
-SHA256 (llvm-mirror-clang-tools-extra-53a136cb793c24b1cc299e71dcee62e370fa37e7_GH0.tar.gz) = 373761149887b63fa1bc20832f113eb65bf5984688a6e65af8c0ddf6e60925cf
-SIZE (llvm-mirror-clang-tools-extra-53a136cb793c24b1cc299e71dcee62e370fa37e7_GH0.tar.gz) = 1083149
-SHA256 (llvm-mirror-lld-73cf9483e0e073af61fe9d94e104678f26b7628f_GH0.tar.gz) = e74efc32254f6a1b845dc35293bcfbfd7d7a7589ba946b1ee6372d621398c596
-SIZE (llvm-mirror-lld-73cf9483e0e073af61fe9d94e104678f26b7628f_GH0.tar.gz) = 1131584
-SHA256 (llvm-mirror-lldb-ebf42bd6cff0c7beaf646460161e5c00bf6c39a7_GH0.tar.gz) = e6a650097e83ef45f4cf7e99a36c2c61a160fbd893ba353959a6ed8dcf68a899
-SIZE (llvm-mirror-lldb-ebf42bd6cff0c7beaf646460161e5c00bf6c39a7_GH0.tar.gz) = 24302756
-SHA256 (llvm-mirror-openmp-3954610539a7fdbf6e09e1cb7a23a2012418b0ba_GH0.tar.gz) = da2806d2a18e8d959b03926080886a7cf64e1d7a4e1573b78fd0941bd4dd69c3
-SIZE (llvm-mirror-openmp-3954610539a7fdbf6e09e1cb7a23a2012418b0ba_GH0.tar.gz) = 2892576
+TIMESTAMP = 1521656905
+SHA256 (llvm-mirror-llvm-7.0.d20180321-2ff763c8ed2587663934050d06b118386b824e3e_GH0.tar.gz) = 8c50b6e35bf6a07a355f61ab5bef22dcda1d7a72230356858d0957583e1d12c0
+SIZE (llvm-mirror-llvm-7.0.d20180321-2ff763c8ed2587663934050d06b118386b824e3e_GH0.tar.gz) = 39591142
+SHA256 (llvm-mirror-clang-440ae10990a4c227674ec4f21f3e002baa0e7c95_GH0.tar.gz) = 659e9021d007d09033ca41aafdc5ce397fd803aef10156948782fada186a38d6
+SIZE (llvm-mirror-clang-440ae10990a4c227674ec4f21f3e002baa0e7c95_GH0.tar.gz) = 17074220
+SHA256 (llvm-mirror-compiler-rt-52411af60152548a1f25237339abaf2b9db0fbba_GH0.tar.gz) = 50b0d25ec72ff4e9d83498a19a9236fd3d198b88f6518280ce7ebf6ebc4fc109
+SIZE (llvm-mirror-compiler-rt-52411af60152548a1f25237339abaf2b9db0fbba_GH0.tar.gz) = 3025322
+SHA256 (llvm-mirror-clang-tools-extra-75b2e0516c500630f6d8c26cf7adfd3f7ae19d0d_GH0.tar.gz) = 246cfa2f586c4257f51a53ff2242cd6713783663d4d4e6f3381034af20e38b2a
+SIZE (llvm-mirror-clang-tools-extra-75b2e0516c500630f6d8c26cf7adfd3f7ae19d0d_GH0.tar.gz) = 1108022
+SHA256 (llvm-mirror-lld-21dc00e6ebf755e9e7cc9cfe659d72f6719bb3ab_GH0.tar.gz) = 52cbd87f4a1d50915a73aa45d4e65f142031b81ac29c29693b941c054ed987c1
+SIZE (llvm-mirror-lld-21dc00e6ebf755e9e7cc9cfe659d72f6719bb3ab_GH0.tar.gz) = 1147093
+SHA256 (llvm-mirror-lldb-c7491328c11fe1d21e7ded80d8eb5e2dbda487e9_GH0.tar.gz) = 5895d2ccadb462ad9039fc57b95e5be6cc3149830af1dc5827df4977d0f571c4
+SIZE (llvm-mirror-lldb-c7491328c11fe1d21e7ded80d8eb5e2dbda487e9_GH0.tar.gz) = 24317286
+SHA256 (llvm-mirror-openmp-a2d302c99ba387e37d5ea638d00991a330d74cb3_GH0.tar.gz) = 53935bffb1f26c4676a6b3321b6a6cf476af2091ed407b79884984998045daa5
+SIZE (llvm-mirror-openmp-a2d302c99ba387e37d5ea638d00991a330d74cb3_GH0.tar.gz) = 2896839
diff --git a/devel/llvm-devel/files/llvm-wrapper.sh.in b/devel/llvm-devel/files/llvm-wrapper.sh.in
index bf15174f746e..509dbe74a6b0 100644
--- a/devel/llvm-devel/files/llvm-wrapper.sh.in
+++ b/devel/llvm-devel/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
 LLVM_PREFIX="%%LLVM_PREFIX%%"
 LLVM_SUFFIX="%%LLVM_SUFFIX%%"
 
-tool=${0##*/}
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
 tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
     "${tool}" "${@}"
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 2a962d3beb0b..8c0ade6fdc6c 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -1,6 +1,7 @@
 @comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<
 @comment Alter build-plist target and regenerate as required
 bin/bugpoint-devel
+bin/dsymutil-devel
 bin/llc-devel
 bin/lli-devel
 bin/llvm-ar-devel
@@ -118,6 +119,7 @@ llvm-devel/bin/bugpoint
 %%EXTRAS%%llvm-devel/bin/clang-reorder-fields
 %%EXTRAS%%llvm-devel/bin/clang-tidy
 %%CLANG%%llvm-devel/bin/clangd
+llvm-devel/bin/dsymutil
 %%EXTRAS%%llvm-devel/bin/find-all-symbols
 %%CLANG%%llvm-devel/bin/git-clang-format
 %%LLD%%llvm-devel/bin/ld.lld
@@ -145,7 +147,6 @@ llvm-devel/bin/llvm-cxxfilt
 llvm-devel/bin/llvm-diff
 llvm-devel/bin/llvm-dis
 llvm-devel/bin/llvm-dlltool
-llvm-devel/bin/llvm-dsymutil
 llvm-devel/bin/llvm-dwarfdump
 llvm-devel/bin/llvm-dwp
 llvm-devel/bin/llvm-extract
@@ -154,6 +155,7 @@ llvm-devel/bin/llvm-link
 llvm-devel/bin/llvm-lto
 llvm-devel/bin/llvm-lto2
 llvm-devel/bin/llvm-mc
+llvm-devel/bin/llvm-mca
 llvm-devel/bin/llvm-mcmarkup
 llvm-devel/bin/llvm-modextract
 llvm-devel/bin/llvm-mt
@@ -331,6 +333,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Analysis/CallGraph.h
 %%CLANG%%llvm-devel/include/clang/Analysis/CloneDetection.h
 %%CLANG%%llvm-devel/include/clang/Analysis/CodeInjector.h
+%%CLANG%%llvm-devel/include/clang/Analysis/ConstructionContext.h
 %%CLANG%%llvm-devel/include/clang/Analysis/DomainSpecific/CocoaConventions.h
 %%CLANG%%llvm-devel/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 %%CLANG%%llvm-devel/include/clang/Analysis/FlowSensitive/DataflowValues.h
@@ -745,6 +748,74 @@ llvm-devel/bin/yaml2obj
 %%LLD%%llvm-devel/include/lld/Core/Writer.h
 %%LLD%%llvm-devel/include/lld/ReaderWriter/MachOLinkingContext.h
 %%LLD%%llvm-devel/include/lld/ReaderWriter/YamlContext.h
+%%LLDB%%llvm-devel/include/lldb/API/LLDB.h
+%%LLDB%%llvm-devel/include/lldb/API/SBAddress.h
+%%LLDB%%llvm-devel/include/lldb/API/SBAttachInfo.h
+%%LLDB%%llvm-devel/include/lldb/API/SBBlock.h
+%%LLDB%%llvm-devel/include/lldb/API/SBBreakpoint.h
+%%LLDB%%llvm-devel/include/lldb/API/SBBreakpointLocation.h
+%%LLDB%%llvm-devel/include/lldb/API/SBBreakpointName.h
+%%LLDB%%llvm-devel/include/lldb/API/SBBroadcaster.h
+%%LLDB%%llvm-devel/include/lldb/API/SBCommandInterpreter.h
+%%LLDB%%llvm-devel/include/lldb/API/SBCommandReturnObject.h
+%%LLDB%%llvm-devel/include/lldb/API/SBCommunication.h
+%%LLDB%%llvm-devel/include/lldb/API/SBCompileUnit.h
+%%LLDB%%llvm-devel/include/lldb/API/SBData.h
+%%LLDB%%llvm-devel/include/lldb/API/SBDebugger.h
+%%LLDB%%llvm-devel/include/lldb/API/SBDeclaration.h
+%%LLDB%%llvm-devel/include/lldb/API/SBDefines.h
+%%LLDB%%llvm-devel/include/lldb/API/SBError.h
+%%LLDB%%llvm-devel/include/lldb/API/SBEvent.h
+%%LLDB%%llvm-devel/include/lldb/API/SBExecutionContext.h
+%%LLDB%%llvm-devel/include/lldb/API/SBExpressionOptions.h
+%%LLDB%%llvm-devel/include/lldb/API/SBFileSpec.h
+%%LLDB%%llvm-devel/include/lldb/API/SBFileSpecList.h
+%%LLDB%%llvm-devel/include/lldb/API/SBFrame.h
+%%LLDB%%llvm-devel/include/lldb/API/SBFunction.h
+%%LLDB%%llvm-devel/include/lldb/API/SBHostOS.h
+%%LLDB%%llvm-devel/include/lldb/API/SBInstruction.h
+%%LLDB%%llvm-devel/include/lldb/API/SBInstructionList.h
+%%LLDB%%llvm-devel/include/lldb/API/SBLanguageRuntime.h
+%%LLDB%%llvm-devel/include/lldb/API/SBLaunchInfo.h
+%%LLDB%%llvm-devel/include/lldb/API/SBLineEntry.h
+%%LLDB%%llvm-devel/include/lldb/API/SBListener.h
+%%LLDB%%llvm-devel/include/lldb/API/SBMemoryRegionInfo.h
+%%LLDB%%llvm-devel/include/lldb/API/SBMemoryRegionInfoList.h
+%%LLDB%%llvm-devel/include/lldb/API/SBModule.h
+%%LLDB%%llvm-devel/include/lldb/API/SBModuleSpec.h
+%%LLDB%%llvm-devel/include/lldb/API/SBPlatform.h
+%%LLDB%%llvm-devel/include/lldb/API/SBProcess.h
+%%LLDB%%llvm-devel/include/lldb/API/SBProcessInfo.h
+%%LLDB%%llvm-devel/include/lldb/API/SBQueue.h
+%%LLDB%%llvm-devel/include/lldb/API/SBQueueItem.h
+%%LLDB%%llvm-devel/include/lldb/API/SBSection.h
+%%LLDB%%llvm-devel/include/lldb/API/SBSourceManager.h
+%%LLDB%%llvm-devel/include/lldb/API/SBStream.h
+%%LLDB%%llvm-devel/include/lldb/API/SBStringList.h
+%%LLDB%%llvm-devel/include/lldb/API/SBStructuredData.h
+%%LLDB%%llvm-devel/include/lldb/API/SBSymbol.h
+%%LLDB%%llvm-devel/include/lldb/API/SBSymbolContext.h
+%%LLDB%%llvm-devel/include/lldb/API/SBSymbolContextList.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTarget.h
+%%LLDB%%llvm-devel/include/lldb/API/SBThread.h
+%%LLDB%%llvm-devel/include/lldb/API/SBThreadCollection.h
+%%LLDB%%llvm-devel/include/lldb/API/SBThreadPlan.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTrace.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTraceOptions.h
+%%LLDB%%llvm-devel/include/lldb/API/SBType.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTypeCategory.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTypeEnumMember.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTypeFilter.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTypeFormat.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTypeNameSpecifier.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTypeSummary.h
+%%LLDB%%llvm-devel/include/lldb/API/SBTypeSynthetic.h
+%%LLDB%%llvm-devel/include/lldb/API/SBUnixSignals.h
+%%LLDB%%llvm-devel/include/lldb/API/SBValue.h
+%%LLDB%%llvm-devel/include/lldb/API/SBValueList.h
+%%LLDB%%llvm-devel/include/lldb/API/SBVariablesOptions.h
+%%LLDB%%llvm-devel/include/lldb/API/SBWatchpoint.h
+%%LLDB%%llvm-devel/include/lldb/API/SystemInitializerFull.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/Breakpoint.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointID.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointIDList.h
@@ -1141,6 +1212,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/StreamString.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StreamTee.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StringExtractor.h
+%%LLDB%%llvm-devel/include/lldb/Utility/StringExtractorGDBRemote.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StringLexer.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StringList.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StructuredData.h
@@ -1153,9 +1225,22 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/UserID.h
 %%LLDB%%llvm-devel/include/lldb/Utility/VASPrintf.h
 %%LLDB%%llvm-devel/include/lldb/Utility/VMRange.h
+%%LLDB%%llvm-devel/include/lldb/lldb-defines.h
+%%LLDB%%llvm-devel/include/lldb/lldb-enumerations.h
+%%LLDB%%llvm-devel/include/lldb/lldb-forward.h
+%%LLDB%%llvm-devel/include/lldb/lldb-private-defines.h
+%%LLDB%%llvm-devel/include/lldb/lldb-private-enumerations.h
+%%LLDB%%llvm-devel/include/lldb/lldb-private-forward.h
+%%LLDB%%llvm-devel/include/lldb/lldb-private-interfaces.h
+%%LLDB%%llvm-devel/include/lldb/lldb-private-types.h
+%%LLDB%%llvm-devel/include/lldb/lldb-private.h
+%%LLDB%%llvm-devel/include/lldb/lldb-public.h
+%%LLDB%%llvm-devel/include/lldb/lldb-types.h
+%%LLDB%%llvm-devel/include/lldb/lldb-versioning.h
 llvm-devel/include/llvm-c/Analysis.h
 llvm-devel/include/llvm-c/BitReader.h
 llvm-devel/include/llvm-c/BitWriter.h
+llvm-devel/include/llvm-c/Comdat.h
 llvm-devel/include/llvm-c/Core.h
 llvm-devel/include/llvm-c/DebugInfo.h
 llvm-devel/include/llvm-c/Disassembler.h
@@ -1308,6 +1393,7 @@ llvm-devel/include/llvm/Analysis/MemoryLocation.h
 llvm-devel/include/llvm/Analysis/MemorySSA.h
 llvm-devel/include/llvm/Analysis/MemorySSAUpdater.h
 llvm-devel/include/llvm/Analysis/ModuleSummaryAnalysis.h
+llvm-devel/include/llvm/Analysis/MustExecute.h
 llvm-devel/include/llvm/Analysis/ObjCARCAliasAnalysis.h
 llvm-devel/include/llvm/Analysis/ObjCARCAnalysisUtils.h
 llvm-devel/include/llvm/Analysis/ObjCARCInstKind.h
@@ -1349,6 +1435,7 @@ llvm-devel/include/llvm/AsmParser/SlotMapping.h
 llvm-devel/include/llvm/BinaryFormat/COFF.h
 llvm-devel/include/llvm/BinaryFormat/Dwarf.def
 llvm-devel/include/llvm/BinaryFormat/Dwarf.h
+llvm-devel/include/llvm/BinaryFormat/DynamicTags.def
 llvm-devel/include/llvm/BinaryFormat/ELF.h
 llvm-devel/include/llvm/BinaryFormat/ELFRelocs/AArch64.def
 llvm-devel/include/llvm/BinaryFormat/ELFRelocs/AMDGPU.def
@@ -1633,20 +1720,24 @@ llvm-devel/include/llvm/DebugInfo/MSF/MappedBlockStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIADataStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h
+llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAEnumInjectedSources.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAEnumLineNumbers.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAEnumSymbols.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAEnumTables.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAError.h
+llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAInjectedSource.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIALineNumber.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIARawSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIASession.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIASourceFile.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIASupport.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIATable.h
+llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAUtils.h
 llvm-devel/include/llvm/DebugInfo/PDB/GenericError.h
 llvm-devel/include/llvm/DebugInfo/PDB/IPDBDataStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/IPDBEnumChildren.h
+llvm-devel/include/llvm/DebugInfo/PDB/IPDBInjectedSource.h
 llvm-devel/include/llvm/DebugInfo/PDB/IPDBLineNumber.h
 llvm-devel/include/llvm/DebugInfo/PDB/IPDBRawSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/IPDBSession.h
@@ -1729,6 +1820,7 @@ llvm-devel/include/llvm/DebugInfo/PDB/UDTLayout.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/DIPrinter.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/Symbolize.h
+llvm-devel/include/llvm/Demangle/Compiler.h
 llvm-devel/include/llvm/Demangle/Demangle.h
 llvm-devel/include/llvm/ExecutionEngine/ExecutionEngine.h
 llvm-devel/include/llvm/ExecutionEngine/GenericValue.h
@@ -1985,6 +2077,7 @@ llvm-devel/include/llvm/Object/StackMapParser.h
 llvm-devel/include/llvm/Object/SymbolSize.h
 llvm-devel/include/llvm/Object/SymbolicFile.h
 llvm-devel/include/llvm/Object/Wasm.h
+llvm-devel/include/llvm/Object/WasmTraits.h
 llvm-devel/include/llvm/Object/WindowsResource.h
 llvm-devel/include/llvm/ObjectYAML/COFFYAML.h
 llvm-devel/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
@@ -2050,6 +2143,7 @@ llvm-devel/include/llvm/Support/COM.h
 llvm-devel/include/llvm/Support/CachePruning.h
 llvm-devel/include/llvm/Support/Capacity.h
 llvm-devel/include/llvm/Support/Casting.h
+llvm-devel/include/llvm/Support/CheckedArithmetic.h
 llvm-devel/include/llvm/Support/Chrono.h
 llvm-devel/include/llvm/Support/CodeGen.h
 llvm-devel/include/llvm/Support/CodeGenCWrappers.h
@@ -2155,6 +2249,7 @@ llvm-devel/include/llvm/Support/Valgrind.h
 llvm-devel/include/llvm/Support/Watchdog.h
 llvm-devel/include/llvm/Support/Win64EH.h
 llvm-devel/include/llvm/Support/WindowsError.h
+llvm-devel/include/llvm/Support/WithColor.h
 llvm-devel/include/llvm/Support/X86TargetParser.def
 llvm-devel/include/llvm/Support/YAMLParser.h
 llvm-devel/include/llvm/Support/YAMLTraits.h
@@ -2242,6 +2337,7 @@ llvm-devel/include/llvm/Transforms/Scalar/GVNExpression.h
 llvm-devel/include/llvm/Transforms/Scalar/GuardWidening.h
 llvm-devel/include/llvm/Transforms/Scalar/IVUsersPrinter.h
 llvm-devel/include/llvm/Transforms/Scalar/IndVarSimplify.h
+llvm-devel/include/llvm/Transforms/Scalar/InductiveRangeCheckElimination.h
 llvm-devel/include/llvm/Transforms/Scalar/JumpThreading.h
 llvm-devel/include/llvm/Transforms/Scalar/LICM.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h
@@ -2249,7 +2345,6 @@ llvm-devel/include/llvm/Transforms/Scalar/LoopDataPrefetch.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopDeletion.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopDistribute.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopIdiomRecognize.h
-llvm-devel/include/llvm/Transforms/Scalar/LoopInstSimplify.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopLoadElimination.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopPassManager.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopPredication.h
@@ -2670,6 +2765,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
 %%CLANG%%llvm-devel/lib/libclangStaticAnalyzerCore.a
 %%CLANG%%llvm-devel/lib/libclangStaticAnalyzerFrontend.a
 %%EXTRAS%%llvm-devel/lib/libclangTidy.a
+%%EXTRAS%%llvm-devel/lib/libclangTidyAbseilModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyAndroidModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyBoostModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyBugproneModule.a
@@ -2685,8 +2781,10 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
 %%EXTRAS%%llvm-devel/lib/libclangTidyObjCModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyPerformanceModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyPlugin.a
+%%EXTRAS%%llvm-devel/lib/libclangTidyPortabilityModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyReadabilityModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyUtils.a
+%%EXTRAS%%llvm-devel/lib/libclangTidyZirconModule.a
 %%CLANG%%llvm-devel/lib/libclangTooling.a
 %%CLANG%%llvm-devel/lib/libclangToolingASTDiff.a
 %%CLANG%%llvm-devel/lib/libclangToolingCore.a
@@ -2731,6 +2829,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_x86_64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginAppleObjCRuntime.a
 %%LLDB%%llvm-devel/lib/liblldbPluginArchitectureArm.a
+%%LLDB%%llvm-devel/lib/liblldbPluginArchitecturePPC64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginCPlusPlusLanguage.a
 %%LLDB%%llvm-devel/lib/liblldbPluginCXXItaniumABI.a
 %%LLDB%%llvm-devel/lib/liblldbPluginDisassemblerLLVM.a
@@ -2746,6 +2845,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
 %%LLDB%%llvm-devel/lib/liblldbPluginInstructionARM64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginInstructionMIPS.a
 %%LLDB%%llvm-devel/lib/liblldbPluginInstructionMIPS64.a
+%%LLDB%%llvm-devel/lib/liblldbPluginInstructionPPC64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginInstrumentationRuntimeASan.a
 %%LLDB%%llvm-devel/lib/liblldbPluginInstrumentationRuntimeMainThreadChecker.a
 %%LLDB%%llvm-devel/lib/liblldbPluginInstrumentationRuntimeTSan.a
@@ -2801,8 +2901,6 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
 %%OPENMP%%llvm-devel/lib/libomptarget.so
 %%CLANG%%llvm-devel/libexec/c++-analyzer
 %%CLANG%%llvm-devel/libexec/ccc-analyzer
-%%COMPILER_RT%%llvm-devel/share/asan_blacklist.txt
-%%COMPILER_RT%%llvm-devel/share/cfi_blacklist.txt
 %%CLANG%%llvm-devel/share/clang/bash-autocomplete.sh
 %%CLANG%%llvm-devel/share/clang/clang-format-bbedit.applescript
 %%CLANG%%llvm-devel/share/clang/clang-format-diff.py