CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 14 Nov 2022 18:44:07 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Nov 14 18:44:07 UTC 2022

Modified Files:
        pkgsrc/devel/lld: PLIST distinfo
        pkgsrc/devel/lldb: PLIST PLIST.Darwin distinfo
        pkgsrc/devel/polly: PLIST distinfo
        pkgsrc/lang/clang: PLIST buildlink3.mk distinfo
        pkgsrc/lang/clang-tools-extra: Makefile PLIST distinfo
        pkgsrc/lang/clang/patches: patch-lib_Driver_ToolChains_Solaris.cpp
            patch-lib_Lex_InitHeaderSearch.cpp
        pkgsrc/lang/compiler-rt: Makefile distinfo
        pkgsrc/lang/libcxx: Makefile PLIST distinfo
        pkgsrc/lang/libcxxabi: Makefile PLIST distinfo
        pkgsrc/lang/libunwind: Makefile distinfo
        pkgsrc/lang/llvm: Makefile PLIST buildlink3.mk distinfo version.mk
        pkgsrc/lang/llvm/patches: patch-CMakeLists.txt
            patch-cmake_config-ix.cmake patch-cmake_modules_AddLLVM.cmake
            patch-include_llvm-c_DataTypes.h
            patch-include_llvm_Analysis_ConstantFolding.h
            patch-tools_llvm-shlib_CMakeLists.txt
        pkgsrc/lang/wasi-compiler-rt: Makefile
        pkgsrc/lang/wasi-libcxx: Makefile PLIST distinfo
        pkgsrc/lang/wasi-libcxx/patches: patch-libcxx_include_CMakeLists.txt
        pkgsrc/parallel/openmp: Makefile distinfo
Added Files:
        pkgsrc/lang/compiler-rt/patches:
            patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
        pkgsrc/lang/libcxxabi/patches: patch-src_CMakeLists.txt
        pkgsrc/lang/wasi-libcxx/patches: patch-libcxxabi_src_CMakeLists.txt
Removed Files:
        pkgsrc/lang/libcxx/patches: patch-include_____config
            patch-include_____locale
        pkgsrc/lang/llvm/patches: patch-lib_Support_Unix_Path.inc
        pkgsrc/lang/wasi-compiler-rt: PLIST

Log Message:
llvm: updated to 15.0.4

LLVM 15.0.4

Changes to the LLVM IR

LLVM now uses opaque pointers. This means that different pointer types like i8*, i32* or void()** are now represented as a single ptr type. See the linked document for migration instructions.
Renamed llvm.experimental.vector.extract intrinsic to llvm.vector.extract.
Renamed llvm.experimental.vector.insert intrinsic to llvm.vector.insert.
The constant expression variants of the following instructions have been removed:
extractvalue
insertvalue
udiv
sdiv
urem
srem
fadd
fsub
fmul
fdiv
frem
Added the support for fmax and fmin in atomicrmw instruction. The comparison is expected to match the behavior of llvm.maxnum.* and llvm.minnum.* respectively.
callbr instructions no longer use blockaddress arguments for labels. Instead, label constraints starting with ! refer directly to entries in the callbr indirect destination list.

Changes to building LLVM

Omitting CMAKE_BUILD_TYPE when using a single configuration generator is now an error. You now have to pass -DCMAKE_BUILD_TYPE=<type> in order to configure LLVM. This is done to help new users of 
LLVM select the correct type: since building LLVM in Debug mode is very resource intensive, we want to make sure that new users make the choice that lines up with their usage. We have also improved 
documentation around this setting that should help new users. You can find this documentation here.

Changes to Loop Optimizations

Loop interchange legality and cost model improvements

Changes to the AMDGPU Backend

8 and 16-bit atomic loads and stores are now supported

Changes to the ARM Backend

Added support for the Armv9-A, Armv9.1-A and Armv9.2-A architectures.
Added support for the Armv8.1-M PACBTI-M extension.
Added support for the Armv9-A, Armv9.1-A and Armv9.2-A architectures.
Added support for the Armv8.1-M PACBTI-M extension.
Removed the deprecation of ARMv8-A T32 Complex IT blocks. No deprecation warnings will be generated and -mrestrict-it is now always off by default. Previously it was on by default for Armv8 and off 
for all other architecture versions.
Added a pass to workaround Cortex-A57 Erratum 1742098 and Cortex-A72 Erratum 1655431. This is enabled by default when targeting either CPU.
Implemented generation of Windows SEH unwind information.
Switched the MinGW target to use SEH instead of DWARF for unwind information.
Added support for the Cortex-M85 CPU.
Added support for a new -mframe-chain=(none|aapcs|aapcs+leaf) command-line option, which controls the generation of AAPCS-compliant Frame Records.

Changes to the DirectX Backend

DirectX has been added as an experimental target. Specify -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=DirectX in your CMake configuration to enable it. The target is not packaged in pre-built binaries.
The DirectX backend supports the dxil architecture which is based on LLVM 3.6 IR encoded as bitcode and is the format used for DirectX GPU Shader programs.

Changes to the PowerPC Backend

Common PowerPC improvements: * Add a new post instruction selection pass to generate CTR loops. * Add SSE4 and BMI compatible intrinsics implementation. * Supported 16-byte lock free atomics on 
PowerPC8 and up. * Supported atomic load/store for pointer types. * Supported stack size larger than 2G * Add __builtin_min/__builtin_max/__abs builtins. * Code generation improvements for splat 
load/vector shuffle/mulli, etc. * Emit VSX instructions for vector loads and stores regardless of alignment. * The mcpu=future has its own ISA now (FutureISA). * Added the ppc-set-dscr option to set 
the Data Stream Control Register (DSCR). * Bug fixes.

AIX improvements: * Supported 64 bit XCOFF for integrated-as path. * Supported X86-compatible vector intrinsics. * Program code csect default alignment now is 32-byte. * Supported auxiliary header in 
integrated-as path. * Improved alias symbol handling.

Changes to the RISC-V Backend

A RISCVRedundantCopyElimination pass was added to remove unnecessary zero copies.
A RISC-V specific CodeGenPrepare pass was added.
The machine outliner was enabled by default for RISC-V at -Oz. Additionally, the newly introduced RISCVMakeCompressible pass will make modify instructions prior to emission at -Oz in order to 
increase opportunities for the compression with the RISC-V C extension.
Various bug fixes and improvements to code generation for the RISC-V vector extensions.
Various improvements were made to RISC-V specific optimisation passes such as RISCVSExtWRemoval and RISCVMergeBaseOffset.
llc now computes the target ABI based on the target architecture using the same logic as Clang if not explicit ABI is given.
generic is now recognized as a valid CPU name and is mapped to generic-rv32 or generic-rv64 depending on the target triple.
Support for the experimental Zvfh extension was added, enabling half-precision floating point in vectors.
Support for the Zihintpause (Pause Hint) extension.
Assembler and disassembler support for the Zfinx and Zdinx (float / double in integer register) extensions.
Assembler and disassembler support for the Zicbom, Zicboz, and Zicbop cache management operation extensions.
Support for the Zmmul extension (a subextension of the M extension, adding multiplication instructions only).
Assembler and disassembler support for the hypervisor extension and for the Sinval supervisor memory-management extension.

Changes to the X86 Backend

Support half type on SSE2 and above targets following X86 psABI.
Support rdpru instruction on Zen2 and above targets.
During this release, half type has an ABI breaking change to provide the support for the ABI of _Float16 type on SSE2 and above following X86 psABI. (D107082)

The change may affect the current use of half includes (but is not limited to):

Frontends generating half type in function passing and/or returning arguments.
Downstream runtimes providing any half conversion builtins assuming the old ABI.
Projects built with LLVM 15.0 but using early versions of compiler-rt.
When you find failures with half type, check the calling conversion of the code and switch it to the new ABI.

Changes to the LLVM tools

(Experimental) llvm-symbolizer now has --filter-markup to filter Symbolizer Markup into human-readable form.
llvm-objcopy has removed support for the legacy zlib-gnu format.
llvm-objcopy now allows --set-section-flags src=... --rename-section src=tst. --add-section=.foo1=... --rename-section=.foo1=.foo2 now adds .foo1 instead of .foo2.
New features supported on AIX for llvm-ar:
AIX big-format archive write operation (D123949)
A new object mode option, -X , to specify the type of object file llvm-ar should operate upon (D127864)
Read global symbols of AIX big archive (D124865)
New options supported for llvm-nm:
-X, to specify the type of object file that llvm-nm should examine (D118193)
--export-symbols, to create a list of symbols to export (D112735)
The LLVM gold plugin now ignores bitcode from the .llvmbc section of ELF files when doing LTO. https://github.com/llvm/llvm-project/issues/47216
llvm-objcopy now supports 32 bit XCOFF.
llvm-objdump: improved assembly printing for XCOFF.
llc now parses code-model attribute from input file.

Changes to LLDB

The “memory region” command now has a “–all” option to list all memory regions (including unmapped ranges). This is the equivalent of using address 0 then repeating the command until all regions have 
been listed.
Added “–show-tags” option to the “memory find” command. This is off by default. When enabled, if the target value is found in tagged memory, the tags for that memory will be shown inline with the 
memory contents.
Various memory related parts of LLDB have been updated to handle non-address bits (such as AArch64 pointer signatures):
“memory read”, “memory write” and “memory find” can now be used with addresses with non-address bits.
All the read and write memory methods on SBProccess and SBTarget can be used with addreses with non-address bits.
When printing a pointer expression, LLDB can now dereference the result even if it has non-address bits.
The memory cache now ignores non-address bits when looking up memory locations. This prevents us reading locations multiple times, or not writing out new values if the addresses have different 
non-address bits.
LLDB now supports reading memory tags from AArch64 Linux core files.
LLDB now supports the gnu debuglink section for reading debug information from a separate file on Windows
LLDB now allows selecting the C++ ABI to use on Windows (between Itanium, used for MingW, and MSVC) via the plugin.object-file.pe-coff.abi setting. In Windows builds of LLDB, this defaults to the 
style used for LLVM’s default target.

Other Changes

The code for the LLVM Visual Studio integration has been removed. This had been obsolete and abandoned since Visual Studio started including an integration by default in 2019.
Added the unwinder, personality, and helper functions for exception handling on AIX. (D100132) (D100504)
PGO on AIX: A new implementation that requires linker support (__start_SECTION/__stop_SECTION symbols) available on AIX 7.2 TL5 SP4 and AIX 7.3 TL0 SP2.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/lld/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/lld/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/lldb/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/lldb/PLIST.Darwin
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/lldb/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/polly/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/polly/distinfo
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/clang/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/clang/buildlink3.mk
cvs rdiff -u -r1.75 -r1.76 pkgsrc/lang/clang/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/clang-tools-extra/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/clang-tools-extra/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/clang-tools-extra/distinfo
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/compiler-rt/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/compiler-rt/distinfo
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/libcxx/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/libcxx/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/libcxx/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/libcxx/patches/patch-include_____config
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/libcxx/patches/patch-include_____locale
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/libcxxabi/Makefile \
    pkgsrc/lang/libcxxabi/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/libcxxabi/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/libunwind/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.82 -r1.83 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/llvm/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/llvm/buildlink3.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/llvm/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/llvm/version.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/llvm/patches/patch-CMakeLists.txt \
    pkgsrc/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/llvm/patches/patch-cmake_config-ix.cmake \
    pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/llvm/patches/patch-include_llvm-c_DataTypes.h
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/lang/llvm/patches/patch-lib_Support_Unix_Path.inc
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/wasi-compiler-rt/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/wasi-libcxx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/wasi-libcxx/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/wasi-libcxx/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt
cvs rdiff -u -r1.14 -r1.15 pkgsrc/parallel/openmp/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/parallel/openmp/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/lld/PLIST
diff -u pkgsrc/devel/lld/PLIST:1.7 pkgsrc/devel/lld/PLIST:1.8
--- pkgsrc/devel/lld/PLIST:1.7  Fri Aug 12 08:52:51 2022
+++ pkgsrc/devel/lld/PLIST      Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/08/12 08:52:51 pin Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/11/14 18:44:05 adam Exp $
 bin/ld.lld
 bin/ld64.lld
 bin/lld
@@ -18,26 +18,6 @@ include/lld/Common/Strings.h
 include/lld/Common/TargetOptionsCommandFlags.h
 include/lld/Common/Timer.h
 include/lld/Common/Version.h
-include/lld/Core/AbsoluteAtom.h
-include/lld/Core/ArchiveLibraryFile.h
-include/lld/Core/Atom.h
-include/lld/Core/DefinedAtom.h
-include/lld/Core/Error.h
-include/lld/Core/File.h
-include/lld/Core/Instrumentation.h
-include/lld/Core/LinkingContext.h
-include/lld/Core/Node.h
-include/lld/Core/Pass.h
-include/lld/Core/PassManager.h
-include/lld/Core/Reader.h
-include/lld/Core/Reference.h
-include/lld/Core/Resolver.h
-include/lld/Core/SharedLibraryAtom.h
-include/lld/Core/SharedLibraryFile.h
-include/lld/Core/Simple.h
-include/lld/Core/SymbolTable.h
-include/lld/Core/UndefinedAtom.h
-include/lld/Core/Writer.h
 lib/cmake/lld/LLDConfig.cmake
 lib/cmake/lld/LLDTargets-release.cmake
 lib/cmake/lld/LLDTargets.cmake

Index: pkgsrc/devel/lld/distinfo
diff -u pkgsrc/devel/lld/distinfo:1.17 pkgsrc/devel/lld/distinfo:1.18
--- pkgsrc/devel/lld/distinfo:1.17      Fri Aug 12 08:52:51 2022
+++ pkgsrc/devel/lld/distinfo   Mon Nov 14 18:44:05 2022
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.17 2022/08/12 08:52:51 pin Exp $
+$NetBSD: distinfo,v 1.18 2022/11/14 18:44:05 adam Exp $
 
-BLAKE2s (lld-14.0.6.src.tar.xz) = 2fc265b616bbdbaeecc8385fda204dbc28b1d871d98f4b3b3cd5183c4d6eefc8
-SHA512 (lld-14.0.6.src.tar.xz) = fad97b441f9642b73edd240af2c026259de0951d5ace42779e9e0fcf5e417252a1d744e2fc51e754a45016621ba0c70088177f88695af1c6ce290dd26873b094
-Size (lld-14.0.6.src.tar.xz) = 1366180 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (lld-15.0.4.src.tar.xz) = f35c610cbe5b7b87ca67e1135c7c0f445091dbe3fb78799cfa5000c625d60b8e
+SHA512 (lld-15.0.4.src.tar.xz) = caa5b7a20cfc803106eb344b7885a17f987a4669111bc5c354e40a880be1e73e804c846d53b32754de3052ae3c1e7706c8d68fac7377dc8d01ffc988c24605b0
+Size (lld-15.0.4.src.tar.xz) = 1407444 bytes
 SHA1 (patch-CMakeLists.txt) = 082e24d9c155f69a8256fcde486c427a7354cb69
 SHA1 (patch-ELF_Config.h) = 50861ef74c2ff9a9091afcbc8d076e379d9531e5
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3

Index: pkgsrc/devel/lldb/PLIST
diff -u pkgsrc/devel/lldb/PLIST:1.15 pkgsrc/devel/lldb/PLIST:1.16
--- pkgsrc/devel/lldb/PLIST:1.15        Fri Aug 12 08:54:31 2022
+++ pkgsrc/devel/lldb/PLIST     Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2022/08/12 08:54:31 pin Exp $
+@comment $NetBSD: PLIST,v 1.16 2022/11/14 18:44:05 adam Exp $
 bin/lldb
 bin/lldb-argdumper
 bin/lldb-instr
@@ -107,6 +107,7 @@ include/lldb/Core/Architecture.h
 include/lldb/Core/Communication.h
 include/lldb/Core/DataFileCache.h
 include/lldb/Core/Debugger.h
+include/lldb/Core/DebuggerEvents.h
 include/lldb/Core/Declaration.h
 include/lldb/Core/Disassembler.h
 include/lldb/Core/DumpDataExtractor.h
@@ -179,6 +180,7 @@ include/lldb/DataFormatters/ValueObjectP
 include/lldb/DataFormatters/VectorIterator.h
 include/lldb/DataFormatters/VectorType.h
 include/lldb/Expression/DWARFExpression.h
+include/lldb/Expression/DWARFExpressionList.h
 include/lldb/Expression/DiagnosticManager.h
 include/lldb/Expression/DynamicCheckerFunctions.h
 include/lldb/Expression/Expression.h
@@ -283,6 +285,7 @@ include/lldb/Interpreter/CommandHistory.
 include/lldb/Interpreter/CommandInterpreter.h
 include/lldb/Interpreter/CommandObject.h
 include/lldb/Interpreter/CommandObjectMultiword.h
+include/lldb/Interpreter/CommandOptionArgumentTable.h
 include/lldb/Interpreter/CommandOptionValidators.h
 include/lldb/Interpreter/CommandReturnObject.h
 include/lldb/Interpreter/OptionArgParser.h
@@ -290,6 +293,7 @@ include/lldb/Interpreter/OptionGroupArch
 include/lldb/Interpreter/OptionGroupBoolean.h
 include/lldb/Interpreter/OptionGroupFile.h
 include/lldb/Interpreter/OptionGroupFormat.h
+include/lldb/Interpreter/OptionGroupMemoryTag.h
 include/lldb/Interpreter/OptionGroupOutputFile.h
 include/lldb/Interpreter/OptionGroupPlatform.h
 include/lldb/Interpreter/OptionGroupPythonClassWithDict.h
@@ -350,6 +354,7 @@ include/lldb/Symbol/Symbol.h
 include/lldb/Symbol/SymbolContext.h
 include/lldb/Symbol/SymbolContextScope.h
 include/lldb/Symbol/SymbolFile.h
+include/lldb/Symbol/SymbolFileOnDemand.h
 include/lldb/Symbol/SymbolVendor.h
 include/lldb/Symbol/Symtab.h
 include/lldb/Symbol/TaggedASTType.h
@@ -433,8 +438,8 @@ include/lldb/Target/ThreadPlanTracer.h
 include/lldb/Target/ThreadSpec.h
 include/lldb/Target/Trace.h
 include/lldb/Target/TraceCursor.h
+include/lldb/Target/TraceDumper.h
 include/lldb/Target/TraceExporter.h
-include/lldb/Target/TraceInstructionDumper.h
 include/lldb/Target/UnixSignals.h
 include/lldb/Target/Unwind.h
 include/lldb/Target/UnwindAssembly.h
@@ -463,9 +468,9 @@ include/lldb/Utility/IOObject.h
 include/lldb/Utility/Instrumentation.h
 include/lldb/Utility/Iterable.h
 include/lldb/Utility/LLDBAssert.h
+include/lldb/Utility/LLDBLog.h
 include/lldb/Utility/Listener.h
 include/lldb/Utility/Log.h
-include/lldb/Utility/Logging.h
 include/lldb/Utility/NameMatches.h
 include/lldb/Utility/OptionDefinition.h
 include/lldb/Utility/Predicate.h
@@ -481,7 +486,6 @@ include/lldb/Utility/SharedCluster.h
 include/lldb/Utility/State.h
 include/lldb/Utility/Status.h
 include/lldb/Utility/Stream.h
-include/lldb/Utility/StreamCallback.h
 include/lldb/Utility/StreamString.h
 include/lldb/Utility/StreamTee.h
 include/lldb/Utility/StringExtractor.h
@@ -516,8 +520,8 @@ include/lldb/lldb-public.h
 include/lldb/lldb-types.h
 include/lldb/lldb-versioning.h
 lib/liblldb.so
-lib/liblldb.so.14
 lib/liblldb.so.${PKGVERSION}
+lib/liblldb.so.15
 lib/lua/5.3/lldb.so
 ${PYSITELIB}/lldb/__init__.py
 ${PYSITELIB}/lldb/_lldb.so

Index: pkgsrc/devel/lldb/PLIST.Darwin
diff -u pkgsrc/devel/lldb/PLIST.Darwin:1.6 pkgsrc/devel/lldb/PLIST.Darwin:1.7
--- pkgsrc/devel/lldb/PLIST.Darwin:1.6  Sat Oct 19 14:01:37 2019
+++ pkgsrc/devel/lldb/PLIST.Darwin      Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.6 2019/10/19 14:01:37 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.7 2022/11/14 18:44:05 adam Exp $
 bin/darwin-debug
 bin/debugserver
 ${PYSITELIB}/lldb/diagnose/__init__.py
@@ -6,6 +6,7 @@ ${PYSITELIB}/lldb/diagnose/diagnose_nsst
 ${PYSITELIB}/lldb/diagnose/diagnose_unwind.py
 ${PYSITELIB}/lldb/macosx/__init__.py
 ${PYSITELIB}/lldb/macosx/crashlog.py
+${PYSITELIB}/lldb/macosx/crashlog_scripted_process.py
 ${PYSITELIB}/lldb/macosx/heap.py
 ${PYSITELIB}/lldb/macosx/heap/Makefile
 ${PYSITELIB}/lldb/macosx/heap/heap_find.cpp

Index: pkgsrc/devel/lldb/distinfo
diff -u pkgsrc/devel/lldb/distinfo:1.30 pkgsrc/devel/lldb/distinfo:1.31
--- pkgsrc/devel/lldb/distinfo:1.30     Fri Aug 12 08:54:31 2022
+++ pkgsrc/devel/lldb/distinfo  Mon Nov 14 18:44:05 2022
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.30 2022/08/12 08:54:31 pin Exp $
+$NetBSD: distinfo,v 1.31 2022/11/14 18:44:05 adam Exp $
 
-BLAKE2s (lldb-14.0.6.src.tar.xz) = 41dcd1742c7b654007d257127a45a41d7c5304dc403913e6ba2129bb98ed77f1
-SHA512 (lldb-14.0.6.src.tar.xz) = 3fd616f2c992edfa92c86a38aaaaccdeec1ba34186ec38856c4e543cf41163f366855a8b2a22d09b9f7152041c52ac5963f5986d31b72bcb942661fddad55543
-Size (lldb-14.0.6.src.tar.xz) = 10088312 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (lldb-15.0.4.src.tar.xz) = 3179511bc9ccc3a17bef597294c115bac80ada9d8ca7f8f63fdc2be0f62e2cae
+SHA512 (lldb-15.0.4.src.tar.xz) = 58d34a8c927e86353599d6daf9fcb52400c3e83b73477e9dce81f2d0c3708204c710d141dd57902735df08d60f27bf983a263627965cf8f9a1902477819e574b
+Size (lldb-15.0.4.src.tar.xz) = 10255288 bytes
 SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 773d420c3fd2c9b4af6af9d42c5778e96a1ae52b
 SHA1 (patch-source_API_CMakeLists.txt) = 23a7b24632f937a4541863aff6a7591255cafe40
+SHA1 (patch-source_Host_netbsd_HostNetBSD.cpp) = 033b5016a360f174f780fbfe56979d7ad4f11272
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 15c6d8399198de567b4e901533e1b1f77d9e348f
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 26a7298b835b97b89257975f7e87f0f8225e5f99

Index: pkgsrc/devel/polly/PLIST
diff -u pkgsrc/devel/polly/PLIST:1.9 pkgsrc/devel/polly/PLIST:1.10
--- pkgsrc/devel/polly/PLIST:1.9        Fri Aug 12 08:47:29 2022
+++ pkgsrc/devel/polly/PLIST    Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2022/08/12 08:47:29 pin Exp $
+@comment $NetBSD: PLIST,v 1.10 2022/11/14 18:44:05 adam Exp $
 include/polly/Canonicalization.h
 include/polly/CodeGen/BlockGenerators.h
 include/polly/CodeGen/CodeGeneration.h
@@ -26,6 +26,7 @@ include/polly/JSONExporter.h
 include/polly/LinkAllPasses.h
 include/polly/ManualOptimizer.h
 include/polly/MatmulOptimizer.h
+include/polly/MaximalStaticExpansion.h
 include/polly/Options.h
 include/polly/PolyhedralInfo.h
 include/polly/PruneUnprofitable.h
@@ -35,6 +36,7 @@ include/polly/ScheduleTreeTransform.h
 include/polly/ScopBuilder.h
 include/polly/ScopDetection.h
 include/polly/ScopDetectionDiagnostic.h
+include/polly/ScopGraphPrinter.h
 include/polly/ScopInfo.h
 include/polly/ScopPass.h
 include/polly/Simplify.h

Index: pkgsrc/devel/polly/distinfo
diff -u pkgsrc/devel/polly/distinfo:1.25 pkgsrc/devel/polly/distinfo:1.26
--- pkgsrc/devel/polly/distinfo:1.25    Mon Aug 15 19:07:20 2022
+++ pkgsrc/devel/polly/distinfo Mon Nov 14 18:44:05 2022
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.25 2022/08/15 19:07:20 wiz Exp $
+$NetBSD: distinfo,v 1.26 2022/11/14 18:44:05 adam Exp $
 
