devel/llvm-{cheri,morello}: new snapshots

Update both llvm-cheri and llvm-morello to new snapshots as we head for
a CheriBSD release with package support.

Switch llvm-morello to use a Makefile.snapshot for more consistancy
with other LLVM snapshot ports.

7 files changed, 125 insertions, 58 deletions

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index cb8f8e9b68cc..ad05b80a6d67 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -33,6 +33,10 @@ SHEBANG_FILES=	\
 		clang/tools/scan-build-py/bin/analyze-build \
 		clang/tools/scan-build-py/bin/intercept-build \
 		clang/tools/scan-build-py/bin/scan-build \
+		clang/tools/scan-build-py/libexec/analyze-cc \
+		clang/tools/scan-build-py/libexec/analyze-c++ \
+		clang/tools/scan-build-py/libexec/intercept-cc \
+		clang/tools/scan-build-py/libexec/intercept-c++ \
 		clang/tools/scan-view/bin/scan-view \
 		clang/utils/hmaptool/hmaptool \
 		llvm/tools/opt-viewer/optrecord.py \
@@ -41,13 +45,6 @@ SHEBANG_FILES=	\
 		llvm/tools/opt-viewer/opt-viewer.py \
 		llvm/utils/lit/lit.py \
 		llvm/utils/llvm-lit/llvm-lit.in
-.if ${LLVM_SUFFIX} == "-cheri"
-SHEBANG_FILES+=	\
-		clang/tools/scan-build-py/libexec/analyze-cc \
-		clang/tools/scan-build-py/libexec/analyze-c++ \
-		clang/tools/scan-build-py/libexec/intercept-cc \
-		clang/tools/scan-build-py/libexec/intercept-c++
-.endif
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
@@ -67,7 +64,9 @@ GH_ACCOUNT=	CTSRD-CHERI
 GH_TAGNAME=	${LLVM_COMMIT}
 .endif
 
+.ifndef SNAPDATE
 .sinclude "${.PARSEDIR}/Makefile.snapshot"
+.endif
 
 OPTIONS_DEFINE=	CLANG DOCS LIT LLD
 OPTIONS_DEFAULT=	CLANG LIT LLD
@@ -118,9 +117,7 @@ COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	clang.1 \
 		diagtool.1 \
 		scan-build.1
-.if ${LLVM_SUFFIX} == "-cheri"
 MAN1SRCS+=	clang-tblgen.1
-.endif
 #DOCS_PLIST_FILES+=	man/man1/scan-build${LLVM_SUFFIX}.1.gz
 USES+=		gnome
 .endif
@@ -189,15 +186,10 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-symbolizer.1 \
 		opt.1
 
-.if ${LLVM_SUFFIX} == "-cheri"
 MAN1SRCS+= \
 		llvm-otool.1 \
 		llvm-tblgen.1 \
 		tblgen.1
-.else
-MAN1SRCS+= \
-		xxx-tblgen.1
-.endif
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.COMMANDS"
@@ -222,10 +214,8 @@ post-install:
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX}
 .endfor
-.if ${LLVM_SUFFIX} == "-cheri"
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github/workflows
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github
-.endif
 
 post-install-DOCS-on:
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index 13a77f145c11..f0a375857fd8 100644
--- a/devel/llvm-cheri/Makefile.snapshot
+++ b/devel/llvm-cheri/Makefile.snapshot
@@ -4,6 +4,6 @@
 #
 LLVM_MAJOR=	13
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20220126
+SNAPDATE=	20220421
 
-LLVM_COMMIT=		7245208df70403e1f7189f3be7b57ca934b1cbb2
+LLVM_COMMIT=		b19d826b460249d3585c087de55fb650e0c4446e
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index be3403795a8f..9e02bf41270a 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644261629
-SHA256 (CTSRD-CHERI-llvm-project-13.0.d20220126-7245208df70403e1f7189f3be7b57ca934b1cbb2_GH0.tar.gz) = 8151ad938a140ae88a565ef7984e1bff272f46b58d1d738d5f8d14514f8b9b0d
-SIZE (CTSRD-CHERI-llvm-project-13.0.d20220126-7245208df70403e1f7189f3be7b57ca934b1cbb2_GH0.tar.gz) = 152219912
+TIMESTAMP = 1650913140
+SHA256 (CTSRD-CHERI-llvm-project-13.0.d20220421-b19d826b460249d3585c087de55fb650e0c4446e_GH0.tar.gz) = 6b90501a76f72afd90cf9c006da3b2873e3bdf9d0d7316ce1cd7498d1ace8984
+SIZE (CTSRD-CHERI-llvm-project-13.0.d20220421-b19d826b460249d3585c087de55fb650e0c4446e_GH0.tar.gz) = 152225754
diff --git a/devel/llvm-morello/Makefile b/devel/llvm-morello/Makefile
index dc8921742d99..0b77d2c69606 100644
--- a/devel/llvm-morello/Makefile
+++ b/devel/llvm-morello/Makefile
@@ -4,9 +4,6 @@ LLVM_SUFFIX=	-morello
 
 COMMENT=	LLVM and Clang with support the Arm Morello architecture
 
