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

Major changes: llvm-cheri: merge LLVM 15 llvm-cheriot: switch the fork at github.com/CHERIoT-Platform llvm-morello: merge LLVM 14 Rework patching and filtering of commands and man pages to better accomdate version skew between the different ports now that all three have different bases. Centralize the addition of ${.CURDIR}/files to EXTRA_PATCHS.
author: Brooks Davis <brooks@FreeBSD.org> 2024-01-23 21:22:41 +0000
committer: Brooks Davis <brooks@FreeBSD.org> 2024-01-23 22:33:31 +0000
commit: 72ae5276b7b612c087fdf77580e1412264f40eff (patch)
tree: 99424380ad752e2be0e2a6b78d7a256aeb36da8a
parent: 8d617ece785e7805c4c679d3e4a88a110a95e360 (diff)
download: ports-72ae5276b7b612c087fdf77580e1412264f40eff.tar.gz
ports-72ae5276b7b612c087fdf77580e1412264f40eff.zip
26 files changed, 854 insertions, 270 deletions
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 624a6e2bf9e2..dd5e4588cd6a 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}
 
@@ -114,7 +114,10 @@ STRIP_LIBS=	BugpointPasses.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
-EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}-backport-version-fixes
+EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}
+.if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files)
+EXTRA_PATCHES+=	${.CURDIR}/files
+.endif
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/llvm-cheri/Makefile.COMMANDS b/devel/llvm-cheri/Makefile.COMMANDS
index f830fe15344a..150777ff7ad3 100644
--- a/devel/llvm-cheri/Makefile.COMMANDS
+++ b/devel/llvm-cheri/Makefile.COMMANDS
@@ -14,11 +14,13 @@ LLVM_COMMANDS=	\
 		llvm-cov \
 		llvm-cvtres \
 		llvm-cxxmap \
+		llvm-debuginfod \
 		llvm-debuginfod-find \
 		llvm-diff \
 		llvm-dis \
 		llvm-dlltool \
 		llvm-dwarfdump \
+		llvm-dwarfutil \
 		llvm-dwp \
 		llvm-exegesis \
 		llvm-extract \
@@ -47,6 +49,7 @@ LLVM_COMMANDS=	\
 		llvm-readelf \
 		llvm-readobj \
 		llvm-reduce \
+		llvm-remark-size-diff \
 		llvm-rtdyld \
 		llvm-sim \
 		llvm-size \
@@ -77,6 +80,7 @@ CLANG_COMMANDS=	\
 		clang-linker-wrapper \
 		clang-nvlink-wrapper \
 		clang-offload-bundler \
+		clang-offload-packager \
 		clang-offload-wrapper \
 		clang-rename \
 		clang-repl \
diff --git a/devel/llvm-cheri/Makefile.MAN1SRCS b/devel/llvm-cheri/Makefile.MAN1SRCS
index 6af3ad45a17c..1ae8c8708011 100644
--- a/devel/llvm-cheri/Makefile.MAN1SRCS
+++ b/devel/llvm-cheri/Makefile.MAN1SRCS
@@ -14,8 +14,10 @@ LLVM_MAN1SRCS= \
 	llvm-diff.1 \
 	llvm-dis.1 \
 	llvm-dwarfdump.1 \
+	llvm-dwarfutil.1 \
 	llvm-exegesis.1 \
 	llvm-extract.1 \
+	llvm-ifs.1 \
 	llvm-install-name-tool.1 \
 	llvm-lib.1 \
 	llvm-libtool-darwin.1 \
@@ -33,6 +35,7 @@ LLVM_MAN1SRCS= \
 	llvm-ranlib.1 \
 	llvm-readelf.1 \
 	llvm-readobj.1 \
+	llvm-remark-size-diff.1 \
 	llvm-size.1 \
 	llvm-stress.1 \
 	llvm-strings.1 \
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index f789b10c92de..b28d62ceb44f 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=	14
+LLVM_MAJOR=	15
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20230818
+SNAPDATE=	20231212
 
-LLVM_COMMIT=		2f2dd3114669e891b64ce53edd070796bcb4e98c
+LLVM_COMMIT=		3e7aad709c172e384fccecafd1061e0b8bf514e8
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index 0810f775d11d..e72a5ad07a3d 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694711086
-SHA256 (CTSRD-CHERI-llvm-project-14.0.d20230818-2f2dd3114669e891b64ce53edd070796bcb4e98c_GH0.tar.gz) = c36ea5dcfda9bd109296acf27db293296b0ec6b58c74954580e5b32d79bcb5e4
-SIZE (CTSRD-CHERI-llvm-project-14.0.d20230818-2f2dd3114669e891b64ce53edd070796bcb4e98c_GH0.tar.gz) = 163056259
+TIMESTAMP = 1706026686
+SHA256 (CTSRD-CHERI-llvm-project-15.0.d20231212-3e7aad709c172e384fccecafd1061e0b8bf514e8_GH0.tar.gz) = 455f3c93f973c91b7e955edf8cab354373f1d4419f4a0dfa2447714993d40307
+SIZE (CTSRD-CHERI-llvm-project-15.0.d20231212-3e7aad709c172e384fccecafd1061e0b8bf514e8_GH0.tar.gz) = 171205571
diff --git a/devel/llvm-cheri/files/gen-Makefile.snapshot.sh b/devel/llvm-cheri/files/gen-Makefile.snapshot.sh
index 9da4f19e27e2..6784a6c55ef5 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=	14
+LLVM_MAJOR=	15
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	${MAX_DATE}
 