-BLAKE2s (polly-14.0.6.src.tar.xz) = b787ce64b15d9f550d0c02966d43c5f18f2a601715780a2a34852b503bb81d5c
-SHA512 (polly-14.0.6.src.tar.xz) = a2a3c96d58975a2023a26aef87ec3a755b489d3fe62d5c18fc1a477a65e032e265f4fcebc3d28c2958c2e97de44673259a1e083cc8aebb5671685695501e7645
-Size (polly-14.0.6.src.tar.xz) = 9357684 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (polly-15.0.4.src.tar.xz) = d32872ba6aee8668df2ff4039ca537cb45be2bf2ada9a5a2eb7efb36f9c5cea1
+SHA512 (polly-15.0.4.src.tar.xz) = a09de648ab462e3661ea08069e8638eccc627cb85c08b07c029643455560af2955ad3d71612e4e788d5f0be804075e0332aa19f7b9a65df4fe620b2ea9dcbf1d
+Size (polly-15.0.4.src.tar.xz) = 9357036 bytes
 SHA1 (patch-CMakeLists.txt) = 8138e11f858f23e0069c8fa0c07eff2b7aaf8c43

Index: pkgsrc/lang/clang/PLIST
diff -u pkgsrc/lang/clang/PLIST:1.36 pkgsrc/lang/clang/PLIST:1.37
--- pkgsrc/lang/clang/PLIST:1.36        Sat Aug 13 22:39:28 2022
+++ pkgsrc/lang/clang/PLIST     Mon Nov 14 18:44:05 2022
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.36 2022/08/13 22:39:28 tnn Exp $
+@comment $NetBSD: PLIST,v 1.37 2022/11/14 18:44:05 adam Exp $
 bin/analyze-build
 bin/c-index-test
 bin/clang
 bin/clang++
-bin/clang-14
+bin/clang-15
 bin/clang-check
 bin/clang-cl
 bin/clang-cpp
@@ -12,6 +12,7 @@ bin/clang-format
 bin/clang-linker-wrapper
 bin/clang-nvlink-wrapper
 bin/clang-offload-bundler
+bin/clang-offload-packager
 bin/clang-offload-wrapper
 bin/clang-refactor
 bin/clang-rename
@@ -49,6 +50,7 @@ include/clang/AST/ASTDiagnostic.h
 include/clang/AST/ASTDumper.h
 include/clang/AST/ASTDumperUtils.h
 include/clang/AST/ASTFwd.h
+include/clang/AST/ASTImportError.h
 include/clang/AST/ASTImporter.h
 include/clang/AST/ASTImporterLookupTable.h
 include/clang/AST/ASTImporterSharedState.h
@@ -148,6 +150,7 @@ include/clang/AST/ParentMapContext.h
 include/clang/AST/PrettyDeclStackTrace.h
 include/clang/AST/PrettyPrinter.h
 include/clang/AST/QualTypeNames.h
+include/clang/AST/Randstruct.h
 include/clang/AST/RawCommentList.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
@@ -220,11 +223,19 @@ include/clang/Analysis/FlowSensitive/Dat
 include/clang/Analysis/FlowSensitive/DataflowLattice.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/FlowSensitive/DataflowWorklist.h
+include/clang/Analysis/FlowSensitive/DebugSupport.h
 include/clang/Analysis/FlowSensitive/MapLattice.h
+include/clang/Analysis/FlowSensitive/MatchSwitch.h
+include/clang/Analysis/FlowSensitive/Models/ChromiumCheckModel.h
+include/clang/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.h
+include/clang/Analysis/FlowSensitive/NoopAnalysis.h
+include/clang/Analysis/FlowSensitive/NoopLattice.h
+include/clang/Analysis/FlowSensitive/Solver.h
 include/clang/Analysis/FlowSensitive/StorageLocation.h
 include/clang/Analysis/FlowSensitive/Transfer.h
 include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h
 include/clang/Analysis/FlowSensitive/Value.h
+include/clang/Analysis/FlowSensitive/WatchedLiteralsSolver.h
 include/clang/Analysis/IssueHash.h
 include/clang/Analysis/MacroExpansionContext.h
 include/clang/Analysis/PathDiagnostic.h
@@ -264,6 +275,8 @@ include/clang/Basic/BuiltinsRISCV.def
 include/clang/Basic/BuiltinsRISCVVector.def
 include/clang/Basic/BuiltinsSVE.def
 include/clang/Basic/BuiltinsSystemZ.def
+include/clang/Basic/BuiltinsVE.def
+include/clang/Basic/BuiltinsVEVL.gen.def
 include/clang/Basic/BuiltinsWebAssembly.def
 include/clang/Basic/BuiltinsX86.def
 include/clang/Basic/BuiltinsX86_64.def
@@ -328,6 +341,7 @@ include/clang/Basic/LangStandards.def
 include/clang/Basic/Linkage.h
 include/clang/Basic/MSP430Target.def
 include/clang/Basic/MacroBuilder.h
+include/clang/Basic/MakeSupport.h
 include/clang/Basic/Module.h
 include/clang/Basic/NoSanitizeList.h
 include/clang/Basic/ObjCRuntime.h
@@ -350,6 +364,7 @@ include/clang/Basic/RISCVVTypes.def
 include/clang/Basic/SanitizerSpecialCaseList.h
 include/clang/Basic/Sanitizers.def
 include/clang/Basic/Sanitizers.h
+include/clang/Basic/Sarif.h
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
@@ -387,6 +402,7 @@ include/clang/Basic/arm_sve_builtins.inc
 include/clang/Basic/arm_sve_sema_rangechecks.inc
 include/clang/Basic/arm_sve_typeflags.inc
 include/clang/Basic/riscv_vector_builtin_cg.inc
+include/clang/Basic/riscv_vector_builtin_sema.inc
 include/clang/Basic/riscv_vector_builtins.inc
 include/clang/CodeGen/BackendUtil.h
 include/clang/CodeGen/CGFunctionInfo.h
@@ -425,6 +441,12 @@ include/clang/Edit/EditedSource.h
 include/clang/Edit/EditsReceiver.h
 include/clang/Edit/FileOffset.h
 include/clang/Edit/Rewriters.h
+include/clang/ExtractAPI/API.h
+include/clang/ExtractAPI/AvailabilityInfo.h
+include/clang/ExtractAPI/DeclarationFragments.h
+include/clang/ExtractAPI/FrontendActions.h
+include/clang/ExtractAPI/Serialization/SerializerBase.h
+include/clang/ExtractAPI/Serialization/SymbolGraphSerializer.h
 include/clang/Format/Format.h
 include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
@@ -466,7 +488,7 @@ include/clang/IndexSerialization/Seriali
 include/clang/Interpreter/Interpreter.h
 include/clang/Interpreter/PartialTranslationUnit.h
 include/clang/Lex/CodeCompletionHandler.h
-include/clang/Lex/DependencyDirectivesSourceMinimizer.h
+include/clang/Lex/DependencyDirectivesScanner.h
 include/clang/Lex/DirectoryLookup.h
 include/clang/Lex/ExternalPreprocessorSource.h
 include/clang/Lex/HeaderMap.h
@@ -486,7 +508,6 @@ include/clang/Lex/PPConditionalDirective
 include/clang/Lex/Pragma.h
 include/clang/Lex/PreprocessingRecord.h
 include/clang/Lex/Preprocessor.h
-include/clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h
 include/clang/Lex/PreprocessorLexer.h
 include/clang/Lex/PreprocessorOptions.h
 include/clang/Lex/ScratchBuffer.h
@@ -525,6 +546,7 @@ include/clang/Sema/DeclSpec.h
 include/clang/Sema/DelayedDiagnostic.h
 include/clang/Sema/Designator.h
 include/clang/Sema/ExternalSemaSource.h
+include/clang/Sema/HLSLExternalSemaSource.h
 include/clang/Sema/IdentifierResolver.h
 include/clang/Sema/Initialization.h
 include/clang/Sema/Lookup.h
@@ -534,6 +556,7 @@ include/clang/Sema/Overload.h
 include/clang/Sema/Ownership.h
 include/clang/Sema/ParsedAttr.h
 include/clang/Sema/ParsedTemplate.h
+include/clang/Sema/RISCVIntrinsicManager.h
 include/clang/Sema/Scope.h
 include/clang/Sema/ScopeInfo.h
 include/clang/Sema/Sema.h
@@ -564,12 +587,14 @@ include/clang/Serialization/ModuleFileEx
 include/clang/Serialization/ModuleManager.h
 include/clang/Serialization/PCHContainerOperations.h
 include/clang/Serialization/SerializationDiagnostic.h
+include/clang/Serialization/SourceLocationEncoding.h
 include/clang/Serialization/TypeBitCodes.def
 include/clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h
 include/clang/StaticAnalyzer/Checkers/Checkers.inc
 include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h
 include/clang/StaticAnalyzer/Checkers/SValExplainer.h
+include/clang/StaticAnalyzer/Checkers/Taint.h
 include/clang/StaticAnalyzer/Core/Analyses.def
 include/clang/StaticAnalyzer/Core/AnalyzerOptions.def
 include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
@@ -626,7 +651,9 @@ include/clang/StaticAnalyzer/Frontend/An
 include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
 include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
+include/clang/Support/RISCVVIntrinsicUtils.h
 include/clang/Testing/CommandLineArgs.h
+include/clang/Testing/TestAST.h
 include/clang/Testing/TestClangConfig.h
 include/clang/Tooling/ASTDiff/ASTDiff.h
 include/clang/Tooling/ASTDiff/ASTDiffInternal.h
@@ -648,6 +675,7 @@ include/clang/Tooling/FileMatchTrie.h
 include/clang/Tooling/FixIt.h
 include/clang/Tooling/Inclusions/HeaderIncludes.h
 include/clang/Tooling/Inclusions/IncludeStyle.h
+include/clang/Tooling/Inclusions/StandardLibrary.h
 include/clang/Tooling/JSONCompilationDatabase.h
 include/clang/Tooling/NodeIntrospection.h
 include/clang/Tooling/NodeIntrospection.inc
@@ -683,6 +711,8 @@ include/clang/Tooling/Syntax/Mutations.h
 include/clang/Tooling/Syntax/NodeClasses.inc
 include/clang/Tooling/Syntax/Nodes.h
 include/clang/Tooling/Syntax/Nodes.inc
+include/clang/Tooling/Syntax/TokenBufferTokenManager.h
+include/clang/Tooling/Syntax/TokenManager.h
 include/clang/Tooling/Syntax/Tokens.h
 include/clang/Tooling/Syntax/Tree.h
 include/clang/Tooling/ToolExecutorPluginRegistry.h
@@ -782,6 +812,9 @@ lib/clang/${PKGVERSION}/include/gfniintr
 lib/clang/${PKGVERSION}/include/hexagon_circ_brev_intrinsics.h
 lib/clang/${PKGVERSION}/include/hexagon_protos.h
 lib/clang/${PKGVERSION}/include/hexagon_types.h
+lib/clang/${PKGVERSION}/include/hlsl.h
+lib/clang/${PKGVERSION}/include/hlsl_basic_types.h
+lib/clang/${PKGVERSION}/include/hlsl_intrinsics.h
 lib/clang/${PKGVERSION}/include/hresetintrin.h
 lib/clang/${PKGVERSION}/include/htmintrin.h
 lib/clang/${PKGVERSION}/include/htmxlintrin.h
@@ -817,15 +850,21 @@ lib/clang/${PKGVERSION}/include/pconfigi
 lib/clang/${PKGVERSION}/include/pkuintrin.h
 lib/clang/${PKGVERSION}/include/pmmintrin.h
 lib/clang/${PKGVERSION}/include/popcntintrin.h
+lib/clang/${PKGVERSION}/include/ppc_wrappers/bmi2intrin.h
+lib/clang/${PKGVERSION}/include/ppc_wrappers/bmiintrin.h
 lib/clang/${PKGVERSION}/include/ppc_wrappers/emmintrin.h
+lib/clang/${PKGVERSION}/include/ppc_wrappers/immintrin.h
 lib/clang/${PKGVERSION}/include/ppc_wrappers/mm_malloc.h
 lib/clang/${PKGVERSION}/include/ppc_wrappers/mmintrin.h
 lib/clang/${PKGVERSION}/include/ppc_wrappers/pmmintrin.h
 lib/clang/${PKGVERSION}/include/ppc_wrappers/smmintrin.h
 lib/clang/${PKGVERSION}/include/ppc_wrappers/tmmintrin.h
+lib/clang/${PKGVERSION}/include/ppc_wrappers/x86gprintrin.h
+lib/clang/${PKGVERSION}/include/ppc_wrappers/x86intrin.h
 lib/clang/${PKGVERSION}/include/ppc_wrappers/xmmintrin.h
 lib/clang/${PKGVERSION}/include/prfchwintrin.h
 lib/clang/${PKGVERSION}/include/ptwriteintrin.h
+lib/clang/${PKGVERSION}/include/rdpruintrin.h
 lib/clang/${PKGVERSION}/include/rdseedintrin.h
 ${PLIST.RISCV}lib/clang/${PKGVERSION}/include/riscv_vector.h
 lib/clang/${PKGVERSION}/include/rtmintrin.h
@@ -851,6 +890,9 @@ lib/clang/${PKGVERSION}/include/vadefs.h
 lib/clang/${PKGVERSION}/include/vaesintrin.h
 lib/clang/${PKGVERSION}/include/varargs.h
 lib/clang/${PKGVERSION}/include/vecintrin.h
+lib/clang/${PKGVERSION}/include/velintrin.h
+lib/clang/${PKGVERSION}/include/velintrin_approx.h
+lib/clang/${PKGVERSION}/include/velintrin_gen.h
 lib/clang/${PKGVERSION}/include/vpclmulqdqintrin.h
 lib/clang/${PKGVERSION}/include/waitpkgintrin.h
 lib/clang/${PKGVERSION}/include/wasm_simd128.h
@@ -869,17 +911,18 @@ lib/cmake/clang/AddClang.cmake
 lib/cmake/clang/ClangConfig.cmake
 lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
-${PLIST.notdylib}lib/libclang-cpp.so.14
 lib/libclang-cpp.${SOEXT}
-${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION}
-${PLIST.notdylib}lib/libclang.${SOEXT}.13
+${PLIST.notdylib}lib/libclang-cpp.so.15
 lib/libclang.${SOEXT}
+${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION}
+${PLIST.notdylib}lib/libclang.${SOEXT}.15
 lib/libclangAPINotes.a
 lib/libclangARCMigrate.a
 lib/libclangAST.a
 lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
 lib/libclangAnalysisFlowSensitive.a
+lib/libclangAnalysisFlowSensitiveModels.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
 lib/libclangCrossTU.a
@@ -888,6 +931,7 @@ lib/libclangDirectoryWatcher.a
 lib/libclangDriver.a
 lib/libclangDynamicASTMatchers.a
 lib/libclangEdit.a
+lib/libclangExtractAPI.a
 lib/libclangFormat.a
 lib/libclangFrontend.a
 lib/libclangFrontendTool.a
@@ -905,7 +949,7 @@ lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
 lib/libclangStaticAnalyzerCore.a
 lib/libclangStaticAnalyzerFrontend.a
-lib/libclangTesting.a
+lib/libclangSupport.a
 lib/libclangTooling.a
 lib/libclangToolingASTDiff.a
 lib/libclangToolingCore.a

Index: pkgsrc/lang/clang/buildlink3.mk
diff -u pkgsrc/lang/clang/buildlink3.mk:1.19 pkgsrc/lang/clang/buildlink3.mk:1.20
--- pkgsrc/lang/clang/buildlink3.mk:1.19        Fri Aug 12 08:45:44 2022
+++ pkgsrc/lang/clang/buildlink3.mk     Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2022/08/12 08:45:44 pin Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2022/11/14 18:44:05 adam Exp $
 
 BUILDLINK_TREE+=       clang
 
@@ -8,17 +8,20 @@ CLANG_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.clang+=  clang>=14.0
 BUILDLINK_PKGSRCDIR.clang?=    ../../lang/clang
 
+BUILDLINK_FILES.clang+=                bin/analyze-build
 BUILDLINK_FILES.clang+=                bin/c-index-test
 BUILDLINK_FILES.clang+=                bin/clang
 BUILDLINK_FILES.clang+=                bin/clang++
-BUILDLINK_FILES.clang+=                bin/clang-14
+BUILDLINK_FILES.clang+=                bin/clang-15
 BUILDLINK_FILES.clang+=                bin/clang-check
 BUILDLINK_FILES.clang+=                bin/clang-cl
 BUILDLINK_FILES.clang+=                bin/clang-cpp
 BUILDLINK_FILES.clang+=                bin/clang-extdef-mapping
 BUILDLINK_FILES.clang+=                bin/clang-format
-BUILDLINK_FILES.clang+=                bin/clang-import-test
+BUILDLINK_FILES.clang+=                bin/clang-linker-wrapper
+BUILDLINK_FILES.clang+=                bin/clang-nvlink-wrapper
 BUILDLINK_FILES.clang+=                bin/clang-offload-bundler
+BUILDLINK_FILES.clang+=                bin/clang-offload-packager
 BUILDLINK_FILES.clang+=                bin/clang-offload-wrapper
 BUILDLINK_FILES.clang+=                bin/clang-refactor
 BUILDLINK_FILES.clang+=                bin/clang-rename

Index: pkgsrc/lang/clang/distinfo
diff -u pkgsrc/lang/clang/distinfo:1.75 pkgsrc/lang/clang/distinfo:1.76
--- pkgsrc/lang/clang/distinfo:1.75     Sat Aug 13 09:58:03 2022
+++ pkgsrc/lang/clang/distinfo  Mon Nov 14 18:44:05 2022
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.75 2022/08/13 09:58:03 tnn Exp $
+$NetBSD: distinfo,v 1.76 2022/11/14 18:44:05 adam Exp $
 
-BLAKE2s (clang-14.0.6.src.tar.xz) = a39d30a3475f93605cf5cf63374500d78b1583e5c738b3ad7693a9ef08c137c4
-SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b
-Size (clang-14.0.6.src.tar.xz) = 18539496 bytes
+BLAKE2s (clang-15.0.4.src.tar.xz) = 6a4c1eb4f2b28eae9fa79dc4f081c04b256c60866c1d5bcaed93f58d663e8d0f
+SHA512 (clang-15.0.4.src.tar.xz) = 408061a0331799e8d6313dea75ba8f811daea43277b3d3f078daa694bc7e9eb9dbe9060824f6281417ca6804498359c5a8195f5a6c1949eaa3a9bab0e8c11649
+Size (clang-15.0.4.src.tar.xz) = 18541400 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
 SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
-SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 29e6ca7cf0bf0b01f50305f50cd555cbb75995e1
+SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = ad22a65fb75c266e4f56e3004844f084f92a988f
 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
-SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = e5cd01d0950f2d9f29b295b2c6da42ec73ce81ca
+SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = 6f8e3d21efbaf3b90bf6c9859ca703d50fa35a46
 SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
 SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525

Index: pkgsrc/lang/clang-tools-extra/Makefile
diff -u pkgsrc/lang/clang-tools-extra/Makefile:1.19 pkgsrc/lang/clang-tools-extra/Makefile:1.20
--- pkgsrc/lang/clang-tools-extra/Makefile:1.19 Sat Aug 13 09:58:04 2022
+++ pkgsrc/lang/clang-tools-extra/Makefile      Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/08/13 09:58:04 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2022/11/14 18:44:05 adam Exp $
 
 .include "../../lang/clang/Makefile.common"
 
@@ -8,11 +8,9 @@ COMMENT=       Extra Clang tools
 
 DEPENDS+=      clang>=${LLVM_VERSION}:../../lang/clang
 
-EXTRA_DIST=            ${DISTNAME:S/clang/clang-tools-extra/}${EXTRACT_SUFX}
+EXTRA_DIST+=           ${DISTNAME:S/clang/clang-tools-extra/}${EXTRACT_SUFX}
 SITES.${EXTRA_DIST}=   ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
-
 BUILD_TARGET=  clang-change-namespace clang-apply-replacements clang-doc
 BUILD_TARGET+= clang-include-fixer clang-move clang-query clang-reorder-fields
 BUILD_TARGET+= clang-tidy clangd modularize pp-trace tool-template

Index: pkgsrc/lang/clang-tools-extra/PLIST
diff -u pkgsrc/lang/clang-tools-extra/PLIST:1.6 pkgsrc/lang/clang-tools-extra/PLIST:1.7
--- pkgsrc/lang/clang-tools-extra/PLIST:1.6     Fri Aug 12 08:50:58 2022
+++ pkgsrc/lang/clang-tools-extra/PLIST Mon Nov 14 18:44:05 2022
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2022/08/12 08:50:58 pin Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/11/14 18:44:05 adam Exp $
 bin/clang-apply-replacements
 bin/clang-change-namespace
 bin/clang-doc
 bin/clang-include-fixer
 bin/clang-move
+bin/clang-pseudo
 bin/clang-query
 bin/clang-reorder-fields
 bin/clang-tidy
@@ -68,6 +69,7 @@ include/clang-tidy/android/ComparisonInT
 include/clang-tidy/boost/UseToStringCheck.h
 include/clang-tidy/bugprone/ArgumentCommentCheck.h
 include/clang-tidy/bugprone/AssertSideEffectCheck.h
+include/clang-tidy/bugprone/AssignmentInIfConditionCheck.h
 include/clang-tidy/bugprone/BadSignalToKillThreadCheck.h
 include/clang-tidy/bugprone/BoolPointerImplicitConversionCheck.h
 include/clang-tidy/bugprone/BranchCloneCheck.h
@@ -98,10 +100,12 @@ include/clang-tidy/bugprone/ParentVirtua
 include/clang-tidy/bugprone/PosixReturnCheck.h
 include/clang-tidy/bugprone/RedundantBranchConditionCheck.h
 include/clang-tidy/bugprone/ReservedIdentifierCheck.h
+include/clang-tidy/bugprone/SharedPtrArrayMismatchCheck.h
 include/clang-tidy/bugprone/SignalHandlerCheck.h
 include/clang-tidy/bugprone/SignedCharMisuseCheck.h
 include/clang-tidy/bugprone/SizeofContainerCheck.h
 include/clang-tidy/bugprone/SizeofExpressionCheck.h
+include/clang-tidy/bugprone/SmartPtrArrayMismatchCheck.h
 include/clang-tidy/bugprone/SpuriouslyWakeUpFunctionsCheck.h
 include/clang-tidy/bugprone/StringConstructorCheck.h
 include/clang-tidy/bugprone/StringIntegerAssignmentCheck.h
@@ -118,6 +122,7 @@ include/clang-tidy/bugprone/SwappedArgum
 include/clang-tidy/bugprone/TerminatingContinueCheck.h
 include/clang-tidy/bugprone/ThrowKeywordMissingCheck.h
 include/clang-tidy/bugprone/TooSmallLoopVariableCheck.h
+include/clang-tidy/bugprone/UncheckedOptionalAccessCheck.h
 include/clang-tidy/bugprone/UndefinedMemoryManipulationCheck.h
 include/clang-tidy/bugprone/UndelegatedConstructorCheck.h
 include/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.h
@@ -202,6 +207,8 @@ include/clang-tidy/llvm/TwineLocalCheck.
 include/clang-tidy/llvmlibc/CalleeNamespaceCheck.h
 include/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.h
 include/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.h
+include/clang-tidy/misc/ConfusableIdentifierCheck.h
+include/clang-tidy/misc/ConstCorrectnessCheck.h
 include/clang-tidy/misc/DefinitionsInHeadersCheck.h
 include/clang-tidy/misc/MisleadingBidirectional.h
 include/clang-tidy/misc/MisleadingIdentifier.h
@@ -223,8 +230,10 @@ include/clang-tidy/modernize/AvoidCArray
 include/clang-tidy/modernize/ConcatNestedNamespacesCheck.h
 include/clang-tidy/modernize/DeprecatedHeadersCheck.h
 include/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.h
+include/clang-tidy/modernize/IntegralLiteralExpressionMatcher.h
 include/clang-tidy/modernize/LoopConvertCheck.h
 include/clang-tidy/modernize/LoopConvertUtils.h
+include/clang-tidy/modernize/MacroToEnumCheck.h
 include/clang-tidy/modernize/MakeSharedCheck.h
 include/clang-tidy/modernize/MakeSmartPtrCheck.h
 include/clang-tidy/modernize/MakeUniqueCheck.h
@@ -278,8 +287,10 @@ include/clang-tidy/performance/Trivially
 include/clang-tidy/performance/TypePromotionInMathFnCheck.h
 include/clang-tidy/performance/UnnecessaryCopyInitialization.h
 include/clang-tidy/performance/UnnecessaryValueParamCheck.h
+@pkgdir include/clang-tidy/plugin
 include/clang-tidy/portability/RestrictSystemIncludesCheck.h
 include/clang-tidy/portability/SIMDIntrinsicsCheck.h
+include/clang-tidy/portability/StdAllocatorConstCheck.h
 include/clang-tidy/readability/AvoidConstParamsInDecls.h
 include/clang-tidy/readability/BracesAroundStatementsCheck.h
 include/clang-tidy/readability/ConstReturnTypeCheck.h
@@ -315,7 +326,6 @@ include/clang-tidy/readability/Redundant
 include/clang-tidy/readability/RedundantStringCStrCheck.h
 include/clang-tidy/readability/RedundantStringInitCheck.h
 include/clang-tidy/readability/SimplifyBooleanExprCheck.h
