Update to a new shpashot matching our upcoming paper.

Sponsored by:	DARPA, AFRL

5 files changed, 150 insertions, 45 deletions

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 5e9cd4afc0db..076220cb1299 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -53,6 +53,7 @@ CLANG_GH_PROJECT=	clang:clang
 CLANG_GH_SUBDIR=	tools/clang:clang
 CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
 CLANG_PORTDOCS=		clang
+CLANG_USE=		GNOME=libxml2
 DOCS_PORTDOCS=		llvm
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
@@ -90,6 +91,7 @@ COMMANDS=	bugpoint \
 		llvm-config \
 		llvm-cov \
 		llvm-cvtres \
+		llvm-cxxmap \
 		llvm-cxxdump \
 		llvm-cxx-filt \
 		llvm-diff \
@@ -124,6 +126,7 @@ COMMANDS=	bugpoint \
 		llvm-strings \
 		llvm-symbolizer \
 		llvm-tblgen \
+		llvm-undname \
 		llvm-xray \
 		opt \
 		sancov \
@@ -184,9 +187,11 @@ USES+=		${_USES_PYTHON}
 
 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-cxxmap.1 \
 		llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \
 		llvm-exegesis.1 \
 		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-mca.1 llvm-nm.1 \
+		llvm-objdump.1 \
 		llvm-pdbutil.1 \
 		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
 		opt.1 tblgen.1
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index a864f525057e..a996f4ced318 100644
--- a/devel/llvm-cheri/Makefile.snapshot
+++ b/devel/llvm-cheri/Makefile.snapshot
@@ -4,11 +4,11 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	7
+LLVM_MAJOR=	8
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20180806
+SNAPDATE=	20190119
 
-LLVM_COMMIT=		7792aae9e8b96591ac265f3a1abcc917382802e3
-CLANG_COMMIT=		f6d42b1c799855ce4c5bb0d2354f2cb9a383c409
-LLD_COMMIT=		70e4ea6fd0f2c7e2ddd12020ed410c4ff94401f2
+LLVM_COMMIT=		523465cbe5e68dfcf83975ecc4c67af1a3f033b0
+CLANG_COMMIT=		9958ffcb30eb715acdaa8fca2d0cac8f6b5ef11d
+LLD_COMMIT=		ad5ebb326481432166f61805768bb9fc3042b771
 LLDB_COMMIT=		7ee5905d0109a13d543a127a9cda7c280c8103c8
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index f78a06f359b8..54e0d507a580 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1534433660
-SHA256 (CTSRD-CHERI-llvm-7.0.d20180806-7792aae9e8b96591ac265f3a1abcc917382802e3_GH0.tar.gz) = 5c0e318d811a2a05c0bb991abf39c53e30f5d59e98cfe8f2c6f1db5fa5268c5b
-SIZE (CTSRD-CHERI-llvm-7.0.d20180806-7792aae9e8b96591ac265f3a1abcc917382802e3_GH0.tar.gz) = 41846708
-SHA256 (CTSRD-CHERI-clang-f6d42b1c799855ce4c5bb0d2354f2cb9a383c409_GH0.tar.gz) = 504834561454bd9d9f16f55a3efc716ef50b74e4cb669a0ca754a8b397cf68c5
-SIZE (CTSRD-CHERI-clang-f6d42b1c799855ce4c5bb0d2354f2cb9a383c409_GH0.tar.gz) = 17616823
-SHA256 (CTSRD-CHERI-lld-70e4ea6fd0f2c7e2ddd12020ed410c4ff94401f2_GH0.tar.gz) = 8d9e8aabab182848c341763f172d7210c9de69fd6de0341997a6d9ce62b3bdd8
-SIZE (CTSRD-CHERI-lld-70e4ea6fd0f2c7e2ddd12020ed410c4ff94401f2_GH0.tar.gz) = 4152405
+TIMESTAMP = 1548708535
+SHA256 (CTSRD-CHERI-llvm-8.0.d20190119-523465cbe5e68dfcf83975ecc4c67af1a3f033b0_GH0.tar.gz) = f59e36f8a3b81a435cf02df63a7b0d83b2896a8e73520e6cdb2b5ff13408ac25
+SIZE (CTSRD-CHERI-llvm-8.0.d20190119-523465cbe5e68dfcf83975ecc4c67af1a3f033b0_GH0.tar.gz) = 44961025
+SHA256 (CTSRD-CHERI-clang-9958ffcb30eb715acdaa8fca2d0cac8f6b5ef11d_GH0.tar.gz) = 53069168deec1be030d0db8afc1544b253843606d5071bf8b6fdb0c9a8ef1695
+SIZE (CTSRD-CHERI-clang-9958ffcb30eb715acdaa8fca2d0cac8f6b5ef11d_GH0.tar.gz) = 18094003
+SHA256 (CTSRD-CHERI-lld-ad5ebb326481432166f61805768bb9fc3042b771_GH0.tar.gz) = 9fdfa76855dbd990594c3c90e7969974b16f566f9cae1c0afc86576c831fa8ef
+SIZE (CTSRD-CHERI-lld-ad5ebb326481432166f61805768bb9fc3042b771_GH0.tar.gz) = 4303033
diff --git a/devel/llvm-cheri/files/gen-Makefile.snapshot.sh b/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
index 3afd69148005..7bcd71c49176 100644
--- a/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
+++ b/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
@@ -44,7 +44,7 @@ cat <<EOF > Makefile.snapshot
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	7
+LLVM_MAJOR=	8
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	${MAX_DATE}
 
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index b83873719f7e..e3f4a0fbc39e 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -12,6 +12,7 @@ bin/llvm-cfi-verify%%COMMAND_SUFFIX%%
 bin/llvm-config%%COMMAND_SUFFIX%%
 bin/llvm-cov%%COMMAND_SUFFIX%%
 bin/llvm-cvtres%%COMMAND_SUFFIX%%