-LLVM_MAJOR=	11
-SNAPDATE=	20201020
-
 DISTINFO_FILE=	${.CURDIR}/distinfo
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
@@ -15,11 +12,13 @@ USE_GITLAB=	yes
 GL_SITE=	https://git.morello-project.org
 GL_ACCOUNT=	morello
 GL_PROJECT=	llvm-project
-GL_COMMIT=	0619e74d198706df7361bc5739e7d7db38e3bc4f
+GL_COMMIT=	${LLVM_COMMIT}
 
 # Regularly tested targets as part of Android development
 LLVM_TARGETS=	AArch64;ARM;BPF;X86
 
+.include "${.CURDIR}/Makefile.snapshot"
+
 MASTERDIR=	${.CURDIR}/../llvm-cheri
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/llvm-morello/Makefile.snapshot b/devel/llvm-morello/Makefile.snapshot
new file mode 100644
index 000000000000..223ebd8be225
--- /dev/null
+++ b/devel/llvm-morello/Makefile.snapshot
@@ -0,0 +1,5 @@
+LLVM_MAJOR=	13
+LLVM_RELEASE=	${LLVM_MAJOR}.0.0
+SNAPDATE=	20220422
+
+LLVM_COMMIT=	a854cede3475cd96ea1d20bd844f85f740e02d5f
diff --git a/devel/llvm-morello/distinfo b/devel/llvm-morello/distinfo
index 65d86f4d3e0d..388aa855987a 100644
--- a/devel/llvm-morello/distinfo
+++ b/devel/llvm-morello/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646239986
-SHA256 (morello-llvm-project-0619e74d198706df7361bc5739e7d7db38e3bc4f_GL0.tar.gz) = 94aee7c8c19f0b8ecb9e957282a399fba347b249093f9a1e0d4696aa71266765
-SIZE (morello-llvm-project-0619e74d198706df7361bc5739e7d7db38e3bc4f_GL0.tar.gz) = 141916788
+TIMESTAMP = 1650909050
+SHA256 (morello-llvm-project-a854cede3475cd96ea1d20bd844f85f740e02d5f_GL0.tar.gz) = 0a1abdd85607b5c83478273ea0cb4a6b99776924cbaec3e65b0c85acda1062ef
+SIZE (morello-llvm-project-a854cede3475cd96ea1d20bd844f85f740e02d5f_GL0.tar.gz) = 152769856
diff --git a/devel/llvm-morello/pkg-plist b/devel/llvm-morello/pkg-plist
index 3039cb8ee7ee..ee44584adefd 100644
--- a/devel/llvm-morello/pkg-plist
+++ b/devel/llvm-morello/pkg-plist
@@ -92,6 +92,7 @@ bin/scan-view%%COMMAND_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/lit
 %%LIT%%bin/llvm-lit%%COMMAND_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/llvm-lit
+llvm%%LLVM_SUFFIX%%/bin/analyze-build
 llvm%%LLVM_SUFFIX%%/bin/bugpoint
 llvm%%LLVM_SUFFIX%%/bin/c-index-test
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang
@@ -111,6 +112,7 @@ llvm%%LLVM_SUFFIX%%/bin/diagtool
 llvm%%LLVM_SUFFIX%%/bin/dsymutil
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
 llvm%%LLVM_SUFFIX%%/bin/hmaptool
+llvm%%LLVM_SUFFIX%%/bin/intercept-build
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew
@@ -138,7 +140,6 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-dis
 llvm%%LLVM_SUFFIX%%/bin/llvm-dlltool
 llvm%%LLVM_SUFFIX%%/bin/llvm-dwarfdump
 llvm%%LLVM_SUFFIX%%/bin/llvm-dwp
-llvm%%LLVM_SUFFIX%%/bin/llvm-elfabi
 llvm%%LLVM_SUFFIX%%/bin/llvm-exegesis
 llvm%%LLVM_SUFFIX%%/bin/llvm-extract
 llvm%%LLVM_SUFFIX%%/bin/llvm-gsymutil
