git: 54b14b73f45b - main - devel/llvm-cheri: Update to a new snapshot

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Fri, 07 Jan 2022 22:34:43 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54b14b73f45b269341c9cc116782e0b662cb7caa

commit 54b14b73f45b269341c9cc116782e0b662cb7caa
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-12-20 17:57:57 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-01-07 22:31:20 +0000

    devel/llvm-cheri: Update to a new snapshot
    
    Adopt Makefile.COMMANDS file used in other llvm ports to reduce the size
    of the main Makefile and limit churn there.
---
 devel/llvm-cheri/Makefile                          | 105 ++-----
 devel/llvm-cheri/Makefile.COMMANDS                 | 105 +++++++
 devel/llvm-cheri/Makefile.snapshot                 |   6 +-
 devel/llvm-cheri/distinfo                          |   6 +-
 devel/llvm-cheri/files/gen-Makefile.snapshot.sh    |   2 +-
 .../files/patch-utils_llvm-build_llvmbuild_main.py |  21 --
 devel/llvm-cheri/pkg-plist                         | 347 +++++++++++++++++----
 7 files changed, 416 insertions(+), 176 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index caa8c1650b78..07643200de0c 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -78,7 +78,7 @@ DOCS_PORTDOCS=		llvm
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld linker
 LLD_PORTDOCS=		lld
-LLDB_DESC=		Install lldb, the LLVM debugger (ignore on 9.x)
+LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 
 LLVM_TARGETS?=		AArch64;ARM;Mips;PowerPC;RISCV;X86
@@ -88,68 +88,7 @@ PLIST_SUB+=	COMMAND_SUFFIX=${COMMAND_SUFFIX} \
 		LLVM_RELEASE=${LLVM_RELEASE} \
 		LLVM_SUFFIX=${LLVM_SUFFIX}
 