+bin/llvm-cxxmap%%COMMAND_SUFFIX%%
 bin/llvm-cxxdump%%COMMAND_SUFFIX%%
 bin/llvm-cxx-filt%%COMMAND_SUFFIX%%
 bin/llvm-diff%%COMMAND_SUFFIX%%
@@ -46,6 +47,7 @@ bin/llvm-stress%%COMMAND_SUFFIX%%
 bin/llvm-strings%%COMMAND_SUFFIX%%
 bin/llvm-symbolizer%%COMMAND_SUFFIX%%
 bin/llvm-tblgen%%COMMAND_SUFFIX%%
+bin/llvm-undname%%COMMAND_SUFFIX%%
 bin/llvm-xray%%COMMAND_SUFFIX%%
 bin/opt%%COMMAND_SUFFIX%%
 bin/sancov%%COMMAND_SUFFIX%%
@@ -108,6 +110,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-cov
 llvm%%LLVM_SUFFIX%%/bin/llvm-cvtres
 llvm%%LLVM_SUFFIX%%/bin/llvm-cxxdump
 llvm%%LLVM_SUFFIX%%/bin/llvm-cxxfilt
+llvm%%LLVM_SUFFIX%%/bin/llvm-cxxmap
 llvm%%LLVM_SUFFIX%%/bin/llvm-diff
 llvm%%LLVM_SUFFIX%%/bin/llvm-dis
 llvm%%LLVM_SUFFIX%%/bin/llvm-dlltool
@@ -141,6 +144,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-strings
 llvm%%LLVM_SUFFIX%%/bin/llvm-strip
 llvm%%LLVM_SUFFIX%%/bin/llvm-symbolizer
 llvm%%LLVM_SUFFIX%%/bin/llvm-tblgen
+llvm%%LLVM_SUFFIX%%/bin/llvm-undname
 llvm%%LLVM_SUFFIX%%/bin/llvm-xray
 llvm%%LLVM_SUFFIX%%/bin/obj2yaml
 llvm%%LLVM_SUFFIX%%/bin/opt