diff --git a/devel/llvm-cheri/files/llvm13-backport-version-fixes b/devel/llvm-cheri/files/llvm13/patch-backport-version-fixes
index 52055a095912..52055a095912 100644
--- a/devel/llvm-cheri/files/llvm13-backport-version-fixes
+++ b/devel/llvm-cheri/files/llvm13/patch-backport-version-fixes
diff --git a/devel/llvm-cheri/files/patch-clang_lib_Headers_CMakeLists.txt b/devel/llvm-cheri/files/llvm13/patch-clang_lib_Headers_CMakeLists.txt
index 698c4719d779..698c4719d779 100644
--- a/devel/llvm-cheri/files/patch-clang_lib_Headers_CMakeLists.txt
+++ b/devel/llvm-cheri/files/llvm13/patch-clang_lib_Headers_CMakeLists.txt
diff --git a/devel/llvm-cheri/files/llvm14-backport-version-fixes b/devel/llvm-cheri/files/llvm14/patch-backport-version-fixes
index 6964bfd7e54d..6964bfd7e54d 100644
--- a/devel/llvm-cheri/files/llvm14-backport-version-fixes
+++ b/devel/llvm-cheri/files/llvm14/patch-backport-version-fixes
diff --git a/devel/llvm-cheri/files/llvm14/patch-clang_lib_Headers_CMakeLists.txt b/devel/llvm-cheri/files/llvm14/patch-clang_lib_Headers_CMakeLists.txt
new file mode 100644
index 000000000000..698c4719d779
--- /dev/null
+++ b/devel/llvm-cheri/files/llvm14/patch-clang_lib_Headers_CMakeLists.txt
@@ -0,0 +1,33 @@
+--- clang/lib/Headers/CMakeLists.txt.orig
++++ clang/lib/Headers/CMakeLists.txt
+@@ -75,7 +75,6 @@
+   invpcidintrin.h
+   iso646.h
+   keylockerintrin.h
+-  limits.h
+   lwpintrin.h
+   lzcntintrin.h
+   mm3dnow.h
+@@ -101,14 +100,7 @@
+   s390intrin.h
+   shaintrin.h
+   smmintrin.h
+-  stdalign.h
+-  stdarg.h
+-  stdatomic.h
+-  stdbool.h
+-  stddef.h
+   __stddef_max_align_t.h
+-  stdint.h
+-  stdnoreturn.h
+   tbmintrin.h
+   tgmath.h
+   tmmintrin.h
+@@ -117,7 +109,6 @@
+   unwind.h
+   vadefs.h
+   vaesintrin.h
+-  varargs.h
+   vecintrin.h
+   vpclmulqdqintrin.h
+   waitpkgintrin.h
diff --git a/devel/llvm-cheri/files/llvm15/patch-backport-version-fixes b/devel/llvm-cheri/files/llvm15/patch-backport-version-fixes
new file mode 100644
index 000000000000..b1d9368ef164
--- /dev/null
+++ b/devel/llvm-cheri/files/llvm15/patch-backport-version-fixes
@@ -0,0 +1,333 @@
+diff --git llvm/tools/lto/CMakeLists.txt llvm/tools/lto/CMakeLists.txt
+index 67f6d3af40e0..9382ee9588b3 100644
+--- llvm/tools/lto/CMakeLists.txt
++++ llvm/tools/lto/CMakeLists.txt
+@@ -19,7 +19,11 @@ set(SOURCES
+   lto.cpp
+   )
+ 
+-set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports)
++if (LLVM_LINK_LLVM_DYLIB)
++  set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.dylib.exports)
++else()
++  set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports)
++endif()
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL AIX)
+     set(LTO_LIBRARY_TYPE MODULE)
+diff --git llvm/tools/lto/lto.dylib.exports llvm/tools/lto/lto.dylib.exports
+new file mode 100644
+index 000000000000..4164c3919a97
+--- /dev/null
++++ llvm/tools/lto/lto.dylib.exports
+@@ -0,0 +1,77 @@
++lto_get_error_message
++lto_get_version
++lto_initialize_disassembler
++lto_module_create
++lto_module_create_from_fd
++lto_module_create_from_fd_at_offset
++lto_module_create_from_memory
++lto_module_create_from_memory_with_path
++lto_module_create_in_local_context
++lto_module_create_in_codegen_context
++lto_module_has_ctor_dtor
++lto_module_get_linkeropts
++lto_module_get_macho_cputype
++lto_module_get_num_symbols
++lto_module_get_symbol_attribute
++lto_module_get_symbol_name
++lto_module_get_target_triple
++lto_module_set_target_triple
++lto_module_is_object_file
++lto_module_is_object_file_for_target
++lto_module_is_object_file_in_memory
++lto_module_is_object_file_in_memory_for_target
++lto_module_has_objc_category
++lto_module_dispose
++lto_api_version
++lto_codegen_set_diagnostic_handler
++lto_codegen_add_module
++lto_codegen_set_module
++lto_codegen_add_must_preserve_symbol
++lto_codegen_compile
++lto_codegen_create
++lto_codegen_create_in_local_context
++lto_codegen_dispose
++lto_codegen_set_debug_model
++lto_codegen_set_pic_model
++lto_codegen_write_merged_modules
++lto_codegen_debug_options
++lto_codegen_debug_options_array
++lto_codegen_set_assembler_args
++lto_codegen_set_assembler_path
++lto_codegen_set_cpu
++lto_codegen_compile_to_file
++lto_codegen_optimize
++lto_codegen_compile_optimized
++lto_codegen_set_should_internalize
++lto_codegen_set_should_embed_uselists
++lto_set_debug_options
++thinlto_create_codegen
++thinlto_codegen_dispose
++thinlto_codegen_add_module
++thinlto_codegen_process
++thinlto_module_get_num_objects
++thinlto_module_get_object
++thinlto_codegen_set_pic_model
++thinlto_codegen_set_cache_dir
++thinlto_codegen_set_cache_pruning_interval
++thinlto_codegen_set_cache_entry_expiration
++thinlto_codegen_set_final_cache_size_relative_to_available_space
++thinlto_codegen_set_cache_size_bytes
++thinlto_codegen_set_cache_size_megabytes
++thinlto_codegen_set_cache_size_files
++thinlto_codegen_set_savetemps_dir
++thinlto_codegen_set_cpu
++thinlto_debug_options
++lto_module_is_thinlto
++thinlto_codegen_add_must_preserve_symbol
++thinlto_codegen_add_cross_referenced_symbol
++thinlto_codegen_set_codegen_only
++thinlto_codegen_disable_codegen
++thinlto_module_get_num_object_files
++thinlto_module_get_object_file
++thinlto_set_generated_objects_dir
++lto_input_create
++lto_input_dispose
++lto_input_get_num_dependent_libraries
++lto_input_get_dependent_library
++lto_runtime_lib_symbols_list
+diff --git llvm/tools/lto/lto.exports llvm/tools/lto/lto.exports
+index 3abae5f0fcba..4164c3919a97 100644
+--- llvm/tools/lto/lto.exports
++++ llvm/tools/lto/lto.exports
+@@ -45,12 +45,6 @@ lto_codegen_compile_optimized
+ lto_codegen_set_should_internalize
+ lto_codegen_set_should_embed_uselists
+ lto_set_debug_options
+-LLVMCreateDisasm
+-LLVMCreateDisasmCPU
+-LLVMDisasmDispose
+-LLVMDisasmInstruction
+-LLVMSetDisasmOptions
+-LLVMCreateDisasmCPUFeatures
+ thinlto_create_codegen
+ thinlto_codegen_dispose
+ thinlto_codegen_add_module
+diff --git llvm/tools/remarks-shlib/CMakeLists.txt llvm/tools/remarks-shlib/CMakeLists.txt
+index f22cedd9ead7..2f108a42c9aa 100644
+--- llvm/tools/remarks-shlib/CMakeLists.txt
++++ llvm/tools/remarks-shlib/CMakeLists.txt
+@@ -9,7 +9,11 @@ if(LLVM_ENABLE_PIC)
+     libremarks.cpp
+     )
+ 
+-  set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports)
++  if (LLVM_LINK_LLVM_DYLIB)
++    set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.dylib.exports)
++  else()
++    set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports)
++  endif()
+ 
+   add_llvm_library(Remarks SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES})
+ 
+diff --git llvm/tools/remarks-shlib/Remarks.dylib.exports llvm/tools/remarks-shlib/Remarks.dylib.exports
+new file mode 100644
+index 000000000000..0c2a3c38c78c
+--- /dev/null
++++ llvm/tools/remarks-shlib/Remarks.dylib.exports
+@@ -0,0 +1 @@
++LLVMRemarkVersion
+diff --git openmp/libomptarget/src/exports openmp/libomptarget/src/exports
+index 35a665a98c27..cedefc996a29 100644
+--- openmp/libomptarget/src/exports
++++ openmp/libomptarget/src/exports
+@@ -51,7 +51,6 @@ VERS1.0 {
+     omp_get_interop_int;
+     omp_get_interop_name;
+     omp_get_interop_type_desc;
+-    omp_get_interop_rc_desc;
+     __tgt_interop_init;
+     __tgt_interop_use;
+     __tgt_interop_destroy;
+diff --git openmp/runtime/cmake/LibompHandleFlags.cmake openmp/runtime/cmake/LibompHandleFlags.cmake
+index 6643ea392f80..fb1825df71d6 100644
+--- openmp/runtime/cmake/LibompHandleFlags.cmake
++++ openmp/runtime/cmake/LibompHandleFlags.cmake
+@@ -98,7 +98,6 @@ function(libomp_get_ldflags ldflags)
+     IF_DEFINED CMAKE_C_OSX_CURRENT_VERSION_FLAG)
+   libomp_append(ldflags_local "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}${LIBOMP_VERSION_MAJOR}.${LIBOMP_VERSION_MINOR}"
+     IF_DEFINED CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG)
+-  libomp_append(ldflags_local -Wl,--warn-shared-textrel LIBOMP_HAVE_WARN_SHARED_TEXTREL_FLAG)
+   libomp_append(ldflags_local -Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG)
+   libomp_append(ldflags_local "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+   libomp_append(ldflags_local -static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
+diff --git openmp/runtime/cmake/config-ix.cmake openmp/runtime/cmake/config-ix.cmake
+index bd7585545b72..f8d52f3c3e43 100644
+--- openmp/runtime/cmake/config-ix.cmake
++++ openmp/runtime/cmake/config-ix.cmake
+@@ -131,9 +131,8 @@ if(WIN32)
+   libomp_check_linker_flag(/SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
+ elseif(NOT APPLE)
+   libomp_check_linker_flag(-Wl,-x LIBOMP_HAVE_X_FLAG)
+-  libomp_check_linker_flag(-Wl,--warn-shared-textrel LIBOMP_HAVE_WARN_SHARED_TEXTREL_FLAG)
+   libomp_check_linker_flag(-Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG)
+-  libomp_check_linker_flag("-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
++  libomp_check_linker_flag("-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+   libomp_check_linker_flag(-static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
+   libomp_check_linker_flag(-Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG)
+ endif()
+diff --git openmp/runtime/src/exports_so.txt openmp/runtime/src/exports_so.txt
+index ac188af31055..834c6118d820 100644
+--- openmp/runtime/src/exports_so.txt
++++ openmp/runtime/src/exports_so.txt
+@@ -71,10 +71,8 @@ VERSION {
+         __kmp_fork_call;
+         __kmp_invoke_microtask;
+ #if KMP_USE_MONITOR
+-        __kmp_launch_monitor;
+         __kmp_reap_monitor;
+ #endif
+-        __kmp_launch_worker;
+         __kmp_reap_worker;
+         __kmp_release_64;
+         __kmp_wait_64;
+diff --git openmp/runtime/src/exports_test_so.txt openmp/runtime/src/exports_test_so.txt
+new file mode 100644
+index 000000000000..912d160e7c06
+--- /dev/null
++++ openmp/runtime/src/exports_test_so.txt
+@@ -0,0 +1,60 @@
++# exports_test_so.txt #
++
++#
++#//===----------------------------------------------------------------------===//
++#//
++#// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
++#// See https://llvm.org/LICENSE.txt for license information.
++#// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
++#//
++#//===----------------------------------------------------------------------===//
++#
++
++# This is used only to test if the linker supports version scripts. If the full
++# version script it used we may error on undefined symbols and erroneously fail.
++
++VERSION {
++
++    global: # Exported symbols.
++
++        *;         # All symbols as exported for testing.
++
++    local: # Non-exported symbols.
++
++        *;         # All other symbols are not exported.
++
++}; # VERSION
++
++# sets up GCC OMP_ version dependency chain
++OMP_1.0 {
++};
++OMP_2.0 {
++} OMP_1.0;
++OMP_3.0 {
++} OMP_2.0;
++OMP_3.1 {
++} OMP_3.0;
++OMP_4.0 {
++} OMP_3.1;
++OMP_4.5 {
++} OMP_4.0;
++OMP_5.0 {
++} OMP_4.5;
++
++# sets up GCC GOMP_ version dependency chain
++GOMP_1.0 {
++};
++GOMP_2.0 {
++} GOMP_1.0;
++GOMP_3.0 {
++} GOMP_2.0;
++GOMP_4.0 {
++} GOMP_3.0;
++GOMP_4.5 {
++} GOMP_4.0;
++GOMP_5.0 {
++} GOMP_4.5;
++GOMP_5.0.1 {
++} GOMP_5.0;
++
++# end of file #
+diff --git openmp/runtime/src/kmp_runtime.cpp openmp/runtime/src/kmp_runtime.cpp
+index b8d470528798..6edbe6d2d74e 100644
+--- openmp/runtime/src/kmp_runtime.cpp
++++ openmp/runtime/src/kmp_runtime.cpp
+@@ -9181,3 +9181,20 @@ void __kmp_set_nesting_mode_threads() {
+   if (__kmp_nesting_mode == 1) // turn on nesting for this case only
+     set__max_active_levels(thread, __kmp_nesting_mode_nlevels);
+ }
++
++// Empty symbols to export (see exports_so.txt) when feature is disabled
++extern "C" {
++#if !KMP_STATS_ENABLED
++void __kmp_reset_stats() {}
++#endif
++#if !USE_DEBUGGER
++int __kmp_omp_debug_struct_info = FALSE;
++int __kmp_debugging = FALSE;
++#endif
++#if !USE_ITT_BUILD || !USE_ITT_NOTIFY
++void __kmp_itt_fini_ittlib() {}
++void __kmp_itt_init_ittlib() {}
++#endif
++}
++
++// end of file
+diff --git openmp/runtime/src/kmp_utility.cpp openmp/runtime/src/kmp_utility.cpp
+index 48d31e5ee7b7..5937f8026e39 100644
+--- openmp/runtime/src/kmp_utility.cpp
++++ openmp/runtime/src/kmp_utility.cpp
+@@ -403,3 +403,16 @@ void __kmp_expand_file_name(char *result, size_t rlen, char *pattern) {
+ 
+   *pos = '\0';
+ }
++
++#if !OMPT_SUPPORT
++extern "C" {
++typedef struct ompt_start_tool_result_t ompt_start_tool_result_t;
++// Define symbols expected by VERSION script
++ompt_start_tool_result_t *ompt_start_tool(unsigned int omp_version,
++                                          const char *runtime_version) {
++  return nullptr;
++}
++
++void ompt_libomp_connect(ompt_start_tool_result_t *result) { result = nullptr; }
++}
++#endif
+diff --git openmp/runtime/src/z_Linux_util.cpp openmp/runtime/src/z_Linux_util.cpp
+index 91edf0254a77..0669b208ce62 100644
+--- openmp/runtime/src/z_Linux_util.cpp
++++ openmp/runtime/src/z_Linux_util.cpp
+@@ -987,7 +987,7 @@ void __kmp_exit_thread(int exit_status) {
+ #if KMP_USE_MONITOR
+ void __kmp_resume_monitor();
+ 
+-void __kmp_reap_monitor(kmp_info_t *th) {
++extern "C" void __kmp_reap_monitor(kmp_info_t *th) {
+   int status;
+   void *exit_val;
+ 
+@@ -1029,6 +1029,12 @@ void __kmp_reap_monitor(kmp_info_t *th) {
+ 
+   KMP_MB(); /* Flush all pending memory write invalidates.  */
+ }
++#else
++// Empty symbol to export (see exports_so.txt) when
++// monitor thread feature is disabled
++extern "C" void __kmp_reap_monitor(kmp_info_t *th) {
++  (void)th;
++}
+ #endif // KMP_USE_MONITOR
+ 
+ void __kmp_reap_worker(kmp_info_t *th) {
diff --git a/devel/llvm-cheri/files/llvm15/patch-clang_lib_Headers_CMakeLists.txt b/devel/llvm-cheri/files/llvm15/patch-clang_lib_Headers_CMakeLists.txt
new file mode 100644
index 000000000000..ceb6a7de05ea
--- /dev/null
+++ b/devel/llvm-cheri/files/llvm15/patch-clang_lib_Headers_CMakeLists.txt
@@ -0,0 +1,22 @@
+--- clang/lib/Headers/CMakeLists.txt.orig
++++ clang/lib/Headers/CMakeLists.txt
+@@ -6,19 +6,10 @@
+   float.h
+   inttypes.h
+   iso646.h
+-  limits.h
+   module.modulemap
+-  stdalign.h
+-  stdarg.h
+-  stdatomic.h
+-  stdbool.h
+-  stddef.h
+   __stddef_max_align_t.h
+-  stdint.h
+-  stdnoreturn.h
+   tgmath.h
+   unwind.h
+-  varargs.h
+   )
+ 
+ set(arm_common_files
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index fdcd1aebc3e9..485a9154ef7e 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -13,11 +13,13 @@ bin/llvm-config%%COMMAND_SUFFIX%%
 bin/llvm-cov%%COMMAND_SUFFIX%%
 bin/llvm-cvtres%%COMMAND_SUFFIX%%
 bin/llvm-cxxmap%%COMMAND_SUFFIX%%
+bin/llvm-debuginfod%%COMMAND_SUFFIX%%
 bin/llvm-debuginfod-find%%COMMAND_SUFFIX%%
 bin/llvm-diff%%COMMAND_SUFFIX%%
 bin/llvm-dis%%COMMAND_SUFFIX%%
 bin/llvm-dlltool%%COMMAND_SUFFIX%%
 bin/llvm-dwarfdump%%COMMAND_SUFFIX%%
+bin/llvm-dwarfutil%%COMMAND_SUFFIX%%
 bin/llvm-dwp%%COMMAND_SUFFIX%%
 bin/llvm-exegesis%%COMMAND_SUFFIX%%
 bin/llvm-extract%%COMMAND_SUFFIX%%
@@ -46,6 +48,7 @@ bin/llvm-rc%%COMMAND_SUFFIX%%
 bin/llvm-readelf%%COMMAND_SUFFIX%%
 bin/llvm-readobj%%COMMAND_SUFFIX%%
 bin/llvm-reduce%%COMMAND_SUFFIX%%
+bin/llvm-remark-size-diff%%COMMAND_SUFFIX%%
 bin/llvm-rtdyld%%COMMAND_SUFFIX%%
 bin/llvm-sim%%COMMAND_SUFFIX%%
 bin/llvm-size%%COMMAND_SUFFIX%%
@@ -74,6 +77,7 @@ bin/c-index-test%%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-packager%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-offload-wrapper%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-rename%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-repl%%COMMAND_SUFFIX%%
@@ -109,6 +113,7 @@ llvm%%LLVM_SUFFIX%%/bin/c-index-test
 %%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-packager
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-wrapper
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-refactor
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-rename
@@ -140,11 +145,13 @@ 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
 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
 llvm%%LLVM_SUFFIX%%/bin/llvm-dwarfdump
+llvm%%LLVM_SUFFIX%%/bin/llvm-dwarfutil
 llvm%%LLVM_SUFFIX%%/bin/llvm-dwp
 llvm%%LLVM_SUFFIX%%/bin/llvm-exegesis
 llvm%%LLVM_SUFFIX%%/bin/llvm-extract
@@ -176,6 +183,7 @@ 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-remark-size-diff
 llvm%%LLVM_SUFFIX%%/bin/llvm-rtdyld
 llvm%%LLVM_SUFFIX%%/bin/llvm-sim
 llvm%%LLVM_SUFFIX%%/bin/llvm-size
@@ -224,6 +232,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTDumper.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTDumperUtils.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTFwd.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTImportError.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTImporter.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTImporterLookupTable.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTImporterSharedState.h
@@ -323,6 +332,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/PrettyDeclStackTrace.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/PrettyPrinter.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/QualTypeNames.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/Randstruct.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/RawCommentList.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/RecordLayout.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/RecursiveASTVisitor.h
@@ -395,11 +405,19 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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/DebugSupport.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/MapLattice.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/MatchSwitch.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/Models/ChromiumCheckModel.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/NoopAnalysis.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/NoopLattice.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/Solver.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/FlowSensitive/WatchedLiteralsSolver.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
@@ -439,6 +457,8 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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/BuiltinsVE.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsVEVL.gen.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
@@ -503,6 +523,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Linkage.h
 %%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/MakeSupport.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
@@ -525,6 +546,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Sarif.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceLocation.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceManagerInternals.h
@@ -562,6 +584,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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_builtin_sema.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
@@ -600,6 +623,12 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Edit/EditsReceiver.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Edit/FileOffset.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Edit/Rewriters.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ExtractAPI/API.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ExtractAPI/AvailabilityInfo.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ExtractAPI/DeclarationFragments.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ExtractAPI/FrontendActions.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ExtractAPI/Serialization/SerializerBase.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ExtractAPI/Serialization/SymbolGraphSerializer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Format/Format.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/ASTConsumers.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/ASTUnit.h
@@ -641,7 +670,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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/DependencyDirectivesScanner.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DirectoryLookup.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/ExternalPreprocessorSource.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/HeaderMap.h
@@ -661,7 +690,6 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/Pragma.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessingRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/Preprocessor.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessorLexer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessorOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/ScratchBuffer.h
@@ -700,6 +728,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/DelayedDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Designator.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ExternalSemaSource.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/HLSLExternalSemaSource.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/IdentifierResolver.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Initialization.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Lookup.h
@@ -709,6 +738,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Ownership.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ParsedAttr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ParsedTemplate.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/RISCVIntrinsicManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Scope.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ScopeInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Sema.h
@@ -739,12 +769,14 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ModuleManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/PCHContainerOperations.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/SerializationDiagnostic.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/SourceLocationEncoding.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/TypeBitCodes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/Checkers.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/SValExplainer.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/Taint.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/Analyses.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/AnalyzerOptions.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
@@ -801,7 +833,9 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Support/RISCVVIntrinsicUtils.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Testing/CommandLineArgs.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Testing/TestAST.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Testing/TestClangConfig.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ASTDiff/ASTDiff.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ASTDiff/ASTDiffInternal.h
@@ -823,6 +857,7 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/FixIt.h
 %%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/Inclusions/StandardLibrary.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
@@ -858,6 +893,8 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%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/TokenBufferTokenManager.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/TokenManager.h
 %%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
@@ -884,26 +921,6 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/TargetOptionsCommandFlags.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Timer.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Version.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/AbsoluteAtom.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/ArchiveLibraryFile.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Atom.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/DefinedAtom.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Error.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/File.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Instrumentation.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/LinkingContext.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Node.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Pass.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/PassManager.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Reader.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Reference.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Resolver.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/SharedLibraryAtom.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/SharedLibraryFile.h
-%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Core/Simple.h
-%%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
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Analysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/BitReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/BitWriter.h
@@ -930,7 +947,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/Support.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Target.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/TargetMachine.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/AggressiveInstCombine.h
-llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/Coroutines.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/IPO.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/InstCombine.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Transforms/PassBuilder.h
@@ -939,11 +955,13 @@ 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/blake3.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
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/AddressRanges.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/AllocatorList.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Any.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ArrayRef.h
@@ -1116,6 +1134,7 @@ 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/MemoryProfileInfo.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
@@ -1147,6 +1166,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionDivision.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionExpressions.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarEvolutionNormalization.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScalarFuncs.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ScopedNoAliasAA.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/SparsePropagation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/StackLifetime.h
@@ -1158,6 +1178,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TargetLibraryInfo.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TargetLibraryInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TargetTransformInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TargetTransformInfoImpl.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/TensorSpec.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
@@ -1176,6 +1197,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/Parser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/SlotMapping.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/COFF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/DXContainer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Dwarf.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Dwarf.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/DynamicTags.def
@@ -1189,6 +1211,7 @@ 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/LoongArch.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
@@ -1200,6 +1223,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/SystemZ.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/VE.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/i386.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/x86_64.def
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/GOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MachO.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Magic.h
@@ -1223,19 +1247,21 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeWriterPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/LLVMBitCodes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitCodeEnums.h
 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_128m.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/contrib/elf.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/contrib/rts.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/contrib/sail.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CHERI/cheri-compressed-cap/test/contrib/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
@@ -1245,7 +1271,9 @@ 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/BasicBlockSectionsProfileReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicTTIImpl.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CFIFixup.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
@@ -1295,8 +1323,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/RegBankSelect.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/RegisterBank.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/Utils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ISDOpcodes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/IndirectThunks.h
@@ -1388,6 +1414,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocCommon.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocPBQP.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocRegistry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Register.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterBank.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterBankInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterClassInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterPressure.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterScavenging.h
@@ -1537,11 +1565,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFLocationExpression.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFObject.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFSection.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFTypePrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFUnitIndex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/ExtractRanges.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FileEntry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FileWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FunctionInfo.h
@@ -1553,7 +1583,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LineEntry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LineTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LookupResult.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
-llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/Range.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/StringTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/MSF/IMSFFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/MSF/MSFBuilder.h
@@ -1598,6 +1627,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/DbiModuleList.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/DbiStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/EnumTables.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/FormatUtil.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/Formatters.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
@@ -1607,6 +1637,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InfoStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InputFile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/LinePrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
@@ -1684,14 +1716,21 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/PDBSymbolUnknown.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/PDBTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/UDTLayout.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/DIFetcher.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/DIPrinter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/Markup.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/MarkupFilter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/SymbolizableObjectFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/Symbolize/Symbolize.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Debuginfod/DIFetcher.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Debuginfod/Debuginfod.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Debuginfod/HTTPClient.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Debuginfod/HTTPServer.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
+llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/ItaniumNodes.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/MicrosoftDemangle.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/MicrosoftDemangleNodes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Demangle/StringView.h
@@ -1700,6 +1739,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/ExecutionEngine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/GenericValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Interpreter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITEventListener.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/COFF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/DWARFRecordSectionSplitter.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
@@ -1747,6 +1789,8 @@ 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/MapperJITLinkMemoryManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/MemoryMapper.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
@@ -1765,6 +1809,7 @@ 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/ExecutorSharedMemoryMapperService.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorDylibManager.h
@@ -1804,7 +1849,6 @@ 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
@@ -1814,6 +1858,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/Cheri.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/CheriIntrinsics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Comdat.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Constant.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/ConstantFold.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ConstantFolder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ConstantRange.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Constants.h
@@ -1830,6 +1875,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticHandler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Dominators.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/FMF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/FPEnv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/FixedMetadataKinds.def
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/FixedPointBuilder.h
@@ -1866,6 +1912,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsARM.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsBPF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsBPF.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsCHERICap.td
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsDirectX.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsDirectX.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsHexagon.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsHexagon.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsHexagonDep.td
@@ -1879,6 +1927,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsR600.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsRISCV.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsRISCV.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsS390.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsSPIRV.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsSPIRV.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsSystemZ.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsVE.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsVE.td
@@ -1936,6 +1986,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/Value.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ValueHandle.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ValueMap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ValueSymbolTable.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/VectorBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Verifier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IRReader/IRReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/InitializePasses.h
@@ -1971,6 +2022,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAssembler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCCodeEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCCodeView.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCContext.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDXContainerStreamer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDXContainerWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDecoderOps.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDirectives.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDisassembler/MCDisassembler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h
@@ -1980,7 +2034,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDwarf.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCELFObjectWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCELFStreamer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCExpr.h
-llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCFixedLenDisassembler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCFixup.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCFixupKindInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCFragment.h
@@ -2008,12 +2061,16 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCParser/MCTargetAsmParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCPseudoProbe.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCRegister.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCRegisterInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSPIRVObjectWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSPIRVStreamer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSchedule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSection.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionCOFF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionDXContainer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionELF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionGOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionMachO.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionSPIRV.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionWasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionXCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCStreamer.h
@@ -2051,6 +2108,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HardwareUnits/RegisterFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HardwareUnits/ResourceManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HardwareUnits/RetireControlUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HardwareUnits/Scheduler.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MCA/IncrementalSourceMgr.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/InstrBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Instruction.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Pipeline.h
@@ -2065,6 +2123,20 @@ 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/ObjCopy/COFF/COFFConfig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/COFF/COFFObjcopy.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/CommonConfig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/ConfigManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/ELF/ELFConfig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/ELF/ELFObjcopy.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/MachO/MachOConfig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/MachO/MachOObjcopy.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/MultiFormatConfig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/ObjCopy.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/XCOFF/XCOFFConfig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/XCOFF/XCOFFObjcopy.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/wasm/WasmConfig.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjCopy/wasm/WasmObjcopy.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
@@ -2072,6 +2144,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Object/COFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/COFFImportFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/COFFModuleDefinition.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/CVDebugRecord.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/DXContainer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/Decompressor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/ELF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/ELFObjectFile.h
@@ -2086,6 +2159,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Object/MachOUniversalWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/Minidump.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/ModuleSymbolTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/ObjectFile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/OffloadBinary.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/RelocationResolver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/StackMapParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/SymbolSize.h
@@ -2104,10 +2178,12 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/CodeViewYAMLTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/DWARFEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/DWARFYAML.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/DXContainerYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/ELFYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/MachOYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/MinidumpYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/ObjectYAML.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/OffloadYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/WasmYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/XCOFFYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/YAML.h
@@ -2136,6 +2212,8 @@ 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/MIBEntryDef.inc
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/MemProf.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
@@ -2174,6 +2252,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/AtomicOrdering.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AutoConvert.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Automaton.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BCD.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/BLAKE3.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Base64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryByteStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryItemStream.h
@@ -2191,6 +2270,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/CFGDiff.h
 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/CSKYAttributeParser.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/CSKYAttributes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/CSKYTargetParser.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/CSKYTargetParser.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
@@ -2207,6 +2290,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/ConvertUTF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CrashRecoveryContext.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DJB.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DOTGraphTraits.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/DXILOperationCommon.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DataExtractor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DataTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Debug.h
@@ -2353,6 +2437,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Automaton.td
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/DirectiveEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Error.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Main.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Parser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Record.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/SearchableTable.td
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/SetTheory.h
@@ -2394,8 +2479,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/CFGuard.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines/CoroCleanup.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines/CoroConditionalWrapper.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines/CoroEarly.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines/CoroElide.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines/CoroSplit.h
@@ -2506,7 +2591,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopStrengthReduce.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopUnrollAndJamPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopUnrollPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopVersioningLICM.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerAtomic.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerAtomicPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerConstantIntrinsics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
@@ -2533,6 +2618,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/Sink.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/SpeculativeExecution.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/StraightLineStrengthReduce.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/StructurizeCFG.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/TLSVariableHoist.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/TailRecursionElimination.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/WarnMissedTransforms.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils.h
@@ -2577,13 +2663,17 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LoopRotationUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LoopSimplify.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LoopUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LoopVersioning.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerAtomic.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerGlobalDtors.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerInvoke.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerMemIntrinsics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerSwitch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MatrixUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Mem2Reg.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MemoryOpRemark.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MemoryTaggingSupport.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MetaRenamer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MisExpect.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ModuleUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/NameAnonGlobals.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/PredicateInfo.h
@@ -2617,6 +2707,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize/LoopVectorize.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize/SLPVectorizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize/VectorCombine.h
+llvm%%LLVM_SUFFIX%%/include/llvm/WindowsDriver/MSVCPaths.h
+llvm%%LLVM_SUFFIX%%/include/llvm/WindowsDriver/MSVCSetupApi.h
 llvm%%LLVM_SUFFIX%%/include/llvm/WindowsManifest/WindowsManifestMerger.h
 llvm%%LLVM_SUFFIX%%/include/llvm/WindowsResource/ResourceProcessor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/WindowsResource/ResourceScriptToken.h
@@ -2728,6 +2820,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_circ_brev_intrinsics.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_protos.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_types.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hlsl.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hlsl_basic_types.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hlsl_intrinsics.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hresetintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
@@ -2762,15 +2857,21 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/popcntintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/bmi2intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/bmiintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/emmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/immintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mm_malloc.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/pmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/smmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/tmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/x86gprintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/x86intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/xmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdpruintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/riscv_vector.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
@@ -2788,6 +2889,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/velintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/velintrin_approx.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/velintrin_gen.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vpclmulqdqintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/waitpkgintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/wasm_simd128.h
@@ -2815,6 +2919,7 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/AddOCaml.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/AddSphinxTarget.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckAtomic.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckCompilerVersion.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/CheckProblematicConfigurations.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
@@ -2847,6 +2952,7 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/TableGen.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/TensorFlowCompile.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/UseLibtool.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/llvm-driver-template.cpp.in
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
@@ -2897,6 +3003,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenACC.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzerCLI.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a
@@ -2915,6 +3022,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCopy.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
@@ -2945,6 +3053,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsDriver.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a
@@ -2961,14 +3070,15 @@ 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_RELEASE%%git
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.13
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysisFlowSensitive.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysisFlowSensitiveModels.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
@@ -2977,6 +3087,7 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangExtractAPI.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFormat.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontend.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontendTool.a
@@ -2994,7 +3105,7 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCheckers.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a
-%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTesting.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSupport.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingASTDiff.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a
diff --git a/devel/llvm-cheriot/Makefile b/devel/llvm-cheriot/Makefile
index e1f10f9761c3..ff1635c3cb02 100644
--- a/devel/llvm-cheriot/Makefile
+++ b/devel/llvm-cheriot/Makefile
@@ -12,10 +12,6 @@ PLIST=		${.CURDIR}/pkg-plist
 LLVM_TARGETS=          RISCV
 CMAKE_FLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=riscv32-unknown-unknown
 
-.if exists(${.CURDIR}/files)
-EXTRA_PATCHES=	${.CURDIR}/files
-.endif
-
 .include "${.CURDIR}/Makefile.snapshot"
 
 MASTERDIR=	${.CURDIR}/../llvm-cheri
diff --git a/devel/llvm-cheriot/Makefile.COMMANDS b/devel/llvm-cheriot/Makefile.COMMANDS
index 61ed67d697b9..4738e95d6530 100644
--- a/devel/llvm-cheriot/Makefile.COMMANDS
+++ b/devel/llvm-cheriot/Makefile.COMMANDS
@@ -1,6 +1,11 @@
 .include "${.CURDIR}/../llvm-cheri/Makefile.COMMANDS"
 
 # Work around version skew with llvm-cheri
+# llvm 14 additions
 LLVM_COMMANDS:=	${LLVM_COMMANDS:Nllvm-debuginfod-find:Nllvm-tli-checker}
 CLANG_COMMANDS:=${CLANG_COMMANDS:Nclang-linker-wrapper:Nclang-nvlink-wrapper:Nclang-repl}
+# llvm 14 removals
 LLD_COMMANDS+=	ld64.lld.darwinnew ld64.lld.darwinold
+# llvm 15 additions
+LLVM_COMMANDS:=	${LLVM_COMMANDS:Nllvm-debuginfod:Nllvm-dwarfutil:Nllvm-remark-size-diff}
+CLANG_COMMANDS:=${CLANG_COMMANDS:Nclang-offload-packager}
diff --git a/devel/llvm-cheriot/Makefile.MAN1SRCS b/devel/llvm-cheriot/Makefile.MAN1SRCS
index 0ee3ab065a25..e4d629491013 100644
--- a/devel/llvm-cheriot/Makefile.MAN1SRCS
+++ b/devel/llvm-cheriot/Makefile.MAN1SRCS
@@ -1,4 +1,7 @@
 .include "${.PARSEDIR}/../llvm-cheri/Makefile.MAN1SRCS"
 
 # Workaround for llvm-cheri/llvm-morello version skew
+# llvm 14 additions
 LLVM_MAN1SRCS:=	${LLVM_MAN1SRCS:Nllvm-tli-checker.1}
+# llvm 15 additions
+LLVM_MAN1SRCS:=	${LLVM_MAN1SRCS:Nllvm-dwarfutil.1:Nllvm-ifs.1:Nllvm-remark-size-diff.1}
diff --git a/devel/llvm-cheriot/Makefile.snapshot b/devel/llvm-cheriot/Makefile.snapshot
index 3fc8b7f572c2..28d859ff4674 100644
--- a/devel/llvm-cheriot/Makefile.snapshot
+++ b/devel/llvm-cheriot/Makefile.snapshot
@@ -4,6 +4,6 @@
 #
 LLVM_MAJOR=	13
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20230706
+SNAPDATE=	20240112
 
-LLVM_COMMIT=		a6c9dc0a4232ed4a64acc6ba4fc7f2754de1ed45
+LLVM_COMMIT=		6544c9b0f68d263e449ed217f34fa25ee3b7d0ed
diff --git a/devel/llvm-cheriot/distinfo b/devel/llvm-cheriot/distinfo
index e93cac3d0a23..3cd242b246e7 100644
--- a/devel/llvm-cheriot/distinfo
+++ b/devel/llvm-cheriot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699044153
-SHA256 (CTSRD-CHERI-llvm-project-13.0.d20230706-a6c9dc0a4232ed4a64acc6ba4fc7f2754de1ed45_GH0.tar.gz) = 955d8fb500a9512d1085caf3a6b250e3d297554d4905aa7e2b7b76fed8280c33
-SIZE (CTSRD-CHERI-llvm-project-13.0.d20230706-a6c9dc0a4232ed4a64acc6ba4fc7f2754de1ed45_GH0.tar.gz) = 152251308
+TIMESTAMP = 1706037618
+SHA256 (CTSRD-CHERI-llvm-project-13.0.d20240112-6544c9b0f68d263e449ed217f34fa25ee3b7d0ed_GH0.tar.gz) = 10480d5f5f8b483e9b8db46f6fa5ea75ca296ddb0568d631c275a63abcd4d1f3
+SIZE (CTSRD-CHERI-llvm-project-13.0.d20240112-6544c9b0f68d263e449ed217f34fa25ee3b7d0ed_GH0.tar.gz) = 152273349
diff --git a/devel/llvm-cheriot/files/gen-Makefile.snapshot.sh b/devel/llvm-cheriot/files/gen-Makefile.snapshot.sh
index 0b3693a9b0d3..4df6fcd08ec4 100644
--- a/devel/llvm-cheriot/files/gen-Makefile.snapshot.sh
+++ b/devel/llvm-cheriot/files/gen-Makefile.snapshot.sh
@@ -4,7 +4,7 @@
 # curl and jq.  Uses unauthenticated access which is ratelimited to 60
 # queries per hour.
 
-REPOS_URL=https://api.github.com/repos/CTSRD-CHERI
+REPOS_URL=https://api.github.com/repos/CHERIoT-Platform
 MAX_DATE=1970101
 
 tmpfile=`mktemp -t gen-Makefile.snapshot`
diff --git a/devel/llvm-cheriot/pkg-plist b/devel/llvm-cheriot/pkg-plist
index 69ff47ed5cde..b1bc8157a298 100644
--- a/devel/llvm-cheriot/pkg-plist
+++ b/devel/llvm-cheriot/pkg-plist
@@ -97,7 +97,7 @@ llvm%%LLVM_SUFFIX%%/bin/bugpoint
 llvm%%LLVM_SUFFIX%%/bin/c-index-test
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang++
-%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-13
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-check
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-cl
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-cpp
@@ -2566,166 +2566,166 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/RecordPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Trace.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/XRayRecord.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_builtin_vars.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_cmath.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_complex_builtins.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_device_functions.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_intrinsics.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_libdevice_declares.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_math.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_math_forward_declares.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_cuda_runtime_wrapper.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_hip_cmath.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_hip_libdevice_declares.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_hip_math.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__clang_hip_runtime_wrapper.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__stddef_max_align_t.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__wmmintrin_aes.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/__wmmintrin_pclmul.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/adxintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/altivec.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ammintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/amxintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm64intr.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_acle.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_bf16.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_cde.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_cmse.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_fp16.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_mve.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_neon.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/arm_sve.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/armintr.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx2intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512bf16intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512bitalgintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512bwintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512cdintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512dqintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512erintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512fintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512ifmaintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512ifmavlintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512pfintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vbmi2intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vbmiintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vbmivlintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlbf16intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlbitalgintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlbwintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlcdintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vldqintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlvbmi2intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlvnniintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vlvp2intersectintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vnniintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vp2intersectintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vpopcntdqintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avx512vpopcntdqvlintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avxintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/avxvnniintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/bmi2intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/bmiintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/builtins.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cet.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cetintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cheri.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cheri_init_globals.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cheriintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cldemoteintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/clflushoptintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/clwbintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/clzerointrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cpuid.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cuda_wrappers/algorithm
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cuda_wrappers/complex
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/cuda_wrappers/new
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/emmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/enqcmdintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/f16cintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/float.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/fma4intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/fmaintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/fxsrintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/gfniintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/hexagon_circ_brev_intrinsics.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/hexagon_protos.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/hexagon_types.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/hresetintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/htmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/htmxlintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/hvx_hexagon_protos.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ia32intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/immintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/inttypes.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/invpcidintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/iso646.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/keylockerintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/lwpintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/lzcntintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/mm3dnow.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/mm_malloc.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/mmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/module.modulemap
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/movdirintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/msa.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/mwaitxintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/nmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/opencl-c-base.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/opencl-c.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/openmp_wrappers/cmath
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/openmp_wrappers/complex
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/openmp_wrappers/complex.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/openmp_wrappers/complex_cmath.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/openmp_wrappers/math.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/openmp_wrappers/new
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/pconfigintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/pkuintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/pmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/popcntintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ppc_wrappers/emmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ppc_wrappers/mm_malloc.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ppc_wrappers/mmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ppc_wrappers/pmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ppc_wrappers/smmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ppc_wrappers/tmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ppc_wrappers/xmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/prfchwintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/ptwriteintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/rdseedintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/riscv_vector.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/rtmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/s390intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/serializeintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/sgxintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/shaintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/smmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/tbmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/tgmath.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/tmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/tsxldtrkintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/uintrintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/unwind.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/vadefs.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/vaesintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/vecintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/vpclmulqdqintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/waitpkgintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/wasm_simd128.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/wbnoinvdintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/wmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/x86gprintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/x86intrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/xmmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/xopintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/xsavecintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/xsaveintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/xsaveoptintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/xsavesintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/13.0.0/include/xtestintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_device_functions.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_intrinsics.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_libdevice_declares.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_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
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_hip_runtime_wrapper.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__stddef_max_align_t.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_aes.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_pclmul.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/adxintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/altivec.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ammintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/amxintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm64intr.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_acle.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_bf16.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_cde.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_cmse.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_fp16.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_mve.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_sve.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/armintr.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bf16intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bitalgintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bwintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512cdintrin.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/avx512ifmaintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmavlintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512pfintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmi2intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmiintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmivlintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbf16intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbitalgintrin.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/avx512vlintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvbmi2intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvnniintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvp2intersectintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vnniintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vp2intersectintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqvlintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avxintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avxvnniintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/bmi2intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/bmiintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/builtins.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cet.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cetintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cheri.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cheri_init_globals.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cheriintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cldemoteintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/clflushoptintrin.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/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
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/enqcmdintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/f16cintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/float.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/gfniintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_circ_brev_intrinsics.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_protos.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hexagon_types.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hresetintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/hvx_hexagon_protos.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/immintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/inttypes.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/invpcidintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/keylockerintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/lwpintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mm_malloc.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/module.modulemap
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/movdirintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/msa.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/opencl-c-base.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/__clang_openmp_device_functions.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/cmath
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/complex
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/complex.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/complex_cmath.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/math.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/new
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pconfigintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/popcntintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/emmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mm_malloc.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/pmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/smmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/tmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/xmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/riscv_vector.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/serializeintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tsxldtrkintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/uintrintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vpclmulqdqintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/waitpkgintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/wasm_simd128.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/wbnoinvdintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/x86gprintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveoptintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsavesintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xtestintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/cmake/clang/AddClang.cmake
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/cmake/clang/ClangConfig.cmake
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/cmake/clang/ClangTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -2769,18 +2769,18 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/TableGen.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/TensorFlowCompile.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/UseLibtool.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-13.0.0git.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-13git.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%git.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
-llvm%%LLVM_SUFFIX%%/lib/libLTO.so.13git
+llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%git
 llvm%%LLVM_SUFFIX%%/lib/libRemarks.so
-llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.13git
+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.13git
+%%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.13
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.13.0.0git
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%git
 llvm%%LLVM_SUFFIX%%/lib/libear/__init__.py
 llvm%%LLVM_SUFFIX%%/lib/libear/config.h.in
 llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
diff --git a/devel/llvm-morello/Makefile b/devel/llvm-morello/Makefile
index b6777d276b3d..b30c9bc0ed65 100644
--- a/devel/llvm-morello/Makefile
+++ b/devel/llvm-morello/Makefile
@@ -18,10 +18,6 @@ GL_TAGNAME=	${LLVM_COMMIT}
 # Regularly tested targets as part of Android development
 LLVM_TARGETS=	AArch64;ARM;BPF;X86
 
-.if exists(${.CURDIR}/files)
-EXTRA_PATCHES=	${.CURDIR}/files
-.endif
-
 .include "${.CURDIR}/Makefile.snapshot"
 
 MASTERDIR=	${.CURDIR}/../llvm-cheri
diff --git a/devel/llvm-morello/Makefile.COMMANDS b/devel/llvm-morello/Makefile.COMMANDS
index 61ed67d697b9..faa76e4603ca 100644
--- a/devel/llvm-morello/Makefile.COMMANDS
+++ b/devel/llvm-morello/Makefile.COMMANDS
@@ -1,6 +1,5 @@
 .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
+LLVM_COMMANDS:=	${LLVM_COMMANDS:Nllvm-debuginfod:Nllvm-dwarfutil:Nllvm-remark-size-diff}
+CLANG_COMMANDS:=${CLANG_COMMANDS:Nclang-offload-packager}
diff --git a/devel/llvm-morello/Makefile.MAN1SRCS b/devel/llvm-morello/Makefile.MAN1SRCS
index 0ee3ab065a25..9b508b89149e 100644
--- a/devel/llvm-morello/Makefile.MAN1SRCS
+++ b/devel/llvm-morello/Makefile.MAN1SRCS
@@ -1,4 +1,4 @@
 .include "${.PARSEDIR}/../llvm-cheri/Makefile.MAN1SRCS"
 
 # Workaround for llvm-cheri/llvm-morello version skew
-LLVM_MAN1SRCS:=	${LLVM_MAN1SRCS:Nllvm-tli-checker.1}
+LLVM_MAN1SRCS:=	${LLVM_MAN1SRCS:Nllvm-dwarfutil.1:Nllvm-ifs.1:Nllvm-remark-size-diff.1}
diff --git a/devel/llvm-morello/Makefile.snapshot b/devel/llvm-morello/Makefile.snapshot
index 7e0c809f529d..5f821f391c21 100644
--- a/devel/llvm-morello/Makefile.snapshot
+++ b/devel/llvm-morello/Makefile.snapshot
@@ -1,5 +1,5 @@
-LLVM_MAJOR=	13
+LLVM_MAJOR=	14
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20231017
+SNAPDATE=	20240123
 
-LLVM_COMMIT=	45b95b9c3afe4c049e73c499bfe4708372171fa0
+LLVM_COMMIT=	671d6dbe2b74525702368edfa086e68f5afadc24
diff --git a/devel/llvm-morello/distinfo b/devel/llvm-morello/distinfo
index 06786561bd5a..9a89f860fbaf 100644
--- a/devel/llvm-morello/distinfo
+++ b/devel/llvm-morello/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702317063
-SHA256 (morello-llvm-project-45b95b9c3afe4c049e73c499bfe4708372171fa0_GL0.tar.gz) = 417f7d45a808bc6559a5e12541bf2b414724c080180faf0dcf319e47449dfd57
-SIZE (morello-llvm-project-45b95b9c3afe4c049e73c499bfe4708372171fa0_GL0.tar.gz) = 152857576
+TIMESTAMP = 1706035026
+SHA256 (morello-llvm-project-671d6dbe2b74525702368edfa086e68f5afadc24_GL0.tar.gz) = 5621572bd1dd00b61041f8aadd9b3ecb676627309cdcfaa436654be8a253d20a
+SIZE (morello-llvm-project-671d6dbe2b74525702368edfa086e68f5afadc24_GL0.tar.gz) = 163659284
diff --git a/devel/llvm-morello/pkg-plist b/devel/llvm-morello/pkg-plist
index 5d4dc95d9f03..cf2dd43c3252 100644
--- a/devel/llvm-morello/pkg-plist
+++ b/devel/llvm-morello/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%%
@@ -84,8 +89,6 @@ bin/scan-view%%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%%
@@ -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
@@ -2151,6 +2213,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
@@ -2181,6 +2245,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
@@ -2194,6 +2259,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
@@ -2208,6 +2275,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
@@ -2218,6 +2286,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
@@ -2247,7 +2316,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
@@ -2358,6 +2426,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
@@ -2372,7 +2441,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
@@ -2407,6 +2475,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
@@ -2485,6 +2554,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
@@ -2499,6 +2569,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
@@ -2524,6 +2595,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
@@ -2577,6 +2649,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
@@ -2606,6 +2679,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
@@ -2617,6 +2691,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
@@ -2640,6 +2715,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
@@ -2698,7 +2774,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/riscv_vector.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/serializeintrin.h
@@ -2742,19 +2817,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
@@ -2812,7 +2889,9 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoMSF.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebuginfod.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDiff.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesis.a
@@ -2867,6 +2946,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86TargetMCA.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
@@ -2876,13 +2956,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
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysisFlowSensitive.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
@@ -2924,15 +3005,10 @@ llvm%%LLVM_SUFFIX%%/lib/libear/config.h.in
 llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
-%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCore.a
-%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldDriver.a
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldELF.a
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO.a
-%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO2.a
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
-%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldReaderWriter.a
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
-%%STATIC_LIBS%%%%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
author	Brooks Davis <brooks@FreeBSD.org>	2024-01-23 21:22:41 +0000
committer	Brooks Davis <brooks@FreeBSD.org>	2024-01-23 22:33:31 +0000
commit	72ae5276b7b612c087fdf77580e1412264f40eff (patch)
tree	99424380ad752e2be0e2a6b78d7a256aeb36da8a
parent	8d617ece785e7805c4c679d3e4a88a110a95e360 (diff)
download	ports-72ae5276b7b612c087fdf77580e1412264f40eff.tar.gz ports-72ae5276b7b612c087fdf77580e1412264f40eff.zip