-include/clang-tidy/readability/SimplifyBooleanExprMatchers.h
 include/clang-tidy/readability/SimplifySubscriptExprCheck.h
 include/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h
 include/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h
@@ -349,9 +359,14 @@ lib/libclangChangeNamespace.a
 lib/libclangDaemon.a
 lib/libclangDaemonTweaks.a
 lib/libclangDoc.a
+lib/libclangIncludeCleaner.a
 lib/libclangIncludeFixer.a
 lib/libclangIncludeFixerPlugin.a
 lib/libclangMove.a
+lib/libclangPseudo.a
+lib/libclangPseudoCLI.a
+lib/libclangPseudoCXX.a
+lib/libclangPseudoGrammar.a
 lib/libclangQuery.a
 lib/libclangReorderFields.a
 lib/libclangTidy.a
@@ -391,4 +406,3 @@ share/clang/clang-include-fixer.py
 share/clang/clang-tidy-diff.py
 share/clang/index.js
 share/clang/run-find-all-symbols.py
-@pkgdir include/clang-tidy/plugin

Index: pkgsrc/lang/clang-tools-extra/distinfo
diff -u pkgsrc/lang/clang-tools-extra/distinfo:1.13 pkgsrc/lang/clang-tools-extra/distinfo:1.14
--- pkgsrc/lang/clang-tools-extra/distinfo:1.13 Fri Aug 12 08:50:58 2022
+++ pkgsrc/lang/clang-tools-extra/distinfo      Mon Nov 14 18:44:05 2022
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.13 2022/08/12 08:50:58 pin Exp $
+$NetBSD: distinfo,v 1.14 2022/11/14 18:44:05 adam Exp $
 
-BLAKE2s (clang-14.0.6.src.tar.xz) = a39d30a3475f93605cf5cf63374500d78b1583e5c738b3ad7693a9ef08c137c4
-SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b
-Size (clang-14.0.6.src.tar.xz) = 18539496 bytes
-BLAKE2s (clang-tools-extra-14.0.6.src.tar.xz) = 05206cb2740386d1dad37aa2368b0223e094455d11a181c1053efe479c1eaf96
-SHA512 (clang-tools-extra-14.0.6.src.tar.xz) = b55fd9872e52a27599e27fa665cf39af3d172814c0e7246ea0e57286e9eea42bf816f8b6d350334f3fe5e2fae35a8e59d59e71a3a5de330ecb0622ef7655e63f
-Size (clang-tools-extra-14.0.6.src.tar.xz) = 2849632 bytes
+BLAKE2s (clang-15.0.4.src.tar.xz) = 6a4c1eb4f2b28eae9fa79dc4f081c04b256c60866c1d5bcaed93f58d663e8d0f
+SHA512 (clang-15.0.4.src.tar.xz) = 408061a0331799e8d6313dea75ba8f811daea43277b3d3f078daa694bc7e9eb9dbe9060824f6281417ca6804498359c5a8195f5a6c1949eaa3a9bab0e8c11649
+Size (clang-15.0.4.src.tar.xz) = 18541400 bytes
+BLAKE2s (clang-tools-extra-15.0.4.src.tar.xz) = d1ddc7d9d91c4ae72f212feba4efcd648f0bf7aed4be7d53dd525e0b72637880
+SHA512 (clang-tools-extra-15.0.4.src.tar.xz) = a9969a55449a6d6eecab5bda071304c0cb804674795b643a53ad113b96bf5382678270bde47f1cd061b88156e3477ab2932f1c8e8926b7eb84dc7683341ce6e9
+Size (clang-tools-extra-15.0.4.src.tar.xz) = 3075652 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes

Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.9 pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.10
--- pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.9       Fri Aug 12 08:45:44 2022
+++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp   Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.9 2022/08/12 08:45:44 pin Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.10 2022/11/14 18:44:05 adam Exp $
 
 Use compiler-rt instead of libgcc.
 Pull in libcxx correctly.
@@ -7,9 +7,9 @@ Don't specify --dynamic-linker, makes it
 Ensure we reset to -zdefaultextract prior to adding compiler-rt.
 Test removing -Bdynamic for golang.
 