-COMMANDS=	bugpoint \
-		c-index-test \
-		dsymutil \
-		llc \
-		lli \
-		llvm-addr2line \
-		llvm-ar \
-		llvm-as \
-		llvm-bcanalyzer \
-		llvm-cat \
-		llvm-cfi-verify \
-		llvm-config \
-		llvm-cov \
-		llvm-cvtres \
-		llvm-cxxmap \
-		llvm-cxxdump \
-		llvm-diff \
-		llvm-dis \
-		llvm-dlltool \
-		llvm-dwarfdump \
-		llvm-dwp \
-		llvm-exegesis \
-		llvm-extract \
-		llvm-gsymutil \
-		llvm-ifs \
-		llvm-install-name-tool \
-		llvm-jitlink \
-		llvm-lib \
-		llvm-link \
-		llvm-lipo \
-		llvm-lto \
-		llvm-lto2 \
-		llvm-mc \
-		llvm-mca \
-		llvm-ml \
-		llvm-modextract \
-		llvm-mt \
-		llvm-nm \
-		llvm-objcopy \
-		llvm-objdump \
-		llvm-opt-report \
-		llvm-pdbutil \
-		llvm-profdata \
-		llvm-ranlib \
-		llvm-rc \
-		llvm-readelf \
-		llvm-readobj \
-		llvm-reduce \
-		llvm-rtdyld \
-		llvm-size \
-		llvm-split \
-		llvm-stress \
-		llvm-strings \
-		llvm-symbolizer \
-		llvm-tblgen \
-		llvm-undname \
-		llvm-xray \
-		opt \
-		sancov \
-		sanstats \
-		verify-uselistorder \
-		yaml2obj
+COMMANDS=	${LLVM_COMMANDS}
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 STRIP_LIBS=	BugpointPasses.so \
@@ -164,21 +103,9 @@ CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${
 
 .if ${PORT_OPTIONS:MCLANG}
 LLVM_ENABLE_PROJECTS+=	clang
-COMMANDS+=	clang \
-		clang++ \
-		clang-check \
-		clang-cpp \
-		clang-extdef-mapping \
-		clang-format \
-		clang-offload-bundler \
-		clang-offload-wrapper \
-		clang-refactor \
-		clang-rename \
-		clang-scan-deps \
-		diagtool \
-		scan-build \
-		scan-view
+COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	clang.1 \
+		clang-tblgen.1 \
 		diagtool.1 \
 		scan-build.1
 #DOCS_PLIST_FILES+=	man/man1/scan-build${LLVM_SUFFIX}.1.gz
@@ -188,22 +115,17 @@ USES+=		gnome
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=	lit.1 FileCheck.1
 _USES_PYTHON=	python:3.6+
-LIT_COMMANDS=	lit llvm-lit FileCheck
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
 LLVM_ENABLE_PROJECTS+=	lld
-COMMANDS+=	ld.lld \
-		ld64.lld \
-		wasm-ld
+COMMANDS+=	${LLD_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MLLDB}
 LLVM_ENABLE_PROJECTS+=	lldb
-COMMANDS+=	argdumper \
-		lldb \
-		lldb-mi \
-		lldb-server
+COMMANDS+=	${LLDB_COMMANDS}
+MAN1SRCS+=	lldb-tblgen.1
 _USES_PYTHON=	python:3.6+
 .endif
 
@@ -222,7 +144,6 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-ar.1 \
 		llvm-as.1 \
 		llvm-bcanalyzer.1 \
-		llvm-build.1 \
 		llvm-config.1 \
 		llvm-cov.1 \
 		llvm-cxxfilt.1 \
@@ -232,7 +153,9 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-dwarfdump.1 \
 		llvm-exegesis.1 \
 		llvm-extract.1 \
+		llvm-install-name-tool.1 \
 		llvm-lib.1 \
+		llvm-libtool-darwin.1 \
 		llvm-link.1 \
 		llvm-lipo.1 \
 		llvm-locstats.1 \
@@ -240,8 +163,10 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-nm.1 \
 		llvm-objcopy.1 \
 		llvm-objdump.1 \
+		llvm-otool.1 \
 		llvm-pdbutil.1 \
 		llvm-profdata.1 \
+		llvm-profgen.1 \
 		llvm-ranlib.1 \
 		llvm-readelf.1 \
 		llvm-readobj.1 \
@@ -250,10 +175,12 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-strings.1 \
 		llvm-strip.1 \
 		llvm-symbolizer.1 \
+		llvm-tblgen.1 \
 		opt.1 \
 		tblgen.1
 
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/Makefile.COMMANDS"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
@@ -275,6 +202,8 @@ post-install:
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX}
 .endfor
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github/workflows
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github
 
 post-install-DOCS-on:
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
@@ -290,6 +219,10 @@ post-install-DOCS-on:
 #	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1 \
 #	    ${STAGEDIR}${MANPREFIX}/man/man1/scan-build${LLVM_SUFFIX}.1
 #.endif