@@ -224,6 +228,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExprOpenMP.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExternalASTMerger.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExternalASTSource.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/FormatString.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/GlobalDecl.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LambdaCapture.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
@@ -234,6 +239,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/NestedNameSpecifier.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/NonTrivialTypeVisitor.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ODRHash.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OSLog.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OpenMPClause.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OperationKinds.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OperationKinds.h
@@ -278,11 +284,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/Consumed.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/Dominators.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/FormatString.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/ExprMutationAnalyzer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/LiveVariables.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/OSLog.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/PostOrderCFGView.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/ReachableCode.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/ThreadSafety.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
@@ -305,6 +309,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowValues.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/ProgramPoint.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/SelectorExtras.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Support/BumpVector.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ABI.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AddressSpaces.h
@@ -316,6 +321,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AttrSubMatchRulesList.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AttrSubjectMatchRules.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Attributes.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BitmaskEnum.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Builtins.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Builtins.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsAArch64.def
@@ -330,8 +336,8 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsPPC.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsSystemZ.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsWebAssembly.def
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsX86.def
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsX86_64.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsX%%LLVM_MAJOR%%6.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsX%%LLVM_MAJOR%%6_64.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsXCore.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CapturedStmt.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CharInfo.h
@@ -364,6 +370,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileSystemOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileSystemStatCache.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FixedPoint.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/IdentifierTable.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LLVM.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Lambda.h
@@ -374,6 +381,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/MemoryBufferCache.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Module.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ObjCRuntime.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OpenCLExtensionTypes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OpenCLExtensions.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OpenCLImageTypes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OpenCLOptions.h
@@ -394,6 +402,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceManagerInternals.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Specifiers.h
+%%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.h
@@ -405,9 +414,8 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TypeTraits.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Version.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Version.inc
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/VirtualFileSystem.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Visibility.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/X86Target.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/X%%LLVM_MAJOR%%6Target.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/XRayInstr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/XRayLists.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_fp16.inc
@@ -537,7 +545,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/AttrParsedAttrList.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/AttrSpellingListIndex.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/AttrTemplateInstantiate.inc
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/AttributeList.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/CXXFieldCollector.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/CleanupInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/CodeCompleteConsumer.h
@@ -554,6 +561,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ObjCMethodList.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Overload.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Ownership.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ParsedAttr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ParsedTemplate.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Scope.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ScopeInfo.h
@@ -584,9 +592,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/SValExplainer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/Analyses.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/AnalyzerOptions.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
@@ -595,7 +603,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/Checker.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/CheckerManager.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/CheckerRegistry.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/IssueHash.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
@@ -623,6 +630,10 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/RangedConstraintManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/Regions.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConstraintManager.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTExpr.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTSolver.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTSort.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SValVisitor.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.def
@@ -638,6 +649,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
@@ -728,6 +740,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/DataTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/DebugInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Disassembler.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/DisassemblerTypes.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/Error.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/ErrorHandling.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/ExecutionEngine.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/IRReader.h
@@ -735,10 +748,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/Initialization.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/LinkTimeOptimizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Linker.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Object.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/OptRemarks.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/OrcBindings.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Support.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Target.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/TargetMachine.h
+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/PassManagerBuilder.h
@@ -751,6 +767,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/APFloat.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/APInt.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/APSInt.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/AllocatorList.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Any.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ArrayRef.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/BitVector.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/BitmaskEnum.h
@@ -765,6 +782,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DepthFirstIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EpochTracker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EquivalenceClasses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FoldingSet.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FunctionExtras.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/GraphTraits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Hashing.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ImmutableList.h
@@ -811,6 +829,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Triple.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Twine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/UniqueVector.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/VariadicFunction.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/bit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/edit_distance.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ilist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ilist_base.h
@@ -851,10 +870,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DominanceFrontier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DominanceFrontierImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/EHPersonalities.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/GlobalsModRef.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/GuardUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IVDescriptors.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IVUsers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IndirectCallPromotionAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IndirectCallSiteVisitor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineCost.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InstructionPrecedenceTracking.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InstructionSimplify.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Interval.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IntervalIterator.h
@@ -864,6 +886,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LazyBlockFrequencyInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LazyBranchProbabilityInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LazyCallGraph.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LazyValueInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LegacyDivergenceAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Lint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Loads.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopAccessAnalysis.h
@@ -885,8 +908,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCAnalysisUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCInstKind.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/OptimizationRemarkEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/OrderedBasicBlock.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/OrderedInstructions.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
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/PostDominators.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ProfileSummaryInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/PtrUseVisitor.h
@@ -902,6 +927,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionExpressions.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionNormalization.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScopedNoAliasAA.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/SparsePropagation.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/SyncDependenceAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/SyntheticCountsUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TargetFolder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TargetLibraryInfo.def
@@ -931,18 +957,23 @@ llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/AVR.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/BPF.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/Hexagon.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/Lanai.def
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/MSP430.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/Mips.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/PowerPC.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/PowerPC64.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/RISCV.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/Sparc.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/SystemZ.def
-llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/WebAssembly.def
-llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/i386.def
-llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/x86_64.def
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/i3%%LLVM_MAJOR%%6.def
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/x%%LLVM_MAJOR%%6_64.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MachO.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Magic.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPack.def
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPack.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackReader.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackTypes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Wasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/WasmRelocs.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitCodes.h
@@ -957,6 +988,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Analysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AsmPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AtomicExpandUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicTTIImpl.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BuiltinGCs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CalcSpillWeights.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CallingConvLower.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CommandFlags.inc
@@ -975,7 +1007,6 @@ 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/GCs.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
@@ -1068,7 +1099,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterPressure.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterScavenging.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterUsageInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ResourcePriorityQueue.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RuntimeLibcalls.def
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RuntimeLibcalls.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/SDNodeProperties.td
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ScheduleDAG.h
@@ -1161,6 +1191,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeHashing.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeIndex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeIndexDiscovery.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeRecord.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeRecordHelpers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeRecordMapping.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeStreamMerger.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/TypeSymbolEmitter.h
@@ -1176,6 +1207,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugAddr.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h
@@ -1190,6 +1222,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDie.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFExpression.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFListTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFObject.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFSection.h
@@ -1205,6 +1238,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/MSF/MappedBlockStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIADataStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumFrameData.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumInjectedSources.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumLineNumbers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumSectionContribs.h
@@ -1212,6 +1246,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumSymbols.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAEnumTables.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAError.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAFrameData.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAInjectedSource.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIALineNumber.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIARawSymbol.h
@@ -1224,6 +1259,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/DIA/DIAUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/GenericError.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/IPDBDataStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/IPDBEnumChildren.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/IPDBFrameData.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/IPDBInjectedSource.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/IPDBLineNumber.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/IPDBRawSymbol.h
@@ -1247,14 +1283,22 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InfoStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
-llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumGlobals.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumModules.h
-llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeRawSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeSession.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypeArray.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypeEnum.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypePointer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypeUDT.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeTypeVTShape.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/PDBFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
@@ -1263,6 +1307,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/PublicsStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/RawConstants.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/RawError.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/RawTypes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/SymbolCache.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/SymbolStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/TpiHashing.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/TpiStream.h
@@ -1308,7 +1353,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/UDTLayout.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/DIPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/Symbolize.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/Compiler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/Demangle.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/ItaniumDemangle.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/MicrosoftDemangle.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/MicrosoftDemangleNodes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/StringView.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/Utility.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/ExecutionEngine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/GenericValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Interpreter.h
@@ -1325,9 +1376,12 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.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/LambdaResolver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Layer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/LazyReexports.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Legacy.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/NullResolver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h
@@ -1342,6 +1396,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RawByteChannel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyld.h
@@ -1361,6 +1416,7 @@ 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/CFG.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/CFGDiff.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/CallSite.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/CallingConv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Cheri.h
@@ -1380,6 +1436,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/DerivedUser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticHandler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticPrinter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/DomTreeUpdater.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Dominators.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Function.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GVMaterializer.h
@@ -1413,9 +1470,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsHexagon.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsMips.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsNVVM.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsPowerPC.td
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsRISCV.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsSystemZ.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsWebAssembly.td
-llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsX86.td
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsX%%LLVM_MAJOR%%6.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsXCore.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/LLVMContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/LegacyPassManager.h
@@ -1433,11 +1491,14 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/NoFolder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/OperandTraits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Operator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/OptBisect.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/PassInstrumentation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PassManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PassManagerInternal.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/PassTimingInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PatternMatch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PredIteratorCache.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ProfileSummary.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/RuntimeLibcalls.def
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/SafepointIRVerifier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Statepoint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/SymbolTableListTraits.h
@@ -1595,6 +1656,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/PassRegistry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/PassSupport.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Passes/PassBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Passes/PassPlugin.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Passes/StandardInstrumentations.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/Coverage/CoverageMapping.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
@@ -1630,12 +1692,15 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryStreamRef.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryStreamWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BlockFrequency.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BranchProbability.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/BuryPointer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CBindingWrapping.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/CFGUpdate.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/COM.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CachePruning.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Capacity.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Casting.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CheckedArithmetic.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/CheriSetBounds.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Chrono.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CodeGen.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CodeGenCoverage.h
@@ -1658,6 +1723,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Errno.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Error.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ErrorHandling.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ErrorOr.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileCheck.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileOutputBuffer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileSystem.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileUtilities.h
@@ -1674,15 +1740,18 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/GlobPattern.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GraphWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Host.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/InitLLVM.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ItaniumManglingCanonicalizer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/JSON.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/JamCRC.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/KnownBits.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/LEB128.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/LEB12%%LLVM_MAJOR%%.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LICENSE.TXT
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LineIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Locale.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LockFileManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LowLevelTypeImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/MD5.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/MSVCErrorWorkarounds.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/MachineValueType.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ManagedStatic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/MathExtras.h
@@ -1723,6 +1792,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/SpecialCaseList.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/StringPool.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/StringSaver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SwapByteOrder.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/SymbolRemappingReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SystemUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TarWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TargetOpcodes.def
@@ -1744,12 +1814,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/UniqueLock.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/VCSRevision.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Valgrind.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/VersionTuple.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/VirtualFileSystem.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Watchdog.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Win64EH.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/WindowsError.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/WithColor.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/X86DisassemblerDecoderCommon.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/X86TargetParser.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/X%%LLVM_MAJOR%%6DisassemblerDecoderCommon.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/X%%LLVM_MAJOR%%6TargetParser.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/YAMLParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/YAMLTraits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/circular_raw_ostream.h
@@ -1780,6 +1851,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetItinerary.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetLoweringObjectFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetMachine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetOptions.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetPfmCounters.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetSchedule.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetSelectionDAG.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Testing/Support/Error.h
@@ -1803,6 +1875,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/FunctionImport.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/GlobalDCE.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/GlobalOpt.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/GlobalSplit.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/HotColdSplitting.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/InferFunctionAttrs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/Inliner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/Internalize.h
@@ -1819,6 +1892,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/InstCombine/InstCombine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/InstCombine/InstCombineWorklist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/BoundsChecking.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/CGProfile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/ControlHeightReduction.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/InstrProfiling.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
@@ -1841,6 +1916,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/GuardWidening.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/IVUsersPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/IndVarSimplify.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/InductiveRangeCheckElimination.h
+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
@@ -1856,6 +1932,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopRotation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopSimplifyCFG.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopSink.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopStrengthReduce.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopUnrollAndJamPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopUnrollPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerAtomic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
@@ -1883,6 +1960,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/BreakCriticalEdges.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/BuildLibCalls.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/BypassSlowDivision.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CallPromotionUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CheriSetBounds.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Cloning.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CodeExtractor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CtorUtils.h
@@ -1892,6 +1970,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Evaluator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/FunctionComparator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/FunctionImportUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/GlobalStatus.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/GuardUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/IntegerDivision.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LCSSA.h
@@ -1906,7 +1985,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerMemIntrinsics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Mem2Reg.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/OrderedInstructions.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/SSAUpdater.h
@@ -1914,7 +1992,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SSAUpdaterBulk.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SSAUpdaterImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SanitizerStats.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SimplifyIndVar.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SimplifyInstructions.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SimplifyLibCalls.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SplitModule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SymbolRewriter.h
@@ -1930,8 +2007,20 @@ llvm%%LLVM_SUFFIX%%/include/llvm/WindowsManifest/WindowsManifestMerger.h
 llvm%%LLVM_SUFFIX%%/include/llvm/WindowsResource/ResourceProcessor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/WindowsResource/ResourceScriptToken.h
 llvm%%LLVM_SUFFIX%%/include/llvm/WindowsResource/ResourceScriptTokenList.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/BlockIndexer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/BlockPrinter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/BlockVerifier.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/FDRLogBuilder.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/FDRRecordConsumer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/FDRRecordProducer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/FDRRecords.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/FDRTraceExpander.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/FDRTraceWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/FileHeaderReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Graph.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/InstrumentationMap.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Profile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/XRay/RecordPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Trace.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/XRayRecord.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
@@ -2052,7 +2141,7 @@ llvm%%LLVM_SUFFIX%%/lib/TestPlugin.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/waitpkgintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/wbnoinvdintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/x%%LLVM_MAJOR%%6intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h
@@ -2165,9 +2254,11 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMMCDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430AsmParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430AsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430CodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Desc.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Disassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Info.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsAsmParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsAsmPrinter.a
@@ -2182,6 +2273,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMOptRemarks.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a
@@ -2213,14 +2305,20 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyAsmParser.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyAsmPrinter.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyCodeGen.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyDesc.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyDisassembler.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmPrinter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Utils.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMX%%LLVM_MAJOR%%6AsmParser.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMX%%LLVM_MAJOR%%6AsmPrinter.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMX%%LLVM_MAJOR%%6CodeGen.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMX%%LLVM_MAJOR%%6Desc.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMX%%LLVM_MAJOR%%6Disassembler.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMX%%LLVM_MAJOR%%6Info.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMX%%LLVM_MAJOR%%6Utils.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreDesc.a
@@ -2229,10 +2327,12 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
-llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%svn
+llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so
+llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
 %%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%%svn
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a