git: 3c1b4ff32113 - main - devel/llvm-{cheri,morello}: Update to new snapshots

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Tue, 03 Jan 2023 22:20:43 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c1b4ff32113cbaccf1d351b1b507297c5eaa991

commit 3c1b4ff32113cbaccf1d351b1b507297c5eaa991
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-01-03 22:20:37 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-01-03 22:20:37 +0000

    devel/llvm-{cheri,morello}: Update to new snapshots
    
    llvm-cheri:
     - This updates from an LLVM 13 base to an LLVM 14 base.
     - Save a little compile time by dropping MIPS support.  The CHERI
       MIPS target still exists, but CheriBSD no longer supports it and the
       places that use it (e.g., https://cheri-compiler-explorer.cl.cam.ac.uk)
       use a Linux build.
    
    llvm-morello:
     - Minor optimization improvements
---
 devel/llvm-cheri/Makefile                       |  12 +-
 devel/llvm-cheri/Makefile.COMMANDS              |   7 +-
 devel/llvm-cheri/Makefile.MAN1SRCS              |   1 +
 devel/llvm-cheri/Makefile.snapshot              |   6 +-
 devel/llvm-cheri/distinfo                       |   6 +-
 devel/llvm-cheri/files/gen-Makefile.snapshot.sh |   2 +-
 devel/llvm-cheri/pkg-plist                      | 145 ++++++++++++++++++------
 devel/llvm-morello/Makefile.COMMANDS            |   5 +
 devel/llvm-morello/Makefile.MAN1SRCS            |   3 +
 devel/llvm-morello/Makefile.snapshot            |   4 +-
 devel/llvm-morello/distinfo                     |   6 +-
 devel/llvm-morello/pkg-plist                    |   4 +-
 12 files changed, 146 insertions(+), 55 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 8fa3fd7671e9..191739defc9c 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -92,7 +92,7 @@ LLD_PORTDOCS=		lld
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 
-LLVM_TARGETS?=		AArch64;ARM;Mips;PowerPC;RISCV;X86
+LLVM_TARGETS?=		AArch64;ARM;PowerPC;RISCV;X86
 
 PLIST_SUB+=	COMMAND_SUFFIX=${COMMAND_SUFFIX} \
 		LLVM_MAJOR=${LLVM_MAJOR} \
@@ -173,7 +173,15 @@ post-install:
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github
 
 post-install-DOCS-on:
+.if ${LLVM_MAJOR} == 13
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
+.else
+	${RM} -r ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/LLVM/* ${STAGEDIR}${DOCSDIR}
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc/LLVM
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
+.endif
 .for _man in ${MAN1SRCS}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
diff --git a/devel/llvm-cheri/Makefile.COMMANDS b/devel/llvm-cheri/Makefile.COMMANDS
index 66fcfa163fed..f830fe15344a 100644
--- a/devel/llvm-cheri/Makefile.COMMANDS
+++ b/devel/llvm-cheri/Makefile.COMMANDS
@@ -14,6 +14,7 @@ LLVM_COMMANDS=	\
 		llvm-cov \
 		llvm-cvtres \
 		llvm-cxxmap \
+		llvm-debuginfod-find \
 		llvm-diff \
 		llvm-dis \
 		llvm-dlltool \
@@ -56,6 +57,7 @@ LLVM_COMMANDS=	\
 		llvm-symbolizer \
 		llvm-tapi-diff \
 		llvm-tblgen \
+		llvm-tli-checker \
 		llvm-undname \
 		llvm-windres \
 		llvm-xray \
@@ -72,9 +74,12 @@ CLANG_COMMANDS=	\
 		clang-cpp \
 		clang-extdef-mapping \
 		clang-format \
+		clang-linker-wrapper \
+		clang-nvlink-wrapper \
 		clang-offload-bundler \
 		clang-offload-wrapper \
 		clang-rename \
+		clang-repl \
 		clang-scan-deps \
 		diagtool \
 		hmaptool \
@@ -91,8 +96,6 @@ LIT_COMMANDS=	\
 LLD_COMMANDS=	\
 		ld.lld \
 		ld64.lld \
-		ld64.lld.darwinnew \
-		ld64.lld.darwinold \
 		lld \
 		lld-link \
 		wasm-ld
diff --git a/devel/llvm-cheri/Makefile.MAN1SRCS b/devel/llvm-cheri/Makefile.MAN1SRCS
index fdc806f62eb1..6af3ad45a17c 100644
--- a/devel/llvm-cheri/Makefile.MAN1SRCS
+++ b/devel/llvm-cheri/Makefile.MAN1SRCS
@@ -39,6 +39,7 @@ LLVM_MAN1SRCS= \
 	llvm-strip.1 \
 	llvm-symbolizer.1 \
 	llvm-tblgen.1 \
+	llvm-tli-checker.1 \
 	opt.1 \
 	tblgen.1
 
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index 4289f1ac8289..7521c3de49e1 100644
--- a/devel/llvm-cheri/Makefile.snapshot
+++ b/devel/llvm-cheri/Makefile.snapshot
@@ -2,8 +2,8 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	13
+LLVM_MAJOR=	14
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20221114
+SNAPDATE=	20221208
 
-LLVM_COMMIT=		19d402e23fcaa197e1d40547da403dc17e13c7ae
+LLVM_COMMIT=		ff66b683475fc44355b2010dbcbe1202d785e6f8
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index ed8fb58d9afd..6aff59de7da8 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669939197
-SHA256 (CTSRD-CHERI-llvm-project-13.0.d20221114-19d402e23fcaa197e1d40547da403dc17e13c7ae_GH0.tar.gz) = 442f8ac8aa73d5f72ee7e70bf522bef669603880daca888eddc81e78660fc1f9
-SIZE (CTSRD-CHERI-llvm-project-13.0.d20221114-19d402e23fcaa197e1d40547da403dc17e13c7ae_GH0.tar.gz) = 152244630
+TIMESTAMP = 1672770396
+SHA256 (CTSRD-CHERI-llvm-project-14.0.d20221208-ff66b683475fc44355b2010dbcbe1202d785e6f8_GH0.tar.gz) = b499846fc34d19a09888a424a66a6e41bf5727251f930b5513b7e851e939fa08
+SIZE (CTSRD-CHERI-llvm-project-14.0.d20221208-ff66b683475fc44355b2010dbcbe1202d785e6f8_GH0.tar.gz) = 163039114
diff --git a/devel/llvm-cheri/files/gen-Makefile.snapshot.sh b/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
index 4e09a454f2fa..9da4f19e27e2 100644
--- a/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
+++ b/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
@@ -36,7 +36,7 @@ cat <<EOF > Makefile.snapshot
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	13
+LLVM_MAJOR=	14
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	${MAX_DATE}
 
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index 903e043d093c..5f5eff6a9890 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -13,6 +13,7 @@ bin/llvm-config%%COMMAND_SUFFIX%%
 bin/llvm-cov%%COMMAND_SUFFIX%%
 bin/llvm-cvtres%%COMMAND_SUFFIX%%
 bin/llvm-cxxmap%%COMMAND_SUFFIX%%
+bin/llvm-debuginfod-find%%COMMAND_SUFFIX%%
 bin/llvm-diff%%COMMAND_SUFFIX%%
 bin/llvm-dis%%COMMAND_SUFFIX%%
 bin/llvm-dlltool%%COMMAND_SUFFIX%%
@@ -55,6 +56,7 @@ bin/llvm-strip%%COMMAND_SUFFIX%%
 bin/llvm-symbolizer%%COMMAND_SUFFIX%%
 bin/llvm-tapi-diff%%COMMAND_SUFFIX%%
 bin/llvm-tblgen%%COMMAND_SUFFIX%%
+bin/llvm-tli-checker%%COMMAND_SUFFIX%%
 bin/llvm-undname%%COMMAND_SUFFIX%%
 bin/llvm-windres%%COMMAND_SUFFIX%%
 bin/llvm-xray%%COMMAND_SUFFIX%%
@@ -69,9 +71,12 @@ bin/c-index-test%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-cpp%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-extdef-mapping%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-format%%COMMAND_SUFFIX%%
+%%CLANG%%bin/clang-linker-wrapper%%COMMAND_SUFFIX%%
+%%CLANG%%bin/clang-nvlink-wrapper%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-offload-bundler%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-offload-wrapper%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-rename%%COMMAND_SUFFIX%%
+%%CLANG%%bin/clang-repl%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-scan-deps%%COMMAND_SUFFIX%%
 bin/diagtool%%COMMAND_SUFFIX%%
 bin/hmaptool%%COMMAND_SUFFIX%%
@@ -81,8 +86,6 @@ bin/scan-build-py%%COMMAND_SUFFIX%%
 bin/scan-view%%COMMAND_SUFFIX%%
 %%LLD%%bin/ld.lld%%COMMAND_SUFFIX%%
 %%LLD%%bin/ld64.lld%%COMMAND_SUFFIX%%
-%%LLD%%bin/ld64.lld.darwinnew%%COMMAND_SUFFIX%%
-%%LLD%%bin/ld64.lld.darwinold%%COMMAND_SUFFIX%%
 %%LLD%%bin/lld%%COMMAND_SUFFIX%%
 %%LLD%%bin/lld-link%%COMMAND_SUFFIX%%
 %%LLD%%bin/wasm-ld%%COMMAND_SUFFIX%%
@@ -103,10 +106,13 @@ llvm%%LLVM_SUFFIX%%/bin/c-index-test
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-cpp
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-extdef-mapping
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-format
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-linker-wrapper
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-nvlink-wrapper
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-bundler
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-wrapper
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-refactor
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-rename
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-repl
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-scan-deps
 llvm%%LLVM_SUFFIX%%/bin/diagtool
 llvm%%LLVM_SUFFIX%%/bin/dsymutil
@@ -116,8 +122,6 @@ llvm%%LLVM_SUFFIX%%/bin/intercept-build
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
-%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew
-%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinold
 llvm%%LLVM_SUFFIX%%/bin/llc
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/lld-link
@@ -136,6 +140,7 @@ 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-debuginfod-find
 llvm%%LLVM_SUFFIX%%/bin/llvm-diff
 llvm%%LLVM_SUFFIX%%/bin/llvm-dis
 llvm%%LLVM_SUFFIX%%/bin/llvm-dlltool
@@ -181,6 +186,7 @@ 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-tli-checker
 llvm%%LLVM_SUFFIX%%/bin/llvm-undname
 llvm%%LLVM_SUFFIX%%/bin/llvm-windres
 llvm%%LLVM_SUFFIX%%/bin/llvm-xray
@@ -382,8 +388,18 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/ConstructionContext.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/CocoaConventions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/ControlFlowContext.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowAnalysisContext.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowLattice.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowValues.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowWorklist.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/MapLattice.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/StorageLocation.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/Transfer.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/Value.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/IssueHash.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/MacroExpansionContext.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/PathDiagnostic.h
@@ -407,6 +423,8 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsAArch64NeonSVEBridge.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsAArch64NeonSVEBridge_cg.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsAMDGPU.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsARM.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsBPF.def
@@ -418,12 +436,14 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNVPTX.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsPPC.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsRISCV.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsRISCVVector.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsSVE.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/BuiltinsXCore.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CLWarnings.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CapturedStmt.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CharInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CodeGenOptions.def
@@ -525,7 +545,6 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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/Visibility.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/X86Target.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_cde_builtin_aliases.inc
@@ -741,6 +760,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CallDescription.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
@@ -852,6 +872,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Transformer.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Args.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Arrays.h
+%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/CommonLinkerContext.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/DWARF.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Driver.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/ErrorHandler.h
@@ -883,8 +904,6 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/SymbolTable.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/UndefinedAtom.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Writer.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/ReaderWriter/MachOLinkingContext.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/ReaderWriter/YamlContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Analysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/BitReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/BitWriter.h
@@ -892,6 +911,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/Comdat.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Core.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/DataTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/DebugInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/Deprecated.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
@@ -933,6 +953,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/BitmaskEnum.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/BreadthFirstIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/CachedHashString.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/CoalescingBitVector.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/CombinationGenerator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DAGDeltaAlgorithm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DeltaAlgorithm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DenseMap.h
@@ -946,6 +967,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EquivalenceClasses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FloatingPointMode.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FoldingSet.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FunctionExtras.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/GenericCycleImpl.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/GenericCycleInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/GenericSSAContext.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
@@ -967,8 +991,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/PostOrderIterator.h
 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/STLArrayExtras.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/STLExtras.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/STLForwardCompat.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/STLFunctionalExtras.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
@@ -994,10 +1020,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Triple.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Twine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/TypeSwitch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/UniqueVector.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Waymarking.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/bit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/edit_distance.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/fallible_iterator.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/identity.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ilist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ilist_base.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ilist_iterator.h
@@ -1031,6 +1057,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CmpInstAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CodeMetrics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ConstantFolding.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ConstraintSystem.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CostModel.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CycleAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DDG.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DDGPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DOTGraphTraitsPass.h
@@ -1056,8 +1084,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IndirectCallVisitor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineAdvisor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineCost.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineModelFeatureMaps.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineOrder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineSizeEstimatorAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InstCount.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InstSimplifyFolder.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
@@ -1088,9 +1118,11 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MemoryDependenceAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MemoryLocation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MemorySSA.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MemorySSAUpdater.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ModelUnderTrainingRunner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ModuleDebugInfoPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ModuleSummaryAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MustExecute.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/NoInferenceModelRunner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCAliasAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCAnalysisUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCInstKind.h
@@ -1108,6 +1140,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/RegionInfoImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/RegionIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/RegionPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/RegionPrinter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ReleaseModeModelRunner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ReplayInlineAdvisor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolution.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h
@@ -1177,6 +1210,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPack.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackDocument.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Swift.def
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Swift.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Wasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/WasmRelocs.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/WasmTraits.h
@@ -1214,6 +1249,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicTTIImpl.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
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CodeGenCommonISel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CodeGenPassBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CommandFlags.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CostTable.h
@@ -1253,6 +1289,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/Legalizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LoadStoreOpt.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/Localizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
@@ -1288,6 +1325,7 @@ 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
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRPrinter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRSampleProfile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRYamlMapping.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachORelocation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineBasicBlock.h
@@ -1295,6 +1333,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineBlockFrequencyInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineCombinerPattern.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineConstantPool.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineCycleAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineDominanceFrontier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineDominators.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineFrameInfo.h
@@ -1321,6 +1360,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachinePipeliner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachinePostDominators.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineRegionInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineRegisterInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSSAContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSSAUpdater.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineScheduler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSizeOpts.h
@@ -1388,6 +1428,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/TargetSchedule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/TargetSubtargetInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/TileShapeInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/UnreachableBlockElim.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/VLIWMachineScheduler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ValueTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ValueTypes.td
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/VirtRegMap.h
@@ -1396,6 +1437,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/WinEHFuncInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/AsmParsers.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/AsmPrinters.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/Disassemblers.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Config/TargetMCAs.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/Targets.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/abi-breaking.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/llvm-config.h
@@ -1645,6 +1687,8 @@ 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/Debuginfod/Debuginfod.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Debuginfod/HTTPClient.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/Demangle.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/DemangleConfig.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/ItaniumDemangle.h
@@ -1658,6 +1702,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_aarch64.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
@@ -1666,6 +1711,9 @@ 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/MemoryFlags.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/TableManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/aarch64.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
@@ -1677,9 +1725,15 @@ 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/DebuggerSupportPlugin.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ELFNixPlatform.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/EPCGenericDylibManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/EPCGenericMemoryAccess.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.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
@@ -1688,38 +1742,37 @@ 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/LookupAndRecordAddrs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/MachOPlatform.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Mangling.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ObjectFileInterface.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/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/AllocationActions.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/OrcRTBridge.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.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/SimpleRemoteEPC.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/TargetProcess/ExecutorBootstrapService.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/SimpleExecutorDylibManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorMemoryManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/TargetExecutionUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TaskDispatch.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
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyld.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyldChecker.h
@@ -1732,6 +1785,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenACC/ACC.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMP.h.inc
 llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMP.inc
 llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMP.td
+llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMPAssume.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMPConstants.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMPContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMPGridValues.h
@@ -1750,6 +1804,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/Assumptions.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Attributes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Attributes.inc
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Attributes.td
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/AttributesAMDGPU.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
@@ -1784,7 +1839,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/GVMaterializer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GetElementPtrTypeIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GlobalAlias.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GlobalIFunc.h
-llvm%%LLVM_SUFFIX%%/include/llvm/IR/GlobalIndirectSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GlobalObject.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GlobalValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GlobalVariable.h
@@ -1865,6 +1919,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/ProfileSummary.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PseudoProbe.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ReplaceConstant.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/RuntimeLibcalls.def
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/SSAContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/SafepointIRVerifier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Statepoint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/StructuralHash.h
@@ -1887,7 +1942,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/InitializePasses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/InterfaceStub/ELFObjHandler.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
 llvm%%LLVM_SUFFIX%%/include/llvm/LTO/LTOBackend.h
@@ -1908,6 +1962,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoDarwin.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoELF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoGOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoWasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoXCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmLayout.h
@@ -1985,6 +2040,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MachineLocation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/SectionKind.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/StringTableBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/SubtargetFeature.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/TargetRegistry.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
@@ -2008,6 +2064,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/MicroOpQueueStage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/RetireStage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/Stage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Support.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MCA/View.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/Archive.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/ArchiveWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/Binary.h
@@ -2066,6 +2123,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/PassAnalysisSupport.h
 llvm%%LLVM_SUFFIX%%/include/llvm/PassInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/PassRegistry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/PassSupport.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Passes/OptimizationLevel.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
@@ -2074,10 +2132,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/GCOV.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProf.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProfCorrelator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProfData.inc
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProfReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProfWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/MemProfData.inc
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/ProfileCommon.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/RawMemProfReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProf.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProfReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProfWriter.h
@@ -2131,6 +2192,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/CFGUpdate.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/COM.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CRC.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CachePruning.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/Caching.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
@@ -2150,6 +2212,8 @@ 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/DivisionByConstantInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/Duration.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
@@ -2180,6 +2244,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/GenericDomTreeConstruction.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GenericIteratedDominanceFrontier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GlobPattern.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GraphWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/HashBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Host.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/InitLLVM.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/InstructionCost.h
@@ -2193,6 +2258,8 @@ 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/MSP430AttributeParser.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/MSP430Attributes.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
@@ -2206,6 +2273,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Mutex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/NativeFormatting.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/OnDiskHashTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/OptimizedStructLayout.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/PGOOptions.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Parallel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Path.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/PluginLoader.h
@@ -2216,6 +2284,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Process.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Program.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/RISCVAttributeParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/RISCVAttributes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/RISCVISAInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/RISCVTargetParser.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/RWMutex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/RandomNumberGenerator.h
@@ -2245,7 +2314,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/SystemUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TarWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TargetOpcodes.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TargetParser.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/TargetRegistry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TargetSelect.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TaskQueue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ThreadLocal.h
@@ -2356,6 +2424,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/Internalize.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/LoopExtractor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/LowerTypeTests.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/MergeFunctions.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/ModuleInliner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/OpenMPOpt.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/PartialInlining.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/PassManagerBuilder.h
@@ -2370,7 +2439,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/ThinLTOBitcodeWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/WholeProgramDevirt.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/InstCombine/InstCombine.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/InstCombine/InstCombineWorklist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/InstCombine/InstCombiner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/AddressSanitizer.h
@@ -2405,6 +2473,7 @@ 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
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/FlattenCFG.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/Float2Int.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/GVN.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/GVNExpression.h
@@ -2483,6 +2552,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CheriLogSetBounds.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/CodeLayout.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CodeMoverUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CtorUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Debugify.h
@@ -2497,6 +2567,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/GuardUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/HelloWorld.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/InjectTLIMappings.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/InstructionNamer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/InstructionWorklist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/IntegerDivision.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LCSSA.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LibCallsShrinkWrap.h
@@ -2522,6 +2593,7 @@ 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
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SampleProfileInference.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SampleProfileLoaderBaseUtil.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SanitizerStats.h
@@ -2575,6 +2647,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_math.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_math_forward_declares.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_runtime_wrapper.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_texture_intrinsics.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_hip_cmath.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_hip_libdevice_declares.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_hip_math.h
@@ -2604,6 +2677,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512dqintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512erintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512fintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512fp16intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmaintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmavlintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512pfintrin.h
@@ -2615,6 +2689,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbwintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlcdintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vldqintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlfp16intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvbmi2intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvnniintrin.h
@@ -2638,6 +2713,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/clwbintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/clzerointrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cpuid.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/crc32intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/algorithm
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/complex
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/new
@@ -2740,19 +2816,21 @@ 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/ChooseMSVCCRT.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CoverageReport.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CrossCompile.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/DetermineGCCCompatible.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindFFI.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindGRPC.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindLibpfm.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindOCaml.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindSphinx.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindTerminfo.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindZ3.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/GenerateVersionFromVCS.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/GetErrcMessages.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/GetLibraryName.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMOptions.cmake
 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
@@ -2805,12 +2883,13 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoMSF.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMDebuginfod.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMDiff.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesis.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisAArch64.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisMips.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisPowerPC.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisX86.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a
@@ -2835,11 +2914,6 @@ 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/libLLVMMipsAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsDesc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
@@ -2877,6 +2951,7 @@ 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/libLLVMX86TargetMCA.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
@@ -2886,13 +2961,14 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so
 %%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_RELEASE%%git
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.13
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysisFlowSensitive.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
@@ -2931,15 +3007,10 @@ 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
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldDriver.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldELF.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO2.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
-%%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
diff --git a/devel/llvm-morello/Makefile.COMMANDS b/devel/llvm-morello/Makefile.COMMANDS
index 23c6648948cb..61ed67d697b9 100644
--- a/devel/llvm-morello/Makefile.COMMANDS
+++ b/devel/llvm-morello/Makefile.COMMANDS
@@ -1 +1,6 @@
 .include "${.CURDIR}/../llvm-cheri/Makefile.COMMANDS"
+
+# Work around version skew with llvm-cheri
+LLVM_COMMANDS:=	${LLVM_COMMANDS:Nllvm-debuginfod-find:Nllvm-tli-checker}
+CLANG_COMMANDS:=${CLANG_COMMANDS:Nclang-linker-wrapper:Nclang-nvlink-wrapper:Nclang-repl}
+LLD_COMMANDS+=	ld64.lld.darwinnew ld64.lld.darwinold
diff --git a/devel/llvm-morello/Makefile.MAN1SRCS b/devel/llvm-morello/Makefile.MAN1SRCS
index 78b439db8b4b..0ee3ab065a25 100644
--- a/devel/llvm-morello/Makefile.MAN1SRCS
+++ b/devel/llvm-morello/Makefile.MAN1SRCS
@@ -1 +1,4 @@
 .include "${.PARSEDIR}/../llvm-cheri/Makefile.MAN1SRCS"
+
+# Workaround for llvm-cheri/llvm-morello version skew
+LLVM_MAN1SRCS:=	${LLVM_MAN1SRCS:Nllvm-tli-checker.1}
diff --git a/devel/llvm-morello/Makefile.snapshot b/devel/llvm-morello/Makefile.snapshot
index 43fce6b3cc0b..d8ff3c87edef 100644
--- a/devel/llvm-morello/Makefile.snapshot
+++ b/devel/llvm-morello/Makefile.snapshot
@@ -1,5 +1,5 @@
 LLVM_MAJOR=	13
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20221122
+SNAPDATE=	20230103
 
-LLVM_COMMIT=	62abae1a71fde1572a6cae61fcdcb0fcdd112259
+LLVM_COMMIT=	5c65f3e35c1f9a73fda125174a42336789cdafad
diff --git a/devel/llvm-morello/distinfo b/devel/llvm-morello/distinfo
index 28f2f46c2b11..8fe32b90b0a0 100644
--- a/devel/llvm-morello/distinfo
+++ b/devel/llvm-morello/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670867795
-SHA256 (morello-llvm-project-62abae1a71fde1572a6cae61fcdcb0fcdd112259_GL0.tar.gz) = 2592cce0e53040dd05d2bd4671b29d1d2e5262a77240063f6ffb6b40aa04f601
-SIZE (morello-llvm-project-62abae1a71fde1572a6cae61fcdcb0fcdd112259_GL0.tar.gz) = 152797527
+TIMESTAMP = 1672777378
+SHA256 (morello-llvm-project-5c65f3e35c1f9a73fda125174a42336789cdafad_GL0.tar.gz) = 01c656ed9e8daa5c46c54c49140d57c0850e25994c38972161040c953db43dd0
+SIZE (morello-llvm-project-5c65f3e35c1f9a73fda125174a42336789cdafad_GL0.tar.gz) = 152796016
diff --git a/devel/llvm-morello/pkg-plist b/devel/llvm-morello/pkg-plist
index 31402f28d085..46ec9444a0cd 100644
--- a/devel/llvm-morello/pkg-plist
+++ b/devel/llvm-morello/pkg-plist
@@ -81,11 +81,11 @@ bin/scan-build-py%%COMMAND_SUFFIX%%
 bin/scan-view%%COMMAND_SUFFIX%%
 %%LLD%%bin/ld.lld%%COMMAND_SUFFIX%%
 %%LLD%%bin/ld64.lld%%COMMAND_SUFFIX%%
-%%LLD%%bin/ld64.lld.darwinnew%%COMMAND_SUFFIX%%
-%%LLD%%bin/ld64.lld.darwinold%%COMMAND_SUFFIX%%
 %%LLD%%bin/lld%%COMMAND_SUFFIX%%
 %%LLD%%bin/lld-link%%COMMAND_SUFFIX%%
 %%LLD%%bin/wasm-ld%%COMMAND_SUFFIX%%
+%%LLD%%bin/ld64.lld.darwinnew%%COMMAND_SUFFIX%%
+%%LLD%%bin/ld64.lld.darwinold%%COMMAND_SUFFIX%%
 %%LIT%%bin/FileCheck%%COMMAND_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/FileCheck
 %%LIT%%bin/lit%%COMMAND_SUFFIX%%