+.if !${PORT_OPTIONS:MLLDB}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lldb-tblgen.1
+.endif
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/mlir-tblgen.1
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
diff --git a/devel/llvm-cheri/Makefile.COMMANDS b/devel/llvm-cheri/Makefile.COMMANDS
new file mode 100644
index 000000000000..66fcfa163fed
--- /dev/null
+++ b/devel/llvm-cheri/Makefile.COMMANDS
@@ -0,0 +1,105 @@
+LLVM_COMMANDS=	\
+		bugpoint \
+		dsymutil \
+		llc \
+		lli \
+		llvm-addr2line \
+		llvm-ar \
+		llvm-as \
+		llvm-bcanalyzer \
+		llvm-bitcode-strip \
+		llvm-cat \
+		llvm-cfi-verify \
+		llvm-config \
+		llvm-cov \
+		llvm-cvtres \
+		llvm-cxxmap \
+		llvm-diff \
+		llvm-dis \
+		llvm-dlltool \
+		llvm-dwarfdump \
+		llvm-dwp \
+		llvm-exegesis \
+		llvm-extract \
+		llvm-gsymutil \
+		llvm-ifs \
+		llvm-install-name-tool \
+		llvm-jitlink \
+		llvm-libtool-darwin \
+		llvm-link \
+		llvm-lipo \
+		llvm-mc \
+		llvm-mca \
+		llvm-ml \
+		llvm-modextract \
+		llvm-mt \
+		llvm-nm \
+		llvm-objcopy \
+		llvm-objdump \
+		llvm-opt-report \
+		llvm-otool \
+		llvm-pdbutil \
+		llvm-profdata \
+		llvm-profgen \
+		llvm-ranlib \
+		llvm-rc \
+		llvm-readelf \
+		llvm-readobj \
+		llvm-reduce \
+		llvm-rtdyld \
+		llvm-sim \
+		llvm-size \
+		llvm-split \
+		llvm-stress \
+		llvm-strings \
+		llvm-strip \
+		llvm-symbolizer \
+		llvm-tapi-diff \
+		llvm-tblgen \
+		llvm-undname \
+		llvm-windres \
+		llvm-xray \
+		opt \
+		sancov \
+		split-file
+
+CLANG_COMMANDS=	\
+		analyze-build \
+		c-index-test \
+		clang \
+		clang++ \
+		clang-check \
+		clang-cpp \
+		clang-extdef-mapping \
+		clang-format \
+		clang-offload-bundler \
+		clang-offload-wrapper \
+		clang-rename \
+		clang-scan-deps \
+		diagtool \
+		hmaptool \
+		intercept-build \
+		scan-build \
+		scan-build-py \
+		scan-view
+
+LIT_COMMANDS=	\
+		FileCheck \
+		lit \
+		llvm-lit
+
+LLD_COMMANDS=	\
+		ld.lld \
+		ld64.lld \
+		ld64.lld.darwinnew \
+		ld64.lld.darwinold \
+		lld \
+		lld-link \
+		wasm-ld
+
+LLDB_COMMANDS=	\
+		lldb \
+		lldb-argdumper \
+		lldb-instr \
+		lldb-server \
+		lldb-vscode
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index 6718ad595349..86f2c2724b9c 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=	11
+LLVM_MAJOR=	13
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20201209
+SNAPDATE=	20211210
 
-LLVM_COMMIT=		37c49ff00e3eadce5d8703fdc4497f28458c64a8
+LLVM_COMMIT=		60af8cd3787b3dd3c64deb858b14001582dcb862
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index ed9a21e3b5d7..952caa5da097 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607987394
-SHA256 (CTSRD-CHERI-llvm-project-11.0.d20201209-37c49ff00e3eadce5d8703fdc4497f28458c64a8_GH0.tar.gz) = cd7db3ecccd8e50e21491c874481cea7dd6c030b84edd530da9d5a4a14a9bf4a
-SIZE (CTSRD-CHERI-llvm-project-11.0.d20201209-37c49ff00e3eadce5d8703fdc4497f28458c64a8_GH0.tar.gz) = 127636179
+TIMESTAMP = 1639607998
+SHA256 (CTSRD-CHERI-llvm-project-13.0.d20211210-60af8cd3787b3dd3c64deb858b14001582dcb862_GH0.tar.gz) = fc1ea791ec1c96fbe5fafda68987eb92ef92f0d90b61bc713950b47b78b2cb7d
+SIZE (CTSRD-CHERI-llvm-project-13.0.d20211210-60af8cd3787b3dd3c64deb858b14001582dcb862_GH0.tar.gz) = 152223668
diff --git a/devel/llvm-cheri/files/gen-Makefile.snapshot.sh b/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
index fc138e450b69..4e09a454f2fa 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=	11
+LLVM_MAJOR=	13
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	${MAX_DATE}
 