@@ -160,6 +161,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-nm
 llvm%%LLVM_SUFFIX%%/bin/llvm-objcopy
 llvm%%LLVM_SUFFIX%%/bin/llvm-objdump
 llvm%%LLVM_SUFFIX%%/bin/llvm-opt-report
+llvm%%LLVM_SUFFIX%%/bin/llvm-otool
 llvm%%LLVM_SUFFIX%%/bin/llvm-pdbutil
 llvm%%LLVM_SUFFIX%%/bin/llvm-profdata
 llvm%%LLVM_SUFFIX%%/bin/llvm-profgen
@@ -169,19 +171,23 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-readelf
 llvm%%LLVM_SUFFIX%%/bin/llvm-readobj
 llvm%%LLVM_SUFFIX%%/bin/llvm-reduce
 llvm%%LLVM_SUFFIX%%/bin/llvm-rtdyld
+llvm%%LLVM_SUFFIX%%/bin/llvm-sim
 llvm%%LLVM_SUFFIX%%/bin/llvm-size
 llvm%%LLVM_SUFFIX%%/bin/llvm-split
 llvm%%LLVM_SUFFIX%%/bin/llvm-stress
 llvm%%LLVM_SUFFIX%%/bin/llvm-strings
 llvm%%LLVM_SUFFIX%%/bin/llvm-strip
 llvm%%LLVM_SUFFIX%%/bin/llvm-symbolizer
+llvm%%LLVM_SUFFIX%%/bin/llvm-tapi-diff
 llvm%%LLVM_SUFFIX%%/bin/llvm-tblgen
 llvm%%LLVM_SUFFIX%%/bin/llvm-undname
+llvm%%LLVM_SUFFIX%%/bin/llvm-windres
 llvm%%LLVM_SUFFIX%%/bin/llvm-xray
 llvm%%LLVM_SUFFIX%%/bin/opt
 llvm%%LLVM_SUFFIX%%/bin/sancov
 llvm%%LLVM_SUFFIX%%/bin/sanstats
 llvm%%LLVM_SUFFIX%%/bin/scan-build
+llvm%%LLVM_SUFFIX%%/bin/scan-build-py
 llvm%%LLVM_SUFFIX%%/bin/scan-view
 llvm%%LLVM_SUFFIX%%/bin/split-file
 llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
@@ -406,7 +412,6 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagon.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagonDep.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagonMapCustomDep.def
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsLe64.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsMips.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNEON.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNVPTX.def
@@ -424,6 +429,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CodeGenOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CommentOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Cuda.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DarwinSDKInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DebugInfoOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Diagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticAST.h
@@ -505,11 +511,13 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Stack.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SyncScope.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetBuiltins.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetCXXABI.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetCXXABI.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetID.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TemplateKinds.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Thunk.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TokenKinds.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TokenKinds.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TypeTraits.h
@@ -550,10 +558,10 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/DirectoryWatcher/DirectoryWatcher.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Action.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Compilation.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/DarwinSDKInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Distro.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Driver.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/DriverDiagnostic.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/InputInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Job.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Multilib.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/OptionUtils.h
@@ -610,6 +618,8 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexingOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/USRGeneration.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/IndexSerialization/SerializablePathCollection.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Interpreter/Interpreter.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Interpreter/PartialTranslationUnit.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/CodeCompletionHandler.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DependencyDirectivesSourceMinimizer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DirectoryLookup.h
@@ -736,7 +746,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicSize.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicExtent.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
@@ -902,6 +912,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/AggressiveInstCombine.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Coroutines.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/IPO.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/InstCombine.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/PassBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/PassManagerBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Scalar.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Utils.h
@@ -956,6 +967,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/PriorityQueue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/PriorityWorklist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/SCCIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/STLExtras.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/STLForwardCompat.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ScopeExit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ScopedHashTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Sequence.h
@@ -1083,6 +1095,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCAnalysisUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCInstKind.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCUtil.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/OptimizationRemarkEmitter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/OverflowInstAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/PHITransAddr.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Passes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/PhiValues.h
@@ -1122,6 +1135,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueLatticeUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueTracking.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/VecFuncs.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/VectorUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/LLLexer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/LLParser.h
+llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/LLToken.h
 llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/Parser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/SlotMapping.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
