git: 72ae5276b7b6 - main - devel/llvm-{cheri,cheriot,morello}: new snapshots

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Tue, 23 Jan 2024 22:33:50 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=72ae5276b7b612c087fdf77580e1412264f40eff

commit 72ae5276b7b612c087fdf77580e1412264f40eff
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-01-23 21:22:41 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-01-23 22:33:31 +0000

    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.
---
 devel/llvm-cheri/Makefile                          |   7 +-
 devel/llvm-cheri/Makefile.COMMANDS                 |   4 +
 devel/llvm-cheri/Makefile.MAN1SRCS                 |   3 +
 devel/llvm-cheri/Makefile.snapshot                 |   6 +-
 devel/llvm-cheri/distinfo                          |   6 +-
 devel/llvm-cheri/files/gen-Makefile.snapshot.sh    |   2 +-
 .../patch-backport-version-fixes}                  |   0
 .../patch-clang_lib_Headers_CMakeLists.txt         |   0
 .../patch-backport-version-fixes}                  |   0
 .../llvm14/patch-clang_lib_Headers_CMakeLists.txt  |  33 ++
 .../files/llvm15/patch-backport-version-fixes      | 333 ++++++++++++++++++++
 .../llvm15/patch-clang_lib_Headers_CMakeLists.txt  |  22 ++
 devel/llvm-cheri/pkg-plist                         | 185 +++++++++---
 devel/llvm-cheriot/Makefile                        |   4 -
 devel/llvm-cheriot/Makefile.COMMANDS               |   5 +
 devel/llvm-cheriot/Makefile.MAN1SRCS               |   3 +
 devel/llvm-cheriot/Makefile.snapshot               |   4 +-
 devel/llvm-cheriot/distinfo                        |   6 +-
 devel/llvm-cheriot/files/gen-Makefile.snapshot.sh  |   2 +-
 devel/llvm-cheriot/pkg-plist                       | 336 ++++++++++-----------
 devel/llvm-morello/Makefile                        |   4 -
 devel/llvm-morello/Makefile.COMMANDS               |   5 +-
 devel/llvm-morello/Makefile.MAN1SRCS               |   2 +-
 devel/llvm-morello/Makefile.snapshot               |   6 +-
 devel/llvm-morello/distinfo                        |   6 +-
 devel/llvm-morello/pkg-plist                       | 140 +++++++--
 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
similarity index 100%
rename from devel/llvm-cheri/files/llvm13-backport-version-fixes
rename to 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
similarity index 100%
rename from devel/llvm-cheri/files/patch-clang_lib_Headers_CMakeLists.txt
rename to 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
similarity index 100%
rename from devel/llvm-cheri/files/llvm14-backport-version-fixes
rename to 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
*** 1639 LINES SKIPPED ***