diff --git a/devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py b/devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py
deleted file mode 100644
index 118c06507797..000000000000
--- a/devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- llvm/utils/llvm-build/llvmbuild/main.py.orig	2015-07-20 23:51:12 UTC
-+++ llvm/utils/llvm-build/llvmbuild/main.py
-@@ -718,7 +718,17 @@ def add_magic_target_components(parser, 
- 
-     # We handle a few special cases of target names here for historical
-     # reasons, as these are the names configure currently comes up with.
--    native_target_name = { 'x86' : 'X86',
-+    native_target_name = { 'amd64' : 'X86',
-+			   'arm' : 'ARM',
-+			   'armeb' : 'ARM',
-+			   'armv6' : 'ARM',
-+			   'armv6hf' : 'ARM',
-+			   'i386' : 'X86',
-+			   'mips' : 'Mips',
-+			   'powerpc' : 'PowerPC',
-+			   'powerpc64' : 'PowerPC',
-+			   'sparc64' : 'Sparc',
-+                           'x86' : 'X86',
-                            'x86_64' : 'X86',
-                            'Unknown' : None }.get(opts.native_target,
-                                                   opts.native_target)
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index 75c3e22a09c1..02f6b42b5b3f 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -1,5 +1,4 @@
 bin/bugpoint%%COMMAND_SUFFIX%%
-bin/c-index-test%%COMMAND_SUFFIX%%
 bin/dsymutil%%COMMAND_SUFFIX%%
 bin/llc%%COMMAND_SUFFIX%%
 bin/lli%%COMMAND_SUFFIX%%
@@ -7,13 +6,13 @@ bin/llvm-addr2line%%COMMAND_SUFFIX%%
 bin/llvm-ar%%COMMAND_SUFFIX%%
 bin/llvm-as%%COMMAND_SUFFIX%%
 bin/llvm-bcanalyzer%%COMMAND_SUFFIX%%
+bin/llvm-bitcode-strip%%COMMAND_SUFFIX%%
 bin/llvm-cat%%COMMAND_SUFFIX%%
 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-diff%%COMMAND_SUFFIX%%
 bin/llvm-dis%%COMMAND_SUFFIX%%
 bin/llvm-dlltool%%COMMAND_SUFFIX%%
@@ -25,11 +24,9 @@ bin/llvm-gsymutil%%COMMAND_SUFFIX%%
 bin/llvm-ifs%%COMMAND_SUFFIX%%
 bin/llvm-install-name-tool%%COMMAND_SUFFIX%%
 bin/llvm-jitlink%%COMMAND_SUFFIX%%
-bin/llvm-lib%%COMMAND_SUFFIX%%
+bin/llvm-libtool-darwin%%COMMAND_SUFFIX%%
 bin/llvm-link%%COMMAND_SUFFIX%%
 bin/llvm-lipo%%COMMAND_SUFFIX%%
-bin/llvm-lto%%COMMAND_SUFFIX%%
-bin/llvm-lto2%%COMMAND_SUFFIX%%
 bin/llvm-mc%%COMMAND_SUFFIX%%
 bin/llvm-mca%%COMMAND_SUFFIX%%
 bin/llvm-ml%%COMMAND_SUFFIX%%
@@ -39,27 +36,33 @@ bin/llvm-nm%%COMMAND_SUFFIX%%
 bin/llvm-objcopy%%COMMAND_SUFFIX%%
 bin/llvm-objdump%%COMMAND_SUFFIX%%
 bin/llvm-opt-report%%COMMAND_SUFFIX%%
+bin/llvm-otool%%COMMAND_SUFFIX%%
 bin/llvm-pdbutil%%COMMAND_SUFFIX%%
 bin/llvm-profdata%%COMMAND_SUFFIX%%
+bin/llvm-profgen%%COMMAND_SUFFIX%%
 bin/llvm-ranlib%%COMMAND_SUFFIX%%
 bin/llvm-rc%%COMMAND_SUFFIX%%
 bin/llvm-readelf%%COMMAND_SUFFIX%%
 bin/llvm-readobj%%COMMAND_SUFFIX%%
 bin/llvm-reduce%%COMMAND_SUFFIX%%
 bin/llvm-rtdyld%%COMMAND_SUFFIX%%
+bin/llvm-sim%%COMMAND_SUFFIX%%
 bin/llvm-size%%COMMAND_SUFFIX%%
 bin/llvm-split%%COMMAND_SUFFIX%%
 bin/llvm-stress%%COMMAND_SUFFIX%%
 bin/llvm-strings%%COMMAND_SUFFIX%%
+bin/llvm-strip%%COMMAND_SUFFIX%%
 bin/llvm-symbolizer%%COMMAND_SUFFIX%%
+bin/llvm-tapi-diff%%COMMAND_SUFFIX%%
 bin/llvm-tblgen%%COMMAND_SUFFIX%%
 bin/llvm-undname%%COMMAND_SUFFIX%%
+bin/llvm-windres%%COMMAND_SUFFIX%%
 bin/llvm-xray%%COMMAND_SUFFIX%%
 bin/opt%%COMMAND_SUFFIX%%
 bin/sancov%%COMMAND_SUFFIX%%
-bin/sanstats%%COMMAND_SUFFIX%%
-bin/verify-uselistorder%%COMMAND_SUFFIX%%
-bin/yaml2obj%%COMMAND_SUFFIX%%
+bin/split-file%%COMMAND_SUFFIX%%
+bin/analyze-build%%COMMAND_SUFFIX%%
+bin/c-index-test%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang++%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-check%%COMMAND_SUFFIX%%
@@ -68,21 +71,28 @@ bin/yaml2obj%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-format%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-offload-bundler%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-offload-wrapper%%COMMAND_SUFFIX%%
-%%CLANG%%bin/clang-refactor%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-rename%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-scan-deps%%COMMAND_SUFFIX%%
 bin/diagtool%%COMMAND_SUFFIX%%
+bin/hmaptool%%COMMAND_SUFFIX%%
+bin/intercept-build%%COMMAND_SUFFIX%%
 bin/scan-build%%COMMAND_SUFFIX%%
+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%%
+%%LIT%%bin/FileCheck%%COMMAND_SUFFIX%%
+%%LIT%%llvm%%LLVM_SUFFIX%%/bin/FileCheck
 %%LIT%%bin/lit%%COMMAND_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/lit
 %%LIT%%bin/llvm-lit%%COMMAND_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/llvm-lit
-%%LIT%%bin/FileCheck%%COMMAND_SUFFIX%%
-%%LIT%%llvm%%LLVM_SUFFIX%%/bin/FileCheck
+llvm%%LLVM_SUFFIX%%/bin/analyze-build
 llvm%%LLVM_SUFFIX%%/bin/bugpoint
 llvm%%LLVM_SUFFIX%%/bin/c-index-test
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang
@@ -102,8 +112,11 @@ llvm%%LLVM_SUFFIX%%/bin/diagtool
 llvm%%LLVM_SUFFIX%%/bin/dsymutil
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
 llvm%%LLVM_SUFFIX%%/bin/hmaptool
+llvm%%LLVM_SUFFIX%%/bin/intercept-build
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
+%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew
+%%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
@@ -112,6 +125,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-addr2line
 llvm%%LLVM_SUFFIX%%/bin/llvm-ar
 llvm%%LLVM_SUFFIX%%/bin/llvm-as
 llvm%%LLVM_SUFFIX%%/bin/llvm-bcanalyzer
+llvm%%LLVM_SUFFIX%%/bin/llvm-bitcode-strip
 llvm%%LLVM_SUFFIX%%/bin/llvm-c-test
 llvm%%LLVM_SUFFIX%%/bin/llvm-cat
 llvm%%LLVM_SUFFIX%%/bin/llvm-cfi-verify
@@ -126,7 +140,6 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-dis
 llvm%%LLVM_SUFFIX%%/bin/llvm-dlltool
 llvm%%LLVM_SUFFIX%%/bin/llvm-dwarfdump
 llvm%%LLVM_SUFFIX%%/bin/llvm-dwp
-llvm%%LLVM_SUFFIX%%/bin/llvm-elfabi
 llvm%%LLVM_SUFFIX%%/bin/llvm-exegesis
 llvm%%LLVM_SUFFIX%%/bin/llvm-extract
 llvm%%LLVM_SUFFIX%%/bin/llvm-gsymutil
@@ -134,6 +147,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-ifs
 llvm%%LLVM_SUFFIX%%/bin/llvm-install-name-tool
 llvm%%LLVM_SUFFIX%%/bin/llvm-jitlink
 llvm%%LLVM_SUFFIX%%/bin/llvm-lib
+llvm%%LLVM_SUFFIX%%/bin/llvm-libtool-darwin
 llvm%%LLVM_SUFFIX%%/bin/llvm-link
 llvm%%LLVM_SUFFIX%%/bin/llvm-lipo
 llvm%%LLVM_SUFFIX%%/bin/llvm-lto
@@ -147,32 +161,37 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-nm
 llvm%%LLVM_SUFFIX%%/bin/llvm-objcopy
 llvm%%LLVM_SUFFIX%%/bin/llvm-objdump
 llvm%%LLVM_SUFFIX%%/bin/llvm-opt-report
+llvm%%LLVM_SUFFIX%%/bin/llvm-otool
 llvm%%LLVM_SUFFIX%%/bin/llvm-pdbutil
 llvm%%LLVM_SUFFIX%%/bin/llvm-profdata
+llvm%%LLVM_SUFFIX%%/bin/llvm-profgen
 llvm%%LLVM_SUFFIX%%/bin/llvm-ranlib
 llvm%%LLVM_SUFFIX%%/bin/llvm-rc
 llvm%%LLVM_SUFFIX%%/bin/llvm-readelf
 llvm%%LLVM_SUFFIX%%/bin/llvm-readobj
 llvm%%LLVM_SUFFIX%%/bin/llvm-reduce
 llvm%%LLVM_SUFFIX%%/bin/llvm-rtdyld
+llvm%%LLVM_SUFFIX%%/bin/llvm-sim
 llvm%%LLVM_SUFFIX%%/bin/llvm-size
 llvm%%LLVM_SUFFIX%%/bin/llvm-split
 llvm%%LLVM_SUFFIX%%/bin/llvm-stress
 llvm%%LLVM_SUFFIX%%/bin/llvm-strings
 llvm%%LLVM_SUFFIX%%/bin/llvm-strip
 llvm%%LLVM_SUFFIX%%/bin/llvm-symbolizer
+llvm%%LLVM_SUFFIX%%/bin/llvm-tapi-diff
 llvm%%LLVM_SUFFIX%%/bin/llvm-tblgen
 llvm%%LLVM_SUFFIX%%/bin/llvm-undname
+llvm%%LLVM_SUFFIX%%/bin/llvm-windres
 llvm%%LLVM_SUFFIX%%/bin/llvm-xray
-llvm%%LLVM_SUFFIX%%/bin/obj2yaml
 llvm%%LLVM_SUFFIX%%/bin/opt
 llvm%%LLVM_SUFFIX%%/bin/sancov
 llvm%%LLVM_SUFFIX%%/bin/sanstats
 llvm%%LLVM_SUFFIX%%/bin/scan-build
+llvm%%LLVM_SUFFIX%%/bin/scan-build-py
 llvm%%LLVM_SUFFIX%%/bin/scan-view
+llvm%%LLVM_SUFFIX%%/bin/split-file
 llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/wasm-ld
-llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/BuildSystem.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXCompilationDatabase.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXErrorCode.h
@@ -182,6 +201,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/FatalErrorHandler.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Index.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Platform.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Rewrite.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/APINotes/APINotesYAMLCompiler.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/APINotes/Types.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/ARCMT.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/ARCMTActions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/FileRemapper.h
@@ -273,6 +295,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%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/IgnoreExpr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/JSONNodeDumper.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LambdaCapture.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
@@ -331,6 +354,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ASTMatchers/Dynamic/VariantValue.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ASTMatchers/GtestMatchers.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/CalledOnceCheck.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/ExprMutationAnalyzer.h
@@ -359,6 +383,8 @@ 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/FlowSensitive/DataflowWorklist.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
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/ProgramPoint.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/RetainSummaryManager.h
@@ -386,11 +412,11 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagon.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagonDep.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagonMapCustomDep.def
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsLe64.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsMips.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNEON.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNVPTX.def
 %%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/BuiltinsSVE.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsSystemZ.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsWebAssembly.def
@@ -403,6 +429,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CodeGenOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/CommentOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Cuda.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DarwinSDKInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DebugInfoOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Diagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticAST.h
@@ -435,14 +462,15 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticSemaKinds.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticSerialization.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticSerializationKinds.inc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DirectoryEntry.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ExceptionSpecificationType.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ExpressionTraits.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FPOptions.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Features.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileEntry.h
 %%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/JsonSupport.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LLVM.h
@@ -455,6 +483,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/MSP430Target.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/MacroBuilder.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Module.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/NoSanitizeList.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
@@ -465,11 +494,13 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OperatorKinds.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OperatorKinds.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OperatorPrecedence.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PPCTypes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PartialDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PlistSupport.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PragmaKinds.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PrettyStackTrace.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SanitizerBlacklist.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ProfileList.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/RISCVVTypes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SanitizerSpecialCaseList.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Sanitizers.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Sanitizers.h
@@ -480,10 +511,13 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Stack.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SyncScope.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetBuiltins.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetCXXABI.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetCXXABI.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetID.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TemplateKinds.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Thunk.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TokenKinds.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TokenKinds.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TypeTraits.h
@@ -507,6 +541,8 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_sve_builtins.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_sve_sema_rangechecks.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_sve_typeflags.inc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/riscv_vector_builtin_cg.inc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/riscv_vector_builtins.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/CodeGen/BackendUtil.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/CodeGen/CGFunctionInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/CodeGen/CodeGenABITypes.h
@@ -522,10 +558,10 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/DirectoryWatcher/DirectoryWatcher.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Action.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Compilation.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/DarwinSDKInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Distro.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Driver.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/DriverDiagnostic.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/InputInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Job.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Multilib.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/OptionUtils.h
@@ -581,6 +617,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexingAction.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexingOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/USRGeneration.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/IndexSerialization/SerializablePathCollection.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Interpreter/Interpreter.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Interpreter/PartialTranslationUnit.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/CodeCompletionHandler.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DependencyDirectivesSourceMinimizer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DirectoryLookup.h
@@ -696,7 +735,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%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/CheckerRegistryData.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/IssueHash.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
@@ -708,7 +746,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicSize.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicExtent.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
@@ -765,6 +803,8 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Inclusions/HeaderIncludes.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Inclusions/IncludeStyle.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/JSONCompilationDatabase.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/NodeIntrospection.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/NodeIntrospection.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/ASTSelection.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/AtomicChange.h
@@ -794,7 +834,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/StandaloneExecution.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/BuildTree.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Mutations.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/NodeClasses.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Nodes.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Nodes.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Tokens.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Tree.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ToolExecutorPluginRegistry.h
@@ -808,6 +850,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Stencil.h
 %%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/DWARF.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Driver.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/ErrorHandler.h
@@ -856,11 +899,11 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/ExecutionEngine.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/ExternC.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/IRReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Initialization.h
-llvm%%LLVM_SUFFIX%%/include/llvm-c/LinkTimeOptimizer.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/LLJIT.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Linker.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Object.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Orc.h
-llvm%%LLVM_SUFFIX%%/include/llvm-c/OrcBindings.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/OrcEE.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Remarks.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Support.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Target.h
@@ -869,12 +912,14 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/AggressiveInstCombine.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Coroutines.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/IPO.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/InstCombine.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/PassBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/PassManagerBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Scalar.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Utils.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Vectorize.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Types.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/lto.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/APFixedPoint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/APFloat.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/APInt.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/APSInt.h
@@ -922,6 +967,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/PriorityQueue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/PriorityWorklist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/SCCIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/STLExtras.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/STLForwardCompat.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ScopeExit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ScopedHashTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Sequence.h
@@ -983,8 +1029,11 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CheriBounds.h
 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/DDG.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DDGPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DOTGraphTraitsPass.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Delinearization.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DemandedBits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DependenceAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DependenceGraphBuilder.h
@@ -994,18 +1043,20 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DomTreeUpdater.h
 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/FunctionPropertiesAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/GlobalsModRef.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/GuardUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/HeatUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IRSimilarityIdentifier.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/IndirectCallVisitor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineAdvisor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineCost.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineFeaturesAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineModelFeatureMaps.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineSizeEstimatorAnalysis.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InstCount.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
@@ -1030,17 +1081,21 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopUnrollAnalyzer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MLInlineAdvisor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MLModelRunner.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MemDerefPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MemoryBuiltins.h
 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/ModuleDebugInfoPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ModuleSummaryAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/MustExecute.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
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ObjCARCUtil.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/OptimizationRemarkEmitter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/OverflowInstAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/PHITransAddr.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Passes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/PhiValues.h
@@ -1052,6 +1107,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/ReplayInlineAdvisor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolution.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionDivision.h
@@ -1071,6 +1127,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TargetTransformInfoImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Trace.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TypeBasedAliasAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TypeMetadataUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Utils/Local.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Utils/TFUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueLattice.h
@@ -1078,6 +1135,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueLatticeUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueTracking.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/VecFuncs.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/VectorUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/LLLexer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/LLParser.h
+llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/LLToken.h
 llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/Parser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/SlotMapping.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
@@ -1092,8 +1152,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/ARC.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/ARM.def
 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/CSKY.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/M68k.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
@@ -1116,8 +1178,11 @@ llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackReader.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/BinaryFormat/WasmTraits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/XCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeAnalyzer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeCommon.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeConvenience.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeWriterPass.h
@@ -1126,7 +1191,16 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitCodes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitstreamReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitstreamWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_128.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_64.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_common.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/cheri_compressed_cap_macros.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/FuzzedDataProvider.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/elf.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/rts.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/sail.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/sail_failure.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/sail_wrapper.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/test_util.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AccelTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Analysis.h
@@ -1134,11 +1208,12 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AntiDepBreaker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AsmPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AsmPrinterHandler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AtomicExpandUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicBlockSectionUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicTTIImpl.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BuiltinGCs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CSEConfigBase.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CalcSpillWeights.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CallingConvLower.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CodeGenPassBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CommandFlags.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CostTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/DAGCombine.h
@@ -1151,27 +1226,28 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/DwarfStringPoolEntry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/EdgeBundles.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ExecutionDomainFix.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ExpandReductions.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ExpandVectorPredication.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FastISel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FaultMaps.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FunctionLoweringInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCMetadata.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCMetadataPrinter.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCStrategy.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CSEInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CSEMIRBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CallLowering.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/Combiner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/ConstantFoldingMIRBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelChangeObserver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GenericMachineInstrs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/IRTranslator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InlineAsmLowering.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InstructionSelect.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InstructionSelector.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/Legalizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
@@ -1206,6 +1282,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveVariables.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LoopTraversal.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LowLevelType.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MBFIWrapper.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRFSDiscriminator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRFormatter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIRParser.h
@@ -1232,9 +1309,12 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineLoopUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineMemOperand.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleInfoImpls.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleSlotTracker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineOperand.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineOptimizationRemarkEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineOutliner.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachinePassManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachinePassRegistry.def
*** 825 LINES SKIPPED ***