@@ -1175,7 +1191,16 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitCodes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitstreamReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitstreamWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_128.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_64.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_common.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_macros.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/FuzzedDataProvider.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/elf.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/rts.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/sail.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/sail_failure.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/sail_wrapper.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/test_util.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AccelTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Analysis.h
@@ -1185,7 +1210,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AsmPrinterHandler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AtomicExpandUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicBlockSectionUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicTTIImpl.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BuiltinGCs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CSEConfigBase.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CalcSpillWeights.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CallingConvLower.h
@@ -1202,27 +1226,28 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/DwarfStringPoolEntry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/EdgeBundles.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ExecutionDomainFix.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ExpandReductions.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ExpandVectorPredication.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FastISel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FaultMaps.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FunctionLoweringInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCMetadata.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCMetadataPrinter.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCStrategy.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CSEInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CSEMIRBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CallLowering.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/Combiner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/ConstantFoldingMIRBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelChangeObserver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GenericMachineInstrs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/IRTranslator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InlineAsmLowering.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InstructionSelect.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InstructionSelector.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/Legalizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
@@ -1257,6 +1282,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveVariables.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LoopTraversal.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LowLevelType.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MBFIWrapper.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRFSDiscriminator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRFormatter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIRParser.h
@@ -1283,6 +1309,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineLoopUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineMemOperand.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleInfoImpls.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleSlotTracker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineOperand.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineOptimizationRemarkEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineOutliner.h
@@ -1316,6 +1343,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFGraph.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFLiveness.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFRegisters.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ReachingDefAnalysis.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocCommon.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocPBQP.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocRegistry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Register.h
@@ -1374,6 +1402,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DWARFLinker/DWARFLinker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DWARFLinker/DWARFLinkerCompileUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DWARFLinker/DWARFLinkerDeclContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DWARFLinker/DWARFStreamer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DWP/DWP.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DWP/DWPError.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DWP/DWPStringPool.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/CVRecord.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
@@ -1626,6 +1657,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Interpreter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITEventListener.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/ELF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/ELF_riscv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/JITLink.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/JITLinkDylib.h
@@ -1633,6 +1665,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO_arm64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/riscv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/x86_64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/MCJIT.h
@@ -1643,12 +1676,18 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/CompileUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Core.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/DebugUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/EPCIndirectionUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ExecutorProcessControl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/LLJIT.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/LLVMSPSSerializers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Layer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/LazyReexports.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/MachOPlatform.h
@@ -1656,29 +1695,27 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Mangling.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcABISupport.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRPCExecutorProcessControl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/FDRawByteChannel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/OrcError.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/RPCUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/SpeculateAnalyses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Speculation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TPCDebugObjectRegistrar.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TPCDynamicLibrarySearchGenerator.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TPCEHFrameRegistrar.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TPCIndirectionUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/TargetExecutionUtils.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcessControl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/OrcV1Deprecation.h
@@ -1714,6 +1751,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/Attributes.inc
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Attributes.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/AutoUpgrade.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/BasicBlock.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/BuiltinGCs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/CFG.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/CallingConv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Cheri.h
@@ -1740,6 +1778,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/FPEnv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/FixedMetadataKinds.def
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/FixedPointBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Function.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/GCStrategy.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GVMaterializer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GetElementPtrTypeIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GlobalAlias.h
@@ -1845,8 +1884,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/Verifier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IRReader/IRReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/InitializePasses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/InterfaceStub/ELFObjHandler.h
-llvm%%LLVM_SUFFIX%%/include/llvm/InterfaceStub/ELFStub.h
-llvm%%LLVM_SUFFIX%%/include/llvm/InterfaceStub/TBEHandler.h
+llvm%%LLVM_SUFFIX%%/include/llvm/InterfaceStub/IFSHandler.h
+llvm%%LLVM_SUFFIX%%/include/llvm/InterfaceStub/IFSStub.h
 llvm%%LLVM_SUFFIX%%/include/llvm/LTO/Caching.h
 llvm%%LLVM_SUFFIX%%/include/llvm/LTO/Config.h
 llvm%%LLVM_SUFFIX%%/include/llvm/LTO/LTO.h