---- lib/Driver/ToolChains/Solaris.cpp.orig     2022-06-22 16:46:24.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.cpp.orig     2022-11-02 03:11:40.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.cpp
-@@ -50,8 +50,28 @@ void solaris::Linker::ConstructJob(Compi
+@@ -52,8 +52,28 @@ void solaris::Linker::ConstructJob(Compi
                                     const InputInfoList &Inputs,
                                     const ArgList &Args,
                                     const char *LinkingOutput) const {
@@ -38,7 +38,7 @@ Test removing -Bdynamic for golang.
    // Demangle C++ names in errors
    CmdArgs.push_back("-C");
  
-@@ -64,7 +84,6 @@ void solaris::Linker::ConstructJob(Compi
+@@ -66,7 +86,6 @@ void solaris::Linker::ConstructJob(Compi
      CmdArgs.push_back("-Bstatic");
      CmdArgs.push_back("-dn");
    } else {
@@ -46,7 +46,7 @@ Test removing -Bdynamic for golang.
      if (Args.hasArg(options::OPT_shared)) {
        CmdArgs.push_back("-shared");
      }
-@@ -86,9 +105,9 @@ void solaris::Linker::ConstructJob(Compi
+@@ -88,9 +107,9 @@ void solaris::Linker::ConstructJob(Compi
                     options::OPT_r)) {
      if (!Args.hasArg(options::OPT_shared))
        CmdArgs.push_back(
@@ -58,7 +58,7 @@ Test removing -Bdynamic for golang.
  
      const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
      bool HaveAnsi = false;
-@@ -103,16 +122,14 @@ void solaris::Linker::ConstructJob(Compi
+@@ -105,16 +124,14 @@ void solaris::Linker::ConstructJob(Compi
      // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
      if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
        values_X = "values-Xc.o";
@@ -77,7 +77,7 @@ Test removing -Bdynamic for golang.
    }
  
    getToolChain().AddFilePathLibArgs(Args, CmdArgs);
-@@ -125,15 +142,6 @@ void solaris::Linker::ConstructJob(Compi
+@@ -127,15 +144,6 @@ void solaris::Linker::ConstructJob(Compi
  
    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
                     options::OPT_r)) {
@@ -93,7 +93,7 @@ Test removing -Bdynamic for golang.
      // LLVM support for atomics on 32-bit SPARC V8+ is incomplete, so
      // forcibly link with libatomic as a workaround.
      if (getToolChain().getTriple().getArch() == llvm::Triple::sparc) {
-@@ -141,24 +149,23 @@ void solaris::Linker::ConstructJob(Compi
+@@ -143,12 +151,18 @@ void solaris::Linker::ConstructJob(Compi
        CmdArgs.push_back("-latomic");
        CmdArgs.push_back(getAsNeededOption(getToolChain(), false));
      }
@@ -113,8 +113,11 @@ Test removing -Bdynamic for golang.
        CmdArgs.push_back("-lm");
      }
 +    CmdArgs.push_back("-lc");
-     if (NeedsSanitizerDeps)
+     if (NeedsSanitizerDeps) {
        linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
+ 
+@@ -163,13 +177,7 @@ void solaris::Linker::ConstructJob(Compi
+     }
    }
  
 -  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
@@ -124,12 +127,11 @@ Test removing -Bdynamic for golang.
 -    CmdArgs.push_back(
 -        Args.MakeArgString(getToolChain().GetFilePath("crtn.o")));
 -  }
--
 +  CmdArgs.push_back(Args.MakeArgString(SysPath + "crtn.o"));
+ 
    getToolChain().addProfileRTLibs(Args, CmdArgs);
  
-   const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath());
-@@ -187,26 +194,9 @@ Solaris::Solaris(const Driver &D, const 
+@@ -199,26 +207,9 @@ Solaris::Solaris(const Driver &D, const 
                   const ArgList &Args)
      : Generic_ELF(D, Triple, Args) {
  
@@ -159,7 +161,7 @@ Test removing -Bdynamic for golang.
  }
  
  SanitizerMask Solaris::getSupportedSanitizers() const {
-@@ -231,6 +221,31 @@ Tool *Solaris::buildAssembler() const {
+@@ -243,6 +234,31 @@ Tool *Solaris::buildAssembler() const {
  
  Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); }
  
@@ -191,7 +193,7 @@ Test removing -Bdynamic for golang.
  void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
                                          ArgStringList &CC1Args) const {
    const Driver &D = getDriver();
-@@ -263,38 +278,20 @@ void Solaris::AddClangSystemIncludeArgs(
+@@ -275,38 +291,20 @@ void Solaris::AddClangSystemIncludeArgs(
      return;
    }
  

Index: pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp:1.1 pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp:1.2
--- pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp:1.1    Sat Aug 13 09:58:04 2022
+++ pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp        Mon Nov 14 18:44:05 2022
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_Lex_InitHeaderSearch.cpp,v 1.1 2022/08/13 09:58:04 tnn Exp $
+$NetBSD: patch-lib_Lex_InitHeaderSearch.cpp,v 1.2 2022/11/14 18:44:05 adam Exp $
 
 Don't add /usr/local/include by default on Solaris.
 was: patch-lib_Frontend_InitHeaderSearch.cpp
 
---- lib/Lex/InitHeaderSearch.cpp.orig  2022-06-22 16:46:24.000000000 +0000
+--- lib/Lex/InitHeaderSearch.cpp.orig  2022-11-02 03:11:40.000000000 +0000
 +++ lib/Lex/InitHeaderSearch.cpp
-@@ -241,6 +241,7 @@ void InitHeaderSearch::AddDefaultCInclud
-     case llvm::Triple::PS4:
+@@ -242,6 +242,7 @@ void InitHeaderSearch::AddDefaultCInclud
+     case llvm::Triple::PS5:
      case llvm::Triple::ELFIAMCU:
      case llvm::Triple::Fuchsia:
 +    case llvm::Triple::Solaris:

Index: pkgsrc/lang/compiler-rt/Makefile
diff -u pkgsrc/lang/compiler-rt/Makefile:1.18 pkgsrc/lang/compiler-rt/Makefile:1.19
--- pkgsrc/lang/compiler-rt/Makefile:1.18       Sun Sep 19 09:12:46 2021
+++ pkgsrc/lang/compiler-rt/Makefile    Mon Nov 14 18:44:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/09/19 09:12:46 nia Exp $
+# $NetBSD: Makefile,v 1.19 2022/11/14 18:44:06 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -25,8 +25,6 @@ CMAKE_ARG_PATH=       ${WRKSRC}
 OS_DIR=                ${OPSYS:tl}
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_OS_DIR:STRING=${OS_DIR}
 CMAKE_ARGS+=   -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}

Index: pkgsrc/lang/compiler-rt/distinfo
diff -u pkgsrc/lang/compiler-rt/distinfo:1.17 pkgsrc/lang/compiler-rt/distinfo:1.18
--- pkgsrc/lang/compiler-rt/distinfo:1.17       Fri Aug 12 08:58:41 2022
+++ pkgsrc/lang/compiler-rt/distinfo    Mon Nov 14 18:44:06 2022
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.17 2022/08/12 08:58:41 pin Exp $
+$NetBSD: distinfo,v 1.18 2022/11/14 18:44:06 adam Exp $
 
-BLAKE2s (compiler-rt-14.0.6.src.tar.xz) = d2c279dadc7d3cd7f8c2999e918d410eaf7c74cfd16095c3db16bcdc83c30fb8
-SHA512 (compiler-rt-14.0.6.src.tar.xz) = c0e63071cb99bca837b83fd0e3597cf45cc635f73ab88a1ec48e863a1633f42bd402ea7c5130e8fa0f550b9574c1ecac1799b92b789565e4ead955cf60060907
-Size (compiler-rt-14.0.6.src.tar.xz) = 2327352 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (compiler-rt-15.0.4.src.tar.xz) = 16007c4ade9ebe84d8dd123931f410762b7c8f6107dbc620df52a52b15ed2906
+SHA512 (compiler-rt-15.0.4.src.tar.xz) = 33c9d3b852cf6c149f8c9940251f111c3f137e03f0e91cdd13da3a22e94b8e5335a53313e1868acf85213ed3ab55a44945b4162834d8209839959fbc12704b87
+Size (compiler-rt-15.0.4.src.tar.xz) = 2349856 bytes
 SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
 SHA1 (patch-lib_asan_CMakeLists.txt) = f91335b88c8c28a25d7dfada85769f799660f82a
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = 32befa87b3487518ce6423ab197c3a587e53bb2f
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 8d9b35c02f0c8c10d7e7d3bf9935bd0ca3f5f448

Index: pkgsrc/lang/libcxx/Makefile
diff -u pkgsrc/lang/libcxx/Makefile:1.15 pkgsrc/lang/libcxx/Makefile:1.16
--- pkgsrc/lang/libcxx/Makefile:1.15    Sun Aug 14 14:15:48 2022
+++ pkgsrc/lang/libcxx/Makefile Mon Nov 14 18:44:06 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2022/08/14 14:15:48 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2022/11/14 18:44:06 adam Exp $
 
 .include "../../lang/llvm/version.mk"
-PKGREVISION=   1
 
 DISTNAME=      libcxx-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -17,15 +16,10 @@ LICENSE=    apache-2.0
 # in both of them to get them to build against each other without causing
 # circular dependencies.  This must be kept in sync with libcxxabi/Makefile.
 LIBCXXABI=     libcxxabi-${LLVM_VERSION}.src
-LLVMDIST=      llvm-${LLVM_VERSION}.src
-EXTRA_DIST=    ${LIBCXXABI}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX}
+EXTRA_DIST+=   ${LIBCXXABI}${EXTRACT_SUFX}
 
 SITES.${LIBCXXABI}${EXTRACT_SUFX}=     \
        ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${LLLVMDIST}${EXTRACT_SUFX}=     \
-       ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
-DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
 
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ${WRKSRC}
@@ -36,13 +30,10 @@ SSP_SUPPORTED=      no
 GCC_REQD+=     10
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS+=   -DLIBCXX_CXX_ABI=libcxxabi
+CMAKE_ARGS+=   -DLIBCXX_CXX_ABI=system-libcxxabi
 CMAKE_ARGS+=   -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
-CMAKE_ARGS+=   -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
 CMAKE_ARGS+=   -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+CMAKE_ARGS+=   -DLIBCXX_INCLUDE_BENCHMARKS=OFF
 
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
@@ -57,7 +48,6 @@ CXXFLAGS+=            -std=c++17 -D_LIBCPP_STD_VER
 post-extract:
        ${MKDIR} ${WRKSRC}/build
        ${LN} -f -s ${WRKDIR}/${LIBCXXABI} ${WRKDIR}/libcxxabi
-       ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
 
 .include "../../lang/libcxxabi/buildlink3.mk"
 .include "../../lang/libunwind/buildlink3.mk"

Index: pkgsrc/lang/libcxx/PLIST
diff -u pkgsrc/lang/libcxx/PLIST:1.8 pkgsrc/lang/libcxx/PLIST:1.9
--- pkgsrc/lang/libcxx/PLIST:1.8        Fri Aug 12 08:43:58 2022
+++ pkgsrc/lang/libcxx/PLIST    Mon Nov 14 18:44:06 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2022/08/12 08:43:58 pin Exp $
+@comment $NetBSD: PLIST,v 1.9 2022/11/14 18:44:06 adam Exp $
 include/c++/v1/__algorithm/adjacent_find.h
 include/c++/v1/__algorithm/all_of.h
 include/c++/v1/__algorithm/any_of.h
@@ -26,8 +26,11 @@ include/c++/v1/__algorithm/for_each_n.h
 include/c++/v1/__algorithm/generate.h
 include/c++/v1/__algorithm/generate_n.h
 include/c++/v1/__algorithm/half_positive.h
+include/c++/v1/__algorithm/in_found_result.h
+include/c++/v1/__algorithm/in_fun_result.h
 include/c++/v1/__algorithm/in_in_out_result.h
 include/c++/v1/__algorithm/in_in_result.h
+include/c++/v1/__algorithm/in_out_out_result.h
 include/c++/v1/__algorithm/in_out_result.h
 include/c++/v1/__algorithm/includes.h
 include/c++/v1/__algorithm/inplace_merge.h
@@ -38,14 +41,17 @@ include/c++/v1/__algorithm/is_permutatio
 include/c++/v1/__algorithm/is_sorted.h
 include/c++/v1/__algorithm/is_sorted_until.h
 include/c++/v1/__algorithm/iter_swap.h
+include/c++/v1/__algorithm/iterator_operations.h
 include/c++/v1/__algorithm/lexicographical_compare.h
 include/c++/v1/__algorithm/lower_bound.h
 include/c++/v1/__algorithm/make_heap.h
+include/c++/v1/__algorithm/make_projected.h
 include/c++/v1/__algorithm/max.h
 include/c++/v1/__algorithm/max_element.h
 include/c++/v1/__algorithm/merge.h
 include/c++/v1/__algorithm/min.h
 include/c++/v1/__algorithm/min_element.h
+include/c++/v1/__algorithm/min_max_result.h
 include/c++/v1/__algorithm/minmax.h
 include/c++/v1/__algorithm/minmax_element.h
 include/c++/v1/__algorithm/mismatch.h
@@ -62,6 +68,92 @@ include/c++/v1/__algorithm/partition_poi
 include/c++/v1/__algorithm/pop_heap.h
 include/c++/v1/__algorithm/prev_permutation.h
 include/c++/v1/__algorithm/push_heap.h
+include/c++/v1/__algorithm/ranges_adjacent_find.h
+include/c++/v1/__algorithm/ranges_all_of.h
+include/c++/v1/__algorithm/ranges_any_of.h
+include/c++/v1/__algorithm/ranges_binary_search.h
+include/c++/v1/__algorithm/ranges_clamp.h
+include/c++/v1/__algorithm/ranges_copy.h
+include/c++/v1/__algorithm/ranges_copy_backward.h
+include/c++/v1/__algorithm/ranges_copy_if.h
+include/c++/v1/__algorithm/ranges_copy_n.h
+include/c++/v1/__algorithm/ranges_count.h
+include/c++/v1/__algorithm/ranges_count_if.h
+include/c++/v1/__algorithm/ranges_equal.h
+include/c++/v1/__algorithm/ranges_equal_range.h
+include/c++/v1/__algorithm/ranges_fill.h
+include/c++/v1/__algorithm/ranges_fill_n.h
+include/c++/v1/__algorithm/ranges_find.h
+include/c++/v1/__algorithm/ranges_find_end.h
+include/c++/v1/__algorithm/ranges_find_first_of.h
+include/c++/v1/__algorithm/ranges_find_if.h
+include/c++/v1/__algorithm/ranges_find_if_not.h
+include/c++/v1/__algorithm/ranges_for_each.h
+include/c++/v1/__algorithm/ranges_for_each_n.h
+include/c++/v1/__algorithm/ranges_generate.h
+include/c++/v1/__algorithm/ranges_generate_n.h
+include/c++/v1/__algorithm/ranges_includes.h
+include/c++/v1/__algorithm/ranges_inplace_merge.h
+include/c++/v1/__algorithm/ranges_is_heap.h
+include/c++/v1/__algorithm/ranges_is_heap_until.h
+include/c++/v1/__algorithm/ranges_is_partitioned.h
+include/c++/v1/__algorithm/ranges_is_permutation.h
+include/c++/v1/__algorithm/ranges_is_sorted.h
+include/c++/v1/__algorithm/ranges_is_sorted_until.h
+include/c++/v1/__algorithm/ranges_iterator_concept.h
+include/c++/v1/__algorithm/ranges_lexicographical_compare.h
+include/c++/v1/__algorithm/ranges_lower_bound.h
+include/c++/v1/__algorithm/ranges_make_heap.h
+include/c++/v1/__algorithm/ranges_max.h
+include/c++/v1/__algorithm/ranges_max_element.h
+include/c++/v1/__algorithm/ranges_merge.h
+include/c++/v1/__algorithm/ranges_min.h
+include/c++/v1/__algorithm/ranges_min_element.h
+include/c++/v1/__algorithm/ranges_minmax.h
+include/c++/v1/__algorithm/ranges_minmax_element.h
+include/c++/v1/__algorithm/ranges_mismatch.h
+include/c++/v1/__algorithm/ranges_move.h
+include/c++/v1/__algorithm/ranges_move_backward.h
+include/c++/v1/__algorithm/ranges_next_permutation.h
+include/c++/v1/__algorithm/ranges_none_of.h
+include/c++/v1/__algorithm/ranges_nth_element.h
+include/c++/v1/__algorithm/ranges_partial_sort.h
+include/c++/v1/__algorithm/ranges_partial_sort_copy.h
+include/c++/v1/__algorithm/ranges_partition.h
+include/c++/v1/__algorithm/ranges_partition_copy.h
+include/c++/v1/__algorithm/ranges_partition_point.h
+include/c++/v1/__algorithm/ranges_pop_heap.h
+include/c++/v1/__algorithm/ranges_prev_permutation.h
+include/c++/v1/__algorithm/ranges_push_heap.h
+include/c++/v1/__algorithm/ranges_remove.h
+include/c++/v1/__algorithm/ranges_remove_copy.h
+include/c++/v1/__algorithm/ranges_remove_copy_if.h
+include/c++/v1/__algorithm/ranges_remove_if.h
+include/c++/v1/__algorithm/ranges_replace.h
+include/c++/v1/__algorithm/ranges_replace_copy.h
+include/c++/v1/__algorithm/ranges_replace_copy_if.h
+include/c++/v1/__algorithm/ranges_replace_if.h
+include/c++/v1/__algorithm/ranges_reverse.h
+include/c++/v1/__algorithm/ranges_reverse_copy.h
+include/c++/v1/__algorithm/ranges_rotate.h
+include/c++/v1/__algorithm/ranges_rotate_copy.h
+include/c++/v1/__algorithm/ranges_sample.h
+include/c++/v1/__algorithm/ranges_search.h
+include/c++/v1/__algorithm/ranges_search_n.h
+include/c++/v1/__algorithm/ranges_set_difference.h
+include/c++/v1/__algorithm/ranges_set_intersection.h
+include/c++/v1/__algorithm/ranges_set_symmetric_difference.h
+include/c++/v1/__algorithm/ranges_set_union.h
+include/c++/v1/__algorithm/ranges_shuffle.h
+include/c++/v1/__algorithm/ranges_sort.h
+include/c++/v1/__algorithm/ranges_sort_heap.h
+include/c++/v1/__algorithm/ranges_stable_partition.h
+include/c++/v1/__algorithm/ranges_stable_sort.h
+include/c++/v1/__algorithm/ranges_swap_ranges.h
+include/c++/v1/__algorithm/ranges_transform.h
+include/c++/v1/__algorithm/ranges_unique.h
+include/c++/v1/__algorithm/ranges_unique_copy.h
+include/c++/v1/__algorithm/ranges_upper_bound.h
 include/c++/v1/__algorithm/remove.h
 include/c++/v1/__algorithm/remove_copy.h
 include/c++/v1/__algorithm/remove_copy_if.h
@@ -91,10 +183,13 @@ include/c++/v1/__algorithm/stable_partit
 include/c++/v1/__algorithm/stable_sort.h
 include/c++/v1/__algorithm/swap_ranges.h
 include/c++/v1/__algorithm/transform.h
+include/c++/v1/__algorithm/uniform_random_bit_generator_adaptor.h
 include/c++/v1/__algorithm/unique.h
 include/c++/v1/__algorithm/unique_copy.h
 include/c++/v1/__algorithm/unwrap_iter.h
+include/c++/v1/__algorithm/unwrap_range.h
 include/c++/v1/__algorithm/upper_bound.h
+include/c++/v1/__assert
 include/c++/v1/__availability
 include/c++/v1/__bit/bit_cast.h
 include/c++/v1/__bit/byteswap.h
@@ -104,15 +199,28 @@ include/c++/v1/__bsd_locale_defaults.h
 include/c++/v1/__bsd_locale_fallbacks.h
 include/c++/v1/__charconv/chars_format.h
 include/c++/v1/__charconv/from_chars_result.h
+include/c++/v1/__charconv/tables.h
+include/c++/v1/__charconv/to_chars_base_10.h
 include/c++/v1/__charconv/to_chars_result.h
 include/c++/v1/__chrono/calendar.h
 include/c++/v1/__chrono/convert_to_timespec.h
+include/c++/v1/__chrono/day.h
 include/c++/v1/__chrono/duration.h
 include/c++/v1/__chrono/file_clock.h
+include/c++/v1/__chrono/hh_mm_ss.h
 include/c++/v1/__chrono/high_resolution_clock.h
+include/c++/v1/__chrono/literals.h
+include/c++/v1/__chrono/month.h
+include/c++/v1/__chrono/month_weekday.h
+include/c++/v1/__chrono/monthday.h
 include/c++/v1/__chrono/steady_clock.h
 include/c++/v1/__chrono/system_clock.h
 include/c++/v1/__chrono/time_point.h
+include/c++/v1/__chrono/weekday.h
+include/c++/v1/__chrono/year.h
+include/c++/v1/__chrono/year_month.h
+include/c++/v1/__chrono/year_month_day.h
+include/c++/v1/__chrono/year_month_weekday.h
 include/c++/v1/__compare/common_comparison_category.h
 include/c++/v1/__compare/compare_partial_order_fallback.h
 include/c++/v1/__compare/compare_strong_order_fallback.h
@@ -154,8 +262,8 @@ include/c++/v1/__coroutine/coroutine_han
 include/c++/v1/__coroutine/coroutine_traits.h
 include/c++/v1/__coroutine/noop_coroutine_handle.h
 include/c++/v1/__coroutine/trivial_awaitables.h
-include/c++/v1/__cxxabi_config.h
 include/c++/v1/__debug
+include/c++/v1/__debug_utils/randomize_range.h
 include/c++/v1/__errc
 include/c++/v1/__filesystem/copy_options.h
 include/c++/v1/__filesystem/directory_entry.h
@@ -173,7 +281,12 @@ include/c++/v1/__filesystem/perms.h
 include/c++/v1/__filesystem/recursive_directory_iterator.h
 include/c++/v1/__filesystem/space_info.h
 include/c++/v1/__filesystem/u8path.h
+include/c++/v1/__format/buffer.h
+include/c++/v1/__format/concepts.h
+include/c++/v1/__format/enable_insertable.h
+include/c++/v1/__format/extended_grapheme_cluster_table.h
 include/c++/v1/__format/format_arg.h
+include/c++/v1/__format/format_arg_store.h
 include/c++/v1/__format/format_args.h
 include/c++/v1/__format/format_context.h
 include/c++/v1/__format/format_error.h
@@ -187,9 +300,11 @@ include/c++/v1/__format/formatter_char.h
 include/c++/v1/__format/formatter_floating_point.h
 include/c++/v1/__format/formatter_integer.h
 include/c++/v1/__format/formatter_integral.h
+include/c++/v1/__format/formatter_output.h
 include/c++/v1/__format/formatter_pointer.h
 include/c++/v1/__format/formatter_string.h
 include/c++/v1/__format/parser_std_format_spec.h
+include/c++/v1/__format/unicode.h
 include/c++/v1/__functional/binary_function.h
 include/c++/v1/__functional/binary_negate.h
 include/c++/v1/__functional/bind.h
@@ -197,6 +312,7 @@ include/c++/v1/__functional/bind_back.h
 include/c++/v1/__functional/bind_front.h
 include/c++/v1/__functional/binder1st.h
 include/c++/v1/__functional/binder2nd.h
+include/c++/v1/__functional/boyer_moore_searcher.h
 include/c++/v1/__functional/compose.h
 include/c++/v1/__functional/default_searcher.h
 include/c++/v1/__functional/function.h
@@ -217,11 +333,14 @@ include/c++/v1/__functional/unary_functi
 include/c++/v1/__functional/unary_negate.h
 include/c++/v1/__functional/unwrap_ref.h
 include/c++/v1/__functional/weak_result_type.h
-include/c++/v1/__functional_base
+include/c++/v1/__fwd/span.h
+include/c++/v1/__fwd/string_view.h
 include/c++/v1/__hash_table
+include/c++/v1/__ios/fpos.h
 include/c++/v1/__iterator/access.h
 include/c++/v1/__iterator/advance.h
 include/c++/v1/__iterator/back_insert_iterator.h
+include/c++/v1/__iterator/bounded_iter.h
 include/c++/v1/__iterator/common_iterator.h
 include/c++/v1/__iterator/concepts.h
 include/c++/v1/__iterator/counted_iterator.h
@@ -240,26 +359,31 @@ include/c++/v1/__iterator/iter_move.h
 include/c++/v1/__iterator/iter_swap.h
 include/c++/v1/__iterator/iterator.h
 include/c++/v1/__iterator/iterator_traits.h
+include/c++/v1/__iterator/mergeable.h
 include/c++/v1/__iterator/move_iterator.h
+include/c++/v1/__iterator/move_sentinel.h
 include/c++/v1/__iterator/next.h
 include/c++/v1/__iterator/ostream_iterator.h
 include/c++/v1/__iterator/ostreambuf_iterator.h
+include/c++/v1/__iterator/permutable.h
 include/c++/v1/__iterator/prev.h
 include/c++/v1/__iterator/projected.h
 include/c++/v1/__iterator/readable_traits.h
 include/c++/v1/__iterator/reverse_access.h
 include/c++/v1/__iterator/reverse_iterator.h
 include/c++/v1/__iterator/size.h
+include/c++/v1/__iterator/sortable.h
 include/c++/v1/__iterator/unreachable_sentinel.h
 include/c++/v1/__iterator/wrap_iter.h
-include/c++/v1/__libcpp_version
 include/c++/v1/__locale
 include/c++/v1/__mbstate_t.h
 include/c++/v1/__memory/addressof.h
+include/c++/v1/__memory/allocate_at_least.h
 include/c++/v1/__memory/allocation_guard.h
 include/c++/v1/__memory/allocator.h
 include/c++/v1/__memory/allocator_arg_t.h
 include/c++/v1/__memory/allocator_traits.h
+include/c++/v1/__memory/assume_aligned.h
 include/c++/v1/__memory/auto_ptr.h
 include/c++/v1/__memory/compressed_pair.h
 include/c++/v1/__memory/concepts.h
@@ -269,6 +393,7 @@ include/c++/v1/__memory/ranges_construct
 include/c++/v1/__memory/ranges_uninitialized_algorithms.h
 include/c++/v1/__memory/raw_storage_iterator.h
 include/c++/v1/__memory/shared_ptr.h
+include/c++/v1/__memory/swap_allocator.h
 include/c++/v1/__memory/temporary_buffer.h
 include/c++/v1/__memory/uninitialized_algorithms.h
 include/c++/v1/__memory/unique_ptr.h
@@ -276,7 +401,6 @@ include/c++/v1/__memory/uses_allocator.h
 include/c++/v1/__memory/voidify.h
 include/c++/v1/__mutex_base
 include/c++/v1/__node_handle
-include/c++/v1/__nullptr
 include/c++/v1/__numeric/accumulate.h
 include/c++/v1/__numeric/adjacent_difference.h
 include/c++/v1/__numeric/exclusive_scan.h
@@ -306,6 +430,7 @@ include/c++/v1/__random/generate_canonic
 include/c++/v1/__random/geometric_distribution.h
 include/c++/v1/__random/independent_bits_engine.h
 include/c++/v1/__random/is_seed_sequence.h
+include/c++/v1/__random/is_valid.h
 include/c++/v1/__random/knuth_b.h
 include/c++/v1/__random/linear_congruential_engine.h
 include/c++/v1/__random/log2.h
@@ -339,12 +464,16 @@ include/c++/v1/__ranges/empty.h
 include/c++/v1/__ranges/empty_view.h
 include/c++/v1/__ranges/enable_borrowed_range.h
 include/c++/v1/__ranges/enable_view.h
+include/c++/v1/__ranges/filter_view.h
 include/c++/v1/__ranges/iota_view.h
 include/c++/v1/__ranges/join_view.h
+include/c++/v1/__ranges/lazy_split_view.h
 include/c++/v1/__ranges/non_propagating_cache.h
 include/c++/v1/__ranges/owning_view.h
 include/c++/v1/__ranges/range_adaptor.h
+include/c++/v1/__ranges/rbegin.h
 include/c++/v1/__ranges/ref_view.h
+include/c++/v1/__ranges/rend.h
 include/c++/v1/__ranges/reverse_view.h
 include/c++/v1/__ranges/single_view.h
 include/c++/v1/__ranges/size.h
@@ -353,16 +482,16 @@ include/c++/v1/__ranges/take_view.h
 include/c++/v1/__ranges/transform_view.h
 include/c++/v1/__ranges/view_interface.h
 include/c++/v1/__ranges/views.h
+include/c++/v1/__ranges/zip_view.h
 include/c++/v1/__split_buffer
 include/c++/v1/__std_stream
-include/c++/v1/__string
+include/c++/v1/__string/char_traits.h
+include/c++/v1/__string/extern_template_lists.h
 include/c++/v1/__support/android/locale_bionic.h
 include/c++/v1/__support/fuchsia/xlocale.h
 include/c++/v1/__support/ibm/gettod_zos.h
-include/c++/v1/__support/ibm/limits.h
 include/c++/v1/__support/ibm/locale_mgmt_zos.h
 include/c++/v1/__support/ibm/nanosleep.h
-include/c++/v1/__support/ibm/support.h
 include/c++/v1/__support/ibm/xlocale.h
 include/c++/v1/__support/musl/xlocale.h
 include/c++/v1/__support/newlib/xlocale.h
@@ -380,6 +509,122 @@ include/c++/v1/__thread/timed_backoff_po
 include/c++/v1/__threading_support
 include/c++/v1/__tree
 include/c++/v1/__tuple
+include/c++/v1/__type_traits/add_const.h
+include/c++/v1/__type_traits/add_cv.h
+include/c++/v1/__type_traits/add_lvalue_reference.h
+include/c++/v1/__type_traits/add_pointer.h
+include/c++/v1/__type_traits/add_rvalue_reference.h
+include/c++/v1/__type_traits/add_volatile.h
+include/c++/v1/__type_traits/aligned_storage.h
+include/c++/v1/__type_traits/aligned_union.h
+include/c++/v1/__type_traits/alignment_of.h
+include/c++/v1/__type_traits/apply_cv.h
+include/c++/v1/__type_traits/common_reference.h
+include/c++/v1/__type_traits/common_type.h
+include/c++/v1/__type_traits/conditional.h
+include/c++/v1/__type_traits/conjunction.h
+include/c++/v1/__type_traits/copy_cv.h
+include/c++/v1/__type_traits/copy_cvref.h
+include/c++/v1/__type_traits/decay.h
+include/c++/v1/__type_traits/disjunction.h
+include/c++/v1/__type_traits/enable_if.h
+include/c++/v1/__type_traits/extent.h
+include/c++/v1/__type_traits/has_unique_object_representation.h
+include/c++/v1/__type_traits/has_virtual_destructor.h
+include/c++/v1/__type_traits/integral_constant.h
+include/c++/v1/__type_traits/is_abstract.h
+include/c++/v1/__type_traits/is_aggregate.h
+include/c++/v1/__type_traits/is_arithmetic.h
+include/c++/v1/__type_traits/is_array.h
+include/c++/v1/__type_traits/is_assignable.h
+include/c++/v1/__type_traits/is_base_of.h
+include/c++/v1/__type_traits/is_bounded_array.h
+include/c++/v1/__type_traits/is_callable.h
+include/c++/v1/__type_traits/is_class.h
+include/c++/v1/__type_traits/is_compound.h
+include/c++/v1/__type_traits/is_const.h
+include/c++/v1/__type_traits/is_constant_evaluated.h
+include/c++/v1/__type_traits/is_constructible.h
+include/c++/v1/__type_traits/is_convertible.h
+include/c++/v1/__type_traits/is_copy_assignable.h
+include/c++/v1/__type_traits/is_copy_constructible.h
+include/c++/v1/__type_traits/is_core_convertible.h
+include/c++/v1/__type_traits/is_default_constructible.h
+include/c++/v1/__type_traits/is_destructible.h
+include/c++/v1/__type_traits/is_empty.h
+include/c++/v1/__type_traits/is_enum.h
+include/c++/v1/__type_traits/is_final.h
+include/c++/v1/__type_traits/is_floating_point.h
+include/c++/v1/__type_traits/is_function.h
+include/c++/v1/__type_traits/is_fundamental.h
+include/c++/v1/__type_traits/is_integral.h
+include/c++/v1/__type_traits/is_literal_type.h
+include/c++/v1/__type_traits/is_member_function_pointer.h
+include/c++/v1/__type_traits/is_member_object_pointer.h
+include/c++/v1/__type_traits/is_member_pointer.h
+include/c++/v1/__type_traits/is_move_assignable.h
+include/c++/v1/__type_traits/is_move_constructible.h
+include/c++/v1/__type_traits/is_nothrow_assignable.h
+include/c++/v1/__type_traits/is_nothrow_constructible.h
+include/c++/v1/__type_traits/is_nothrow_convertible.h
+include/c++/v1/__type_traits/is_nothrow_copy_assignable.h
+include/c++/v1/__type_traits/is_nothrow_copy_constructible.h
+include/c++/v1/__type_traits/is_nothrow_default_constructible.h
+include/c++/v1/__type_traits/is_nothrow_destructible.h
+include/c++/v1/__type_traits/is_nothrow_move_assignable.h
+include/c++/v1/__type_traits/is_nothrow_move_constructible.h
+include/c++/v1/__type_traits/is_null_pointer.h
+include/c++/v1/__type_traits/is_object.h
+include/c++/v1/__type_traits/is_pod.h
+include/c++/v1/__type_traits/is_pointer.h
+include/c++/v1/__type_traits/is_polymorphic.h
+include/c++/v1/__type_traits/is_primary_template.h
+include/c++/v1/__type_traits/is_reference.h
+include/c++/v1/__type_traits/is_reference_wrapper.h
+include/c++/v1/__type_traits/is_referenceable.h
+include/c++/v1/__type_traits/is_same.h
+include/c++/v1/__type_traits/is_scalar.h
+include/c++/v1/__type_traits/is_scoped_enum.h
+include/c++/v1/__type_traits/is_signed.h
+include/c++/v1/__type_traits/is_signed_integer.h
+include/c++/v1/__type_traits/is_standard_layout.h
+include/c++/v1/__type_traits/is_trivial.h
+include/c++/v1/__type_traits/is_trivially_assignable.h
+include/c++/v1/__type_traits/is_trivially_constructible.h
+include/c++/v1/__type_traits/is_trivially_copy_assignable.h
+include/c++/v1/__type_traits/is_trivially_copy_constructible.h
+include/c++/v1/__type_traits/is_trivially_copyable.h
+include/c++/v1/__type_traits/is_trivially_default_constructible.h
+include/c++/v1/__type_traits/is_trivially_destructible.h
+include/c++/v1/__type_traits/is_trivially_move_assignable.h
+include/c++/v1/__type_traits/is_trivially_move_constructible.h
+include/c++/v1/__type_traits/is_unbounded_array.h
+include/c++/v1/__type_traits/is_union.h
+include/c++/v1/__type_traits/is_unsigned.h
+include/c++/v1/__type_traits/is_unsigned_integer.h
+include/c++/v1/__type_traits/is_valid_expansion.h
+include/c++/v1/__type_traits/is_void.h
+include/c++/v1/__type_traits/is_volatile.h
+include/c++/v1/__type_traits/lazy.h
+include/c++/v1/__type_traits/make_32_64_or_128_bit.h
+include/c++/v1/__type_traits/make_signed.h
+include/c++/v1/__type_traits/make_unsigned.h
+include/c++/v1/__type_traits/nat.h
+include/c++/v1/__type_traits/negation.h
+include/c++/v1/__type_traits/promote.h
+include/c++/v1/__type_traits/rank.h
+include/c++/v1/__type_traits/remove_all_extents.h
+include/c++/v1/__type_traits/remove_const.h
+include/c++/v1/__type_traits/remove_cv.h
+include/c++/v1/__type_traits/remove_cvref.h
+include/c++/v1/__type_traits/remove_extent.h
+include/c++/v1/__type_traits/remove_pointer.h
+include/c++/v1/__type_traits/remove_reference.h
+include/c++/v1/__type_traits/remove_volatile.h
+include/c++/v1/__type_traits/type_identity.h
+include/c++/v1/__type_traits/type_list.h
+include/c++/v1/__type_traits/underlying_type.h
+include/c++/v1/__type_traits/void_t.h
 include/c++/v1/__undef_macros
 include/c++/v1/__utility/as_const.h
 include/c++/v1/__utility/auto_cast.h
@@ -397,7 +642,9 @@ include/c++/v1/__utility/rel_ops.h
 include/c++/v1/__utility/swap.h
 include/c++/v1/__utility/to_underlying.h
 include/c++/v1/__utility/transaction.h
+include/c++/v1/__utility/unreachable.h
 include/c++/v1/__variant/monostate.h
+include/c++/v1/__verbose_abort
 include/c++/v1/algorithm
 include/c++/v1/any
 include/c++/v1/array
@@ -437,9 +684,9 @@ include/c++/v1/cstring
 include/c++/v1/ctgmath
 include/c++/v1/ctime
 include/c++/v1/ctype.h
+include/c++/v1/cuchar
 include/c++/v1/cwchar
 include/c++/v1/cwctype
-include/c++/v1/cxxabi.h
 include/c++/v1/deque
 include/c++/v1/errno.h
 include/c++/v1/exception
@@ -449,7 +696,6 @@ include/c++/v1/experimental/__memory
 include/c++/v1/experimental/algorithm
 include/c++/v1/experimental/coroutine
 include/c++/v1/experimental/deque
-include/c++/v1/experimental/filesystem
 include/c++/v1/experimental/forward_list
 include/c++/v1/experimental/functional
 include/c++/v1/experimental/iterator
@@ -514,6 +760,7 @@ include/c++/v1/shared_mutex
 include/c++/v1/span
 include/c++/v1/sstream
 include/c++/v1/stack
+include/c++/v1/stdatomic.h
 include/c++/v1/stdbool.h
 include/c++/v1/stddef.h
 include/c++/v1/stdexcept
@@ -532,6 +779,7 @@ include/c++/v1/tuple
 include/c++/v1/type_traits
 include/c++/v1/typeindex
 include/c++/v1/typeinfo
+include/c++/v1/uchar.h
 include/c++/v1/unordered_map
 include/c++/v1/unordered_set
 include/c++/v1/utility

Index: pkgsrc/lang/libcxx/distinfo
diff -u pkgsrc/lang/libcxx/distinfo:1.20 pkgsrc/lang/libcxx/distinfo:1.21
--- pkgsrc/lang/libcxx/distinfo:1.20    Sun Aug 14 19:54:31 2022
+++ pkgsrc/lang/libcxx/distinfo Mon Nov 14 18:44:06 2022
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.20 2022/08/14 19:54:31 tnn Exp $
+$NetBSD: distinfo,v 1.21 2022/11/14 18:44:06 adam Exp $
 
-BLAKE2s (libcxx-14.0.6.src.tar.xz) = e77dfac79fb977adf84345b7e4c2762b3fa89f3d1f611baa8f8fa6831d1bc68a
-SHA512 (libcxx-14.0.6.src.tar.xz) = c39bb01317e8ae7e5b23a677754a866953b6c45188c194d3d76fbd276de9565df8bcbcab8cf6606584af7dd30a61f39376c0e2de6b8c32c69f7fc592587e710d
-Size (libcxx-14.0.6.src.tar.xz) = 3065120 bytes
-BLAKE2s (libcxxabi-14.0.6.src.tar.xz) = c2bc894a75176b7f24517b6c045ddaccc61375453d56331f51dc9d03821804cc
-SHA512 (libcxxabi-14.0.6.src.tar.xz) = f61926ce9c8bf4d704d9ee03a795ebd23730099d56c385e3cbd1f8b588b337c1394d6548f55e1452df5040117a80765c977ba256547d53cd21895e91ef0fffa6
-Size (libcxxabi-14.0.6.src.tar.xz) = 561844 bytes
-BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d44946453add45426569fd4187654f83881341c5c0109e4ffacc60e8f73af60
-SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
-Size (llvm-14.0.6.src.tar.xz) = 49660136 bytes
-SHA1 (patch-include_____config) = 01793dc2ec7db8f51d042fd0114649223036b089
-SHA1 (patch-include_____locale) = 16ce105c26adf43828699ddb2825ea2a199f2bda
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (libcxx-15.0.4.src.tar.xz) = 218577b1a527b22b4a349ad95dd515d08fc682ccbaca85dee39efebbe4efc001
+SHA512 (libcxx-15.0.4.src.tar.xz) = 4d03a945e1625d4c7293c57e5432a782deb47d701895874fa6d518c835b1f84fdf3c00076155e17e825d0c72f6faccbc1c9394183fe9ffd70fce8e1cdcb85e3a
+Size (libcxx-15.0.4.src.tar.xz) = 3334192 bytes
+BLAKE2s (libcxxabi-15.0.4.src.tar.xz) = bae765eb627eebd7d047effc3a026a63ce49a680f4a774efaec49158f3a428a3
+SHA512 (libcxxabi-15.0.4.src.tar.xz) = 28d50e4a71b1badfaa97799c39a5077927b579c8d3a4d5c23908e4ee7659f04d7932aa9a7b8f6503d28d05ad42af5e5ef8e18633cfa97b63cc4a122188f9aa0b
+Size (libcxxabi-15.0.4.src.tar.xz) = 568608 bytes
 SHA1 (patch-src_charconv.cpp) = b8569ae77df4a5a7b627b3a9cb6691be73699dca
 SHA1 (patch-src_filesystem_filesystem__common.h) = 7b088ae8e577b482e05906434b510daed40469ae
 SHA1 (patch-src_include_to__chars__floating__point.h) = f7f880905609b87830ea657c7510fb3987448a09

Index: pkgsrc/lang/libcxxabi/Makefile
diff -u pkgsrc/lang/libcxxabi/Makefile:1.15 pkgsrc/lang/libcxxabi/Makefile:1.16
--- pkgsrc/lang/libcxxabi/Makefile:1.15 Sun Aug 14 13:52:26 2022
+++ pkgsrc/lang/libcxxabi/Makefile      Mon Nov 14 18:44:06 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2022/08/14 13:52:26 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2022/11/14 18:44:06 adam Exp $
 
 .include "../../lang/llvm/version.mk"
-PKGREVISION=   2
 
 DISTNAME=      libcxxabi-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -17,15 +16,10 @@ LICENSE=    apache-2.0
 # in both of them to get them to build against each other without causing
 # circular dependencies.  This must be kept in sync with libcxxabi/Makefile.
 LIBCXX=                libcxx-${LLVM_VERSION}.src
-LLVMDIST=      llvm-${LLVM_VERSION}.src
-EXTRA_DIST=    ${LIBCXX}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX}
+EXTRA_DIST+=   ${LIBCXX}${EXTRACT_SUFX}
 
 SITES.${LIBCXX}${EXTRACT_SUFX}=        \
        ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${LLLVMDIST}${EXTRACT_SUFX}=     \
-       ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
-DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
 
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ${WRKSRC}
@@ -36,10 +30,6 @@ SSP_SUPPORTED=       no
 GCC_REQD+=     10      # must be in sync with libcxx
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+=   -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/${LIBCXX}/include
-CMAKE_ARGS+=   -DLIBCXXABI_USE_LLVM_UNWINDER=ON
 
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
@@ -54,7 +44,6 @@ CXXFLAGS+=            -std=c++17 -D_LIBCPP_STD_VER
 post-extract:
        ${MKDIR} ${WRKSRC}/build
        ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-       ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
 # TODO: not sure what should create this and with which contents
        ${TOUCH} ${WRKDIR}/${LIBCXX}/include/__config_site
 
Index: pkgsrc/lang/libcxxabi/distinfo
diff -u pkgsrc/lang/libcxxabi/distinfo:1.15 pkgsrc/lang/libcxxabi/distinfo:1.16
--- pkgsrc/lang/libcxxabi/distinfo:1.15 Fri Aug 12 08:41:58 2022
+++ pkgsrc/lang/libcxxabi/distinfo      Mon Nov 14 18:44:06 2022
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.15 2022/08/12 08:41:58 pin Exp $
+$NetBSD: distinfo,v 1.16 2022/11/14 18:44:06 adam Exp $
 
-BLAKE2s (libcxx-14.0.6.src.tar.xz) = e77dfac79fb977adf84345b7e4c2762b3fa89f3d1f611baa8f8fa6831d1bc68a
-SHA512 (libcxx-14.0.6.src.tar.xz) = c39bb01317e8ae7e5b23a677754a866953b6c45188c194d3d76fbd276de9565df8bcbcab8cf6606584af7dd30a61f39376c0e2de6b8c32c69f7fc592587e710d
-Size (libcxx-14.0.6.src.tar.xz) = 3065120 bytes
-BLAKE2s (libcxxabi-14.0.6.src.tar.xz) = c2bc894a75176b7f24517b6c045ddaccc61375453d56331f51dc9d03821804cc
-SHA512 (libcxxabi-14.0.6.src.tar.xz) = f61926ce9c8bf4d704d9ee03a795ebd23730099d56c385e3cbd1f8b588b337c1394d6548f55e1452df5040117a80765c977ba256547d53cd21895e91ef0fffa6
-Size (libcxxabi-14.0.6.src.tar.xz) = 561844 bytes
-BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d44946453add45426569fd4187654f83881341c5c0109e4ffacc60e8f73af60
-SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
-Size (llvm-14.0.6.src.tar.xz) = 49660136 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (libcxx-15.0.4.src.tar.xz) = 218577b1a527b22b4a349ad95dd515d08fc682ccbaca85dee39efebbe4efc001
+SHA512 (libcxx-15.0.4.src.tar.xz) = 4d03a945e1625d4c7293c57e5432a782deb47d701895874fa6d518c835b1f84fdf3c00076155e17e825d0c72f6faccbc1c9394183fe9ffd70fce8e1cdcb85e3a
+Size (libcxx-15.0.4.src.tar.xz) = 3334192 bytes
+BLAKE2s (libcxxabi-15.0.4.src.tar.xz) = bae765eb627eebd7d047effc3a026a63ce49a680f4a774efaec49158f3a428a3
+SHA512 (libcxxabi-15.0.4.src.tar.xz) = 28d50e4a71b1badfaa97799c39a5077927b579c8d3a4d5c23908e4ee7659f04d7932aa9a7b8f6503d28d05ad42af5e5ef8e18633cfa97b63cc4a122188f9aa0b
+Size (libcxxabi-15.0.4.src.tar.xz) = 568608 bytes
+SHA1 (patch-src_CMakeLists.txt) = da127de7603ed0ea5530c4a8cd2ffcee61d2ff90

Index: pkgsrc/lang/libcxxabi/PLIST
diff -u pkgsrc/lang/libcxxabi/PLIST:1.1 pkgsrc/lang/libcxxabi/PLIST:1.2
--- pkgsrc/lang/libcxxabi/PLIST:1.1     Thu Aug  9 14:13:25 2018
+++ pkgsrc/lang/libcxxabi/PLIST Mon Nov 14 18:44:06 2022
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/09 14:13:25 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/11/14 18:44:06 adam Exp $
+include/c++/v1/__cxxabi_config.h
+include/c++/v1/cxxabi.h
 lib/libc++abi.a
 lib/libc++abi.so
 lib/libc++abi.so.1

Index: pkgsrc/lang/libunwind/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.28 pkgsrc/lang/libunwind/Makefile:1.29
--- pkgsrc/lang/libunwind/Makefile:1.28 Sun Aug 14 13:52:27 2022
+++ pkgsrc/lang/libunwind/Makefile      Mon Nov 14 18:44:06 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2022/08/14 13:52:27 tnn Exp $
+# $NetBSD: Makefile,v 1.29 2022/11/14 18:44:06 adam Exp $
 
 .include "../../lang/llvm/version.mk"
-PKGREVISION=   2
 
 DISTNAME=      libunwind-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -12,17 +11,12 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 COMMENT=       LLVM libunwind
 LICENSE=       apache-2.0
 
-# libunwind requires llvm and libcxx source code to build
+# libunwind requires libcxx source code to build
 LIBCXX=                libcxx-${LLVM_VERSION}.src
-LLVMDIST=      llvm-${LLVM_VERSION}.src
-EXTRA_DIST=    ${LIBCXX}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX}
+EXTRA_DIST+=   ${LIBCXX}${EXTRACT_SUFX}
 
 SITES.${LIBCXX}${EXTRACT_SUFX}=        \
        ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${LLLVMDIST}${EXTRACT_SUFX}=     \
-       ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
-DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
 
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ${WRKSRC}
@@ -34,15 +28,12 @@ SSP_SUPPORTED=              no
 GCC_REQD+=             10      # must be in sync with libcxx
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 
 INSTALLATION_DIRS=     include
 
 post-extract:
        ${MKDIR} ${WRKSRC}/build
        ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-       ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
 
 post-install:
        cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include

Index: pkgsrc/lang/libunwind/distinfo
diff -u pkgsrc/lang/libunwind/distinfo:1.25 pkgsrc/lang/libunwind/distinfo:1.26
--- pkgsrc/lang/libunwind/distinfo:1.25 Fri Aug 12 08:39:56 2022
+++ pkgsrc/lang/libunwind/distinfo      Mon Nov 14 18:44:06 2022
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.25 2022/08/12 08:39:56 pin Exp $
+$NetBSD: distinfo,v 1.26 2022/11/14 18:44:06 adam Exp $
 
-BLAKE2s (libcxx-14.0.6.src.tar.xz) = e77dfac79fb977adf84345b7e4c2762b3fa89f3d1f611baa8f8fa6831d1bc68a
-SHA512 (libcxx-14.0.6.src.tar.xz) = c39bb01317e8ae7e5b23a677754a866953b6c45188c194d3d76fbd276de9565df8bcbcab8cf6606584af7dd30a61f39376c0e2de6b8c32c69f7fc592587e710d
-Size (libcxx-14.0.6.src.tar.xz) = 3065120 bytes
-BLAKE2s (libunwind-14.0.6.src.tar.xz) = 21da632762db6524a46c1f721908b233265afe83728c1de5dd7757c662db0d99
-SHA512 (libunwind-14.0.6.src.tar.xz) = c8f3804c47ac33273238899e5682f9cb52465dcceff0e0ecf9925469620c6c9a62cc2c708a35a0e156b666e1198df52c5fff1da9d5ee3194605dfd62c296b058
-Size (libunwind-14.0.6.src.tar.xz) = 108680 bytes
-BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d44946453add45426569fd4187654f83881341c5c0109e4ffacc60e8f73af60
-SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
-Size (llvm-14.0.6.src.tar.xz) = 49660136 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (libcxx-15.0.4.src.tar.xz) = 218577b1a527b22b4a349ad95dd515d08fc682ccbaca85dee39efebbe4efc001
+SHA512 (libcxx-15.0.4.src.tar.xz) = 4d03a945e1625d4c7293c57e5432a782deb47d701895874fa6d518c835b1f84fdf3c00076155e17e825d0c72f6faccbc1c9394183fe9ffd70fce8e1cdcb85e3a
+Size (libcxx-15.0.4.src.tar.xz) = 3334192 bytes
+BLAKE2s (libunwind-15.0.4.src.tar.xz) = 5c46aabe2d13ae480910ee4fba40576f5b9e226a14dde1b261332bfade9b4af0
+SHA512 (libunwind-15.0.4.src.tar.xz) = b00a90c43926d5c90ebb2ac0189660232de0824cc05b229446e880bec87302066ee7dea719990e2e72058859d26f1ae92529c9832644871fe07f00267e59a25a
+Size (libunwind-15.0.4.src.tar.xz) = 113360 bytes
+SHA1 (patch-src_CMakeLists.txt) = 6f8902b27c596ba5216604a6ab3ac557021b50ab

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.82 pkgsrc/lang/llvm/Makefile:1.83
--- pkgsrc/lang/llvm/Makefile:1.82      Mon Sep 12 08:59:15 2022
+++ pkgsrc/lang/llvm/Makefile   Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2022/09/12 08:59:15 he Exp $
+# $NetBSD: Makefile,v 1.83 2022/11/14 18:44:05 adam Exp $
 #
 # When updating this, please also update:
 # devel/include-what-you-use
@@ -27,7 +27,6 @@
 
 DISTNAME=      llvm-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
-PKGREVISION=   1
 CATEGORIES=    lang devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -103,7 +102,7 @@ PLIST.notdylib=     yes
 PLIST_SUBST+=  SOEXT=${SOEXT}
 PLIST_SUBST+=  LLVM_MAJOR_VERSION=${LLVM_MAJOR_VERSION}
 
-NOTDYLIBS=     LTO Remarks
+NOTDYLIBS=             LTO Remarks
 .for libname in ${NOTDYLIBS}
 PRINT_PLIST_AWK+=      /lib${libname}.${SOEXT}.${LLVM_MAJOR_VERSION}/ { gsub(/\.${SOEXT}\.${LLVM_MAJOR_VERSION}/, ".$${SOEXT}.$${LLVM_MAJOR_VERSION}"); print "$${PLIST.notdylib}" $$0; next }
 .endfor
@@ -143,9 +142,10 @@ CMAKE_ARGS+=       -DPKGSRC_LLVM_PTHREADLIB=-l
 post-extract:
        ${MKDIR} ${WRKSRC}/build
 .for f in config.guess config.sub
-       cp ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
+       ${CP} ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
 .endfor
 
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/lang/llvm/PLIST
diff -u pkgsrc/lang/llvm/PLIST:1.21 pkgsrc/lang/llvm/PLIST:1.22
--- pkgsrc/lang/llvm/PLIST:1.21 Wed Aug 24 14:38:56 2022
+++ pkgsrc/lang/llvm/PLIST      Mon Nov 14 18:44:05 2022
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.21 2022/08/24 14:38:56 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.22 2022/11/14 18:44:05 adam Exp $
 bin/FileCheck
+bin/UnicodeNameMappingGenerator
 bin/bugpoint
 bin/count
 bin/dsymutil
@@ -21,11 +22,13 @@ bin/llvm-cvtres
 bin/llvm-cxxdump
 bin/llvm-cxxfilt
 bin/llvm-cxxmap
+bin/llvm-debuginfod
 bin/llvm-debuginfod-find
 bin/llvm-diff
 bin/llvm-dis
 bin/llvm-dlltool
 bin/llvm-dwarfdump
+bin/llvm-dwarfutil
 bin/llvm-dwp
 bin/llvm-exegesis
 bin/llvm-extract
@@ -58,6 +61,7 @@ bin/llvm-rc
 bin/llvm-readelf
 bin/llvm-readobj
 bin/llvm-reduce
+bin/llvm-remark-size-diff
 bin/llvm-rtdyld
 bin/llvm-sim
 bin/llvm-size
@@ -107,7 +111,6 @@ include/llvm-c/Support.h
 include/llvm-c/Target.h
 include/llvm-c/TargetMachine.h
 include/llvm-c/Transforms/AggressiveInstCombine.h
-include/llvm-c/Transforms/Coroutines.h
 include/llvm-c/Transforms/IPO.h
 include/llvm-c/Transforms/InstCombine.h
 include/llvm-c/Transforms/PassBuilder.h
@@ -116,11 +119,13 @@ include/llvm-c/Transforms/Scalar.h
 include/llvm-c/Transforms/Utils.h
 include/llvm-c/Transforms/Vectorize.h
 include/llvm-c/Types.h
+include/llvm-c/blake3.h
 include/llvm-c/lto.h
 include/llvm/ADT/APFixedPoint.h
 include/llvm/ADT/APFloat.h
 include/llvm/ADT/APInt.h
 include/llvm/ADT/APSInt.h
+include/llvm/ADT/AddressRanges.h
 include/llvm/ADT/AllocatorList.h
 include/llvm/ADT/Any.h
 include/llvm/ADT/ArrayRef.h
@@ -292,6 +297,7 @@ include/llvm/Analysis/MemDerefPrinter.h
 include/llvm/Analysis/MemoryBuiltins.h
 include/llvm/Analysis/MemoryDependenceAnalysis.h
 include/llvm/Analysis/MemoryLocation.h
+include/llvm/Analysis/MemoryProfileInfo.h
 include/llvm/Analysis/MemorySSA.h
 include/llvm/Analysis/MemorySSAUpdater.h
 include/llvm/Analysis/ModelUnderTrainingRunner.h
@@ -323,6 +329,7 @@ include/llvm/Analysis/ScalarEvolutionAli
 include/llvm/Analysis/ScalarEvolutionDivision.h
 include/llvm/Analysis/ScalarEvolutionExpressions.h
 include/llvm/Analysis/ScalarEvolutionNormalization.h
+include/llvm/Analysis/ScalarFuncs.def
 include/llvm/Analysis/ScopedNoAliasAA.h
 include/llvm/Analysis/SparsePropagation.h
 include/llvm/Analysis/StackLifetime.h
@@ -334,6 +341,7 @@ include/llvm/Analysis/TargetLibraryInfo.
 include/llvm/Analysis/TargetLibraryInfo.h
 include/llvm/Analysis/TargetTransformInfo.h
 include/llvm/Analysis/TargetTransformInfoImpl.h
+include/llvm/Analysis/TensorSpec.h
 include/llvm/Analysis/Trace.h
 include/llvm/Analysis/TypeBasedAliasAnalysis.h
 include/llvm/Analysis/TypeMetadataUtils.h
@@ -352,6 +360,7 @@ include/llvm/AsmParser/Parser.h
 include/llvm/AsmParser/SlotMapping.h
 include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
 include/llvm/BinaryFormat/COFF.h
+include/llvm/BinaryFormat/DXContainer.h
 include/llvm/BinaryFormat/Dwarf.def
 include/llvm/BinaryFormat/Dwarf.h
 include/llvm/BinaryFormat/DynamicTags.def
@@ -365,6 +374,7 @@ include/llvm/BinaryFormat/ELFRelocs/BPF.
 include/llvm/BinaryFormat/ELFRelocs/CSKY.def
 include/llvm/BinaryFormat/ELFRelocs/Hexagon.def
 include/llvm/BinaryFormat/ELFRelocs/Lanai.def
+include/llvm/BinaryFormat/ELFRelocs/LoongArch.def
 include/llvm/BinaryFormat/ELFRelocs/M68k.def
 include/llvm/BinaryFormat/ELFRelocs/MSP430.def
 include/llvm/BinaryFormat/ELFRelocs/Mips.def
@@ -376,6 +386,7 @@ include/llvm/BinaryFormat/ELFRelocs/Syst
 include/llvm/BinaryFormat/ELFRelocs/VE.def
 include/llvm/BinaryFormat/ELFRelocs/i386.def
 include/llvm/BinaryFormat/ELFRelocs/x86_64.def
+include/llvm/BinaryFormat/GOFF.h
 include/llvm/BinaryFormat/MachO.def
 include/llvm/BinaryFormat/MachO.h
 include/llvm/BinaryFormat/Magic.h
@@ -399,6 +410,7 @@ include/llvm/Bitcode/BitcodeReader.h
 include/llvm/Bitcode/BitcodeWriter.h
 include/llvm/Bitcode/BitcodeWriterPass.h
 include/llvm/Bitcode/LLVMBitCodes.h
+include/llvm/Bitstream/BitCodeEnums.h
 include/llvm/Bitstream/BitCodes.h
 include/llvm/Bitstream/BitstreamReader.h
 include/llvm/Bitstream/BitstreamWriter.h
@@ -409,7 +421,9 @@ include/llvm/CodeGen/AsmPrinter.h
 include/llvm/CodeGen/AsmPrinterHandler.h
 include/llvm/CodeGen/AtomicExpandUtils.h
 include/llvm/CodeGen/BasicBlockSectionUtils.h
+include/llvm/CodeGen/BasicBlockSectionsProfileReader.h
 include/llvm/CodeGen/BasicTTIImpl.h
+include/llvm/CodeGen/CFIFixup.h
 include/llvm/CodeGen/CSEConfigBase.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
@@ -459,8 +473,6 @@ include/llvm/CodeGen/GlobalISel/LostDebu
 include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
 include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h
 include/llvm/CodeGen/GlobalISel/RegBankSelect.h
-include/llvm/CodeGen/GlobalISel/RegisterBank.h
-include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h
 include/llvm/CodeGen/GlobalISel/Utils.h
 include/llvm/CodeGen/ISDOpcodes.h
 include/llvm/CodeGen/IndirectThunks.h
@@ -552,6 +564,8 @@ include/llvm/CodeGen/RegAllocCommon.h
 include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
 include/llvm/CodeGen/Register.h
+include/llvm/CodeGen/RegisterBank.h
+include/llvm/CodeGen/RegisterBankInfo.h
 include/llvm/CodeGen/RegisterClassInfo.h
 include/llvm/CodeGen/RegisterPressure.h
 include/llvm/CodeGen/RegisterScavenging.h
@@ -701,11 +715,13 @@ include/llvm/DebugInfo/DWARF/DWARFLocati
 include/llvm/DebugInfo/DWARF/DWARFObject.h
 include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
 include/llvm/DebugInfo/DWARF/DWARFSection.h
+include/llvm/DebugInfo/DWARF/DWARFTypePrinter.h
 include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
 include/llvm/DebugInfo/DWARF/DWARFUnit.h
 include/llvm/DebugInfo/DWARF/DWARFUnitIndex.h
 include/llvm/DebugInfo/DWARF/DWARFVerifier.h
 include/llvm/DebugInfo/GSYM/DwarfTransformer.h
+include/llvm/DebugInfo/GSYM/ExtractRanges.h
 include/llvm/DebugInfo/GSYM/FileEntry.h
 include/llvm/DebugInfo/GSYM/FileWriter.h
 include/llvm/DebugInfo/GSYM/FunctionInfo.h
@@ -717,7 +733,6 @@ include/llvm/DebugInfo/GSYM/LineEntry.h
 include/llvm/DebugInfo/GSYM/LineTable.h
 include/llvm/DebugInfo/GSYM/LookupResult.h
 include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
-include/llvm/DebugInfo/GSYM/Range.h
 include/llvm/DebugInfo/GSYM/StringTable.h
 include/llvm/DebugInfo/MSF/IMSFFile.h
 include/llvm/DebugInfo/MSF/MSFBuilder.h
@@ -762,6 +777,7 @@ include/llvm/DebugInfo/PDB/Native/DbiMod
 include/llvm/DebugInfo/PDB/Native/DbiStream.h
 include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/EnumTables.h
+include/llvm/DebugInfo/PDB/Native/FormatUtil.h
 include/llvm/DebugInfo/PDB/Native/Formatters.h
 include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
@@ -771,6 +787,8 @@ include/llvm/DebugInfo/PDB/Native/ISecti
 include/llvm/DebugInfo/PDB/Native/InfoStream.h
 include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
+include/llvm/DebugInfo/PDB/Native/InputFile.h
+include/llvm/DebugInfo/PDB/Native/LinePrinter.h
 include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
 include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
 include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
@@ -850,14 +868,19 @@ include/llvm/DebugInfo/PDB/PDBTypes.h
 include/llvm/DebugInfo/PDB/UDTLayout.h
 include/llvm/DebugInfo/Symbolize/DIFetcher.h
 include/llvm/DebugInfo/Symbolize/DIPrinter.h
+include/llvm/DebugInfo/Symbolize/Markup.h
+include/llvm/DebugInfo/Symbolize/MarkupFilter.h
 include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
+include/llvm/DebugInfo/Symbolize/SymbolizableObjectFile.h
 include/llvm/DebugInfo/Symbolize/Symbolize.h
 include/llvm/Debuginfod/DIFetcher.h
 include/llvm/Debuginfod/Debuginfod.h
 include/llvm/Debuginfod/HTTPClient.h
+include/llvm/Debuginfod/HTTPServer.h
 include/llvm/Demangle/Demangle.h
 include/llvm/Demangle/DemangleConfig.h
 include/llvm/Demangle/ItaniumDemangle.h
+include/llvm/Demangle/ItaniumNodes.def
 include/llvm/Demangle/MicrosoftDemangle.h
 include/llvm/Demangle/MicrosoftDemangleNodes.h
 include/llvm/Demangle/StringView.h
@@ -866,6 +889,9 @@ include/llvm/ExecutionEngine/ExecutionEn
 include/llvm/ExecutionEngine/GenericValue.h
 include/llvm/ExecutionEngine/Interpreter.h
 include/llvm/ExecutionEngine/JITEventListener.h
+include/llvm/ExecutionEngine/JITLink/COFF.h
+include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h
+include/llvm/ExecutionEngine/JITLink/DWARFRecordSectionSplitter.h
 include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
 include/llvm/ExecutionEngine/JITLink/ELF.h
 include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h
@@ -913,6 +939,8 @@ include/llvm/ExecutionEngine/Orc/LazyRee
 include/llvm/ExecutionEngine/Orc/LookupAndRecordAddrs.h
 include/llvm/ExecutionEngine/Orc/MachOPlatform.h
 include/llvm/ExecutionEngine/Orc/Mangling.h
+include/llvm/ExecutionEngine/Orc/MapperJITLinkMemoryManager.h
+include/llvm/ExecutionEngine/Orc/MemoryMapper.h
 include/llvm/ExecutionEngine/Orc/ObjectFileInterface.h
 include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
 include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h
@@ -931,6 +959,7 @@ include/llvm/ExecutionEngine/Orc/Specula
 include/llvm/ExecutionEngine/Orc/Speculation.h
 include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorBootstrapService.h
+include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorDylibManager.h
@@ -970,7 +999,6 @@ include/llvm/IR/Assumptions.h
 include/llvm/IR/Attributes.h
 include/llvm/IR/Attributes.inc
 include/llvm/IR/Attributes.td
-include/llvm/IR/AttributesAMDGPU.td
 include/llvm/IR/AutoUpgrade.h
 include/llvm/IR/BasicBlock.h
 include/llvm/IR/BuiltinGCs.h
@@ -978,6 +1006,7 @@ include/llvm/IR/CFG.h
 include/llvm/IR/CallingConv.h
 include/llvm/IR/Comdat.h
 include/llvm/IR/Constant.h
+include/llvm/IR/ConstantFold.h
 include/llvm/IR/ConstantFolder.h
 include/llvm/IR/ConstantRange.h
 include/llvm/IR/Constants.h
@@ -994,6 +1023,7 @@ include/llvm/IR/DiagnosticHandler.h
 include/llvm/IR/DiagnosticInfo.h
 include/llvm/IR/DiagnosticPrinter.h
 include/llvm/IR/Dominators.h
+include/llvm/IR/FMF.h
 include/llvm/IR/FPEnv.h
 include/llvm/IR/FixedMetadataKinds.def
 include/llvm/IR/FixedPointBuilder.h
@@ -1029,6 +1059,8 @@ include/llvm/IR/IntrinsicsARM.h
 include/llvm/IR/IntrinsicsARM.td
 include/llvm/IR/IntrinsicsBPF.h
 include/llvm/IR/IntrinsicsBPF.td
+include/llvm/IR/IntrinsicsDirectX.h
+include/llvm/IR/IntrinsicsDirectX.td
 include/llvm/IR/IntrinsicsHexagon.h
 include/llvm/IR/IntrinsicsHexagon.td
 include/llvm/IR/IntrinsicsHexagonDep.td
@@ -1042,6 +1074,8 @@ include/llvm/IR/IntrinsicsR600.h
 include/llvm/IR/IntrinsicsRISCV.h
 include/llvm/IR/IntrinsicsRISCV.td
 include/llvm/IR/IntrinsicsS390.h
+include/llvm/IR/IntrinsicsSPIRV.h
+include/llvm/IR/IntrinsicsSPIRV.td
 include/llvm/IR/IntrinsicsSystemZ.td
 include/llvm/IR/IntrinsicsVE.h
 include/llvm/IR/IntrinsicsVE.td
@@ -1099,6 +1133,7 @@ include/llvm/IR/Value.h
 include/llvm/IR/ValueHandle.h
 include/llvm/IR/ValueMap.h
 include/llvm/IR/ValueSymbolTable.h
+include/llvm/IR/VectorBuilder.h
 include/llvm/IR/Verifier.h
 include/llvm/IRReader/IRReader.h
 include/llvm/InitializePasses.h
@@ -1134,6 +1169,9 @@ include/llvm/MC/MCAssembler.h
 include/llvm/MC/MCCodeEmitter.h
 include/llvm/MC/MCCodeView.h
 include/llvm/MC/MCContext.h
+include/llvm/MC/MCDXContainerStreamer.h
+include/llvm/MC/MCDXContainerWriter.h
+include/llvm/MC/MCDecoderOps.h
 include/llvm/MC/MCDirectives.h
 include/llvm/MC/MCDisassembler/MCDisassembler.h
 include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h
@@ -1143,7 +1181,6 @@ include/llvm/MC/MCDwarf.h
 include/llvm/MC/MCELFObjectWriter.h
 include/llvm/MC/MCELFStreamer.h
 include/llvm/MC/MCExpr.h
-include/llvm/MC/MCFixedLenDisassembler.h
 include/llvm/MC/MCFixup.h
 include/llvm/MC/MCFixupKindInfo.h
 include/llvm/MC/MCFragment.h
@@ -1171,12 +1208,16 @@ include/llvm/MC/MCParser/MCTargetAsmPars
 include/llvm/MC/MCPseudoProbe.h
 include/llvm/MC/MCRegister.h
 include/llvm/MC/MCRegisterInfo.h
+include/llvm/MC/MCSPIRVObjectWriter.h
+include/llvm/MC/MCSPIRVStreamer.h
 include/llvm/MC/MCSchedule.h
 include/llvm/MC/MCSection.h
 include/llvm/MC/MCSectionCOFF.h
+include/llvm/MC/MCSectionDXContainer.h
 include/llvm/MC/MCSectionELF.h
 include/llvm/MC/MCSectionGOFF.h
 include/llvm/MC/MCSectionMachO.h
+include/llvm/MC/MCSectionSPIRV.h
 include/llvm/MC/MCSectionWasm.h
 include/llvm/MC/MCSectionXCOFF.h
 include/llvm/MC/MCStreamer.h
@@ -1214,6 +1255,7 @@ include/llvm/MCA/HardwareUnits/RegisterF
 include/llvm/MCA/HardwareUnits/ResourceManager.h
 include/llvm/MCA/HardwareUnits/RetireControlUnit.h
 include/llvm/MCA/HardwareUnits/Scheduler.h
+include/llvm/MCA/IncrementalSourceMgr.h
 include/llvm/MCA/InstrBuilder.h
 include/llvm/MCA/Instruction.h
 include/llvm/MCA/Pipeline.h
@@ -1228,6 +1270,20 @@ include/llvm/MCA/Stages/RetireStage.h
 include/llvm/MCA/Stages/Stage.h
 include/llvm/MCA/Support.h
 include/llvm/MCA/View.h
+include/llvm/ObjCopy/COFF/COFFConfig.h
+include/llvm/ObjCopy/COFF/COFFObjcopy.h
+include/llvm/ObjCopy/CommonConfig.h
+include/llvm/ObjCopy/ConfigManager.h
+include/llvm/ObjCopy/ELF/ELFConfig.h
+include/llvm/ObjCopy/ELF/ELFObjcopy.h
+include/llvm/ObjCopy/MachO/MachOConfig.h
+include/llvm/ObjCopy/MachO/MachOObjcopy.h
+include/llvm/ObjCopy/MultiFormatConfig.h
+include/llvm/ObjCopy/ObjCopy.h
+include/llvm/ObjCopy/XCOFF/XCOFFConfig.h
+include/llvm/ObjCopy/XCOFF/XCOFFObjcopy.h
+include/llvm/ObjCopy/wasm/WasmConfig.h
+include/llvm/ObjCopy/wasm/WasmObjcopy.h
 include/llvm/Object/Archive.h
 include/llvm/Object/ArchiveWriter.h
 include/llvm/Object/Binary.h
@@ -1235,6 +1291,7 @@ include/llvm/Object/COFF.h
 include/llvm/Object/COFFImportFile.h
 include/llvm/Object/COFFModuleDefinition.h
 include/llvm/Object/CVDebugRecord.h
+include/llvm/Object/DXContainer.h
 include/llvm/Object/Decompressor.h
 include/llvm/Object/ELF.h
 include/llvm/Object/ELFObjectFile.h
@@ -1249,6 +1306,7 @@ include/llvm/Object/MachOUniversalWriter
 include/llvm/Object/Minidump.h
 include/llvm/Object/ModuleSymbolTable.h
 include/llvm/Object/ObjectFile.h
+include/llvm/Object/OffloadBinary.h
 include/llvm/Object/RelocationResolver.h
 include/llvm/Object/StackMapParser.h
 include/llvm/Object/SymbolSize.h
@@ -1267,10 +1325,12 @@ include/llvm/ObjectYAML/CodeViewYAMLType
 include/llvm/ObjectYAML/CodeViewYAMLTypes.h
 include/llvm/ObjectYAML/DWARFEmitter.h
 include/llvm/ObjectYAML/DWARFYAML.h
+include/llvm/ObjectYAML/DXContainerYAML.h
 include/llvm/ObjectYAML/ELFYAML.h
 include/llvm/ObjectYAML/MachOYAML.h
 include/llvm/ObjectYAML/MinidumpYAML.h
 include/llvm/ObjectYAML/ObjectYAML.h
+include/llvm/ObjectYAML/OffloadYAML.h
 include/llvm/ObjectYAML/WasmYAML.h
 include/llvm/ObjectYAML/XCOFFYAML.h
 include/llvm/ObjectYAML/YAML.h
@@ -1299,6 +1359,8 @@ include/llvm/ProfileData/InstrProfCorrel
 include/llvm/ProfileData/InstrProfData.inc
 include/llvm/ProfileData/InstrProfReader.h
 include/llvm/ProfileData/InstrProfWriter.h
+include/llvm/ProfileData/MIBEntryDef.inc
+include/llvm/ProfileData/MemProf.h
 include/llvm/ProfileData/MemProfData.inc
 include/llvm/ProfileData/ProfileCommon.h
 include/llvm/ProfileData/RawMemProfReader.h
@@ -1337,6 +1399,7 @@ include/llvm/Support/AtomicOrdering.h
 include/llvm/Support/AutoConvert.h
 include/llvm/Support/Automaton.h
 include/llvm/Support/BCD.h
+include/llvm/Support/BLAKE3.h
 include/llvm/Support/Base64.h
 include/llvm/Support/BinaryByteStream.h
 include/llvm/Support/BinaryItemStream.h
@@ -1354,6 +1417,10 @@ include/llvm/Support/CFGDiff.h
 include/llvm/Support/CFGUpdate.h
 include/llvm/Support/COM.h
 include/llvm/Support/CRC.h
+include/llvm/Support/CSKYAttributeParser.h
+include/llvm/Support/CSKYAttributes.h
+include/llvm/Support/CSKYTargetParser.def
+include/llvm/Support/CSKYTargetParser.h
 include/llvm/Support/CachePruning.h
 include/llvm/Support/Caching.h
 include/llvm/Support/Capacity.h
@@ -1369,6 +1436,7 @@ include/llvm/Support/ConvertUTF.h
 include/llvm/Support/CrashRecoveryContext.h
 include/llvm/Support/DJB.h
 include/llvm/Support/DOTGraphTraits.h
+include/llvm/Support/DXILOperationCommon.h
 include/llvm/Support/DataExtractor.h
 include/llvm/Support/DataTypes.h
 include/llvm/Support/Debug.h
@@ -1515,6 +1583,7 @@ include/llvm/TableGen/Automaton.td
 include/llvm/TableGen/DirectiveEmitter.h
 include/llvm/TableGen/Error.h
 include/llvm/TableGen/Main.h
+include/llvm/TableGen/Parser.h
 include/llvm/TableGen/Record.h
 include/llvm/TableGen/SearchableTable.td
 include/llvm/TableGen/SetTheory.h
@@ -1556,8 +1625,8 @@ include/llvm/ToolDrivers/llvm-dlltool/Dl
 include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
 include/llvm/Transforms/CFGuard.h
-include/llvm/Transforms/Coroutines.h
 include/llvm/Transforms/Coroutines/CoroCleanup.h
+include/llvm/Transforms/Coroutines/CoroConditionalWrapper.h
 include/llvm/Transforms/Coroutines/CoroEarly.h
 include/llvm/Transforms/Coroutines/CoroElide.h
 include/llvm/Transforms/Coroutines/CoroSplit.h
@@ -1668,7 +1737,7 @@ include/llvm/Transforms/Scalar/LoopStren
 include/llvm/Transforms/Scalar/LoopUnrollAndJamPass.h
 include/llvm/Transforms/Scalar/LoopUnrollPass.h
 include/llvm/Transforms/Scalar/LoopVersioningLICM.h
-include/llvm/Transforms/Scalar/LowerAtomic.h
+include/llvm/Transforms/Scalar/LowerAtomicPass.h
 include/llvm/Transforms/Scalar/LowerConstantIntrinsics.h
 include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
 include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
@@ -1695,6 +1764,7 @@ include/llvm/Transforms/Scalar/Sink.h
 include/llvm/Transforms/Scalar/SpeculativeExecution.h
 include/llvm/Transforms/Scalar/StraightLineStrengthReduce.h
 include/llvm/Transforms/Scalar/StructurizeCFG.h
+include/llvm/Transforms/Scalar/TLSVariableHoist.h
 include/llvm/Transforms/Scalar/TailRecursionElimination.h
 include/llvm/Transforms/Scalar/WarnMissedTransforms.h
 include/llvm/Transforms/Utils.h
@@ -1737,13 +1807,17 @@ include/llvm/Transforms/Utils/LoopRotati
 include/llvm/Transforms/Utils/LoopSimplify.h
 include/llvm/Transforms/Utils/LoopUtils.h
 include/llvm/Transforms/Utils/LoopVersioning.h
+include/llvm/Transforms/Utils/LowerAtomic.h
+include/llvm/Transforms/Utils/LowerGlobalDtors.h
 include/llvm/Transforms/Utils/LowerInvoke.h
 include/llvm/Transforms/Utils/LowerMemIntrinsics.h
 include/llvm/Transforms/Utils/LowerSwitch.h
 include/llvm/Transforms/Utils/MatrixUtils.h
 include/llvm/Transforms/Utils/Mem2Reg.h
 include/llvm/Transforms/Utils/MemoryOpRemark.h
+include/llvm/Transforms/Utils/MemoryTaggingSupport.h
 include/llvm/Transforms/Utils/MetaRenamer.h
+include/llvm/Transforms/Utils/MisExpect.h
 include/llvm/Transforms/Utils/ModuleUtils.h
 include/llvm/Transforms/Utils/NameAnonGlobals.h
 include/llvm/Transforms/Utils/PredicateInfo.h
@@ -1777,6 +1851,8 @@ include/llvm/Transforms/Vectorize/LoopVe
 include/llvm/Transforms/Vectorize/LoopVectorize.h
 include/llvm/Transforms/Vectorize/SLPVectorizer.h
 include/llvm/Transforms/Vectorize/VectorCombine.h
+include/llvm/WindowsDriver/MSVCPaths.h
+include/llvm/WindowsDriver/MSVCSetupApi.h
 include/llvm/WindowsManifest/WindowsManifestMerger.h
 include/llvm/WindowsResource/ResourceProcessor.h
 include/llvm/WindowsResource/ResourceScriptToken.h
@@ -1804,6 +1880,7 @@ lib/cmake/llvm/AddOCaml.cmake
 lib/cmake/llvm/AddSphinxTarget.cmake
 lib/cmake/llvm/CheckAtomic.cmake
 lib/cmake/llvm/CheckCompilerVersion.cmake
+lib/cmake/llvm/CheckProblematicConfigurations.cmake
 lib/cmake/llvm/ChooseMSVCCRT.cmake
 lib/cmake/llvm/CoverageReport.cmake
 lib/cmake/llvm/CrossCompile.cmake
@@ -1815,6 +1892,7 @@ lib/cmake/llvm/FindOCaml.cmake
 lib/cmake/llvm/FindSphinx.cmake
 lib/cmake/llvm/FindTerminfo.cmake
 lib/cmake/llvm/FindZ3.cmake
+lib/cmake/llvm/Findzstd.cmake
 lib/cmake/llvm/GenerateVersionFromVCS.cmake
 lib/cmake/llvm/GetErrcMessages.cmake
 lib/cmake/llvm/GetLibraryName.cmake
@@ -1836,8 +1914,9 @@ lib/cmake/llvm/TableGen.cmake
 lib/cmake/llvm/TensorFlowCompile.cmake
 lib/cmake/llvm/UseLibtool.cmake
 lib/cmake/llvm/VersionFromVCS.cmake
+lib/cmake/llvm/llvm-driver-template.cpp.in
 lib/libLLVM-${PKGVERSION}.${SOEXT}
-lib/libLLVM-14.${SOEXT}
+lib/libLLVM-15.${SOEXT}
 lib/libLLVM.${SOEXT}
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a
@@ -1885,6 +1964,7 @@ lib/libLLVMCFIVerify.a
 ${PLIST.CSKY}lib/libLLVMCSKYAsmParser.a
 ${PLIST.CSKY}lib/libLLVMCSKYCodeGen.a
 ${PLIST.CSKY}lib/libLLVMCSKYDesc.a
+${PLIST.CSKY}lib/libLLVMCSKYDisassembler.a
 ${PLIST.CSKY}lib/libLLVMCSKYInfo.a
 lib/libLLVMCodeGen.a
 lib/libLLVMCore.a
@@ -1912,6 +1992,7 @@ lib/libLLVMFileCheck.a
 lib/libLLVMFrontendOpenACC.a
 lib/libLLVMFrontendOpenMP.a
 lib/libLLVMFuzzMutate.a
+lib/libLLVMFuzzerCLI.a
 lib/libLLVMGlobalISel.a
 ${PLIST.Hexagon}lib/libLLVMHexagonAsmParser.a
 ${PLIST.Hexagon}lib/libLLVMHexagonCodeGen.a
@@ -1958,6 +2039,7 @@ ${PLIST.NVPTX}lib/libLLVMNVPTXCodeGen.a
 ${PLIST.NVPTX}lib/libLLVMNVPTXDesc.a
 ${PLIST.NVPTX}lib/libLLVMNVPTXInfo.a
 lib/libLLVMObjCARCOpts.a
+lib/libLLVMObjCopy.a
 lib/libLLVMObject.a
 lib/libLLVMObjectYAML.a
 lib/libLLVMOption.a
@@ -2009,6 +2091,7 @@ ${PLIST.WebAssembly}lib/libLLVMWebAssemb
 ${PLIST.WebAssembly}lib/libLLVMWebAssemblyDisassembler.a
 ${PLIST.WebAssembly}lib/libLLVMWebAssemblyInfo.a
 ${PLIST.WebAssembly}lib/libLLVMWebAssemblyUtils.a
+lib/libLLVMWindowsDriver.a
 lib/libLLVMWindowsManifest.a
 ${PLIST.X86}lib/libLLVMX86AsmParser.a
 ${PLIST.X86}lib/libLLVMX86CodeGen.a

Index: pkgsrc/lang/llvm/buildlink3.mk
diff -u pkgsrc/lang/llvm/buildlink3.mk:1.19 pkgsrc/lang/llvm/buildlink3.mk:1.20
--- pkgsrc/lang/llvm/buildlink3.mk:1.19 Fri Aug 12 08:37:58 2022
+++ pkgsrc/lang/llvm/buildlink3.mk      Mon Nov 14 18:44:05 2022
@@ -1,16 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.19 2022/08/12 08:37:58 pin Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2022/11/14 18:44:05 adam Exp $
 
 BUILDLINK_TREE+=       llvm
 
 .if !defined(LLVM_BUILDLINK3_MK)
 LLVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.llvm+=   llvm>=14
+BUILDLINK_API_DEPENDS.llvm+=   llvm>=15
 BUILDLINK_PKGSRCDIR.llvm?=     ../../lang/llvm
 
 LLVM_CONFIG_PATH?=             ${BUILDLINK_PREFIX.llvm}/bin/llvm-config
 
 BUILDLINK_FILES.llvm+=         bin/FileCheck
+BUILDLINK_FILES.llvm+=         bin/UnicodeNameMappingGenerator
 BUILDLINK_FILES.llvm+=         bin/bugpoint
 BUILDLINK_FILES.llvm+=         bin/count
 BUILDLINK_FILES.llvm+=         bin/dsymutil
@@ -32,11 +33,13 @@ BUILDLINK_FILES.llvm+=              bin/llvm-cvtres
 BUILDLINK_FILES.llvm+=         bin/llvm-cxxdump
 BUILDLINK_FILES.llvm+=         bin/llvm-cxxfilt
 BUILDLINK_FILES.llvm+=         bin/llvm-cxxmap
+BUILDLINK_FILES.llvm+=         bin/llvm-debuginfod
 BUILDLINK_FILES.llvm+=         bin/llvm-debuginfod-find
 BUILDLINK_FILES.llvm+=         bin/llvm-diff
 BUILDLINK_FILES.llvm+=         bin/llvm-dis
 BUILDLINK_FILES.llvm+=         bin/llvm-dlltool
 BUILDLINK_FILES.llvm+=         bin/llvm-dwarfdump
+BUILDLINK_FILES.llvm+=         bin/llvm-dwarfutil
 BUILDLINK_FILES.llvm+=         bin/llvm-dwp
 BUILDLINK_FILES.llvm+=         bin/llvm-exegesis
 BUILDLINK_FILES.llvm+=         bin/llvm-extract
@@ -69,6 +72,7 @@ BUILDLINK_FILES.llvm+=                bin/llvm-rc
 BUILDLINK_FILES.llvm+=         bin/llvm-readelf
 BUILDLINK_FILES.llvm+=         bin/llvm-readobj
 BUILDLINK_FILES.llvm+=         bin/llvm-reduce
+BUILDLINK_FILES.llvm+=         bin/llvm-remark-size-diff
 BUILDLINK_FILES.llvm+=         bin/llvm-rtdyld
 BUILDLINK_FILES.llvm+=         bin/llvm-sim
 BUILDLINK_FILES.llvm+=         bin/llvm-size
@@ -103,6 +107,7 @@ pkgbase := llvm
 .include "../../math/z3/buildlink3.mk"
 .endif
 
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .endif # LLVM_BUILDLINK3_MK
 

Index: pkgsrc/lang/llvm/distinfo
diff -u pkgsrc/lang/llvm/distinfo:1.36 pkgsrc/lang/llvm/distinfo:1.37
--- pkgsrc/lang/llvm/distinfo:1.36      Sun Aug 14 20:22:44 2022
+++ pkgsrc/lang/llvm/distinfo   Mon Nov 14 18:44:05 2022
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.36 2022/08/14 20:22:44 tnn Exp $
+$NetBSD: distinfo,v 1.37 2022/11/14 18:44:05 adam Exp $
 
-BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d44946453add45426569fd4187654f83881341c5c0109e4ffacc60e8f73af60
-SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
-Size (llvm-14.0.6.src.tar.xz) = 49660136 bytes
-SHA1 (patch-CMakeLists.txt) = 78e2dab2bf73f7e466ca2788fe6444e39b4ebd80
-SHA1 (patch-cmake_config-ix.cmake) = bd4ad5b56f49c356f162994524e6e708005dace8
-SHA1 (patch-cmake_modules_AddLLVM.cmake) = 148897aeba8c29b9cf55eade62554710ae0f63f3
-SHA1 (patch-include_llvm-c_DataTypes.h) = 790c9458d6590a0d6985fdcbd8785da340b9779b
-SHA1 (patch-include_llvm_Analysis_ConstantFolding.h) = 56b9374da236c346565897977040255b9766cab8
-SHA1 (patch-lib_Support_Unix_Path.inc) = 91a636abf719cf5693f3078e980fe34a381185a6
-SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 97b9c7c3487989c2909dd0294a67a5328d9ef309
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (llvm-15.0.4.src.tar.xz) = 5574395a49e9b7a173c8a575efe1b6fd5660376f13da55d8ccc6a4a7ac25289a
+SHA512 (llvm-15.0.4.src.tar.xz) = ab543afdf3664f88f9174a673a089bfa3477e20f88f49ed07fab3322767741a2efebc4a15e8fa2b4aa494ef7ed0d9e3acfb2c1bf7044b75bfd00eb94dbd49db6
+Size (llvm-15.0.4.src.tar.xz) = 52927372 bytes
+SHA1 (patch-CMakeLists.txt) = c53cef61bdaeaf5216b78330992357a632a2b0b2
+SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
+SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4e6668e0c3e13423ce3e19304f4ad60f66d41562
+SHA1 (patch-include_llvm-c_DataTypes.h) = ff547cae5bdf90c5a1371b9eb196e7537a03b18d
+SHA1 (patch-include_llvm_Analysis_ConstantFolding.h) = 0a8db4d876b749dd492fced6fbc8c4faf3ff2450
+SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = be0f3fd2a020f634a5f8ec972275e52dc92d36a5

Index: pkgsrc/lang/llvm/version.mk
diff -u pkgsrc/lang/llvm/version.mk:1.10 pkgsrc/lang/llvm/version.mk:1.11
--- pkgsrc/lang/llvm/version.mk:1.10    Wed Aug 24 14:38:56 2022
+++ pkgsrc/lang/llvm/version.mk Mon Nov 14 18:44:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.10 2022/08/24 14:38:56 ryoon Exp $
+# $NetBSD: version.mk,v 1.11 2022/11/14 18:44:05 adam Exp $
 # used by devel/lld
 # used by devel/lldb
 # used by devel/polly
@@ -12,10 +12,22 @@
 # used by lang/wasi-libcxx
 # used by parallel/openmp
 
-LLVM_VERSION=  14.0.6
+LLVM_VERSION=  15.0.4
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=llvm/}
 GITHUB_PROJECT=        llvm-project
 GITHUB_RELEASE=        llvmorg-${PKGVERSION_NOREV}
 EXTRACT_SUFX=  .tar.xz
 
 LLVM_MAJOR_VERSION=    ${LLVM_VERSION:tu:C/\\.[[:digit:]\.]*//}
+
+# As of v15.0.0 llvm requires cmake source code to build
+CMAKE_DIST=    cmake-${LLVM_VERSION}.src
+EXTRA_DIST+=   ${CMAKE_DIST}${EXTRACT_SUFX}
+SITES.${CMAKE_DIST}${EXTRACT_SUFX}=    \
+               ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
+DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
+
+.PHONY: llvm-cmake-modules
+post-extract: llvm-cmake-modules
+llvm-cmake-modules:
+       ${LN} -f -s ${WRKDIR}/${CMAKE_DIST} ${WRKDIR}/cmake

Index: pkgsrc/lang/llvm/patches/patch-CMakeLists.txt
diff -u pkgsrc/lang/llvm/patches/patch-CMakeLists.txt:1.1 pkgsrc/lang/llvm/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/lang/llvm/patches/patch-CMakeLists.txt:1.1   Mon Jan  8 10:48:34 2018
+++ pkgsrc/lang/llvm/patches/patch-CMakeLists.txt       Mon Nov 14 18:44:05 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2018/01/08 10:48:34 jperkin Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2022/11/14 18:44:05 adam Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
---- CMakeLists.txt.orig        2017-08-15 00:16:21.000000000 +0000
+--- CMakeLists.txt.orig        2022-09-20 06:05:50.000000000 +0000
 +++ CMakeLists.txt
-@@ -809,7 +809,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "(Fre
+@@ -1074,7 +1074,7 @@ endif()
  
  if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
     # special hack for Solaris to handle crazy system sys/regset.h
 -   include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")
-+   #include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")
++   # include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")
  endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
  
  # Make sure we don't get -rdynamic in every binary. For those that need it,
Index: pkgsrc/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h
diff -u pkgsrc/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h:1.1 pkgsrc/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h:1.2
--- pkgsrc/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h:1.1  Sat Dec 15 23:41:45 2018
+++ pkgsrc/lang/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h      Mon Nov 14 18:44:05 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-include_llvm_Analysis_ConstantFolding.h,v 1.1 2018/12/15 23:41:45 jperkin Exp $
+$NetBSD: patch-include_llvm_Analysis_ConstantFolding.h,v 1.2 2022/11/14 18:44:05 adam Exp $
 
 Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
 
---- include/llvm/Analysis/ConstantFolding.h.orig       2018-05-01 15:54:18.000000000 +0000
+--- include/llvm/Analysis/ConstantFolding.h.orig       2022-09-20 06:05:50.000000000 +0000
 +++ include/llvm/Analysis/ConstantFolding.h
-@@ -20,6 +20,10 @@
+@@ -19,6 +19,10 @@
  #ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H
  #define LLVM_ANALYSIS_CONSTANTFOLDING_H
  
@@ -12,6 +12,6 @@ Fix SunOS CS conflict not handled by inc
 +#undef CS
 +#endif
 +
+ #include <stdint.h>
+ 
  namespace llvm {
- class APInt;
- template <typename T> class ArrayRef;

Index: pkgsrc/lang/llvm/patches/patch-cmake_config-ix.cmake
diff -u pkgsrc/lang/llvm/patches/patch-cmake_config-ix.cmake:1.7 pkgsrc/lang/llvm/patches/patch-cmake_config-ix.cmake:1.8
--- pkgsrc/lang/llvm/patches/patch-cmake_config-ix.cmake:1.7    Fri Aug 12 08:37:58 2022
+++ pkgsrc/lang/llvm/patches/patch-cmake_config-ix.cmake        Mon Nov 14 18:44:05 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-cmake_config-ix.cmake,v 1.7 2022/08/12 08:37:58 pin Exp $
+$NetBSD: patch-cmake_config-ix.cmake,v 1.8 2022/11/14 18:44:05 adam Exp $
 
 Do not generate invalid llvm-config in pkgsrc.
 Allow override of pthread library selection via PKGSRC_LLVM_PTHREADLIB.
 
---- cmake/config-ix.cmake.orig 2022-06-22 16:46:24.000000000 +0000
+--- cmake/config-ix.cmake.orig 2022-09-20 06:05:50.000000000 +0000
 +++ cmake/config-ix.cmake
-@@ -113,7 +113,11 @@ if(HAVE_LIBPTHREAD)
+@@ -112,7 +112,11 @@ if(HAVE_LIBPTHREAD)
    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
    set(THREADS_HAVE_PTHREAD_ARG Off)
    find_package(Threads REQUIRED)
Index: pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
diff -u pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.7 pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.8
--- pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.7  Tue Nov 23 20:55:44 2021
+++ pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt      Mon Nov 14 18:44:05 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.7 2021/11/23 20:55:44 wiz Exp $
+$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.8 2022/11/14 18:44:05 adam Exp $
 
 Use the Linux style linking everywhere except Darwin and SunOS.
 
---- tools/llvm-shlib/CMakeLists.txt.orig       2021-09-24 16:18:10.000000000 +0000
+--- tools/llvm-shlib/CMakeLists.txt.orig       2022-09-20 06:05:50.000000000 +0000
 +++ tools/llvm-shlib/CMakeLists.txt
 @@ -33,13 +33,11 @@ if(LLVM_BUILD_LLVM_DYLIB)
    add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})

Index: pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake
diff -u pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake:1.8 pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake:1.9
--- pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake:1.8      Tue Nov 23 20:55:44 2021
+++ pkgsrc/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake  Mon Nov 14 18:44:05 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.8 2021/11/23 20:55:44 wiz Exp $
+$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.9 2022/11/14 18:44:05 adam Exp $
 
 On Darwin, create symbolic links to shared libraries.
 On Darwin, use correct install-name for shared libraries.
 
---- cmake/modules/AddLLVM.cmake.orig   2021-09-24 16:18:10.000000000 +0000
+--- cmake/modules/AddLLVM.cmake.orig   2022-09-20 06:05:50.000000000 +0000
 +++ cmake/modules/AddLLVM.cmake
-@@ -607,7 +607,7 @@ function(llvm_add_library name)
+@@ -627,7 +627,7 @@ function(llvm_add_library name)
    endif()
  
    if(ARG_SHARED)
@@ -14,7 +14,7 @@ On Darwin, use correct install-name for 
        get_target_property(output_name ${name} OUTPUT_NAME)
        if(${output_name} STREQUAL "output_name-NOTFOUND")
          set(output_name ${name})
-@@ -2118,7 +2118,7 @@ function(llvm_setup_rpath name)
+@@ -2270,7 +2270,7 @@ function(llvm_setup_rpath name)
    endif()
  
    if (APPLE)

Index: pkgsrc/lang/llvm/patches/patch-include_llvm-c_DataTypes.h
diff -u pkgsrc/lang/llvm/patches/patch-include_llvm-c_DataTypes.h:1.2 pkgsrc/lang/llvm/patches/patch-include_llvm-c_DataTypes.h:1.3
--- pkgsrc/lang/llvm/patches/patch-include_llvm-c_DataTypes.h:1.2       Mon Jul 12 18:41:02 2021
+++ pkgsrc/lang/llvm/patches/patch-include_llvm-c_DataTypes.h   Mon Nov 14 18:44:05 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-include_llvm-c_DataTypes.h,v 1.2 2021/07/12 18:41:02 adam Exp $
+$NetBSD: patch-include_llvm-c_DataTypes.h,v 1.3 2022/11/14 18:44:05 adam Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
---- include/llvm-c/DataTypes.h.orig    2021-04-06 16:38:18.000000000 +0000
+--- include/llvm-c/DataTypes.h.orig    2022-09-20 06:05:50.000000000 +0000
 +++ include/llvm-c/DataTypes.h
 @@ -77,4 +77,27 @@ typedef signed int ssize_t;
  # define UINT64_MAX 0xffffffffffffffffULL

Index: pkgsrc/lang/wasi-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.14 pkgsrc/lang/wasi-compiler-rt/Makefile:1.15
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.14  Sat Aug 13 10:07:26 2022
+++ pkgsrc/lang/wasi-compiler-rt/Makefile       Mon Nov 14 18:44:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/08/13 10:07:26 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2022/11/14 18:44:06 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -29,11 +29,7 @@ CMAKE_ARG_PATH=      ${WRKSRC}/lib/builtins
 BUILDLINK_TRANSFORM+=  rm:-I/usr/include
 BUILDLINK_TRANSFORM+=  rm:-I${PREFIX}/include
 
-CMAKE_ARGS+=   -DCMAKE_VERBOSE_MAKEFILE=1
-
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_TEST_COMPILER=${CC:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_OS_DIR:STRING=wasi
 CMAKE_ARGS+=   -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
@@ -50,6 +46,7 @@ CMAKE_ARGS+=  -DCOMPILER_RT_HAS_VISIBILIT
 CMAKE_ARGS+=   -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON
 CMAKE_ARGS+=   -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF
 CMAKE_ARGS+=   -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON
+CMAKE_ARGS+=   -DCOMPILER_RT_HAS_BFLOAT16:BOOL=OFF
 CMAKE_ARGS+=   -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF
 CMAKE_ARGS+=   -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
 CMAKE_ARGS+=   -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
@@ -57,17 +54,22 @@ CMAKE_ARGS+=        -DCMAKE_CXX_COMPILER_WORKS=
 
 CMAKE_INSTALL_PREFIX=  ${PREFIX}/lib/clang/${PKGVERSION_NOREV}
 
+GENERATE_PLIST+=       find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
+                       sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
+
 post-extract:
        ${MKDIR} ${WRKSRC}/build
 
+.include "../../mk/bsd.prefs.mk"
+
 # Run llvm-ranlib again on the archive. Fixes mystery build failure
 # in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
 # problem in this package?
+.if ${OPSYS} != "Darwin"
 post-install:
        ${PREFIX}/bin/llvm-ranlib \
          ${DESTDIR}${PREFIX}/lib/clang/${PKGVERSION_NOREV}/lib/wasi/libclang_rt.builtins-wasm32.a
-
-.include "../../mk/bsd.prefs.mk"
+.endif
 
 ABI=                   # 32
 CFLAGS=                        -O2

Index: pkgsrc/lang/wasi-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.13 pkgsrc/lang/wasi-libcxx/Makefile:1.14
--- pkgsrc/lang/wasi-libcxx/Makefile:1.13       Sat Aug 13 12:42:45 2022
+++ pkgsrc/lang/wasi-libcxx/Makefile    Mon Nov 14 18:44:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/08/13 12:42:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2022/11/14 18:44:07 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -18,14 +18,9 @@ WRKSRC=              ${WRKDIR}
 # in both of them to get them to build against each other without causing
 # circular dependencies.  This must be kept in sync with libcxxabi/Makefile.
 LIBCXX=                libcxx-${LLVM_VERSION}.src
-LLVMDIST=      llvm-${LLVM_VERSION}.src
-EXTRA_DIST=    ${LIBCXX}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX}
+EXTRA_DIST+=   ${LIBCXX}${EXTRACT_SUFX}
 SITES.${LIBCXX}${EXTRACT_SUFX}=        \
        ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${LLLVMDIST}${EXTRACT_SUFX}=     \
-       ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
-DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
 
 BUILD_DEPENDS+=        lld-[0-9]*:../../devel/lld
 
@@ -43,11 +38,7 @@ USE_CMAKE=   yes
 SSP_SUPPORTED=         no
 PKGSRC_USE_STACK_CHECK=        no
 
-CMAKE_ARGS+=   -DCMAKE_VERBOSE_MAKEFILE=1
-
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 CMAKE_ARGS+=   -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/libcxx/include
 CMAKE_ARGS+=   -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
 CMAKE_ARGS+=   -DCMAKE_C_COMPILER_WORKS=1
@@ -147,7 +138,7 @@ CMAKE_ARGS+=        -DLIBCXXABI_SUPPORTS_FSTRIC
 CMAKE_ARGS+=   -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
 CMAKE_ARGS+=   -DCMAKE_C_FLAGS=-fno-exceptions
 CMAKE_ARGS+=   -DCMAKE_CXX_FLAGS=-fno-exceptions
-CMAKE_ARGS+=   -DLIBCXX_CXX_ABI=libcxxabi
+CMAKE_ARGS+=   -DLIBCXX_CXX_ABI=system-libcxxabi
 CMAKE_ARGS+=   -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/libcxxabi/include
 
 CMAKE_INSTALL_PREFIX=  ${PREFIX}/wasi
@@ -160,7 +151,6 @@ post-extract:
        ${MKDIR} ${WRKDIR}/build_libcxxabi
        ${LN} -f -s ${WRKDIR}/${DISTNAME} ${WRKDIR}/libcxxabi
        ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-       ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
 
 do-configure:
        cd ${WRKSRC} && cd build_libcxx && \

Index: pkgsrc/lang/wasi-libcxx/PLIST
diff -u pkgsrc/lang/wasi-libcxx/PLIST:1.2 pkgsrc/lang/wasi-libcxx/PLIST:1.3
--- pkgsrc/lang/wasi-libcxx/PLIST:1.2   Sat Aug 13 12:42:45 2022
+++ pkgsrc/lang/wasi-libcxx/PLIST       Mon Nov 14 18:44:07 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/08/13 12:42:45 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/11/14 18:44:07 adam Exp $
 wasi/include/c++/v1/__algorithm/adjacent_find.h
 wasi/include/c++/v1/__algorithm/all_of.h
 wasi/include/c++/v1/__algorithm/any_of.h
@@ -26,8 +26,11 @@ wasi/include/c++/v1/__algorithm/for_each
 wasi/include/c++/v1/__algorithm/generate.h
 wasi/include/c++/v1/__algorithm/generate_n.h
 wasi/include/c++/v1/__algorithm/half_positive.h
+wasi/include/c++/v1/__algorithm/in_found_result.h
+wasi/include/c++/v1/__algorithm/in_fun_result.h
 wasi/include/c++/v1/__algorithm/in_in_out_result.h
 wasi/include/c++/v1/__algorithm/in_in_result.h
+wasi/include/c++/v1/__algorithm/in_out_out_result.h
 wasi/include/c++/v1/__algorithm/in_out_result.h
 wasi/include/c++/v1/__algorithm/includes.h
 wasi/include/c++/v1/__algorithm/inplace_merge.h
@@ -38,14 +41,17 @@ wasi/include/c++/v1/__algorithm/is_permu
 wasi/include/c++/v1/__algorithm/is_sorted.h
 wasi/include/c++/v1/__algorithm/is_sorted_until.h
 wasi/include/c++/v1/__algorithm/iter_swap.h
+wasi/include/c++/v1/__algorithm/iterator_operations.h
 wasi/include/c++/v1/__algorithm/lexicographical_compare.h
 wasi/include/c++/v1/__algorithm/lower_bound.h
 wasi/include/c++/v1/__algorithm/make_heap.h
+wasi/include/c++/v1/__algorithm/make_projected.h
 wasi/include/c++/v1/__algorithm/max.h
 wasi/include/c++/v1/__algorithm/max_element.h
 wasi/include/c++/v1/__algorithm/merge.h
 wasi/include/c++/v1/__algorithm/min.h
 wasi/include/c++/v1/__algorithm/min_element.h
+wasi/include/c++/v1/__algorithm/min_max_result.h
 wasi/include/c++/v1/__algorithm/minmax.h
 wasi/include/c++/v1/__algorithm/minmax_element.h
 wasi/include/c++/v1/__algorithm/mismatch.h
@@ -62,6 +68,92 @@ wasi/include/c++/v1/__algorithm/partitio
 wasi/include/c++/v1/__algorithm/pop_heap.h
 wasi/include/c++/v1/__algorithm/prev_permutation.h
 wasi/include/c++/v1/__algorithm/push_heap.h
+wasi/include/c++/v1/__algorithm/ranges_adjacent_find.h
+wasi/include/c++/v1/__algorithm/ranges_all_of.h
+wasi/include/c++/v1/__algorithm/ranges_any_of.h
+wasi/include/c++/v1/__algorithm/ranges_binary_search.h
+wasi/include/c++/v1/__algorithm/ranges_clamp.h
+wasi/include/c++/v1/__algorithm/ranges_copy.h
+wasi/include/c++/v1/__algorithm/ranges_copy_backward.h
+wasi/include/c++/v1/__algorithm/ranges_copy_if.h
+wasi/include/c++/v1/__algorithm/ranges_copy_n.h
+wasi/include/c++/v1/__algorithm/ranges_count.h
+wasi/include/c++/v1/__algorithm/ranges_count_if.h
+wasi/include/c++/v1/__algorithm/ranges_equal.h
+wasi/include/c++/v1/__algorithm/ranges_equal_range.h
+wasi/include/c++/v1/__algorithm/ranges_fill.h
+wasi/include/c++/v1/__algorithm/ranges_fill_n.h
+wasi/include/c++/v1/__algorithm/ranges_find.h
+wasi/include/c++/v1/__algorithm/ranges_find_end.h
+wasi/include/c++/v1/__algorithm/ranges_find_first_of.h
+wasi/include/c++/v1/__algorithm/ranges_find_if.h
+wasi/include/c++/v1/__algorithm/ranges_find_if_not.h
+wasi/include/c++/v1/__algorithm/ranges_for_each.h
+wasi/include/c++/v1/__algorithm/ranges_for_each_n.h
+wasi/include/c++/v1/__algorithm/ranges_generate.h
+wasi/include/c++/v1/__algorithm/ranges_generate_n.h
+wasi/include/c++/v1/__algorithm/ranges_includes.h
+wasi/include/c++/v1/__algorithm/ranges_inplace_merge.h
+wasi/include/c++/v1/__algorithm/ranges_is_heap.h
+wasi/include/c++/v1/__algorithm/ranges_is_heap_until.h
+wasi/include/c++/v1/__algorithm/ranges_is_partitioned.h
+wasi/include/c++/v1/__algorithm/ranges_is_permutation.h
+wasi/include/c++/v1/__algorithm/ranges_is_sorted.h
+wasi/include/c++/v1/__algorithm/ranges_is_sorted_until.h
+wasi/include/c++/v1/__algorithm/ranges_iterator_concept.h
+wasi/include/c++/v1/__algorithm/ranges_lexicographical_compare.h
+wasi/include/c++/v1/__algorithm/ranges_lower_bound.h
+wasi/include/c++/v1/__algorithm/ranges_make_heap.h
+wasi/include/c++/v1/__algorithm/ranges_max.h
+wasi/include/c++/v1/__algorithm/ranges_max_element.h
+wasi/include/c++/v1/__algorithm/ranges_merge.h
+wasi/include/c++/v1/__algorithm/ranges_min.h
+wasi/include/c++/v1/__algorithm/ranges_min_element.h
+wasi/include/c++/v1/__algorithm/ranges_minmax.h
+wasi/include/c++/v1/__algorithm/ranges_minmax_element.h
+wasi/include/c++/v1/__algorithm/ranges_mismatch.h
+wasi/include/c++/v1/__algorithm/ranges_move.h
+wasi/include/c++/v1/__algorithm/ranges_move_backward.h
+wasi/include/c++/v1/__algorithm/ranges_next_permutation.h
+wasi/include/c++/v1/__algorithm/ranges_none_of.h
+wasi/include/c++/v1/__algorithm/ranges_nth_element.h
+wasi/include/c++/v1/__algorithm/ranges_partial_sort.h
+wasi/include/c++/v1/__algorithm/ranges_partial_sort_copy.h
+wasi/include/c++/v1/__algorithm/ranges_partition.h
+wasi/include/c++/v1/__algorithm/ranges_partition_copy.h
+wasi/include/c++/v1/__algorithm/ranges_partition_point.h
+wasi/include/c++/v1/__algorithm/ranges_pop_heap.h
+wasi/include/c++/v1/__algorithm/ranges_prev_permutation.h
+wasi/include/c++/v1/__algorithm/ranges_push_heap.h
+wasi/include/c++/v1/__algorithm/ranges_remove.h
+wasi/include/c++/v1/__algorithm/ranges_remove_copy.h
+wasi/include/c++/v1/__algorithm/ranges_remove_copy_if.h
+wasi/include/c++/v1/__algorithm/ranges_remove_if.h
+wasi/include/c++/v1/__algorithm/ranges_replace.h
+wasi/include/c++/v1/__algorithm/ranges_replace_copy.h
+wasi/include/c++/v1/__algorithm/ranges_replace_copy_if.h
+wasi/include/c++/v1/__algorithm/ranges_replace_if.h
+wasi/include/c++/v1/__algorithm/ranges_reverse.h
+wasi/include/c++/v1/__algorithm/ranges_reverse_copy.h
+wasi/include/c++/v1/__algorithm/ranges_rotate.h
+wasi/include/c++/v1/__algorithm/ranges_rotate_copy.h
+wasi/include/c++/v1/__algorithm/ranges_sample.h
+wasi/include/c++/v1/__algorithm/ranges_search.h
+wasi/include/c++/v1/__algorithm/ranges_search_n.h
+wasi/include/c++/v1/__algorithm/ranges_set_difference.h
+wasi/include/c++/v1/__algorithm/ranges_set_intersection.h
+wasi/include/c++/v1/__algorithm/ranges_set_symmetric_difference.h
+wasi/include/c++/v1/__algorithm/ranges_set_union.h
+wasi/include/c++/v1/__algorithm/ranges_shuffle.h
+wasi/include/c++/v1/__algorithm/ranges_sort.h
+wasi/include/c++/v1/__algorithm/ranges_sort_heap.h
+wasi/include/c++/v1/__algorithm/ranges_stable_partition.h
+wasi/include/c++/v1/__algorithm/ranges_stable_sort.h
+wasi/include/c++/v1/__algorithm/ranges_swap_ranges.h
+wasi/include/c++/v1/__algorithm/ranges_transform.h
+wasi/include/c++/v1/__algorithm/ranges_unique.h
+wasi/include/c++/v1/__algorithm/ranges_unique_copy.h
+wasi/include/c++/v1/__algorithm/ranges_upper_bound.h
 wasi/include/c++/v1/__algorithm/remove.h
 wasi/include/c++/v1/__algorithm/remove_copy.h
 wasi/include/c++/v1/__algorithm/remove_copy_if.h
@@ -91,10 +183,13 @@ wasi/include/c++/v1/__algorithm/stable_p
 wasi/include/c++/v1/__algorithm/stable_sort.h
 wasi/include/c++/v1/__algorithm/swap_ranges.h
 wasi/include/c++/v1/__algorithm/transform.h
+wasi/include/c++/v1/__algorithm/uniform_random_bit_generator_adaptor.h
 wasi/include/c++/v1/__algorithm/unique.h
 wasi/include/c++/v1/__algorithm/unique_copy.h
 wasi/include/c++/v1/__algorithm/unwrap_iter.h
+wasi/include/c++/v1/__algorithm/unwrap_range.h
 wasi/include/c++/v1/__algorithm/upper_bound.h
+wasi/include/c++/v1/__assert
 wasi/include/c++/v1/__availability
 wasi/include/c++/v1/__bit/bit_cast.h
 wasi/include/c++/v1/__bit/byteswap.h
@@ -104,15 +199,28 @@ wasi/include/c++/v1/__bsd_locale_default
 wasi/include/c++/v1/__bsd_locale_fallbacks.h
 wasi/include/c++/v1/__charconv/chars_format.h
 wasi/include/c++/v1/__charconv/from_chars_result.h
+wasi/include/c++/v1/__charconv/tables.h
+wasi/include/c++/v1/__charconv/to_chars_base_10.h
 wasi/include/c++/v1/__charconv/to_chars_result.h
 wasi/include/c++/v1/__chrono/calendar.h
 wasi/include/c++/v1/__chrono/convert_to_timespec.h
+wasi/include/c++/v1/__chrono/day.h
 wasi/include/c++/v1/__chrono/duration.h
 wasi/include/c++/v1/__chrono/file_clock.h
+wasi/include/c++/v1/__chrono/hh_mm_ss.h
 wasi/include/c++/v1/__chrono/high_resolution_clock.h
+wasi/include/c++/v1/__chrono/literals.h
+wasi/include/c++/v1/__chrono/month.h
+wasi/include/c++/v1/__chrono/month_weekday.h
+wasi/include/c++/v1/__chrono/monthday.h
 wasi/include/c++/v1/__chrono/steady_clock.h
 wasi/include/c++/v1/__chrono/system_clock.h
 wasi/include/c++/v1/__chrono/time_point.h
+wasi/include/c++/v1/__chrono/weekday.h
+wasi/include/c++/v1/__chrono/year.h
+wasi/include/c++/v1/__chrono/year_month.h
+wasi/include/c++/v1/__chrono/year_month_day.h
+wasi/include/c++/v1/__chrono/year_month_weekday.h
 wasi/include/c++/v1/__compare/common_comparison_category.h
 wasi/include/c++/v1/__compare/compare_partial_order_fallback.h
 wasi/include/c++/v1/__compare/compare_strong_order_fallback.h
@@ -156,6 +264,7 @@ wasi/include/c++/v1/__coroutine/noop_cor
 wasi/include/c++/v1/__coroutine/trivial_awaitables.h
 wasi/include/c++/v1/__cxxabi_config.h
 wasi/include/c++/v1/__debug
+wasi/include/c++/v1/__debug_utils/randomize_range.h
 wasi/include/c++/v1/__errc
 wasi/include/c++/v1/__filesystem/copy_options.h
 wasi/include/c++/v1/__filesystem/directory_entry.h
@@ -173,7 +282,12 @@ wasi/include/c++/v1/__filesystem/perms.h
 wasi/include/c++/v1/__filesystem/recursive_directory_iterator.h
 wasi/include/c++/v1/__filesystem/space_info.h
 wasi/include/c++/v1/__filesystem/u8path.h
+wasi/include/c++/v1/__format/buffer.h
+wasi/include/c++/v1/__format/concepts.h
+wasi/include/c++/v1/__format/enable_insertable.h
+wasi/include/c++/v1/__format/extended_grapheme_cluster_table.h
 wasi/include/c++/v1/__format/format_arg.h
+wasi/include/c++/v1/__format/format_arg_store.h
 wasi/include/c++/v1/__format/format_args.h
 wasi/include/c++/v1/__format/format_context.h
 wasi/include/c++/v1/__format/format_error.h
@@ -187,9 +301,11 @@ wasi/include/c++/v1/__format/formatter_c
 wasi/include/c++/v1/__format/formatter_floating_point.h
 wasi/include/c++/v1/__format/formatter_integer.h
 wasi/include/c++/v1/__format/formatter_integral.h
+wasi/include/c++/v1/__format/formatter_output.h
 wasi/include/c++/v1/__format/formatter_pointer.h
 wasi/include/c++/v1/__format/formatter_string.h
 wasi/include/c++/v1/__format/parser_std_format_spec.h
+wasi/include/c++/v1/__format/unicode.h
 wasi/include/c++/v1/__functional/binary_function.h
 wasi/include/c++/v1/__functional/binary_negate.h
 wasi/include/c++/v1/__functional/bind.h
@@ -197,6 +313,7 @@ wasi/include/c++/v1/__functional/bind_ba
 wasi/include/c++/v1/__functional/bind_front.h
 wasi/include/c++/v1/__functional/binder1st.h
 wasi/include/c++/v1/__functional/binder2nd.h
+wasi/include/c++/v1/__functional/boyer_moore_searcher.h
 wasi/include/c++/v1/__functional/compose.h
 wasi/include/c++/v1/__functional/default_searcher.h
 wasi/include/c++/v1/__functional/function.h
@@ -217,11 +334,14 @@ wasi/include/c++/v1/__functional/unary_f
 wasi/include/c++/v1/__functional/unary_negate.h
 wasi/include/c++/v1/__functional/unwrap_ref.h
 wasi/include/c++/v1/__functional/weak_result_type.h
-wasi/include/c++/v1/__functional_base
+wasi/include/c++/v1/__fwd/span.h
+wasi/include/c++/v1/__fwd/string_view.h
 wasi/include/c++/v1/__hash_table
+wasi/include/c++/v1/__ios/fpos.h
 wasi/include/c++/v1/__iterator/access.h
 wasi/include/c++/v1/__iterator/advance.h
 wasi/include/c++/v1/__iterator/back_insert_iterator.h
+wasi/include/c++/v1/__iterator/bounded_iter.h
 wasi/include/c++/v1/__iterator/common_iterator.h
 wasi/include/c++/v1/__iterator/concepts.h
 wasi/include/c++/v1/__iterator/counted_iterator.h
@@ -240,26 +360,31 @@ wasi/include/c++/v1/__iterator/iter_move
 wasi/include/c++/v1/__iterator/iter_swap.h
 wasi/include/c++/v1/__iterator/iterator.h
 wasi/include/c++/v1/__iterator/iterator_traits.h
+wasi/include/c++/v1/__iterator/mergeable.h
 wasi/include/c++/v1/__iterator/move_iterator.h
+wasi/include/c++/v1/__iterator/move_sentinel.h
 wasi/include/c++/v1/__iterator/next.h
 wasi/include/c++/v1/__iterator/ostream_iterator.h
 wasi/include/c++/v1/__iterator/ostreambuf_iterator.h
+wasi/include/c++/v1/__iterator/permutable.h
 wasi/include/c++/v1/__iterator/prev.h
 wasi/include/c++/v1/__iterator/projected.h
 wasi/include/c++/v1/__iterator/readable_traits.h
 wasi/include/c++/v1/__iterator/reverse_access.h
 wasi/include/c++/v1/__iterator/reverse_iterator.h
 wasi/include/c++/v1/__iterator/size.h
+wasi/include/c++/v1/__iterator/sortable.h
 wasi/include/c++/v1/__iterator/unreachable_sentinel.h
 wasi/include/c++/v1/__iterator/wrap_iter.h
-wasi/include/c++/v1/__libcpp_version
 wasi/include/c++/v1/__locale
 wasi/include/c++/v1/__mbstate_t.h
 wasi/include/c++/v1/__memory/addressof.h
+wasi/include/c++/v1/__memory/allocate_at_least.h
 wasi/include/c++/v1/__memory/allocation_guard.h
 wasi/include/c++/v1/__memory/allocator.h
 wasi/include/c++/v1/__memory/allocator_arg_t.h
 wasi/include/c++/v1/__memory/allocator_traits.h
+wasi/include/c++/v1/__memory/assume_aligned.h
 wasi/include/c++/v1/__memory/auto_ptr.h
 wasi/include/c++/v1/__memory/compressed_pair.h
 wasi/include/c++/v1/__memory/concepts.h
@@ -269,6 +394,7 @@ wasi/include/c++/v1/__memory/ranges_cons
 wasi/include/c++/v1/__memory/ranges_uninitialized_algorithms.h
 wasi/include/c++/v1/__memory/raw_storage_iterator.h
 wasi/include/c++/v1/__memory/shared_ptr.h
+wasi/include/c++/v1/__memory/swap_allocator.h
 wasi/include/c++/v1/__memory/temporary_buffer.h
 wasi/include/c++/v1/__memory/uninitialized_algorithms.h
 wasi/include/c++/v1/__memory/unique_ptr.h
@@ -276,7 +402,6 @@ wasi/include/c++/v1/__memory/uses_alloca
 wasi/include/c++/v1/__memory/voidify.h
 wasi/include/c++/v1/__mutex_base
 wasi/include/c++/v1/__node_handle
-wasi/include/c++/v1/__nullptr
 wasi/include/c++/v1/__numeric/accumulate.h
 wasi/include/c++/v1/__numeric/adjacent_difference.h
 wasi/include/c++/v1/__numeric/exclusive_scan.h
@@ -306,6 +431,7 @@ wasi/include/c++/v1/__random/generate_ca
 wasi/include/c++/v1/__random/geometric_distribution.h
 wasi/include/c++/v1/__random/independent_bits_engine.h
 wasi/include/c++/v1/__random/is_seed_sequence.h
+wasi/include/c++/v1/__random/is_valid.h
 wasi/include/c++/v1/__random/knuth_b.h
 wasi/include/c++/v1/__random/linear_congruential_engine.h
 wasi/include/c++/v1/__random/log2.h
@@ -339,12 +465,16 @@ wasi/include/c++/v1/__ranges/empty.h
 wasi/include/c++/v1/__ranges/empty_view.h
 wasi/include/c++/v1/__ranges/enable_borrowed_range.h
 wasi/include/c++/v1/__ranges/enable_view.h
+wasi/include/c++/v1/__ranges/filter_view.h
 wasi/include/c++/v1/__ranges/iota_view.h
 wasi/include/c++/v1/__ranges/join_view.h
+wasi/include/c++/v1/__ranges/lazy_split_view.h
 wasi/include/c++/v1/__ranges/non_propagating_cache.h
 wasi/include/c++/v1/__ranges/owning_view.h
 wasi/include/c++/v1/__ranges/range_adaptor.h
+wasi/include/c++/v1/__ranges/rbegin.h
 wasi/include/c++/v1/__ranges/ref_view.h
+wasi/include/c++/v1/__ranges/rend.h
 wasi/include/c++/v1/__ranges/reverse_view.h
 wasi/include/c++/v1/__ranges/single_view.h
 wasi/include/c++/v1/__ranges/size.h
@@ -353,16 +483,16 @@ wasi/include/c++/v1/__ranges/take_view.h
 wasi/include/c++/v1/__ranges/transform_view.h
 wasi/include/c++/v1/__ranges/view_interface.h
 wasi/include/c++/v1/__ranges/views.h
+wasi/include/c++/v1/__ranges/zip_view.h
 wasi/include/c++/v1/__split_buffer
 wasi/include/c++/v1/__std_stream
-wasi/include/c++/v1/__string
+wasi/include/c++/v1/__string/char_traits.h
+wasi/include/c++/v1/__string/extern_template_lists.h
 wasi/include/c++/v1/__support/android/locale_bionic.h
 wasi/include/c++/v1/__support/fuchsia/xlocale.h
 wasi/include/c++/v1/__support/ibm/gettod_zos.h
-wasi/include/c++/v1/__support/ibm/limits.h
 wasi/include/c++/v1/__support/ibm/locale_mgmt_zos.h
 wasi/include/c++/v1/__support/ibm/nanosleep.h
-wasi/include/c++/v1/__support/ibm/support.h
 wasi/include/c++/v1/__support/ibm/xlocale.h
 wasi/include/c++/v1/__support/musl/xlocale.h
 wasi/include/c++/v1/__support/newlib/xlocale.h
@@ -380,6 +510,122 @@ wasi/include/c++/v1/__thread/timed_backo
 wasi/include/c++/v1/__threading_support
 wasi/include/c++/v1/__tree
 wasi/include/c++/v1/__tuple
+wasi/include/c++/v1/__type_traits/add_const.h
+wasi/include/c++/v1/__type_traits/add_cv.h
+wasi/include/c++/v1/__type_traits/add_lvalue_reference.h
+wasi/include/c++/v1/__type_traits/add_pointer.h
+wasi/include/c++/v1/__type_traits/add_rvalue_reference.h
+wasi/include/c++/v1/__type_traits/add_volatile.h
+wasi/include/c++/v1/__type_traits/aligned_storage.h
+wasi/include/c++/v1/__type_traits/aligned_union.h
+wasi/include/c++/v1/__type_traits/alignment_of.h
+wasi/include/c++/v1/__type_traits/apply_cv.h
+wasi/include/c++/v1/__type_traits/common_reference.h
+wasi/include/c++/v1/__type_traits/common_type.h
+wasi/include/c++/v1/__type_traits/conditional.h
+wasi/include/c++/v1/__type_traits/conjunction.h
+wasi/include/c++/v1/__type_traits/copy_cv.h
+wasi/include/c++/v1/__type_traits/copy_cvref.h
+wasi/include/c++/v1/__type_traits/decay.h
+wasi/include/c++/v1/__type_traits/disjunction.h
+wasi/include/c++/v1/__type_traits/enable_if.h
+wasi/include/c++/v1/__type_traits/extent.h
+wasi/include/c++/v1/__type_traits/has_unique_object_representation.h
+wasi/include/c++/v1/__type_traits/has_virtual_destructor.h
+wasi/include/c++/v1/__type_traits/integral_constant.h
+wasi/include/c++/v1/__type_traits/is_abstract.h
+wasi/include/c++/v1/__type_traits/is_aggregate.h
+wasi/include/c++/v1/__type_traits/is_arithmetic.h
+wasi/include/c++/v1/__type_traits/is_array.h
+wasi/include/c++/v1/__type_traits/is_assignable.h
+wasi/include/c++/v1/__type_traits/is_base_of.h
+wasi/include/c++/v1/__type_traits/is_bounded_array.h
+wasi/include/c++/v1/__type_traits/is_callable.h
+wasi/include/c++/v1/__type_traits/is_class.h
+wasi/include/c++/v1/__type_traits/is_compound.h
+wasi/include/c++/v1/__type_traits/is_const.h
+wasi/include/c++/v1/__type_traits/is_constant_evaluated.h
+wasi/include/c++/v1/__type_traits/is_constructible.h
+wasi/include/c++/v1/__type_traits/is_convertible.h
+wasi/include/c++/v1/__type_traits/is_copy_assignable.h
+wasi/include/c++/v1/__type_traits/is_copy_constructible.h
+wasi/include/c++/v1/__type_traits/is_core_convertible.h
+wasi/include/c++/v1/__type_traits/is_default_constructible.h
+wasi/include/c++/v1/__type_traits/is_destructible.h
+wasi/include/c++/v1/__type_traits/is_empty.h
+wasi/include/c++/v1/__type_traits/is_enum.h
+wasi/include/c++/v1/__type_traits/is_final.h
+wasi/include/c++/v1/__type_traits/is_floating_point.h
+wasi/include/c++/v1/__type_traits/is_function.h
+wasi/include/c++/v1/__type_traits/is_fundamental.h
+wasi/include/c++/v1/__type_traits/is_integral.h
+wasi/include/c++/v1/__type_traits/is_literal_type.h
+wasi/include/c++/v1/__type_traits/is_member_function_pointer.h
+wasi/include/c++/v1/__type_traits/is_member_object_pointer.h
+wasi/include/c++/v1/__type_traits/is_member_pointer.h
+wasi/include/c++/v1/__type_traits/is_move_assignable.h
+wasi/include/c++/v1/__type_traits/is_move_constructible.h
+wasi/include/c++/v1/__type_traits/is_nothrow_assignable.h
+wasi/include/c++/v1/__type_traits/is_nothrow_constructible.h
+wasi/include/c++/v1/__type_traits/is_nothrow_convertible.h
+wasi/include/c++/v1/__type_traits/is_nothrow_copy_assignable.h
+wasi/include/c++/v1/__type_traits/is_nothrow_copy_constructible.h
+wasi/include/c++/v1/__type_traits/is_nothrow_default_constructible.h
+wasi/include/c++/v1/__type_traits/is_nothrow_destructible.h
+wasi/include/c++/v1/__type_traits/is_nothrow_move_assignable.h
+wasi/include/c++/v1/__type_traits/is_nothrow_move_constructible.h
+wasi/include/c++/v1/__type_traits/is_null_pointer.h
+wasi/include/c++/v1/__type_traits/is_object.h
+wasi/include/c++/v1/__type_traits/is_pod.h
+wasi/include/c++/v1/__type_traits/is_pointer.h
+wasi/include/c++/v1/__type_traits/is_polymorphic.h
+wasi/include/c++/v1/__type_traits/is_primary_template.h
+wasi/include/c++/v1/__type_traits/is_reference.h
+wasi/include/c++/v1/__type_traits/is_reference_wrapper.h
+wasi/include/c++/v1/__type_traits/is_referenceable.h
+wasi/include/c++/v1/__type_traits/is_same.h
+wasi/include/c++/v1/__type_traits/is_scalar.h
+wasi/include/c++/v1/__type_traits/is_scoped_enum.h
+wasi/include/c++/v1/__type_traits/is_signed.h
+wasi/include/c++/v1/__type_traits/is_signed_integer.h
+wasi/include/c++/v1/__type_traits/is_standard_layout.h
+wasi/include/c++/v1/__type_traits/is_trivial.h
+wasi/include/c++/v1/__type_traits/is_trivially_assignable.h
+wasi/include/c++/v1/__type_traits/is_trivially_constructible.h
+wasi/include/c++/v1/__type_traits/is_trivially_copy_assignable.h
+wasi/include/c++/v1/__type_traits/is_trivially_copy_constructible.h
+wasi/include/c++/v1/__type_traits/is_trivially_copyable.h
+wasi/include/c++/v1/__type_traits/is_trivially_default_constructible.h
+wasi/include/c++/v1/__type_traits/is_trivially_destructible.h
+wasi/include/c++/v1/__type_traits/is_trivially_move_assignable.h
+wasi/include/c++/v1/__type_traits/is_trivially_move_constructible.h
+wasi/include/c++/v1/__type_traits/is_unbounded_array.h
+wasi/include/c++/v1/__type_traits/is_union.h
+wasi/include/c++/v1/__type_traits/is_unsigned.h
+wasi/include/c++/v1/__type_traits/is_unsigned_integer.h
+wasi/include/c++/v1/__type_traits/is_valid_expansion.h
+wasi/include/c++/v1/__type_traits/is_void.h
+wasi/include/c++/v1/__type_traits/is_volatile.h
+wasi/include/c++/v1/__type_traits/lazy.h
+wasi/include/c++/v1/__type_traits/make_32_64_or_128_bit.h
+wasi/include/c++/v1/__type_traits/make_signed.h
+wasi/include/c++/v1/__type_traits/make_unsigned.h
+wasi/include/c++/v1/__type_traits/nat.h
+wasi/include/c++/v1/__type_traits/negation.h
+wasi/include/c++/v1/__type_traits/promote.h
+wasi/include/c++/v1/__type_traits/rank.h
+wasi/include/c++/v1/__type_traits/remove_all_extents.h
+wasi/include/c++/v1/__type_traits/remove_const.h
+wasi/include/c++/v1/__type_traits/remove_cv.h
+wasi/include/c++/v1/__type_traits/remove_cvref.h
+wasi/include/c++/v1/__type_traits/remove_extent.h
+wasi/include/c++/v1/__type_traits/remove_pointer.h
+wasi/include/c++/v1/__type_traits/remove_reference.h
+wasi/include/c++/v1/__type_traits/remove_volatile.h
+wasi/include/c++/v1/__type_traits/type_identity.h
+wasi/include/c++/v1/__type_traits/type_list.h
+wasi/include/c++/v1/__type_traits/underlying_type.h
+wasi/include/c++/v1/__type_traits/void_t.h
 wasi/include/c++/v1/__undef_macros
 wasi/include/c++/v1/__utility/as_const.h
 wasi/include/c++/v1/__utility/auto_cast.h
@@ -397,7 +643,9 @@ wasi/include/c++/v1/__utility/rel_ops.h
 wasi/include/c++/v1/__utility/swap.h
 wasi/include/c++/v1/__utility/to_underlying.h
 wasi/include/c++/v1/__utility/transaction.h
+wasi/include/c++/v1/__utility/unreachable.h
 wasi/include/c++/v1/__variant/monostate.h
+wasi/include/c++/v1/__verbose_abort
 wasi/include/c++/v1/algorithm
 wasi/include/c++/v1/any
 wasi/include/c++/v1/array
@@ -437,6 +685,7 @@ wasi/include/c++/v1/cstring
 wasi/include/c++/v1/ctgmath
 wasi/include/c++/v1/ctime
 wasi/include/c++/v1/ctype.h
+wasi/include/c++/v1/cuchar
 wasi/include/c++/v1/cwchar
 wasi/include/c++/v1/cwctype
 wasi/include/c++/v1/cxxabi.h
@@ -449,7 +698,6 @@ wasi/include/c++/v1/experimental/__memor
 wasi/include/c++/v1/experimental/algorithm
 wasi/include/c++/v1/experimental/coroutine
 wasi/include/c++/v1/experimental/deque
-wasi/include/c++/v1/experimental/filesystem
 wasi/include/c++/v1/experimental/forward_list
 wasi/include/c++/v1/experimental/functional
 wasi/include/c++/v1/experimental/iterator
@@ -514,6 +762,7 @@ wasi/include/c++/v1/shared_mutex
 wasi/include/c++/v1/span
 wasi/include/c++/v1/sstream
 wasi/include/c++/v1/stack
+wasi/include/c++/v1/stdatomic.h
 wasi/include/c++/v1/stdbool.h
 wasi/include/c++/v1/stddef.h
 wasi/include/c++/v1/stdexcept
@@ -532,6 +781,7 @@ wasi/include/c++/v1/tuple
 wasi/include/c++/v1/type_traits
 wasi/include/c++/v1/typeindex
 wasi/include/c++/v1/typeinfo
+wasi/include/c++/v1/uchar.h
 wasi/include/c++/v1/unordered_map
 wasi/include/c++/v1/unordered_set
 wasi/include/c++/v1/utility
@@ -543,3 +793,4 @@ wasi/include/c++/v1/wchar.h
 wasi/include/c++/v1/wctype.h
 wasi/lib/wasm32-wasi/libc++.a
 wasi/lib/wasm32-wasi/libc++abi.a
+wasi/lib/wasm32-wasi/libc++experimental.a

Index: pkgsrc/lang/wasi-libcxx/distinfo
diff -u pkgsrc/lang/wasi-libcxx/distinfo:1.4 pkgsrc/lang/wasi-libcxx/distinfo:1.5
--- pkgsrc/lang/wasi-libcxx/distinfo:1.4        Sat Aug 13 12:42:45 2022
+++ pkgsrc/lang/wasi-libcxx/distinfo    Mon Nov 14 18:44:07 2022
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.4 2022/08/13 12:42:45 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2022/11/14 18:44:07 adam Exp $
 
-BLAKE2s (libcxx-14.0.6.src.tar.xz) = e77dfac79fb977adf84345b7e4c2762b3fa89f3d1f611baa8f8fa6831d1bc68a
-SHA512 (libcxx-14.0.6.src.tar.xz) = c39bb01317e8ae7e5b23a677754a866953b6c45188c194d3d76fbd276de9565df8bcbcab8cf6606584af7dd30a61f39376c0e2de6b8c32c69f7fc592587e710d
-Size (libcxx-14.0.6.src.tar.xz) = 3065120 bytes
-BLAKE2s (libcxxabi-14.0.6.src.tar.xz) = c2bc894a75176b7f24517b6c045ddaccc61375453d56331f51dc9d03821804cc
-SHA512 (libcxxabi-14.0.6.src.tar.xz) = f61926ce9c8bf4d704d9ee03a795ebd23730099d56c385e3cbd1f8b588b337c1394d6548f55e1452df5040117a80765c977ba256547d53cd21895e91ef0fffa6
-Size (libcxxabi-14.0.6.src.tar.xz) = 561844 bytes
-BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d44946453add45426569fd4187654f83881341c5c0109e4ffacc60e8f73af60
-SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
-Size (llvm-14.0.6.src.tar.xz) = 49660136 bytes
-SHA1 (patch-libcxx_include_CMakeLists.txt) = b8e99024618f01f9acc3370189ff121ea500c0d0
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (libcxx-15.0.4.src.tar.xz) = 218577b1a527b22b4a349ad95dd515d08fc682ccbaca85dee39efebbe4efc001
+SHA512 (libcxx-15.0.4.src.tar.xz) = 4d03a945e1625d4c7293c57e5432a782deb47d701895874fa6d518c835b1f84fdf3c00076155e17e825d0c72f6faccbc1c9394183fe9ffd70fce8e1cdcb85e3a
+Size (libcxx-15.0.4.src.tar.xz) = 3334192 bytes
+BLAKE2s (libcxxabi-15.0.4.src.tar.xz) = bae765eb627eebd7d047effc3a026a63ce49a680f4a774efaec49158f3a428a3
+SHA512 (libcxxabi-15.0.4.src.tar.xz) = 28d50e4a71b1badfaa97799c39a5077927b579c8d3a4d5c23908e4ee7659f04d7932aa9a7b8f6503d28d05ad42af5e5ef8e18633cfa97b63cc4a122188f9aa0b
+Size (libcxxabi-15.0.4.src.tar.xz) = 568608 bytes
+SHA1 (patch-libcxx_include_CMakeLists.txt) = ca1d4f8dbc99bbcfdad6a0bd389f973a48a938d7
+SHA1 (patch-libcxxabi_src_CMakeLists.txt) = ccd70bb5902b31a6bb989521e9a5f50fe0a4021d

Index: pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
diff -u pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt:1.1 pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt:1.2
--- pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt:1.1     Sat Aug 13 12:42:45 2022
+++ pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt Mon Nov 14 18:44:07 2022
@@ -1,18 +1,19 @@
-$NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.1 2022/08/13 12:42:45 ryoon Exp $
+$NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.2 2022/11/14 18:44:07 adam Exp $
 
 * Generate __config_site under source directory. This is wrong.
   This fixes non-pthreads wasi-libcxx-14.0.6 build.
 
---- libcxx/include/CMakeLists.txt.orig 2022-06-22 16:46:24.000000000 +0000
+--- libcxx/include/CMakeLists.txt.orig 2022-11-13 10:03:36.918375190 +0000
 +++ libcxx/include/CMakeLists.txt
-@@ -540,8 +540,10 @@ set(files
-   wctype.h
-   )
+@@ -795,9 +795,11 @@ foreach(feature LIBCXX_ENABLE_FILESYSTEM
+   endif()
+ endforeach()
  
 +configure_file("__config_site.in" "${CMAKE_CURRENT_SOURCE_DIR}/__config_site" @ONLY)
  configure_file("__config_site.in" "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site" @ONLY)
+ configure_file("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
  
 +set(_all_includes "${CMAKE_CURRENT_SOURCE_DIR}/__config_site")
- set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site")
+ set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
+                   "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap")
  foreach(f ${files})
-   set(src "${CMAKE_CURRENT_SOURCE_DIR}/${f}")

Index: pkgsrc/parallel/openmp/Makefile
diff -u pkgsrc/parallel/openmp/Makefile:1.14 pkgsrc/parallel/openmp/Makefile:1.15
--- pkgsrc/parallel/openmp/Makefile:1.14        Fri Aug 12 08:49:20 2022
+++ pkgsrc/parallel/openmp/Makefile     Mon Nov 14 18:44:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/08/12 08:49:20 pin Exp $
+# $NetBSD: Makefile,v 1.15 2022/11/14 18:44:07 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -20,8 +20,6 @@ USE_TOOLS+=           perl pkg-config
 GCC_REQD+=             4.8
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 CMAKE_ARGS+=   -DOPENMP_ENABLE_LIBOMPTARGET=OFF
 CMAKE_ARGS+=   -DOPENMP_ENABLE_OMPT_TOOLS=OFF
 

Index: pkgsrc/parallel/openmp/distinfo
diff -u pkgsrc/parallel/openmp/distinfo:1.13 pkgsrc/parallel/openmp/distinfo:1.14
--- pkgsrc/parallel/openmp/distinfo:1.13        Fri Aug 12 08:49:20 2022
+++ pkgsrc/parallel/openmp/distinfo     Mon Nov 14 18:44:07 2022
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.13 2022/08/12 08:49:20 pin Exp $
+$NetBSD: distinfo,v 1.14 2022/11/14 18:44:07 adam Exp $
 
-BLAKE2s (openmp-14.0.6.src.tar.xz) = b56918c4cfcf7bf21cf123e395f615346caf2b8306cb2269b66a9fe6ffac828c
-SHA512 (openmp-14.0.6.src.tar.xz) = 0b29e25354d58d3f851c60fa4cd3e4e251092c4dadca995598b11757fa8d5d184e9895a362a6a23b67d6dd2a210ca64e681c3b47f3f225edbf048012762f0988
-Size (openmp-14.0.6.src.tar.xz) = 1205476 bytes
+BLAKE2s (cmake-15.0.4.src.tar.xz) = 7b5f8ecd490470c57f456046717afccf5a9fe0d62234f7062553d0760c964d4f
+SHA512 (cmake-15.0.4.src.tar.xz) = c983deefbdf128bf47d009a4eed0628f69462146c33e7e670bc43f80aea3dacf9c1367d81afea9512126d15543156b11c7d9eca7944f4b8e4c5c31479c549734
+Size (cmake-15.0.4.src.tar.xz) = 6972 bytes
+BLAKE2s (openmp-15.0.4.src.tar.xz) = d2925346967a5fe7bf98446c408bb9abd5e1861fac4365af4eaaa97d6e61dbb6
+SHA512 (openmp-15.0.4.src.tar.xz) = e87d2051721fd16ca21bbea8f365dc1874f308338320e003b62142006864c2d79d196f6d49c6fac0193d13a914e6ebe2d110b3313cabcfb961e667afb68b2b5b
+Size (openmp-15.0.4.src.tar.xz) = 1184532 bytes
 SHA1 (patch-runtime_src_kmp__runtime.cpp) = 70f4396d4c1631fbd74692ef26b22d08675da547

Added files:

Index: pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
diff -u /dev/null pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp:1.4
--- /dev/null   Mon Nov 14 18:44:07 2022
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp   Mon Nov 14 18:44:06 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp,v 1.4 2022/11/14 18:44:06 adam Exp $
+
+Fix build on NetBSD.
+
+--- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig      2022-11-10 13:10:42.578954666 +0000
++++ lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+@@ -568,6 +568,7 @@ static void GetTls(uptr *addr, uptr *siz
+       *addr = (uptr)tcb->tcb_dtv[1];
+     }
+   }
++#else
+ #error "Unknown OS"
+ #endif
+ }

Index: pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Mon Nov 14 18:44:07 2022
+++ pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt      Mon Nov 14 18:44:06 2022
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2022/11/14 18:44:06 adam Exp $
+
+Fix build.
+
+--- src/CMakeLists.txt.orig    2022-11-02 03:11:40.000000000 +0000
++++ src/CMakeLists.txt
+@@ -57,6 +57,7 @@ if (MSVC_IDE OR XCODE)
+ endif()
+ 
+ # Some files depend on libc++ internals.
++include_directories("${LIBCXXABI_LIBCXX_PATH}/include")
+ include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
+ 
+ if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
+@@ -168,7 +169,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
+     target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared)
+   endif()
+ endif()
+-target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_BUILTINS_LIBRARY} ${LIBCXXABI_SHARED_LIBRARIES} ${LIBCXXABI_LIBRARIES})
+ target_link_libraries(cxxabi_shared_objects PUBLIC cxxabi-headers)
+ set_target_properties(cxxabi_shared_objects
+   PROPERTIES
+@@ -239,7 +239,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBC
+   target_link_libraries(cxxabi_static_objects PUBLIC unwind_static_objects) # propagate usage requirements
+   target_sources(cxxabi_static_objects PUBLIC $<TARGET_OBJECTS:unwind_static_objects>)
+ endif()
+-target_link_libraries(cxxabi_static_objects PRIVATE cxx-headers ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
+ target_link_libraries(cxxabi_static_objects PUBLIC cxxabi-headers)
+ set_target_properties(cxxabi_static_objects
+   PROPERTIES

Index: pkgsrc/lang/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt
diff -u /dev/null pkgsrc/lang/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt:1.1
--- /dev/null   Mon Nov 14 18:44:07 2022
+++ pkgsrc/lang/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt  Mon Nov 14 18:44:07 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-libcxxabi_src_CMakeLists.txt,v 1.1 2022/11/14 18:44:07 adam Exp $
+
+Fix build.
+
+--- libcxxabi/src/CMakeLists.txt.orig  2022-11-13 10:23:18.552841671 +0000
++++ libcxxabi/src/CMakeLists.txt
+@@ -57,6 +57,7 @@ if (MSVC_IDE OR XCODE)
+ endif()
+ 
+ # Some files depend on libc++ internals.
++include_directories("${LIBCXXABI_LIBCXX_PATH}/include")
+ include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
+ 
+ if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)

Prev by Date: CVS commit: pkgsrc/devel/py-frozendict
Next by Date: CVS commit: pkgsrc/lang/libunwind/patches
Previous by Thread: CVS commit: pkgsrc/devel/py-frozendict
Next by Thread: CVS commit: pkgsrc/lang/libunwind/patches
Indexes:

Home | Main Index | Thread Index | Old Index