@@ -1917,6 +1956,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSchedule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSection.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionELF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionGOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionMachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionWasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionXCOFF.h
@@ -1925,6 +1965,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSubtargetInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolELF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolGOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolMachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolWasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolXCOFF.h
@@ -1945,6 +1986,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/StringTableBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/SubtargetFeature.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/CodeEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Context.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MCA/CustomBehaviour.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HWEventListener.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HardwareUnits/HardwareUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HardwareUnits/LSUnit.h
@@ -2067,7 +2109,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/AllocatorBase.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ArrayRecycler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Atomic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AtomicOrdering.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/AutoConvert.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Automaton.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/BCD.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Base64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryByteStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryItemStream.h
@@ -2105,6 +2149,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/DataExtractor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DataTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Debug.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DebugCounter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/Discriminator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DynamicLibrary.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFAttributeParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFAttributes.h
@@ -2268,16 +2313,16 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetSelectionDAG.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Testing/Support/Annotations.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Testing/Support/Error.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Testing/Support/SupportHelpers.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Architecture.def
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Architecture.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/ArchitectureSet.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/InterfaceFile.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/PackedVersion.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Platform.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Symbol.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Target.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/TextAPIReader.h
-llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/TextAPIWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/Architecture.def
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/Architecture.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/ArchitectureSet.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/InterfaceFile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/PackedVersion.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/Platform.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/Symbol.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/Target.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/TextAPIReader.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/TextAPIWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
@@ -2357,6 +2402,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/ConstantHoisting.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/ConstraintElimination.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/CorrelatedValuePropagation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/DCE.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/DFAJumpThreading.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/DeadStoreElimination.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/DivRemPairs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/EarlyCSE.h
@@ -2372,6 +2418,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/InstSimplifyPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/JumpThreading.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LICM.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopBoundSplit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopDataPrefetch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopDeletion.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopDistribute.h
@@ -2415,7 +2462,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/SeparateConstOffsetFromGEP.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/SimpleLoopUnswitch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/SimplifyCFG.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/Sink.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/SpeculativeExecution.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/StraightLineStrengthReduce.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/StructurizeCFG.h
@@ -2426,7 +2472,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/AMDGPUEmitPrintf.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/AddDiscriminators.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/AssumeBundleBuilder.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/AutoInitRemark.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/BasicBlockUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/BreakCriticalEdges.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/BuildLibCalls.h
@@ -2467,11 +2512,14 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerMemIntrinsics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerSwitch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MatrixUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Mem2Reg.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MemoryOpRemark.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MetaRenamer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ModuleUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/NameAnonGlobals.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/PredicateInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/PromoteMemToReg.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/RelLookupTableConverter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SCCPSolver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SSAUpdater.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SSAUpdaterBulk.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SSAUpdaterImpl.h
@@ -2580,6 +2628,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avxvnniintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/bmi2intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/bmiintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/builtins.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cet.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cetintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cheri.h
@@ -2601,9 +2650,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/gfniintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_circ_brev_intrinsics.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_protos.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_types.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hresetintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hvx_hexagon_protos.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/immintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/intrin.h
@@ -2696,7 +2749,6 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/AddOCaml.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/AddSphinxTarget.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckAtomic.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckCompilerVersion.cmake
-llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckLinkerFlag.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/ChooseMSVCCRT.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CrossCompile.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/DetermineGCCCompatible.cmake
@@ -2713,6 +2765,7 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMStdlib.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleStandaloneBuild.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVM-Build.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVM-Config.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMCheckLinkerFlag.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfig.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfigExtensions.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfigVersion.cmake
@@ -2761,6 +2814,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCoroutines.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCoverage.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDWARFLinker.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMDWP.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoCodeView.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
@@ -2831,7 +2885,7 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%git
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
@@ -2852,6 +2906,7 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleLLVM.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndex.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndexSerialization.a
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangInterpreter.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangLex.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangParse.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewrite.a
@@ -2872,6 +2927,9 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang_cxx.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang_cxx.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang_cxx.so.%%LLVM_MAJOR%%git
+llvm%%LLVM_SUFFIX%%/lib/libear/__init__.py
+llvm%%LLVM_SUFFIX%%/lib/libear/config.h.in
+llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCore.a
@@ -2883,8 +2941,23 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldReaderWriter.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldYAML.a
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/clang.py
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/compilation.py
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/intercept.py
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/report.py
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/scanview.css
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/selectable.js
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/sorttable.js
+llvm%%LLVM_SUFFIX%%/lib/libscanbuild/shell.py
+llvm%%LLVM_SUFFIX%%/libexec/analyze-c++
+llvm%%LLVM_SUFFIX%%/libexec/analyze-cc
 llvm%%LLVM_SUFFIX%%/libexec/c++-analyzer
 llvm%%LLVM_SUFFIX%%/libexec/ccc-analyzer
+llvm%%LLVM_SUFFIX%%/libexec/intercept-c++
+llvm%%LLVM_SUFFIX%%/libexec/intercept-cc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/bash-autocomplete.sh
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format-bbedit.applescript
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format-diff.py