pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jul  6 15:45:10 UTC 2024

Modified Files:
        pkgsrc/devel/lld: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/devel/lldb: Makefile PLIST PLIST.Darwin PLIST.Linux
            buildlink3.mk distinfo options.mk
        pkgsrc/devel/lldb/patches: patch-source_Host_common_Editline.cpp
        pkgsrc/devel/polly: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/clang: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/lang/clang-tools-extra: Makefile PLIST distinfo
        pkgsrc/lang/clang/patches: patch-lib_Basic_Targets_OSTargets.h
            patch-lib_Driver_ToolChain.cpp patch-lib_Driver_ToolChains_Gnu.cpp
        pkgsrc/lang/compiler-rt: Makefile buildlink3.mk distinfo
        pkgsrc/lang/compiler-rt/patches: patch-CMakeLists.txt
        pkgsrc/lang/flang: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/libcxx: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/libcxx/patches: patch-src_filesystem_file__descriptor.h
            patch-src_include_to__chars__floating__point.h
        pkgsrc/lang/libcxxabi: Makefile buildlink3.mk distinfo
        pkgsrc/lang/libcxxabi/files: __config_site
        pkgsrc/lang/libcxxabi/patches: patch-src_CMakeLists.txt
        pkgsrc/lang/libunwind: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/libunwind/patches: patch-src_CMakeLists.txt
        pkgsrc/lang/llvm: Makefile PLIST buildlink3.mk distinfo options.mk
            version.mk
        pkgsrc/lang/llvm/patches: patch-tools_llvm-shlib_CMakeLists.txt
            patch-utils_llvm-lit_CMakeLists.txt
        pkgsrc/lang/mlir: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/mlir/patches: patch-cmake_modules_MLIRConfig.cmake.in
            patch-tools_mlir-tblgen_CMakeLists.txt
        pkgsrc/lang/wasi-compiler-rt: Makefile buildlink3.mk
        pkgsrc/lang/wasi-libcxx: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/wasi-libcxx/patches: patch-libcxx_include_CMakeLists.txt
        pkgsrc/parallel/openmp: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/parallel/openmp/patches: patch-runtime_src_kmp__os.h
Added Files:
        pkgsrc/lang/compiler-rt/patches: patch-lib_fuzzer_FuzzerUtilLinux.cpp
            patch-lib_sanitizer__common_sanitizer__linux.cpp
Removed Files:
        pkgsrc/devel/lldb/patches: patch-source_Host_netbsd_HostNetBSD.cpp
            patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
            patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
        pkgsrc/lang/clang/patches: patch-lib_Lex_InitHeaderSearch.cpp
            patch-tools_clang-shlib_CMakeLists.txt
            patch-tools_libclang_CMakeLists.txt
        pkgsrc/lang/compiler-rt/patches: patch-lib_asan_CMakeLists.txt
        pkgsrc/lang/llvm/patches: patch-lib_Support_BLAKE3-blake3__impl.h

Log Message:
llvm: updated to 18.1.8

https://releases.llvm.org


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/lld/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/lld/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/lld/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/lld/distinfo
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/lldb/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/lldb/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/lldb/PLIST.Darwin
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/lldb/PLIST.Linux
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/lldb/buildlink3.mk
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/lldb/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/lldb/options.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/lldb/patches/patch-source_Host_common_Editline.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/lldb/patches/patch-source_Host_netbsd_HostNetBSD.cpp
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/polly/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/polly/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/polly/buildlink3.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/polly/distinfo
cvs rdiff -u -r1.85 -r1.86 pkgsrc/lang/clang/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/clang/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/clang/buildlink3.mk
cvs rdiff -u -r1.84 -r1.85 pkgsrc/lang/clang/distinfo
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/clang-tools-extra/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/clang-tools-extra/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/clang-tools-extra/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Gnu.cpp
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/lang/clang/patches/patch-tools_clang-shlib_CMakeLists.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/lang/clang/patches/patch-tools_libclang_CMakeLists.txt
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/compiler-rt/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/compiler-rt/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/compiler-rt/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/compiler-rt/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/lang/compiler-rt/patches/patch-lib_asan_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/compiler-rt/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp \
    pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/flang/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/flang/PLIST pkgsrc/lang/flang/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/flang/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/libcxx/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/libcxx/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/libcxx/buildlink3.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/libcxx/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/libcxx/patches/patch-src_filesystem_file__descriptor.h \
    pkgsrc/lang/libcxx/patches/patch-src_include_to__chars__floating__point.h
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/libcxxabi/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/libcxxabi/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/libcxxabi/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/libcxxabi/files/__config_site
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/libunwind/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/libunwind/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/libunwind/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/libunwind/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt
cvs rdiff -u -r1.97 -r1.98 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/llvm/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/llvm/buildlink3.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/llvm/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/llvm/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/llvm/version.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/llvm/patches/patch-lib_Support_BLAKE3-blake3__impl.h
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/mlir/Makefile pkgsrc/lang/mlir/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/mlir/buildlink3.mk \
    pkgsrc/lang/mlir/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/mlir/patches/patch-tools_mlir-tblgen_CMakeLists.txt
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/wasi-compiler-rt/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/wasi-libcxx/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/wasi-libcxx/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/wasi-libcxx/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/wasi-libcxx/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
cvs rdiff -u -r1.19 -r1.20 pkgsrc/parallel/openmp/Makefile \
    pkgsrc/parallel/openmp/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/parallel/openmp/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/parallel/openmp/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/parallel/openmp/patches/patch-runtime_src_kmp__os.h

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/Makefile
diff -u pkgsrc/devel/lld/Makefile:1.24 pkgsrc/devel/lld/Makefile:1.25
--- pkgsrc/devel/lld/Makefile:1.24      Mon Apr 22 07:06:38 2024
+++ pkgsrc/devel/lld/Makefile   Sat Jul  6 15:45:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/04/22 07:06:38 adam Exp $
+# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:08 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 

Index: pkgsrc/devel/lld/PLIST
diff -u pkgsrc/devel/lld/PLIST:1.11 pkgsrc/devel/lld/PLIST:1.12
--- pkgsrc/devel/lld/PLIST:1.11 Mon Apr 22 07:06:39 2024
+++ pkgsrc/devel/lld/PLIST      Sat Jul  6 15:45:08 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2024/04/22 07:06:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/07/06 15:45:08 adam Exp $
 bin/ld.lld
 bin/ld64.lld
 bin/lld

Index: pkgsrc/devel/lld/buildlink3.mk
diff -u pkgsrc/devel/lld/buildlink3.mk:1.7 pkgsrc/devel/lld/buildlink3.mk:1.8
--- pkgsrc/devel/lld/buildlink3.mk:1.7  Mon Apr 22 07:06:39 2024
+++ pkgsrc/devel/lld/buildlink3.mk      Sat Jul  6 15:45:08 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2024/04/22 07:06:39 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2024/07/06 15:45:08 adam Exp $
 
 BUILDLINK_TREE+=       lld
 
 .if !defined(LLD_BUILDLINK3_MK)
 LLD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lld+=    lld>=17.0.0<18
+BUILDLINK_API_DEPENDS.lld+=    lld>=18.0.0
 BUILDLINK_PKGSRCDIR.lld?=      ../../devel/lld
 
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/devel/lld/distinfo
diff -u pkgsrc/devel/lld/distinfo:1.23 pkgsrc/devel/lld/distinfo:1.24
--- pkgsrc/devel/lld/distinfo:1.23      Mon Apr 22 07:06:39 2024
+++ pkgsrc/devel/lld/distinfo   Sat Jul  6 15:45:08 2024
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.23 2024/04/22 07:06:39 adam Exp $
+$NetBSD: distinfo,v 1.24 2024/07/06 15:45:08 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (lld-17.0.6.src.tar.xz) = e52fa27ce04c4d316d793c17e118d748469aa03216d7a20a7f10d01bf073b41e
-SHA512 (lld-17.0.6.src.tar.xz) = 55955fc24b3fb87012486618cf227a1640ad9a6d607c898d890337aa8c28f3e6a9ed48a52bd0ed57f365f0dc5081a6b3a037cb65da9a9f2cbc53a1527cb8db60
-Size (lld-17.0.6.src.tar.xz) = 1506048 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (lld-18.1.8.src.tar.xz) = 10fbb9cf2c578bfa61ed36857dc1a2368833d03481f2ad19867e386489ab71f3
+SHA512 (lld-18.1.8.src.tar.xz) = 21671591cce90c967720d094d2c8b9d12eaf5ce8138abee8c35cf38dda7008f3ed0b1b5cd9ed9f11ea6aa30905444fc2a45e0e3a323d3612f47d534466262064
+Size (lld-18.1.8.src.tar.xz) = 1563500 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
 SHA1 (patch-ELF_Config.h) = 50861ef74c2ff9a9091afcbc8d076e379d9531e5
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3

Index: pkgsrc/devel/lldb/Makefile
diff -u pkgsrc/devel/lldb/Makefile:1.51 pkgsrc/devel/lldb/Makefile:1.52
--- pkgsrc/devel/lldb/Makefile:1.51     Wed May 29 16:32:15 2024
+++ pkgsrc/devel/lldb/Makefile  Sat Jul  6 15:45:08 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.51 2024/05/29 16:32:15 adam Exp $
+# $NetBSD: Makefile,v 1.52 2024/07/06 15:45:08 adam Exp $
 
-PKGREVISION= 1
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      lldb-${LLVM_VERSION}.src
@@ -66,7 +65,8 @@ PKG_FAIL_REASON+=     "Only NetBSD >= 9.99.2
 .endif
 
 # Not yet ported, so avoid wasting time trying...
-NOT_FOR_PLATFORM+=     NetBSD-*-powerpc
+# See: source/Plugins/Process/NetBSD
+NOT_FOR_PLATFORM+=     NetBSD-*-aarch64 NetBSD-*-powerpc
 
 .include "../../devel/cmake/build.mk"
 #.include "../../devel/googletest/buildlink3.mk" # check-lldb-unit

Index: pkgsrc/devel/lldb/PLIST
diff -u pkgsrc/devel/lldb/PLIST:1.18 pkgsrc/devel/lldb/PLIST:1.19
--- pkgsrc/devel/lldb/PLIST:1.18        Mon Apr 22 07:06:39 2024
+++ pkgsrc/devel/lldb/PLIST     Sat Jul  6 15:45:08 2024
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.18 2024/04/22 07:06:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2024/07/06 15:45:08 adam Exp $
 bin/lldb
 bin/lldb-argdumper
+bin/lldb-dap
 bin/lldb-instr
 bin/lldb-server
-bin/lldb-vscode
 include/lldb/API/LLDB.h
 include/lldb/API/SBAddress.h
 include/lldb/API/SBAttachInfo.h
@@ -29,6 +29,7 @@ include/lldb/API/SBExpressionOptions.h
 include/lldb/API/SBFile.h
 include/lldb/API/SBFileSpec.h
 include/lldb/API/SBFileSpecList.h
+include/lldb/API/SBFormat.h
 include/lldb/API/SBFrame.h
 include/lldb/API/SBFunction.h
 include/lldb/API/SBHostOS.h
@@ -45,6 +46,7 @@ include/lldb/API/SBModuleSpec.h
 include/lldb/API/SBPlatform.h
 include/lldb/API/SBProcess.h
 include/lldb/API/SBProcessInfo.h
+include/lldb/API/SBProcessInfoList.h
 include/lldb/API/SBQueue.h
 include/lldb/API/SBQueueItem.h
 include/lldb/API/SBReproducer.h
@@ -76,6 +78,7 @@ include/lldb/API/SBValue.h
 include/lldb/API/SBValueList.h
 include/lldb/API/SBVariablesOptions.h
 include/lldb/API/SBWatchpoint.h
+include/lldb/API/SBWatchpointOptions.h
 include/lldb/Breakpoint/Breakpoint.h
 include/lldb/Breakpoint/BreakpointID.h
 include/lldb/Breakpoint/BreakpointIDList.h
@@ -93,7 +96,7 @@ include/lldb/Breakpoint/BreakpointResolv
 include/lldb/Breakpoint/BreakpointResolverName.h
 include/lldb/Breakpoint/BreakpointResolverScripted.h
 include/lldb/Breakpoint/BreakpointSite.h
-include/lldb/Breakpoint/BreakpointSiteList.h
+include/lldb/Breakpoint/StopPointSiteList.h
 include/lldb/Breakpoint/Stoppoint.h
 include/lldb/Breakpoint/StoppointCallbackContext.h
 include/lldb/Breakpoint/StoppointHitCounter.h
@@ -101,6 +104,8 @@ include/lldb/Breakpoint/StoppointSite.h
 include/lldb/Breakpoint/Watchpoint.h
 include/lldb/Breakpoint/WatchpointList.h
 include/lldb/Breakpoint/WatchpointOptions.h
+include/lldb/Breakpoint/WatchpointResource.h
+include/lldb/Breakpoint/WatchpointResourceList.h
 include/lldb/Core/Address.h
 include/lldb/Core/AddressRange.h
 include/lldb/Core/AddressResolver.h
@@ -121,10 +126,8 @@ include/lldb/Core/FormatEntity.h
 include/lldb/Core/Highlighter.h
 include/lldb/Core/IOHandler.h
 include/lldb/Core/IOHandlerCursesGUI.h
-include/lldb/Core/IOStreamMacros.h
 include/lldb/Core/LoadedModuleInfoList.h
 include/lldb/Core/Mangled.h
-include/lldb/Core/MappedHash.h
 include/lldb/Core/Module.h
 include/lldb/Core/ModuleChild.h
 include/lldb/Core/ModuleList.h
@@ -139,8 +142,6 @@ include/lldb/Core/Section.h
 include/lldb/Core/SourceLocationSpec.h
 include/lldb/Core/SourceManager.h
 include/lldb/Core/StreamAsynchronousIO.h
-include/lldb/Core/StreamBuffer.h
-include/lldb/Core/StreamFile.h
 include/lldb/Core/StructuredDataImpl.h
 include/lldb/Core/ThreadSafeDenseSet.h
 include/lldb/Core/ThreadSafeValue.h
@@ -161,6 +162,7 @@ include/lldb/Core/ValueObjectMemory.h
 include/lldb/Core/ValueObjectRegister.h
 include/lldb/Core/ValueObjectSyntheticFilter.h
 include/lldb/Core/ValueObjectUpdater.h
+include/lldb/Core/ValueObjectVTable.h
 include/lldb/Core/ValueObjectVariable.h
 include/lldb/Core/dwarf.h
 include/lldb/DataFormatters/CXXFunctionPointer.h
@@ -236,6 +238,7 @@ include/lldb/Host/PseudoTerminal.h
 include/lldb/Host/SafeMachO.h
 include/lldb/Host/Socket.h
 include/lldb/Host/SocketAddress.h
+include/lldb/Host/StreamFile.h
 include/lldb/Host/Terminal.h
 include/lldb/Host/ThreadLauncher.h
 include/lldb/Host/Time.h
@@ -293,6 +296,11 @@ include/lldb/Interpreter/CommandObjectMu
 include/lldb/Interpreter/CommandOptionArgumentTable.h
 include/lldb/Interpreter/CommandOptionValidators.h
 include/lldb/Interpreter/CommandReturnObject.h
+include/lldb/Interpreter/Interfaces/OperatingSystemInterface.h
+include/lldb/Interpreter/Interfaces/ScriptedInterface.h
+include/lldb/Interpreter/Interfaces/ScriptedPlatformInterface.h
+include/lldb/Interpreter/Interfaces/ScriptedProcessInterface.h
+include/lldb/Interpreter/Interfaces/ScriptedThreadInterface.h
 include/lldb/Interpreter/OptionArgParser.h
 include/lldb/Interpreter/OptionGroupArchitecture.h
 include/lldb/Interpreter/OptionGroupBoolean.h
@@ -334,9 +342,6 @@ include/lldb/Interpreter/Options.h
 include/lldb/Interpreter/Property.h
 include/lldb/Interpreter/ScriptInterpreter.h
 include/lldb/Interpreter/ScriptObject.h
-include/lldb/Interpreter/ScriptedInterface.h
-include/lldb/Interpreter/ScriptedPlatformInterface.h
-include/lldb/Interpreter/ScriptedProcessInterface.h
 include/lldb/Symbol/ArmUnwindInfo.h
 include/lldb/Symbol/Block.h
 include/lldb/Symbol/CallFrameInfo.h
@@ -362,6 +367,7 @@ include/lldb/Symbol/SymbolContext.h
 include/lldb/Symbol/SymbolContextScope.h
 include/lldb/Symbol/SymbolFile.h
 include/lldb/Symbol/SymbolFileOnDemand.h
+include/lldb/Symbol/SymbolLocator.h
 include/lldb/Symbol/SymbolVendor.h
 include/lldb/Symbol/Symtab.h
 include/lldb/Symbol/TaggedASTType.h
@@ -453,11 +459,14 @@ include/lldb/Target/UnixSignals.h
 include/lldb/Target/Unwind.h
 include/lldb/Target/UnwindAssembly.h
 include/lldb/Target/UnwindLLDB.h
+include/lldb/Utility/AddressableBits.h
 include/lldb/Utility/AnsiTerminal.h
+include/lldb/Utility/AppleUuidCompatibility.h
 include/lldb/Utility/ArchSpec.h
 include/lldb/Utility/Args.h
 include/lldb/Utility/Baton.h
 include/lldb/Utility/Broadcaster.h
+include/lldb/Utility/Checksum.h
 include/lldb/Utility/Cloneable.h
 include/lldb/Utility/CompletionRequest.h
 include/lldb/Utility/Connection.h
@@ -496,6 +505,7 @@ include/lldb/Utility/SharedCluster.h
 include/lldb/Utility/State.h
 include/lldb/Utility/Status.h
 include/lldb/Utility/Stream.h
+include/lldb/Utility/StreamBuffer.h
 include/lldb/Utility/StreamString.h
 include/lldb/Utility/StreamTee.h
 include/lldb/Utility/StringExtractor.h
@@ -503,6 +513,7 @@ include/lldb/Utility/StringExtractorGDBR
 include/lldb/Utility/StringLexer.h
 include/lldb/Utility/StringList.h
 include/lldb/Utility/StructuredData.h
+include/lldb/Utility/SupportFile.h
 include/lldb/Utility/ThreadSafeDenseMap.h
 include/lldb/Utility/TildeExpressionResolver.h
 include/lldb/Utility/Timeout.h
@@ -533,23 +544,3 @@ include/lldb/lldb-versioning.h
 lib/liblldb.so
 lib/liblldb.so.${LLVM_MAJOR_VERSION}
 lib/liblldb.so.${PKGVERSION}
-lib/lua/5.3/lldb.so
-${PYSITELIB}/lldb/__init__.py
-${PYSITELIB}/lldb/_lldb.so
-${PYSITELIB}/lldb/embedded_interpreter.py
-${PYSITELIB}/lldb/formatters/Logger.py
-${PYSITELIB}/lldb/formatters/__init__.py
-${PYSITELIB}/lldb/formatters/attrib_fromdict.py
-${PYSITELIB}/lldb/formatters/cache.py
-${PYSITELIB}/lldb/formatters/cpp/__init__.py
-${PYSITELIB}/lldb/formatters/cpp/gnu_libstdcpp.py
-${PYSITELIB}/lldb/formatters/cpp/libcxx.py
-${PYSITELIB}/lldb/formatters/metrics.py
-${PYSITELIB}/lldb/formatters/synth.py
-${PYSITELIB}/lldb/lldb-argdumper
-${PYSITELIB}/lldb/plugins/__init__.py
-${PYSITELIB}/lldb/plugins/scripted_platform.py
-${PYSITELIB}/lldb/plugins/scripted_process.py
-${PYSITELIB}/lldb/utils/__init__.py
-${PYSITELIB}/lldb/utils/in_call_stack.py
-${PYSITELIB}/lldb/utils/symbolication.py

Index: pkgsrc/devel/lldb/PLIST.Darwin
diff -u pkgsrc/devel/lldb/PLIST.Darwin:1.7 pkgsrc/devel/lldb/PLIST.Darwin:1.8
--- pkgsrc/devel/lldb/PLIST.Darwin:1.7  Mon Nov 14 18:44:05 2022
+++ pkgsrc/devel/lldb/PLIST.Darwin      Sat Jul  6 15:45:08 2024
@@ -1,12 +1,3 @@
-@comment $NetBSD: PLIST.Darwin,v 1.7 2022/11/14 18:44:05 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.8 2024/07/06 15:45:08 adam Exp $
 bin/darwin-debug
 bin/debugserver
-${PYSITELIB}/lldb/diagnose/__init__.py
-${PYSITELIB}/lldb/diagnose/diagnose_nsstring.py
-${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/PLIST.Linux
diff -u pkgsrc/devel/lldb/PLIST.Linux:1.3 pkgsrc/devel/lldb/PLIST.Linux:1.4
--- pkgsrc/devel/lldb/PLIST.Linux:1.3   Fri Oct  6 19:15:19 2023
+++ pkgsrc/devel/lldb/PLIST.Linux       Sat Jul  6 15:45:08 2024
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2023/10/06 19:15:19 adam Exp $
+@comment $NetBSD: PLIST.Linux,v 1.4 2024/07/06 15:45:08 adam Exp $
 lib/liblldbIntelFeatures.so
 lib/liblldbIntelFeatures.so.${LLVM_MAJOR_VERSION}

Index: pkgsrc/devel/lldb/buildlink3.mk
diff -u pkgsrc/devel/lldb/buildlink3.mk:1.20 pkgsrc/devel/lldb/buildlink3.mk:1.21
--- pkgsrc/devel/lldb/buildlink3.mk:1.20        Mon Apr 22 07:06:39 2024
+++ pkgsrc/devel/lldb/buildlink3.mk     Sat Jul  6 15:45:08 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.20 2024/04/22 07:06:39 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2024/07/06 15:45:08 adam Exp $
 
 BUILDLINK_TREE+=       lldb
 
 .if !defined(LLDB_BUILDLINK3_MK)
 LLDB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lldb+=   lldb>=17.0.0<18
-BUILDLINK_ABI_DEPENDS.lldb+=   lldb>=17.0.0
+BUILDLINK_API_DEPENDS.lldb+=   lldb>=18.0.0
+BUILDLINK_ABI_DEPENDS.lldb+=   lldb>=18.0.0
 BUILDLINK_PKGSRCDIR.lldb?=     ../../devel/lldb
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/devel/lldb/distinfo
diff -u pkgsrc/devel/lldb/distinfo:1.37 pkgsrc/devel/lldb/distinfo:1.38
--- pkgsrc/devel/lldb/distinfo:1.37     Mon Apr 22 07:06:39 2024
+++ pkgsrc/devel/lldb/distinfo  Sat Jul  6 15:45:08 2024
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.37 2024/04/22 07:06:39 adam Exp $
+$NetBSD: distinfo,v 1.38 2024/07/06 15:45:08 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (lldb-17.0.6.src.tar.xz) = b11c531823763d748df262917a95f8011695c504c9e227baca32716cdb7f7024
-SHA512 (lldb-17.0.6.src.tar.xz) = 80b327c89b160b1dcdbea1946a7c69514e797056629c0a7501c77e7557d6bb3a7ae6ecdd0d760d072b1f7c3f5b136838f76c8d75522cd84622a03b1b25ba6e6c
-Size (lldb-17.0.6.src.tar.xz) = 10493512 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (lldb-18.1.8.src.tar.xz) = 767a50b8585d137633b02f0d8dfcd9ef7e665b4b8c66f49810ce9890a11db998
+SHA512 (lldb-18.1.8.src.tar.xz) = f356a657d1aec860aeaaeb3aa3190652735160dd1e86dfbbae0441ace0a21cc774621198b0fc26c37d3e7c34d68d8a5f56806097f0c8d94718f5fc03495b1a3e
+Size (lldb-18.1.8.src.tar.xz) = 10598652 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
 SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 773d420c3fd2c9b4af6af9d42c5778e96a1ae52b
 SHA1 (patch-source_API_CMakeLists.txt) = 23a7b24632f937a4541863aff6a7591255cafe40
 SHA1 (patch-source_Host_common_Editline.cpp) = 40d78016a3932b77f7176628bfa60b3c96b80c6a
-SHA1 (patch-source_Host_netbsd_HostNetBSD.cpp) = 8c19657d90ffea176b1297331fd23a8b565c6f1d
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 15c6d8399198de567b4e901533e1b1f77d9e348f
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 26a7298b835b97b89257975f7e87f0f8225e5f99

Index: pkgsrc/devel/lldb/options.mk
diff -u pkgsrc/devel/lldb/options.mk:1.2 pkgsrc/devel/lldb/options.mk:1.3
--- pkgsrc/devel/lldb/options.mk:1.2    Fri Apr 26 20:07:15 2024
+++ pkgsrc/devel/lldb/options.mk        Sat Jul  6 15:45:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2024/04/26 20:07:15 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2024/07/06 15:45:08 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lldb
 

Index: pkgsrc/devel/lldb/patches/patch-source_Host_common_Editline.cpp
diff -u pkgsrc/devel/lldb/patches/patch-source_Host_common_Editline.cpp:1.1 pkgsrc/devel/lldb/patches/patch-source_Host_common_Editline.cpp:1.2
--- pkgsrc/devel/lldb/patches/patch-source_Host_common_Editline.cpp:1.1 Fri Oct  6 19:15:20 2023
+++ pkgsrc/devel/lldb/patches/patch-source_Host_common_Editline.cpp     Sat Jul  6 15:45:08 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-source_Host_common_Editline.cpp,v 1.1 2023/10/06 19:15:20 adam Exp $
+$NetBSD: patch-source_Host_common_Editline.cpp,v 1.2 2024/07/06 15:45:08 adam Exp $
 
 Remove the hack for Darwin.
 

Index: pkgsrc/devel/polly/Makefile
diff -u pkgsrc/devel/polly/Makefile:1.24 pkgsrc/devel/polly/Makefile:1.25
--- pkgsrc/devel/polly/Makefile:1.24    Mon Apr 29 09:55:10 2024
+++ pkgsrc/devel/polly/Makefile Sat Jul  6 15:45:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/04/29 09:55:10 nia Exp $
+# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:08 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -13,7 +13,7 @@ LICENSE=      apache-2.0
 
 DEPENDS+=      llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm
 
-USE_CXX_FEATURES+=     c++17
+USE_CXX_FEATURES=      c++17
 FORCE_CXX_STD=         c++17
 USE_LANGUAGES=         c c++
 GCC_REQD+=             4.8

Index: pkgsrc/devel/polly/PLIST
diff -u pkgsrc/devel/polly/PLIST:1.12 pkgsrc/devel/polly/PLIST:1.13
--- pkgsrc/devel/polly/PLIST:1.12       Mon Apr 22 07:25:56 2024
+++ pkgsrc/devel/polly/PLIST    Sat Jul  6 15:45:08 2024
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2024/04/22 07:25:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2024/07/06 15:45:08 adam Exp $
 include/polly/Canonicalization.h
 include/polly/CodeGen/BlockGenerators.h
 include/polly/CodeGen/CodeGeneration.h
-include/polly/CodeGen/CodegenCleanup.h
 include/polly/CodeGen/IRBuilder.h
 include/polly/CodeGen/IslAst.h
 include/polly/CodeGen/IslExprBuilder.h

Index: pkgsrc/devel/polly/buildlink3.mk
diff -u pkgsrc/devel/polly/buildlink3.mk:1.9 pkgsrc/devel/polly/buildlink3.mk:1.10
--- pkgsrc/devel/polly/buildlink3.mk:1.9        Mon Apr 22 07:25:56 2024
+++ pkgsrc/devel/polly/buildlink3.mk    Sat Jul  6 15:45:08 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2024/04/22 07:25:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2024/07/06 15:45:08 adam Exp $
 
 BUILDLINK_TREE+=       polly
 
 .if !defined(POLLY_BUILDLINK3_MK)
 POLLY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.polly+=  polly>=17.0.0<18
+BUILDLINK_API_DEPENDS.polly+=  polly>=18.0.0
 BUILDLINK_PKGSRCDIR.polly?=    ../../devel/polly
 
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/devel/polly/distinfo
diff -u pkgsrc/devel/polly/distinfo:1.31 pkgsrc/devel/polly/distinfo:1.32
--- pkgsrc/devel/polly/distinfo:1.31    Mon Apr 22 07:25:56 2024
+++ pkgsrc/devel/polly/distinfo Sat Jul  6 15:45:08 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.31 2024/04/22 07:25:56 adam Exp $
+$NetBSD: distinfo,v 1.32 2024/07/06 15:45:08 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (polly-17.0.6.src.tar.xz) = 63978c455a4d3d0c0235133d5a0424dc3f17efece9c38795bcf0c67ef741e1ac
-SHA512 (polly-17.0.6.src.tar.xz) = 2ccba166cc7a7f94e04f41ff5bd3b2447a7049cfa44cdc1091da265d36c1431372cf7c843b410dc7052da820107fa46990cb852894595cd2ca2751a81a168332
-Size (polly-17.0.6.src.tar.xz) = 9219324 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (polly-18.1.8.src.tar.xz) = 0b3cf94acff01104fb8cee9d242fee062efb4eddfa4d2e0c2559c894e7335385
+SHA512 (polly-18.1.8.src.tar.xz) = c6186f42c821a542a4c85326023bed82031b9ff3a77deff9644929a93d66d88f19f7b76c190273e50fdfdae41572687576cb24fa6799c407fab0fea0b5fee991
+Size (polly-18.1.8.src.tar.xz) = 9159676 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes

Index: pkgsrc/lang/clang/Makefile
diff -u pkgsrc/lang/clang/Makefile:1.85 pkgsrc/lang/clang/Makefile:1.86
--- pkgsrc/lang/clang/Makefile:1.85     Wed May 29 16:33:13 2024
+++ pkgsrc/lang/clang/Makefile  Sat Jul  6 15:45:07 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.85 2024/05/29 16:33:13 adam Exp $
+# $NetBSD: Makefile,v 1.86 2024/07/06 15:45:07 adam Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/.src//}

Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.58 pkgsrc/lang/clang/Makefile.common:1.59
--- pkgsrc/lang/clang/Makefile.common:1.58      Mon Jun 17 11:27:02 2024
+++ pkgsrc/lang/clang/Makefile.common   Sat Jul  6 15:45:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2024/06/17 11:27:02 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.59 2024/07/06 15:45:07 adam Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-tools-extra/Makefile
 
@@ -115,26 +115,21 @@ LIBCPP_CHECK=     NO
 CMAKE_ARGS+=                   -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
 .endif
 
-# On SunOS use the libraries from the GCC used to build clang rather than
-# aimlessly searching the file system for ones that might be incompatible.
-#
-SUBST_CLASSES.SunOS+=  sunos-gcc
-SUBST_STAGE.sunos-gcc= pre-configure
-SUBST_FILES.sunos-gcc= lib/Driver/ToolChains/Gnu.cpp
-SUBST_SED.sunos-gcc=   -e 's,@GCCBASEDIR@,${CCPATH:H:H},'
-
-# Not perfect, but should catch most common cases.  We can't simply use
-# gcc-libs as that doesn't ship the headers.
-#
-.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Mgcc}
-BUILDLINK_DEPMETHOD.${_GCC_PKGBASE}=   full
+# Enable full LLVM suite on SunOS
+.if ${OPSYS} == "SunOS"
+.include "../../lang/compiler-rt/buildlink3.mk"
+.include "../../lang/libcxx/buildlink3.mk"
+.include "../../lang/libcxxabi/buildlink3.mk"
+.include "../../lang/libunwind/buildlink3.mk"
+CMAKE_ARGS+=    -DCLANG_DEFAULT_RTLIB:STRING="compiler-rt"
+CMAKE_ARGS+=    -DCLANG_DEFAULT_CXX_STDLIB:STRING="libc++"
 .endif
 
 # 3.8.0 -> 3.8
 LLVM_MAJOR=    ${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/}
 PLIST_SUBST+=  LLVM_MAJOR=${LLVM_MAJOR}
 
-PKGVERSION_MAJOR=      17
+PKGVERSION_MAJOR=      18
 PLIST_SUBST+=          PKGVERSION_MAJOR=${PKGVERSION_MAJOR}
 
 PLIST_VARS+=   notdylib

Index: pkgsrc/lang/clang/PLIST
diff -u pkgsrc/lang/clang/PLIST:1.39 pkgsrc/lang/clang/PLIST:1.40
--- pkgsrc/lang/clang/PLIST:1.39        Mon Apr 22 07:03:35 2024
+++ pkgsrc/lang/clang/PLIST     Sat Jul  6 15:45:07 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2024/04/22 07:03:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2024/07/06 15:45:07 adam Exp $
 bin/amdgpu-arch
 bin/analyze-build
 bin/c-index-test
@@ -38,11 +38,16 @@ include/clang-c/FatalErrorHandler.h
 include/clang-c/Index.h
 include/clang-c/Platform.h
 include/clang-c/Rewrite.h
+include/clang/APINotes/APINotesManager.h
+include/clang/APINotes/APINotesOptions.h
+include/clang/APINotes/APINotesReader.h
+include/clang/APINotes/APINotesWriter.h
 include/clang/APINotes/APINotesYAMLCompiler.h
 include/clang/APINotes/Types.h
 include/clang/ARCMigrate/ARCMT.h
 include/clang/ARCMigrate/ARCMTActions.h
 include/clang/ARCMigrate/FileRemapper.h
+include/clang/AST/APNumericStorage.h
 include/clang/AST/APValue.h
 include/clang/AST/AST.h
 include/clang/AST/ASTConcept.h
@@ -241,6 +246,7 @@ include/clang/Analysis/FlowSensitive/Mod
 include/clang/Analysis/FlowSensitive/NoopAnalysis.h
 include/clang/Analysis/FlowSensitive/NoopLattice.h
 include/clang/Analysis/FlowSensitive/RecordOps.h
+include/clang/Analysis/FlowSensitive/SimplifyConstraints.h
 include/clang/Analysis/FlowSensitive/Solver.h
 include/clang/Analysis/FlowSensitive/StorageLocation.h
 include/clang/Analysis/FlowSensitive/Transfer.h
@@ -261,10 +267,11 @@ include/clang/Basic/AlignedAllocation.h
 include/clang/Basic/AllDiagnostics.h
 include/clang/Basic/AttrHasAttributeImpl.inc
 include/clang/Basic/AttrKinds.h
+include/clang/Basic/AttrLeftSideCanPrintList.inc
+include/clang/Basic/AttrLeftSideMustPrintList.inc
 include/clang/Basic/AttrList.inc
 include/clang/Basic/AttrSubMatchRulesList.inc
 include/clang/Basic/AttrSubjectMatchRules.h
-include/clang/Basic/AttrTokenKinds.inc
 include/clang/Basic/AttributeCommonInfo.h
 include/clang/Basic/Attributes.h
 include/clang/Basic/BitmaskEnum.h
@@ -281,6 +288,9 @@ include/clang/Basic/BuiltinsHexagon.def
 include/clang/Basic/BuiltinsHexagonDep.def
 include/clang/Basic/BuiltinsHexagonMapCustomDep.def
 include/clang/Basic/BuiltinsLoongArch.def
+include/clang/Basic/BuiltinsLoongArchBase.def
+include/clang/Basic/BuiltinsLoongArchLASX.def
+include/clang/Basic/BuiltinsLoongArchLSX.def
 include/clang/Basic/BuiltinsMips.def
 include/clang/Basic/BuiltinsNEON.def
 include/clang/Basic/BuiltinsNVPTX.def
@@ -305,6 +315,7 @@ include/clang/Basic/CommentOptions.h
 include/clang/Basic/Cuda.h
 include/clang/Basic/CustomizableOptional.h
 include/clang/Basic/DarwinSDKInfo.h
+include/clang/Basic/DebugOptions.def
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticAST.h
 include/clang/Basic/DiagnosticASTKinds.inc
@@ -362,6 +373,7 @@ include/clang/Basic/MakeSupport.h
 include/clang/Basic/Module.h
 include/clang/Basic/NoSanitizeList.h
 include/clang/Basic/ObjCRuntime.h
+include/clang/Basic/OpenACCKinds.h
 include/clang/Basic/OpenCLExtensionTypes.def
 include/clang/Basic/OpenCLExtensions.def
 include/clang/Basic/OpenCLImageTypes.def
@@ -379,6 +391,7 @@ include/clang/Basic/PragmaKinds.h
 include/clang/Basic/PrettyStackTrace.h
 include/clang/Basic/ProfileList.h
 include/clang/Basic/RISCVVTypes.def
+include/clang/Basic/RegularKeywordAttrInfo.inc
 include/clang/Basic/SanitizerSpecialCaseList.h
 include/clang/Basic/Sanitizers.def
 include/clang/Basic/Sanitizers.h
@@ -386,6 +399,7 @@ include/clang/Basic/Sarif.h
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
+include/clang/Basic/SourceMgrAdapter.h
 include/clang/Basic/Specifiers.h
 include/clang/Basic/Stack.h
 include/clang/Basic/SyncScope.h
@@ -394,6 +408,7 @@ include/clang/Basic/TargetCXXABI.def
 include/clang/Basic/TargetCXXABI.h
 include/clang/Basic/TargetID.h
 include/clang/Basic/TargetInfo.h
+include/clang/Basic/TargetOSMacros.def
 include/clang/Basic/TargetOptions.h
 include/clang/Basic/TemplateKinds.h
 include/clang/Basic/Thunk.h
@@ -419,10 +434,13 @@ include/clang/Basic/arm_mve_builtins.inc
 include/clang/Basic/arm_neon.inc
 include/clang/Basic/arm_sme_builtin_cg.inc
 include/clang/Basic/arm_sme_builtins.inc
+include/clang/Basic/arm_sme_builtins_za_state.inc
 include/clang/Basic/arm_sme_sema_rangechecks.inc
+include/clang/Basic/arm_sme_streaming_attrs.inc
 include/clang/Basic/arm_sve_builtin_cg.inc
 include/clang/Basic/arm_sve_builtins.inc
 include/clang/Basic/arm_sve_sema_rangechecks.inc
+include/clang/Basic/arm_sve_streaming_attrs.inc
 include/clang/Basic/arm_sve_typeflags.inc
 include/clang/Basic/riscv_sifive_vector_builtin_cg.inc
 include/clang/Basic/riscv_sifive_vector_builtin_sema.inc
@@ -519,6 +537,7 @@ include/clang/Index/IndexingAction.h
 include/clang/Index/IndexingOptions.h
 include/clang/Index/USRGeneration.h
 include/clang/IndexSerialization/SerializablePathCollection.h
+include/clang/Interpreter/CodeCompletion.h
 include/clang/Interpreter/Interpreter.h
 include/clang/Interpreter/PartialTranslationUnit.h
 include/clang/Interpreter/Value.h
@@ -635,6 +654,7 @@ include/clang/StaticAnalyzer/Core/Analyz
 include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
+include/clang/StaticAnalyzer/Core/BugReporter/BugSuppression.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
 include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h
 include/clang/StaticAnalyzer/Core/Checker.h
@@ -776,9 +796,24 @@ lib/clang/${PKGVERSION_MAJOR}/include/__
 lib/clang/${PKGVERSION_MAJOR}/include/__clang_hip_math.h
 lib/clang/${PKGVERSION_MAJOR}/include/__clang_hip_runtime_wrapper.h
 lib/clang/${PKGVERSION_MAJOR}/include/__clang_hip_stdlib.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stdarg___gnuc_va_list.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stdarg___va_copy.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stdarg_va_arg.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stdarg_va_copy.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stdarg_va_list.h
 lib/clang/${PKGVERSION_MAJOR}/include/__stddef_max_align_t.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_null.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_nullptr_t.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_offsetof.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_ptrdiff_t.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_rsize_t.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_size_t.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_unreachable.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_wchar_t.h
+lib/clang/${PKGVERSION_MAJOR}/include/__stddef_wint_t.h
 lib/clang/${PKGVERSION_MAJOR}/include/__wmmintrin_aes.h
 lib/clang/${PKGVERSION_MAJOR}/include/__wmmintrin_pclmul.h
+lib/clang/${PKGVERSION_MAJOR}/include/adcintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/adxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/altivec.h
 lib/clang/${PKGVERSION_MAJOR}/include/ammintrin.h
@@ -787,15 +822,16 @@ lib/clang/${PKGVERSION_MAJOR}/include/am
 lib/clang/${PKGVERSION_MAJOR}/include/amxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm64intr.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm_acle.h
-${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_bf16.h
-${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_cde.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_bf16.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_cde.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm_cmse.h
-${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_fp16.h
-${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_mve.h
-${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_neon.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_fp16.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_mve.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_neon.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm_neon_sve_bridge.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_sme_draft_spec_subject_to_change.h
-${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_sve.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_sme.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_sve.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_vector_types.h
 lib/clang/${PKGVERSION_MAJOR}/include/armintr.h
 lib/clang/${PKGVERSION_MAJOR}/include/avx2intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/avx512bf16intrin.h
@@ -874,12 +910,16 @@ lib/clang/${PKGVERSION_MAJOR}/include/in
 lib/clang/${PKGVERSION_MAJOR}/include/iso646.h
 lib/clang/${PKGVERSION_MAJOR}/include/keylockerintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/larchintrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/lasxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/limits.h
+lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/assert.h
 lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/ctype.h
 lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/inttypes.h
 lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/stdio.h
 lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/stdlib.h
 lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/string.h
+lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/time.h
+lib/clang/${PKGVERSION_MAJOR}/include/lsxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/lwpintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/lzcntintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/mm3dnow.h
@@ -909,6 +949,7 @@ lib/clang/${PKGVERSION_MAJOR}/include/pp
 lib/clang/${PKGVERSION_MAJOR}/include/ppc_wrappers/immintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/ppc_wrappers/mm_malloc.h
 lib/clang/${PKGVERSION_MAJOR}/include/ppc_wrappers/mmintrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/ppc_wrappers/nmmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/ppc_wrappers/pmmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/ppc_wrappers/smmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/ppc_wrappers/tmmintrin.h
@@ -921,8 +962,10 @@ lib/clang/${PKGVERSION_MAJOR}/include/pt
 lib/clang/${PKGVERSION_MAJOR}/include/raointintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/rdpruintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/rdseedintrin.h
-${PLIST.RISCV}lib/clang/${PKGVERSION_MAJOR}/include/riscv_ntlh.h
-${PLIST.RISCV}lib/clang/${PKGVERSION_MAJOR}/include/riscv_vector.h
+lib/clang/${PKGVERSION_MAJOR}/include/riscv_bitmanip.h
+lib/clang/${PKGVERSION_MAJOR}/include/riscv_crypto.h
+lib/clang/${PKGVERSION_MAJOR}/include/riscv_ntlh.h
+lib/clang/${PKGVERSION_MAJOR}/include/riscv_vector.h
 lib/clang/${PKGVERSION_MAJOR}/include/rtmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/s390intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/serializeintrin.h
@@ -937,6 +980,7 @@ lib/clang/${PKGVERSION_MAJOR}/include/st
 lib/clang/${PKGVERSION_MAJOR}/include/stdarg.h
 lib/clang/${PKGVERSION_MAJOR}/include/stdatomic.h
 lib/clang/${PKGVERSION_MAJOR}/include/stdbool.h
+lib/clang/${PKGVERSION_MAJOR}/include/stdckdint.h
 lib/clang/${PKGVERSION_MAJOR}/include/stddef.h
 lib/clang/${PKGVERSION_MAJOR}/include/stdint.h
 lib/clang/${PKGVERSION_MAJOR}/include/stdnoreturn.h
@@ -946,6 +990,7 @@ lib/clang/${PKGVERSION_MAJOR}/include/tm
 lib/clang/${PKGVERSION_MAJOR}/include/tsxldtrkintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/uintrintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/unwind.h
+lib/clang/${PKGVERSION_MAJOR}/include/usermsrintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/vadefs.h
 lib/clang/${PKGVERSION_MAJOR}/include/vaesintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/varargs.h
@@ -973,10 +1018,10 @@ lib/cmake/clang/ClangConfigVersion.cmake
 lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
 lib/libclang-cpp.${SOEXT}
-${PLIST.notdylib}lib/libclang-cpp.so.${PKGVERSION_MAJOR}
+${PLIST.notdylib}lib/libclang-cpp.so.18.1
 lib/libclang.${SOEXT}
-${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION_MAJOR}
 ${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION}
+${PLIST.notdylib}lib/libclang.${SOEXT}.18.1
 lib/libclangAPINotes.a
 lib/libclangARCMigrate.a
 lib/libclangAST.a

Index: pkgsrc/lang/clang/buildlink3.mk
diff -u pkgsrc/lang/clang/buildlink3.mk:1.29 pkgsrc/lang/clang/buildlink3.mk:1.30
--- pkgsrc/lang/clang/buildlink3.mk:1.29        Wed May 29 17:18:40 2024
+++ pkgsrc/lang/clang/buildlink3.mk     Sat Jul  6 15:45:07 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.29 2024/05/29 17:18:40 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2024/07/06 15:45:07 adam Exp $
 
 BUILDLINK_TREE+=       clang
 
 .if !defined(CLANG_BUILDLINK3_MK)
 CLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clang+=  clang>=17.0.0<18
-BUILDLINK_ABI_DEPENDS.clang+=  clang>=17.0.0
+BUILDLINK_API_DEPENDS.clang+=  clang>=18.0.0
+BUILDLINK_ABI_DEPENDS.clang+=  clang>=18.0.0
 BUILDLINK_PKGSRCDIR.clang?=    ../../lang/clang
 
 BUILDLINK_FILES.clang+=                bin/amdgpu-arch
@@ -14,7 +14,7 @@ BUILDLINK_FILES.clang+=               bin/analyze-bui
 BUILDLINK_FILES.clang+=                bin/c-index-test
 BUILDLINK_FILES.clang+=                bin/clang
 BUILDLINK_FILES.clang+=                bin/clang++
-BUILDLINK_FILES.clang+=                bin/clang-17
+BUILDLINK_FILES.clang+=                bin/clang-18
 BUILDLINK_FILES.clang+=                bin/clang-check
 BUILDLINK_FILES.clang+=                bin/clang-cl
 BUILDLINK_FILES.clang+=                bin/clang-cpp

Index: pkgsrc/lang/clang/distinfo
diff -u pkgsrc/lang/clang/distinfo:1.84 pkgsrc/lang/clang/distinfo:1.85
--- pkgsrc/lang/clang/distinfo:1.84     Mon Jun 17 11:26:11 2024
+++ pkgsrc/lang/clang/distinfo  Sat Jul  6 15:45:07 2024
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.84 2024/06/17 11:26:11 jperkin Exp $
+$NetBSD: distinfo,v 1.85 2024/07/06 15:45:07 adam Exp $
 
-BLAKE2s (clang-17.0.6.src.tar.xz) = 888020252b920ca120cc022d13cf411d7dc024f4076ccaff5eccc38dc1e4b438
-SHA512 (clang-17.0.6.src.tar.xz) = da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439
-Size (clang-17.0.6.src.tar.xz) = 21577596 bytes
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
-SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 0dcfbf3c8b0006e3314c36a75995032891ea8ceb
-SHA1 (patch-lib_Driver_ToolChain.cpp) = 06002fa45d16f9b9385f8a7a947aaf3970007938
-SHA1 (patch-lib_Driver_ToolChains_Gnu.cpp) = 2db0a13db660ad0b7cd87199da36653b1e8113b5
+BLAKE2s (clang-18.1.8.src.tar.xz) = 7b596722003d9519baaa1f49320bc7ce80f3da104d96df834ebbc0778cb3cfa7
+SHA512 (clang-18.1.8.src.tar.xz) = 4147ef5e3547e80fbea573a6e3964870b38e7a547e796deb8859ca670b039ddd1af289cd4feadcb4ab5e94211b2ab5e91dfa84f58f114fdcbc9e807c9de901ca
+Size (clang-18.1.8.src.tar.xz) = 22155252 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
+SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 4b511871c8a38d57f3fddc4a6c0e921ff53194cb
+SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
+SHA1 (patch-lib_Driver_ToolChains_Gnu.cpp) = 4840adc48240ee8af641af6c3bd4932bb83d92f7
+SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = ff430e567c901f4c55739c91588821441278a651
+SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 7de96cf9c55e78158de49d38eceb5aaf98a009db
 SHA1 (patch-lib_Interpreter_IncrementalParser.cpp) = c5ace959ce566478316447b1621e9bfd9a537cc5
-SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = d37f5f2fff2fb358911875f73f5bf48446940436
-SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = d6ce7370fca44b4ea4120c1e189931ca5e2bdd5b
-SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525

Index: pkgsrc/lang/clang-tools-extra/Makefile
diff -u pkgsrc/lang/clang-tools-extra/Makefile:1.29 pkgsrc/lang/clang-tools-extra/Makefile:1.30
--- pkgsrc/lang/clang-tools-extra/Makefile:1.29 Wed May 29 16:33:13 2024
+++ pkgsrc/lang/clang-tools-extra/Makefile      Sat Jul  6 15:45:08 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2024/05/29 16:33:13 adam Exp $
+# $NetBSD: Makefile,v 1.30 2024/07/06 15:45:08 adam Exp $
 
 INSTALL_DIRS=  build/tools/extra
 
-PKGREVISION= 1
 .include "../../lang/clang/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/clang/clang-tools-extra/:S/.src//}

Index: pkgsrc/lang/clang-tools-extra/PLIST
diff -u pkgsrc/lang/clang-tools-extra/PLIST:1.9 pkgsrc/lang/clang-tools-extra/PLIST:1.10
--- pkgsrc/lang/clang-tools-extra/PLIST:1.9     Mon Apr 22 07:04:01 2024
+++ pkgsrc/lang/clang-tools-extra/PLIST Sat Jul  6 15:45:08 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2024/04/22 07:04:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2024/07/06 15:45:08 adam Exp $
 bin/clang-apply-replacements
 bin/clang-change-namespace
 bin/clang-doc
@@ -75,6 +75,9 @@ include/clang-tidy/bugprone/AssignmentIn
 include/clang-tidy/bugprone/BadSignalToKillThreadCheck.h
 include/clang-tidy/bugprone/BoolPointerImplicitConversionCheck.h
 include/clang-tidy/bugprone/BranchCloneCheck.h
+include/clang-tidy/bugprone/CastingThroughVoidCheck.h
+include/clang-tidy/bugprone/ChainedComparisonCheck.h
+include/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.h
 include/clang-tidy/bugprone/CopyConstructorInitCheck.h
 include/clang-tidy/bugprone/DanglingHandleCheck.h
 include/clang-tidy/bugprone/DynamicStaticInitializersCheck.h
@@ -86,6 +89,8 @@ include/clang-tidy/bugprone/ForwardDecla
 include/clang-tidy/bugprone/ForwardingReferenceOverloadCheck.h
 include/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.h
 include/clang-tidy/bugprone/InaccurateEraseCheck.h
+include/clang-tidy/bugprone/IncDecInConditionsCheck.h
+include/clang-tidy/bugprone/IncorrectEnableIfCheck.h
 include/clang-tidy/bugprone/IncorrectRoundingsCheck.h
 include/clang-tidy/bugprone/InfiniteLoopCheck.h
 include/clang-tidy/bugprone/IntegerDivisionCheck.h
@@ -96,11 +101,13 @@ include/clang-tidy/bugprone/MisplacedOpe
 include/clang-tidy/bugprone/MisplacedPointerArithmeticInAllocCheck.h
 include/clang-tidy/bugprone/MisplacedWideningCastCheck.h
 include/clang-tidy/bugprone/MoveForwardingReferenceCheck.h
+include/clang-tidy/bugprone/MultiLevelImplicitPointerConversionCheck.h
 include/clang-tidy/bugprone/MultipleNewInOneExpressionCheck.h
 include/clang-tidy/bugprone/MultipleStatementMacroCheck.h
 include/clang-tidy/bugprone/NoEscapeCheck.h
 include/clang-tidy/bugprone/NonZeroEnumToBoolConversionCheck.h
 include/clang-tidy/bugprone/NotNullTerminatedResultCheck.h
+include/clang-tidy/bugprone/OptionalValueConversionCheck.h
 include/clang-tidy/bugprone/ParentVirtualCallCheck.h
 include/clang-tidy/bugprone/PosixReturnCheck.h
 include/clang-tidy/bugprone/RedundantBranchConditionCheck.h
@@ -137,6 +144,7 @@ include/clang-tidy/bugprone/UnhandledExc
 include/clang-tidy/bugprone/UnhandledSelfAssignmentCheck.h
 include/clang-tidy/bugprone/UniquePtrArrayMismatchCheck.h
 include/clang-tidy/bugprone/UnsafeFunctionsCheck.h
+include/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.h
 include/clang-tidy/bugprone/UnusedRaiiCheck.h
 include/clang-tidy/bugprone/UnusedReturnValueCheck.h
 include/clang-tidy/bugprone/UseAfterMoveCheck.h
@@ -170,6 +178,7 @@ include/clang-tidy/cppcoreguidelines/Mis
 include/clang-tidy/cppcoreguidelines/MissingStdForwardCheck.h
 include/clang-tidy/cppcoreguidelines/NarrowingConversionsCheck.h
 include/clang-tidy/cppcoreguidelines/NoMallocCheck.h
+include/clang-tidy/cppcoreguidelines/NoSuspendWithLockCheck.h
 include/clang-tidy/cppcoreguidelines/OwningMemoryCheck.h
 include/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.h
 include/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.h
@@ -212,6 +221,7 @@ include/clang-tidy/google/UnnamedNamespa
 include/clang-tidy/google/UpgradeGoogletestCaseCheck.h
 include/clang-tidy/google/UsingNamespaceDirectiveCheck.h
 include/clang-tidy/hicpp/ExceptionBaseclassCheck.h
+include/clang-tidy/hicpp/IgnoredRemoveResultCheck.h
 include/clang-tidy/hicpp/MultiwayPathsCoveredCheck.h
 include/clang-tidy/hicpp/NoAssemblerCheck.h
 include/clang-tidy/hicpp/SignedBitwiseCheck.h
@@ -224,9 +234,11 @@ include/clang-tidy/llvm/TwineLocalCheck.
 include/clang-tidy/llvmlibc/CalleeNamespaceCheck.h
 include/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.h
 include/clang-tidy/llvmlibc/InlineFunctionDeclCheck.h
+include/clang-tidy/llvmlibc/NamespaceConstants.h
 include/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.h
 include/clang-tidy/misc/ConfusableIdentifierCheck.h
 include/clang-tidy/misc/ConstCorrectnessCheck.h
+include/clang-tidy/misc/CoroutineHostileRAIICheck.h
 include/clang-tidy/misc/DefinitionsInHeadersCheck.h
 include/clang-tidy/misc/HeaderIncludeCycleCheck.h
 include/clang-tidy/misc/IncludeCleanerCheck.h
@@ -270,6 +282,7 @@ include/clang-tidy/modernize/TypeTraitsC
 include/clang-tidy/modernize/UnaryStaticAssertCheck.h
 include/clang-tidy/modernize/UseAutoCheck.h
 include/clang-tidy/modernize/UseBoolLiteralsCheck.h
+include/clang-tidy/modernize/UseConstraintsCheck.h
 include/clang-tidy/modernize/UseDefaultMemberInitCheck.h
 include/clang-tidy/modernize/UseEmplaceCheck.h
 include/clang-tidy/modernize/UseEqualsDefaultCheck.h
@@ -278,6 +291,8 @@ include/clang-tidy/modernize/UseNodiscar
 include/clang-tidy/modernize/UseNoexceptCheck.h
 include/clang-tidy/modernize/UseNullptrCheck.h
 include/clang-tidy/modernize/UseOverrideCheck.h
+include/clang-tidy/modernize/UseStartsEndsWithCheck.h
+include/clang-tidy/modernize/UseStdNumbersCheck.h
 include/clang-tidy/modernize/UseStdPrintCheck.h
 include/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
 include/clang-tidy/modernize/UseTransparentFunctorsCheck.h
@@ -297,6 +312,7 @@ include/clang-tidy/objc/SuperSelfCheck.h
 include/clang-tidy/openmp/ExceptionEscapeCheck.h
 include/clang-tidy/openmp/UseDefaultNoneCheck.h
 include/clang-tidy/performance/AvoidEndlCheck.h
+include/clang-tidy/performance/EnumSizeCheck.h
 include/clang-tidy/performance/FasterStringFindCheck.h
 include/clang-tidy/performance/ForRangeCopyCheck.h
 include/clang-tidy/performance/ImplicitConversionInLoopCheck.h
@@ -320,6 +336,8 @@ include/clang-tidy/portability/RestrictS
 include/clang-tidy/portability/SIMDIntrinsicsCheck.h
 include/clang-tidy/portability/StdAllocatorConstCheck.h
 include/clang-tidy/readability/AvoidConstParamsInDecls.h
+include/clang-tidy/readability/AvoidNestedConditionalOperatorCheck.h
+include/clang-tidy/readability/AvoidReturnWithVoidValueCheck.h
 include/clang-tidy/readability/AvoidUnconditionalPreprocessorIfCheck.h
 include/clang-tidy/readability/BracesAroundStatementsCheck.h
 include/clang-tidy/readability/ConstReturnTypeCheck.h
@@ -347,14 +365,17 @@ include/clang-tidy/readability/NonConstP
 include/clang-tidy/readability/OperatorsRepresentationCheck.h
 include/clang-tidy/readability/QualifiedAutoCheck.h
 include/clang-tidy/readability/RedundantAccessSpecifiersCheck.h
+include/clang-tidy/readability/RedundantCastingCheck.h
 include/clang-tidy/readability/RedundantControlFlowCheck.h
 include/clang-tidy/readability/RedundantDeclarationCheck.h
 include/clang-tidy/readability/RedundantFunctionPtrDereferenceCheck.h
+include/clang-tidy/readability/RedundantInlineSpecifierCheck.h
 include/clang-tidy/readability/RedundantMemberInitCheck.h
 include/clang-tidy/readability/RedundantPreprocessorCheck.h
 include/clang-tidy/readability/RedundantSmartptrGetCheck.h
 include/clang-tidy/readability/RedundantStringCStrCheck.h
 include/clang-tidy/readability/RedundantStringInitCheck.h
+include/clang-tidy/readability/ReferenceToConstructedTemporaryCheck.h
 include/clang-tidy/readability/SimplifyBooleanExprCheck.h
 include/clang-tidy/readability/SimplifySubscriptExprCheck.h
 include/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h

Index: pkgsrc/lang/clang-tools-extra/distinfo
diff -u pkgsrc/lang/clang-tools-extra/distinfo:1.19 pkgsrc/lang/clang-tools-extra/distinfo:1.20
--- pkgsrc/lang/clang-tools-extra/distinfo:1.19 Mon Apr 22 07:04:01 2024
+++ pkgsrc/lang/clang-tools-extra/distinfo      Sat Jul  6 15:45:08 2024
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.19 2024/04/22 07:04:01 adam Exp $
+$NetBSD: distinfo,v 1.20 2024/07/06 15:45:08 adam Exp $
 
-BLAKE2s (clang-17.0.6.src.tar.xz) = 888020252b920ca120cc022d13cf411d7dc024f4076ccaff5eccc38dc1e4b438
-SHA512 (clang-17.0.6.src.tar.xz) = da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439
-Size (clang-17.0.6.src.tar.xz) = 21577596 bytes
-BLAKE2s (clang-tools-extra-17.0.6.src.tar.xz) = 34adb6dfd8e8cb375e798d0473f70affd3d9a481368754eace97e08416de3412
-SHA512 (clang-tools-extra-17.0.6.src.tar.xz) = 5110dd36ee1c966d22760000f0c28cf070fd00b05445d418d264dbd3b48426a203f934e402d408fab2602dbf39a29d66898cc7c69c1a52b5e0e6e7097f9db877
-Size (clang-tools-extra-17.0.6.src.tar.xz) = 3269980 bytes
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (clang-18.1.8.src.tar.xz) = 7b596722003d9519baaa1f49320bc7ce80f3da104d96df834ebbc0778cb3cfa7
+SHA512 (clang-18.1.8.src.tar.xz) = 4147ef5e3547e80fbea573a6e3964870b38e7a547e796deb8859ca670b039ddd1af289cd4feadcb4ab5e94211b2ab5e91dfa84f58f114fdcbc9e807c9de901ca
+Size (clang-18.1.8.src.tar.xz) = 22155252 bytes
+BLAKE2s (clang-tools-extra-18.1.8.src.tar.xz) = 1d7c6a430a66d8313dc305e4989807aa70f0eb0ecef4e6ebe39f402cb8d8a04c
+SHA512 (clang-tools-extra-18.1.8.src.tar.xz) = e6770875b1bfb3626de2e15133aa819669c889574134b7c22d30882717d0f400a73d2e0e881a2bd707e0b07bca5fcfd1d4a9e83b1101c7f15e4657782659b6fe
+Size (clang-tools-extra-18.1.8.src.tar.xz) = 3340400 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes

Index: pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h
diff -u pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.7 pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.8
--- pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.7   Mon Jun 17 11:26:11 2024
+++ pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h       Sat Jul  6 15:45:07 2024
@@ -1,17 +1,12 @@
-$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.7 2024/06/17 11:26:11 jperkin Exp $
+$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.8 2024/07/06 15:45:07 adam Exp $
 
-Add __illumos__ if the bootstrap compiler also defines it.
-Sync SunOS default defines with what GCC uses.
+Sync SunOS default defines with a working reality.
+NetBSD __float128, needed to build anything with base libstdc++
+which assumes __float128.
 
---- lib/Basic/Targets/OSTargets.h.orig 2023-11-28 08:52:28.000000000 +0000
+--- lib/Basic/Targets/OSTargets.h.orig 2023-10-03 06:37:35.000000000 +0000
 +++ lib/Basic/Targets/OSTargets.h
-@@ -639,25 +639,21 @@ protected:
-   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
-                     MacroBuilder &Builder) const override {
-     DefineStd(Builder, "sun", Opts);
-+#if defined(__illumos__)
-+    DefineStd(Builder, "__illumos__", Opts);
-+#endif
+@@ -628,22 +638,15 @@ protected:
      DefineStd(Builder, "unix", Opts);
      Builder.defineMacro("__svr4__");
      Builder.defineMacro("__SVR4");

Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp:1.3 pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp:1.4
--- pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp:1.3        Thu May  9 14:15:51 2024
+++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp    Sat Jul  6 15:45:07 2024
@@ -1,12 +1,11 @@
-$NetBSD: patch-lib_Driver_ToolChain.cpp,v 1.3 2024/05/09 14:15:51 jperkin Exp $
+$NetBSD: patch-lib_Driver_ToolChain.cpp,v 1.4 2024/07/06 15:45:07 adam Exp $
 
 [LLD] Add NetBSD support as a new flavor of LLD (nb.lld)
 https://reviews.llvm.org/D70048
-Add -R for library paths on SunOS.
 
---- lib/Driver/ToolChain.cpp.orig      2023-11-28 08:52:28.000000000 +0000
+--- lib/Driver/ToolChain.cpp.orig      2019-07-11 19:06:38.000000000 +0000
 +++ lib/Driver/ToolChain.cpp
-@@ -837,6 +837,8 @@ std::string ToolChain::GetLinkerPath(boo
+@@ -506,6 +506,8 @@ std::string ToolChain::GetLinkerPath() c
      llvm::SmallString<8> LinkerName;
      if (Triple.isOSDarwin())
        LinkerName.append("ld64.");
@@ -15,19 +14,3 @@ Add -R for library paths on SunOS.
      else
        LinkerName.append("ld.");
      LinkerName.append(UseLinker);
-@@ -1213,9 +1215,13 @@ void ToolChain::AddCXXStdlibLibArgs(cons
- 
- void ToolChain::AddFilePathLibArgs(const ArgList &Args,
-                                    ArgStringList &CmdArgs) const {
--  for (const auto &LibPath : getFilePaths())
--    if(LibPath.length() > 0)
-+  for (const auto &LibPath : getFilePaths()) {
-+    if(LibPath.length() > 0) {
-       CmdArgs.push_back(Args.MakeArgString(StringRef("-L") + LibPath));
-+      if (Triple.isOSSolaris())
-+        CmdArgs.push_back(Args.MakeArgString(StringRef("-R") + LibPath));
-+    }
-+  }
- }
- 
- void ToolChain::AddCCKextLibArgs(const ArgList &Args,

Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Gnu.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Gnu.cpp:1.1 pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Gnu.cpp:1.2
--- pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Gnu.cpp:1.1   Thu May  9 14:15:51 2024
+++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Gnu.cpp       Sat Jul  6 15:45:07 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_Driver_ToolChains_Gnu.cpp,v 1.1 2024/05/09 14:15:51 jperkin Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Gnu.cpp,v 1.2 2024/07/06 15:45:07 adam Exp $
 
 On SunOS always use the GCC that was used to build clang.
 Support x86_64-sun-solaris2.11 target.
 
---- lib/Driver/ToolChains/Gnu.cpp.orig 2024-05-09 10:06:41.859223500 +0000
+--- lib/Driver/ToolChains/Gnu.cpp.orig 2024-06-15 17:21:32.000000000 +0000
 +++ lib/Driver/ToolChains/Gnu.cpp
-@@ -2228,6 +2228,11 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -2382,6 +2382,11 @@ void Generic_GCC::GCCInstallationDetecto
      // /usr/gcc/<version> as a prefix.
  
      SmallVector<std::pair<GCCVersion, std::string>, 8> SolarisPrefixes;
@@ -17,11 +17,12 @@ Support x86_64-sun-solaris2.11 target.
      std::string PrefixDir = concat(SysRoot, "/usr/gcc");
      std::error_code EC;
      for (llvm::vfs::directory_iterator LI = D.getVFS().dir_begin(PrefixDir, EC),
-@@ -2431,6 +2436,7 @@ void Generic_GCC::GCCInstallationDetecto
-     static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11",
-                                                     "i386-pc-solaris2.12"};
-     static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11",
-+                                                       "x86_64-sun-solaris2.11",
-                                                        "x86_64-pc-solaris2.12"};
+@@ -2583,7 +2588,7 @@ void Generic_GCC::GCCInstallationDetecto
+     static const char *const SolarisSparcV9Triples[] = {
+         "sparcv9-sun-solaris2.11"};
+     static const char *const SolarisX86Triples[] = {"i386-pc-solaris2.11"};
+-    static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11"};
++    static const char *const SolarisX86_64Triples[] = {"x86_64-pc-solaris2.11", "x86_64-sun-solaris2.11"};
      LibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs));
      BiarchLibDirs.append(begin(SolarisLibDirs), end(SolarisLibDirs));
+     switch (TargetTriple.getArch()) {

Index: pkgsrc/lang/compiler-rt/Makefile
diff -u pkgsrc/lang/compiler-rt/Makefile:1.24 pkgsrc/lang/compiler-rt/Makefile:1.25
--- pkgsrc/lang/compiler-rt/Makefile:1.24       Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/compiler-rt/Makefile    Sat Jul  6 15:45:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/04/22 07:05:15 adam Exp $
+# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:06 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -11,7 +11,8 @@ HOMEPAGE=     https://compiler-rt.llvm.org/
 COMMENT=       LLVM runtime libraries
 LICENSE=       apache-2.0
 
-NOT_FOR_PLATFORM=      NetBSD-[0-7].*-*
+# aarch64: lib/tsan/rtl/tsan_platform_linux.cpp
+NOT_FOR_PLATFORM=      NetBSD-[0-7].*-* NetBSD-*-aarch64
 
 USE_CC_FEATURES=       c99
 USE_CXX_FEATURES=      c++14

Index: pkgsrc/lang/compiler-rt/buildlink3.mk
diff -u pkgsrc/lang/compiler-rt/buildlink3.mk:1.7 pkgsrc/lang/compiler-rt/buildlink3.mk:1.8
--- pkgsrc/lang/compiler-rt/buildlink3.mk:1.7   Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/compiler-rt/buildlink3.mk       Sat Jul  6 15:45:06 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2024/04/22 07:05:15 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2024/07/06 15:45:06 adam Exp $
 
 BUILDLINK_TREE+=       compiler-rt
 
 .if !defined(COMPILER_RT_BUILDLINK3_MK)
 COMPILER_RT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.compiler-rt+=    compiler-rt>=17.0.0<18
+BUILDLINK_API_DEPENDS.compiler-rt+=    compiler-rt>=18.0.0
 BUILDLINK_PKGSRCDIR.compiler-rt?=      ../../lang/compiler-rt
 
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/lang/compiler-rt/distinfo
diff -u pkgsrc/lang/compiler-rt/distinfo:1.25 pkgsrc/lang/compiler-rt/distinfo:1.26
--- pkgsrc/lang/compiler-rt/distinfo:1.25       Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/compiler-rt/distinfo    Sat Jul  6 15:45:06 2024
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.25 2024/04/22 07:05:15 adam Exp $
+$NetBSD: distinfo,v 1.26 2024/07/06 15:45:06 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (compiler-rt-17.0.6.src.tar.xz) = 8040b6b978282e9e1c096321ce72be431ac88683cb1126f24e72637a21eef328
-SHA512 (compiler-rt-17.0.6.src.tar.xz) = 56dc9d304dd4ba8d28179077dd99ca7c820ce26dbc70d33b2ba41769928adc900f7618d3efef756b2fc92e322d2f25dba49be966d6583d2d8f1fce9283a9cdf7
-Size (compiler-rt-17.0.6.src.tar.xz) = 2421808 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (compiler-rt-18.1.8.src.tar.xz) = 266de1c998f04997c17b032762f7ea2755fcc2df7a2dfc4e9733be835bb9754a
+SHA512 (compiler-rt-18.1.8.src.tar.xz) = fb8795bd51c9b005c2ad1975591e9e2715740d6407ccad41379f136ef2e8d24ded8b97b01165a3ae4bd377119a6a1049ca05d3220404fc12bee86114ff2bff0d
+Size (compiler-rt-18.1.8.src.tar.xz) = 2469712 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
 SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
 SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
-SHA1 (patch-lib_asan_CMakeLists.txt) = b06a9cf121847d4fabf1da34e3af1d036c110b43
+SHA1 (patch-lib_fuzzer_FuzzerUtilLinux.cpp) = 9de59ffcb31d511f67f10fa4ec55cfa7c7f64b31
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cpp) = bc04e2d792c8eaffb26b60fdaceef261ffe03371

Index: pkgsrc/lang/compiler-rt/patches/patch-CMakeLists.txt
diff -u pkgsrc/lang/compiler-rt/patches/patch-CMakeLists.txt:1.1 pkgsrc/lang/compiler-rt/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/lang/compiler-rt/patches/patch-CMakeLists.txt:1.1    Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/compiler-rt/patches/patch-CMakeLists.txt        Sat Jul  6 15:45:06 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/10/06 19:15:20 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/07/06 15:45:06 adam Exp $
 
 Fix build for Darwin.
 

Index: pkgsrc/lang/flang/Makefile
diff -u pkgsrc/lang/flang/Makefile:1.5 pkgsrc/lang/flang/Makefile:1.6
--- pkgsrc/lang/flang/Makefile:1.5      Wed May 29 16:33:13 2024
+++ pkgsrc/lang/flang/Makefile  Sat Jul  6 15:45:09 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.5 2024/05/29 16:33:13 adam Exp $
+# $NetBSD: Makefile,v 1.6 2024/07/06 15:45:09 adam Exp $
 
-PKGREVISION= 1
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      flang-${LLVM_VERSION}.src
@@ -24,13 +23,9 @@ CMAKE_ARGS+= -DBUILD_SHARED_LIBS=YES
 
 REPLACE_BASH=  tools/f18/flang-to-external-fc.in
 
-PLIST_VARS=    notdarwin
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
-MAKE_ENV+=             DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
-.else
-PLIST.notdarwin=       yes
-MAKE_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
+MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
 .endif
 
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/lang/flang/PLIST
diff -u pkgsrc/lang/flang/PLIST:1.3 pkgsrc/lang/flang/PLIST:1.4
--- pkgsrc/lang/flang/PLIST:1.3 Mon Apr 22 07:28:21 2024
+++ pkgsrc/lang/flang/PLIST     Sat Jul  6 15:45:09 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2024/04/22 07:28:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/07/06 15:45:09 adam Exp $
 bin/bbc
 bin/f18-parse-demo
 bin/fir-opt
@@ -17,6 +17,7 @@ include/flang/Common/default-kinds.h
 include/flang/Common/enum-class.h
 include/flang/Common/enum-set.h
 include/flang/Common/fast-int-set.h
+include/flang/Common/float128.h
 include/flang/Common/format.h
 include/flang/Common/idioms.h
 include/flang/Common/indirection.h
@@ -75,6 +76,7 @@ include/flang/Frontend/TextDiagnosticBuf
 include/flang/Frontend/TextDiagnosticPrinter.h
 include/flang/FrontendTool/Utils.h
 include/flang/ISO_Fortran_binding.h
+include/flang/ISO_Fortran_binding_wrapper.h
 include/flang/Lower/AbstractConverter.h
 include/flang/Lower/Allocatable.h
 include/flang/Lower/BoxAnalyzer.h
@@ -114,6 +116,7 @@ include/flang/Lower/SymbolMap.h
 include/flang/Lower/VectorSubscripts.h
 include/flang/OpenMP/omp_lib.h
 include/flang/Optimizer/Analysis/AliasAnalysis.h
+include/flang/Optimizer/Analysis/TBAAForest.h
 include/flang/Optimizer/Builder/Array.h
 include/flang/Optimizer/Builder/BoxValue.h
 include/flang/Optimizer/Builder/Character.h
@@ -133,9 +136,12 @@ include/flang/Optimizer/Builder/Runtime/
 include/flang/Optimizer/Builder/Runtime/Command.h
 include/flang/Optimizer/Builder/Runtime/Derived.h
 include/flang/Optimizer/Builder/Runtime/EnvironmentDefaults.h
+include/flang/Optimizer/Builder/Runtime/Exceptions.h
+include/flang/Optimizer/Builder/Runtime/Execute.h
 include/flang/Optimizer/Builder/Runtime/Inquiry.h
 include/flang/Optimizer/Builder/Runtime/Intrinsics.h
 include/flang/Optimizer/Builder/Runtime/Numeric.h
+include/flang/Optimizer/Builder/Runtime/Pointer.h
 include/flang/Optimizer/Builder/Runtime/RTBuilder.h
 include/flang/Optimizer/Builder/Runtime/Ragged.h
 include/flang/Optimizer/Builder/Runtime/Reduction.h
@@ -172,6 +178,10 @@ include/flang/Optimizer/Dialect/FIROpsTy
 include/flang/Optimizer/Dialect/FIROpsTypes.h.inc
 include/flang/Optimizer/Dialect/FIRType.h
 include/flang/Optimizer/Dialect/FIRTypes.td
+include/flang/Optimizer/Dialect/FirAliasTagOpInterface.cpp.inc
+include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
+include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h.inc
+include/flang/Optimizer/Dialect/FirAliasTagOpInterface.td
 include/flang/Optimizer/Dialect/FortranVariableInterface.cpp.inc
 include/flang/Optimizer/Dialect/FortranVariableInterface.h
 include/flang/Optimizer/Dialect/FortranVariableInterface.h.inc
@@ -197,6 +207,7 @@ include/flang/Optimizer/HLFIR/HLFIRTypes
 include/flang/Optimizer/HLFIR/Passes.h
 include/flang/Optimizer/HLFIR/Passes.h.inc
 include/flang/Optimizer/HLFIR/Passes.td
+include/flang/Optimizer/Support/DataLayout.h
 include/flang/Optimizer/Support/FatalError.h
 include/flang/Optimizer/Support/InitFIR.h
 include/flang/Optimizer/Support/InternalNames.h
@@ -234,9 +245,9 @@ include/flang/Runtime/cpp-type.h
 include/flang/Runtime/derived-api.h
 include/flang/Runtime/descriptor.h
 include/flang/Runtime/entry-names.h
+include/flang/Runtime/exceptions.h
+include/flang/Runtime/execute.h
 include/flang/Runtime/extensions.h
-include/flang/Runtime/float128.h
-include/flang/Runtime/ieee_arithmetic.h
 include/flang/Runtime/inquiry.h
 include/flang/Runtime/io-api.h
 include/flang/Runtime/iostat.h
@@ -259,6 +270,7 @@ include/flang/Runtime/transformational.h
 include/flang/Runtime/type-code.h
 include/flang/Semantics/attr.h
 include/flang/Semantics/expression.h
+include/flang/Semantics/openmp-directive-sets.h
 include/flang/Semantics/runtime-type-info.h
 include/flang/Semantics/scope.h
 include/flang/Semantics/semantics.h
@@ -269,6 +281,7 @@ include/flang/Semantics/unparse-with-sym
 include/flang/Tools/CLOptions.inc
 include/flang/Tools/CrossToolHelpers.h
 include/flang/Tools/PointerModels.h
+include/flang/Tools/TargetSetup.h
 include/flang/Version.inc
 include/flang/__cuda_builtins.f18.mod
 include/flang/__cuda_builtins.mod
@@ -292,8 +305,11 @@ include/flang/iso_c_binding.f18.mod
 include/flang/iso_c_binding.mod
 include/flang/iso_fortran_env.f18.mod
 include/flang/iso_fortran_env.mod
+include/flang/mma.f18.mod
+include/flang/mma.mod
 include/flang/omp_lib.f18.mod
 include/flang/omp_lib.mod
+lib/clang/18/include/ISO_Fortran_binding.h
 lib/cmake/flang/FlangConfig.cmake
 lib/cmake/flang/FlangConfigVersion.cmake
 lib/cmake/flang/FlangTargets-release.cmake
Index: pkgsrc/lang/flang/distinfo
diff -u pkgsrc/lang/flang/distinfo:1.3 pkgsrc/lang/flang/distinfo:1.4
--- pkgsrc/lang/flang/distinfo:1.3      Mon Apr 22 07:28:21 2024
+++ pkgsrc/lang/flang/distinfo  Sat Jul  6 15:45:09 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2024/04/22 07:28:21 adam Exp $
+$NetBSD: distinfo,v 1.4 2024/07/06 15:45:09 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (flang-17.0.6.src.tar.xz) = 2ea312137dfcaa03cd8f4b0744b33437dd99a0932e705697a85cb5cef14f82f1
-SHA512 (flang-17.0.6.src.tar.xz) = 29f42b4c1f9d3734385ed83e03ae35757dacd3720aa8eeece3697bf91067c65847c7de36dcfe43880d036d861f4c1d2f8076d64731e327a5b4818646f72ed90a
-Size (flang-17.0.6.src.tar.xz) = 2762700 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (flang-18.1.8.src.tar.xz) = 02588230ee4f8cc72bcd81abd4a0e7078060524173a3d6a46ce4b6c1439c2d12
+SHA512 (flang-18.1.8.src.tar.xz) = d466e3c4b8638301ccfed9aab7154a85ea9b48de20452446bcf7fbe28b858f17b1f136b83a34fe033fea7f25dcb41985171cce977b7411a83e8c099557422155
+Size (flang-18.1.8.src.tar.xz) = 3074072 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes

Index: pkgsrc/lang/flang/buildlink3.mk
diff -u pkgsrc/lang/flang/buildlink3.mk:1.1 pkgsrc/lang/flang/buildlink3.mk:1.2
--- pkgsrc/lang/flang/buildlink3.mk:1.1 Wed May 29 16:33:13 2024
+++ pkgsrc/lang/flang/buildlink3.mk     Sat Jul  6 15:45:09 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2024/05/29 16:33:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2024/07/06 15:45:09 adam Exp $
 
 BUILDLINK_TREE+=       flang
 
 .if !defined(FLANG_BUILDLINK3_MK)
 FLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.flang+=  flang>=17.0.0<18
-BUILDLINK_ABI_DEPENDS.flang+=  flang>=17.0.0
+BUILDLINK_API_DEPENDS.flang+=  flang>=18.0.0<19
+BUILDLINK_ABI_DEPENDS.flang+=  flang>=18.0.0
 BUILDLINK_PKGSRCDIR.flang?=    ../../lang/flang
 
 BUILDLINK_FILES.flang+=                bin/bbc

Index: pkgsrc/lang/libcxx/Makefile
diff -u pkgsrc/lang/libcxx/Makefile:1.19 pkgsrc/lang/libcxx/Makefile:1.20
--- pkgsrc/lang/libcxx/Makefile:1.19    Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/libcxx/Makefile Sat Jul  6 15:45:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/04/22 07:05:15 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/07/06 15:45:07 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -24,7 +24,7 @@ SITES.${LIBCXXABI}${EXTRACT_SUFX}=    \
 USE_CXX_FEATURES=      c++20
 USE_LANGUAGES=         c c++
 SSP_SUPPORTED=         no
-GCC_REQD+=             12
+GCC_REQD+=             13
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=   -DLIBCXX_CXX_ABI=system-libcxxabi

Index: pkgsrc/lang/libcxx/PLIST
diff -u pkgsrc/lang/libcxx/PLIST:1.11 pkgsrc/lang/libcxx/PLIST:1.12
--- pkgsrc/lang/libcxx/PLIST:1.11       Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/libcxx/PLIST    Sat Jul  6 15:45:07 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2024/04/22 07:05:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/07/06 15:45:07 adam Exp $
 include/c++/v1/__algorithm/adjacent_find.h
 include/c++/v1/__algorithm/all_of.h
 include/c++/v1/__algorithm/any_of.h
@@ -22,6 +22,8 @@ include/c++/v1/__algorithm/find_end.h
 include/c++/v1/__algorithm/find_first_of.h
 include/c++/v1/__algorithm/find_if.h
 include/c++/v1/__algorithm/find_if_not.h
+include/c++/v1/__algorithm/find_segment_if.h
+include/c++/v1/__algorithm/fold.h
 include/c++/v1/__algorithm/for_each.h
 include/c++/v1/__algorithm/for_each_n.h
 include/c++/v1/__algorithm/for_each_segment.h
@@ -87,6 +89,7 @@ include/c++/v1/__algorithm/pstl_backends
 include/c++/v1/__algorithm/pstl_backends/cpu_backends/transform_reduce.h
 include/c++/v1/__algorithm/pstl_copy.h
 include/c++/v1/__algorithm/pstl_count.h
+include/c++/v1/__algorithm/pstl_equal.h
 include/c++/v1/__algorithm/pstl_fill.h
 include/c++/v1/__algorithm/pstl_find.h
 include/c++/v1/__algorithm/pstl_for_each.h
@@ -94,7 +97,9 @@ include/c++/v1/__algorithm/pstl_frontend
 include/c++/v1/__algorithm/pstl_generate.h
 include/c++/v1/__algorithm/pstl_is_partitioned.h
 include/c++/v1/__algorithm/pstl_merge.h
+include/c++/v1/__algorithm/pstl_move.h
 include/c++/v1/__algorithm/pstl_replace.h
+include/c++/v1/__algorithm/pstl_rotate_copy.h
 include/c++/v1/__algorithm/pstl_sort.h
 include/c++/v1/__algorithm/pstl_stable_sort.h
 include/c++/v1/__algorithm/pstl_transform.h
@@ -104,12 +109,14 @@ include/c++/v1/__algorithm/ranges_all_of
 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_contains.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_ends_with.h
 include/c++/v1/__algorithm/ranges_equal.h
 include/c++/v1/__algorithm/ranges_equal_range.h
 include/c++/v1/__algorithm/ranges_fill.h
@@ -223,6 +230,7 @@ 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/__assertion_handler
 include/c++/v1/__atomic/aliases.h
 include/c++/v1/__atomic/atomic.h
 include/c++/v1/__atomic/atomic_base.h
@@ -249,6 +257,7 @@ include/c++/v1/__bit/countl.h
 include/c++/v1/__bit/countr.h
 include/c++/v1/__bit/endian.h
 include/c++/v1/__bit/has_single_bit.h
+include/c++/v1/__bit/invert_if.h
 include/c++/v1/__bit/popcount.h
 include/c++/v1/__bit/rotate.h
 include/c++/v1/__bit_reference
@@ -282,6 +291,8 @@ include/c++/v1/__chrono/statically_widen
 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/tzdb.h
+include/c++/v1/__chrono/tzdb_list.h
 include/c++/v1/__chrono/weekday.h
 include/c++/v1/__chrono/year.h
 include/c++/v1/__chrono/year_month.h
@@ -416,6 +427,7 @@ include/c++/v1/__functional/unary_functi
 include/c++/v1/__functional/unary_negate.h
 include/c++/v1/__functional/weak_result_type.h
 include/c++/v1/__fwd/array.h
+include/c++/v1/__fwd/bit_reference.h
 include/c++/v1/__fwd/fstream.h
 include/c++/v1/__fwd/get.h
 include/c++/v1/__fwd/hash.h
@@ -480,11 +492,31 @@ include/c++/v1/__locale
 include/c++/v1/__locale_dir/locale_base_api/bsd_locale_defaults.h
 include/c++/v1/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
 include/c++/v1/__locale_dir/locale_base_api/locale_guard.h
+include/c++/v1/__math/abs.h
+include/c++/v1/__math/copysign.h
+include/c++/v1/__math/error_functions.h
+include/c++/v1/__math/exponential_functions.h
+include/c++/v1/__math/fdim.h
+include/c++/v1/__math/fma.h
+include/c++/v1/__math/gamma.h
+include/c++/v1/__math/hyperbolic_functions.h
+include/c++/v1/__math/hypot.h
+include/c++/v1/__math/inverse_hyperbolic_functions.h
+include/c++/v1/__math/inverse_trigonometric_functions.h
+include/c++/v1/__math/logarithms.h
+include/c++/v1/__math/min_max.h
+include/c++/v1/__math/modulo.h
+include/c++/v1/__math/remainder.h
+include/c++/v1/__math/roots.h
+include/c++/v1/__math/rounding_functions.h
+include/c++/v1/__math/traits.h
+include/c++/v1/__math/trigonometric_functions.h
 include/c++/v1/__mbstate_t.h
 include/c++/v1/__mdspan/default_accessor.h
 include/c++/v1/__mdspan/extents.h
 include/c++/v1/__mdspan/layout_left.h
 include/c++/v1/__mdspan/layout_right.h
+include/c++/v1/__mdspan/layout_stride.h
 include/c++/v1/__mdspan/mdspan.h
 include/c++/v1/__memory/addressof.h
 include/c++/v1/__memory/align.h
@@ -523,6 +555,7 @@ include/c++/v1/__memory_resource/synchro
 include/c++/v1/__memory_resource/unsynchronized_pool_resource.h
 include/c++/v1/__mutex/lock_guard.h
 include/c++/v1/__mutex/mutex.h
+include/c++/v1/__mutex/once_flag.h
 include/c++/v1/__mutex/tag_types.h
 include/c++/v1/__mutex/unique_lock.h
 include/c++/v1/__node_handle
@@ -538,42 +571,10 @@ include/c++/v1/__numeric/partial_sum.h
 include/c++/v1/__numeric/pstl_reduce.h
 include/c++/v1/__numeric/pstl_transform_reduce.h
 include/c++/v1/__numeric/reduce.h
+include/c++/v1/__numeric/saturation_arithmetic.h
 include/c++/v1/__numeric/transform_exclusive_scan.h
 include/c++/v1/__numeric/transform_inclusive_scan.h
 include/c++/v1/__numeric/transform_reduce.h
-include/c++/v1/__pstl/internal/algorithm_fwd.h
-include/c++/v1/__pstl/internal/algorithm_impl.h
-include/c++/v1/__pstl/internal/execution_defs.h
-include/c++/v1/__pstl/internal/execution_impl.h
-include/c++/v1/__pstl/internal/glue_algorithm_defs.h
-include/c++/v1/__pstl/internal/glue_algorithm_impl.h
-include/c++/v1/__pstl/internal/glue_memory_defs.h
-include/c++/v1/__pstl/internal/glue_memory_impl.h
-include/c++/v1/__pstl/internal/glue_numeric_defs.h
-include/c++/v1/__pstl/internal/glue_numeric_impl.h
-include/c++/v1/__pstl/internal/memory_impl.h
-include/c++/v1/__pstl/internal/numeric_fwd.h
-include/c++/v1/__pstl/internal/numeric_impl.h
-include/c++/v1/__pstl/internal/omp/parallel_for.h
-include/c++/v1/__pstl/internal/omp/parallel_for_each.h
-include/c++/v1/__pstl/internal/omp/parallel_invoke.h
-include/c++/v1/__pstl/internal/omp/parallel_merge.h
-include/c++/v1/__pstl/internal/omp/parallel_scan.h
-include/c++/v1/__pstl/internal/omp/parallel_stable_partial_sort.h
-include/c++/v1/__pstl/internal/omp/parallel_stable_sort.h
-include/c++/v1/__pstl/internal/omp/parallel_transform_reduce.h
-include/c++/v1/__pstl/internal/omp/parallel_transform_scan.h
-include/c++/v1/__pstl/internal/omp/util.h
-include/c++/v1/__pstl/internal/parallel_backend.h
-include/c++/v1/__pstl/internal/parallel_backend_omp.h
-include/c++/v1/__pstl/internal/parallel_backend_serial.h
-include/c++/v1/__pstl/internal/parallel_backend_tbb.h
-include/c++/v1/__pstl/internal/parallel_backend_utils.h
-include/c++/v1/__pstl/internal/unseq_backend_simd.h
-include/c++/v1/__pstl/internal/utils.h
-include/c++/v1/__pstl_algorithm
-include/c++/v1/__pstl_memory
-include/c++/v1/__pstl_numeric
 include/c++/v1/__random/bernoulli_distribution.h
 include/c++/v1/__random/binomial_distribution.h
 include/c++/v1/__random/cauchy_distribution.h
@@ -614,6 +615,7 @@ include/c++/v1/__random/weibull_distribu
 include/c++/v1/__ranges/access.h
 include/c++/v1/__ranges/all.h
 include/c++/v1/__ranges/as_rvalue_view.h
+include/c++/v1/__ranges/chunk_by_view.h
 include/c++/v1/__ranges/common_view.h
 include/c++/v1/__ranges/concepts.h
 include/c++/v1/__ranges/container_compatible_range.h
@@ -686,6 +688,7 @@ include/c++/v1/__system_error/error_cond
 include/c++/v1/__system_error/system_error.h
 include/c++/v1/__thread/formatter.h
 include/c++/v1/__thread/id.h
+include/c++/v1/__thread/jthread.h
 include/c++/v1/__thread/poll_with_backoff.h
 include/c++/v1/__thread/this_thread.h
 include/c++/v1/__thread/thread.h
@@ -820,7 +823,6 @@ include/c++/v1/__type_traits/nat.h
 include/c++/v1/__type_traits/negation.h
 include/c++/v1/__type_traits/noexcept_move_assign_container.h
 include/c++/v1/__type_traits/operation_traits.h
-include/c++/v1/__type_traits/predicate_traits.h
 include/c++/v1/__type_traits/promote.h
 include/c++/v1/__type_traits/rank.h
 include/c++/v1/__type_traits/remove_all_extents.h
@@ -841,10 +843,12 @@ include/c++/v1/__type_traits/unwrap_ref.
 include/c++/v1/__type_traits/void_t.h
 include/c++/v1/__undef_macros
 include/c++/v1/__utility/as_const.h
+include/c++/v1/__utility/as_lvalue.h
 include/c++/v1/__utility/auto_cast.h
 include/c++/v1/__utility/cmp.h
 include/c++/v1/__utility/convert_to_integral.h
 include/c++/v1/__utility/declval.h
+include/c++/v1/__utility/empty.h
 include/c++/v1/__utility/exception_guard.h
 include/c++/v1/__utility/exchange.h
 include/c++/v1/__utility/forward.h
@@ -853,12 +857,13 @@ include/c++/v1/__utility/in_place.h
 include/c++/v1/__utility/integer_sequence.h
 include/c++/v1/__utility/is_pointer_in_range.h
 include/c++/v1/__utility/move.h
+include/c++/v1/__utility/no_destroy.h
 include/c++/v1/__utility/pair.h
 include/c++/v1/__utility/piecewise_construct.h
 include/c++/v1/__utility/priority_tag.h
 include/c++/v1/__utility/rel_ops.h
+include/c++/v1/__utility/small_buffer.h
 include/c++/v1/__utility/swap.h
-include/c++/v1/__utility/terminate_on_exception.h
 include/c++/v1/__utility/to_underlying.h
 include/c++/v1/__utility/unreachable.h
 include/c++/v1/__variant/monostate.h
@@ -912,22 +917,21 @@ include/c++/v1/execution
 include/c++/v1/expected
 include/c++/v1/experimental/__config
 include/c++/v1/experimental/__memory
-include/c++/v1/experimental/deque
-include/c++/v1/experimental/forward_list
+include/c++/v1/experimental/__simd/aligned_tag.h
+include/c++/v1/experimental/__simd/declaration.h
+include/c++/v1/experimental/__simd/reference.h
+include/c++/v1/experimental/__simd/scalar.h
+include/c++/v1/experimental/__simd/simd.h
+include/c++/v1/experimental/__simd/simd_mask.h
+include/c++/v1/experimental/__simd/traits.h
+include/c++/v1/experimental/__simd/utility.h
+include/c++/v1/experimental/__simd/vec_ext.h
 include/c++/v1/experimental/iterator
-include/c++/v1/experimental/list
-include/c++/v1/experimental/map
-include/c++/v1/experimental/memory_resource
+include/c++/v1/experimental/memory
 include/c++/v1/experimental/propagate_const
-include/c++/v1/experimental/regex
-include/c++/v1/experimental/set
 include/c++/v1/experimental/simd
-include/c++/v1/experimental/string
 include/c++/v1/experimental/type_traits
-include/c++/v1/experimental/unordered_map
-include/c++/v1/experimental/unordered_set
 include/c++/v1/experimental/utility
-include/c++/v1/experimental/vector
 include/c++/v1/ext/__hash
 include/c++/v1/ext/hash_map
 include/c++/v1/ext/hash_set
@@ -950,7 +954,6 @@ include/c++/v1/iterator
 include/c++/v1/latch
 include/c++/v1/libcxx.imp
 include/c++/v1/limits
-include/c++/v1/limits.h
 include/c++/v1/list
 include/c++/v1/locale
 include/c++/v1/locale.h
@@ -975,7 +978,6 @@ include/c++/v1/regex
 include/c++/v1/scoped_allocator
 include/c++/v1/semaphore
 include/c++/v1/set
-include/c++/v1/setjmp.h
 include/c++/v1/shared_mutex
 include/c++/v1/source_location
 include/c++/v1/span
@@ -994,6 +996,7 @@ include/c++/v1/string
 include/c++/v1/string.h
 include/c++/v1/string_view
 include/c++/v1/strstream
+include/c++/v1/syncstream
 include/c++/v1/system_error
 include/c++/v1/tgmath.h
 include/c++/v1/thread

Index: pkgsrc/lang/libcxx/buildlink3.mk
diff -u pkgsrc/lang/libcxx/buildlink3.mk:1.10 pkgsrc/lang/libcxx/buildlink3.mk:1.11
--- pkgsrc/lang/libcxx/buildlink3.mk:1.10       Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/libcxx/buildlink3.mk    Sat Jul  6 15:45:07 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.10 2024/04/22 07:05:15 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2024/07/06 15:45:07 adam Exp $
 
 BUILDLINK_TREE+=       libcxx
 
 .if !defined(LIBCXX_BUILDLINK3_MK)
 LIBCXX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libcxx+= libcxx>=17.0.0<18
+BUILDLINK_API_DEPENDS.libcxx+= libcxx>=18.0.0
 BUILDLINK_PKGSRCDIR.libcxx?=   ../../lang/libcxx
 
 .endif # LIBCXX_BUILDLINK3_MK

Index: pkgsrc/lang/libcxx/distinfo
diff -u pkgsrc/lang/libcxx/distinfo:1.28 pkgsrc/lang/libcxx/distinfo:1.29
--- pkgsrc/lang/libcxx/distinfo:1.28    Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/libcxx/distinfo Sat Jul  6 15:45:07 2024
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.28 2024/04/22 07:05:15 adam Exp $
+$NetBSD: distinfo,v 1.29 2024/07/06 15:45:07 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (libcxx-17.0.6.src.tar.xz) = cf31b1c41185da916ba428f5797e97f5cd8acb6d5a23947b40a94903e80de3ed
-SHA512 (libcxx-17.0.6.src.tar.xz) = 8be288ab14bd34a1946aeadc83c9e11ff68eb0cda707fd6bee711514d0e506112ffc2a40d0317d19f64f05b644e072f1322ed0e8ab238d9640b6b827d42126eb
-Size (libcxx-17.0.6.src.tar.xz) = 3946532 bytes
-BLAKE2s (libcxxabi-17.0.6.src.tar.xz) = 85c5ca07166696fbde2c24716e66f46741d42d69d617c574042b9ba9389ae9da
-SHA512 (libcxxabi-17.0.6.src.tar.xz) = acd2b0b48eee4380625347a955fa3dfafce948aeccd87a2070e09bd91b148ae189aec12b506f3097193a8288095e99496c66ce26974772878622e5892d822cc3
-Size (libcxxabi-17.0.6.src.tar.xz) = 575744 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.8.src.tar.xz) = a804de6e86f74c0b6f6833f5e87831fdda8d1bc956b1da7f573200b3c4d31c53
+SHA512 (libcxx-18.1.8.src.tar.xz) = b24f8adbc4edd0cde3a28c6ce0ae2d7cd32049c155459c669f30ee6400a7a0e789c968db7f93bb0aa0f972b47b86424b9655af00e99867e242baccece8f323e8
+Size (libcxx-18.1.8.src.tar.xz) = 4028732 bytes
+BLAKE2s (libcxxabi-18.1.8.src.tar.xz) = c2e29ed27ba6144043b7ab036976f065685752e08995ff3b6ebead9c7cbad9f2
+SHA512 (libcxxabi-18.1.8.src.tar.xz) = 40f8691e86948527cd104b3b7f481757e6f8f4892fbe8632a6f86f35008e0c9d721e5f2d3629c6f0b99e9f150ee9f3d650aa111ea2c5f6df44fec481ff00a1f9
+Size (libcxxabi-18.1.8.src.tar.xz) = 582748 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
 SHA1 (patch-src_charconv.cpp) = b8569ae77df4a5a7b627b3a9cb6691be73699dca
-SHA1 (patch-src_filesystem_file__descriptor.h) = 4467b29e3daf2d9e7b0c7b61fdc5d2ccc1f1753d
-SHA1 (patch-src_include_to__chars__floating__point.h) = f7f880905609b87830ea657c7510fb3987448a09
+SHA1 (patch-src_filesystem_file__descriptor.h) = 44a64cb3eac4e94abb54170c355639642b8246c2
+SHA1 (patch-src_include_to__chars__floating__point.h) = 717ef2db570fc225ec0864027667c28791e6366f

Index: pkgsrc/lang/libcxx/patches/patch-src_filesystem_file__descriptor.h
diff -u pkgsrc/lang/libcxx/patches/patch-src_filesystem_file__descriptor.h:1.1 pkgsrc/lang/libcxx/patches/patch-src_filesystem_file__descriptor.h:1.2
--- pkgsrc/lang/libcxx/patches/patch-src_filesystem_file__descriptor.h:1.1      Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/libcxx/patches/patch-src_filesystem_file__descriptor.h  Sat Jul  6 15:45:07 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_filesystem_file__descriptor.h,v 1.1 2024/04/22 07:05:15 adam Exp $
+$NetBSD: patch-src_filesystem_file__descriptor.h,v 1.2 2024/07/06 15:45:07 adam Exp $
 
 Support POSIX file modes.
 
---- src/filesystem/file_descriptor.h.orig      2023-10-17 06:20:52.000000000 +0000
+--- src/filesystem/file_descriptor.h.orig      2024-04-17 00:21:15.000000000 +0000
 +++ src/filesystem/file_descriptor.h
 @@ -41,7 +41,21 @@ namespace detail {
- #if defined(DT_BLK)
+ #  if defined(DT_BLK)
  template <class DirEntT, class = decltype(DirEntT::d_type)>
  file_type get_file_type(DirEntT* ent, int) {
 +#ifdef __sun
Index: pkgsrc/lang/libcxx/patches/patch-src_include_to__chars__floating__point.h
diff -u pkgsrc/lang/libcxx/patches/patch-src_include_to__chars__floating__point.h:1.1 pkgsrc/lang/libcxx/patches/patch-src_include_to__chars__floating__point.h:1.2
--- pkgsrc/lang/libcxx/patches/patch-src_include_to__chars__floating__point.h:1.1       Sat Aug 13 09:38:09 2022
+++ pkgsrc/lang/libcxx/patches/patch-src_include_to__chars__floating__point.h   Sat Jul  6 15:45:07 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_include_to__chars__floating__point.h,v 1.1 2022/08/13 09:38:09 tnn Exp $
+$NetBSD: patch-src_include_to__chars__floating__point.h,v 1.2 2024/07/06 15:45:07 adam Exp $
 
 #if out some code that doesn't compile with GCC < 11 for now
 
---- src/include/to_chars_floating_point.h.orig 2022-06-22 16:46:24.000000000 +0000
+--- src/include/to_chars_floating_point.h.orig 2024-04-17 00:21:15.000000000 +0000
 +++ src/include/to_chars_floating_point.h
-@@ -90,6 +90,7 @@ struct _Floating_type_traits<double> {
+@@ -93,6 +93,7 @@ struct _Floating_type_traits<double> {
  
  // ^^^^^^^^^^ DERIVED FROM corecrt_internal_fltintrn.h ^^^^^^^^^^
  
@@ -12,9 +12,9 @@ $NetBSD: patch-src_include_to__chars__fl
  // FUNCTION to_chars (FLOATING-POINT TO STRING)
  template <class _Floating>
  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI
-@@ -329,7 +330,9 @@ to_chars_result _Floating_to_chars_hex_p
+@@ -332,7 +333,9 @@ to_chars_result _Floating_to_chars_hex_p
      // We've already printed '-' if necessary, so uint32_t _Absolute_exponent avoids testing that again.
-     return _VSTD::to_chars(_First, _Last, _Absolute_exponent);
+     return std::to_chars(_First, _Last, _Absolute_exponent);
  }
 +#endif
  
@@ -22,15 +22,15 @@ $NetBSD: patch-src_include_to__chars__fl
  template <class _Floating>
  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI
  to_chars_result _Floating_to_chars_hex_shortest(
-@@ -456,6 +459,7 @@ to_chars_result _Floating_to_chars_hex_s
+@@ -459,6 +462,7 @@ to_chars_result _Floating_to_chars_hex_s
      // We've already printed '-' if necessary, so static_cast<uint32_t> avoids testing that again.
-     return _VSTD::to_chars(_First, _Last, static_cast<uint32_t>(_Unbiased_exponent));
+     return std::to_chars(_First, _Last, static_cast<uint32_t>(_Unbiased_exponent));
  }
 +#endif
  
  // For general precision, we can use lookup tables to avoid performing trial formatting.
  
-@@ -828,6 +832,7 @@ struct _General_precision_tables<double>
+@@ -831,6 +835,7 @@ struct _General_precision_tables<double>
          0x7FEFFFFFFFFFFFFFu};
  };
  
@@ -38,7 +38,7 @@ $NetBSD: patch-src_include_to__chars__fl
  template <class _Floating>
  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI
  to_chars_result _Floating_to_chars_general_precision(
-@@ -980,9 +985,11 @@ to_chars_result _Floating_to_chars_gener
+@@ -983,9 +988,11 @@ to_chars_result _Floating_to_chars_gener
  
      return {_First, errc{}};
  }
@@ -50,7 +50,7 @@ $NetBSD: patch-src_include_to__chars__fl
  template <_Floating_to_chars_overload _Overload, class _Floating>
  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI
  to_chars_result _Floating_to_chars(
-@@ -1068,6 +1075,7 @@ to_chars_result _Floating_to_chars(
+@@ -1071,6 +1078,7 @@ to_chars_result _Floating_to_chars(
          }
      }
  }

Index: pkgsrc/lang/libcxxabi/Makefile
diff -u pkgsrc/lang/libcxxabi/Makefile:1.19 pkgsrc/lang/libcxxabi/Makefile:1.20
--- pkgsrc/lang/libcxxabi/Makefile:1.19 Mon Apr 22 07:05:16 2024
+++ pkgsrc/lang/libcxxabi/Makefile      Sat Jul  6 15:45:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/04/22 07:05:16 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/07/06 15:45:06 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -24,9 +24,12 @@ SITES.${LIBCXX}${EXTRACT_SUFX}=      \
 USE_CXX_FEATURES=      c++17
 USE_LANGUAGES=         c c++
 SSP_SUPPORTED=         no
-GCC_REQD+=             12      # must be in sync with libcxx
+GCC_REQD+=             13      # must be in sync with libcxx
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
+# "LIBCXXABI_USE_LLVM_UNWINDER is set to ON, but libunwind is not specified in LLVM_ENABLE_RUNTIMES."
+#CMAKE_ARGS+=  -DLLVM_ENABLE_RUNTIMES=libunwind
+CMAKE_ARGS+=   -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
 
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=      -D__DEFINED_max_align_t=1
@@ -41,8 +44,8 @@ CXXFLAGS+=    -std=c++17 -D_LIBCPP_STD_VER=
 # IMPORTANT: copy __config_site from partial build of libcxx.
 post-extract:
        ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-       ${CP} ${FILESDIR}/__config_site \
-               ${WRKDIR}/${LIBCXX}/include/__config_site
+       ${CP} ${FILESDIR}/__assertion_handler ${FILESDIR}/__config_site \
+               ${WRKDIR}/${LIBCXX}/include/
 
 .include "../../devel/cmake/build.mk"
 .include "../../lang/libunwind/buildlink3.mk"

Index: pkgsrc/lang/libcxxabi/buildlink3.mk
diff -u pkgsrc/lang/libcxxabi/buildlink3.mk:1.10 pkgsrc/lang/libcxxabi/buildlink3.mk:1.11
--- pkgsrc/lang/libcxxabi/buildlink3.mk:1.10    Mon Apr 22 07:05:16 2024
+++ pkgsrc/lang/libcxxabi/buildlink3.mk Sat Jul  6 15:45:06 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.10 2024/04/22 07:05:16 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2024/07/06 15:45:06 adam Exp $
 
 BUILDLINK_TREE+=       libcxxabi
 
 .if !defined(LIBCXXABI_BUILDLINK3_MK)
 LIBCXXABI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libcxxabi+=      libcxxabi>=17.0.0<18
+BUILDLINK_API_DEPENDS.libcxxabi+=      libcxxabi>=18.0.0
 BUILDLINK_PKGSRCDIR.libcxxabi?=                ../../lang/libcxxabi
 
 .include "../../lang/llvm/buildlink3.mk"

Index: pkgsrc/lang/libcxxabi/distinfo
diff -u pkgsrc/lang/libcxxabi/distinfo:1.24 pkgsrc/lang/libcxxabi/distinfo:1.25
--- pkgsrc/lang/libcxxabi/distinfo:1.24 Mon Apr 22 07:05:16 2024
+++ pkgsrc/lang/libcxxabi/distinfo      Sat Jul  6 15:45:06 2024
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.24 2024/04/22 07:05:16 adam Exp $
+$NetBSD: distinfo,v 1.25 2024/07/06 15:45:06 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (libcxx-17.0.6.src.tar.xz) = cf31b1c41185da916ba428f5797e97f5cd8acb6d5a23947b40a94903e80de3ed
-SHA512 (libcxx-17.0.6.src.tar.xz) = 8be288ab14bd34a1946aeadc83c9e11ff68eb0cda707fd6bee711514d0e506112ffc2a40d0317d19f64f05b644e072f1322ed0e8ab238d9640b6b827d42126eb
-Size (libcxx-17.0.6.src.tar.xz) = 3946532 bytes
-BLAKE2s (libcxxabi-17.0.6.src.tar.xz) = 85c5ca07166696fbde2c24716e66f46741d42d69d617c574042b9ba9389ae9da
-SHA512 (libcxxabi-17.0.6.src.tar.xz) = acd2b0b48eee4380625347a955fa3dfafce948aeccd87a2070e09bd91b148ae189aec12b506f3097193a8288095e99496c66ce26974772878622e5892d822cc3
-Size (libcxxabi-17.0.6.src.tar.xz) = 575744 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
-SHA1 (patch-src_CMakeLists.txt) = da127de7603ed0ea5530c4a8cd2ffcee61d2ff90
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.8.src.tar.xz) = a804de6e86f74c0b6f6833f5e87831fdda8d1bc956b1da7f573200b3c4d31c53
+SHA512 (libcxx-18.1.8.src.tar.xz) = b24f8adbc4edd0cde3a28c6ce0ae2d7cd32049c155459c669f30ee6400a7a0e789c968db7f93bb0aa0f972b47b86424b9655af00e99867e242baccece8f323e8
+Size (libcxx-18.1.8.src.tar.xz) = 4028732 bytes
+BLAKE2s (libcxxabi-18.1.8.src.tar.xz) = c2e29ed27ba6144043b7ab036976f065685752e08995ff3b6ebead9c7cbad9f2
+SHA512 (libcxxabi-18.1.8.src.tar.xz) = 40f8691e86948527cd104b3b7f481757e6f8f4892fbe8632a6f86f35008e0c9d721e5f2d3629c6f0b99e9f150ee9f3d650aa111ea2c5f6df44fec481ff00a1f9
+Size (libcxxabi-18.1.8.src.tar.xz) = 582748 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
+SHA1 (patch-src_CMakeLists.txt) = 0236901cff68aec407538f43f1e6d41b0c6bf26b
 SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95

Index: pkgsrc/lang/libcxxabi/files/__config_site
diff -u pkgsrc/lang/libcxxabi/files/__config_site:1.1 pkgsrc/lang/libcxxabi/files/__config_site:1.2
--- pkgsrc/lang/libcxxabi/files/__config_site:1.1       Thu Apr 25 10:14:48 2024
+++ pkgsrc/lang/libcxxabi/files/__config_site   Sat Jul  6 15:45:06 2024
@@ -27,7 +27,9 @@
 /* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */
 /* #undef _LIBCPP_HAS_NO_LOCALIZATION */
 /* #undef _LIBCPP_HAS_NO_WIDE_CHARACTERS */
-#define _LIBCPP_ENABLE_ASSERTIONS_DEFAULT 0
+/* #undef _LIBCPP_HAS_NO_STD_MODULES */
+#define _LIBCPP_HAS_NO_TIME_ZONE_DATABASE
+/* #undef _LIBCPP_INSTRUMENTED_WITH_ASAN */
 
 // PSTL backends
 /* #undef _LIBCPP_PSTL_CPU_BACKEND_SERIAL */
@@ -35,8 +37,7 @@
 /* #undef _LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH */
 
 // Hardening.
-#define _LIBCPP_ENABLE_HARDENED_MODE_DEFAULT 0
-#define _LIBCPP_ENABLE_DEBUG_MODE_DEFAULT 0
+#define _LIBCPP_HARDENING_MODE_DEFAULT 2
 
 // __USE_MINGW_ANSI_STDIO gets redefined on MinGW
 #ifdef __clang__

Index: pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt:1.1 pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt:1.2
--- pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt:1.1  Mon Nov 14 18:44:06 2022
+++ pkgsrc/lang/libcxxabi/patches/patch-src_CMakeLists.txt      Sat Jul  6 15:45:06 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2022/11/14 18:44:06 adam Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2024/07/06 15:45:06 adam Exp $
 
 Fix build.
 
---- src/CMakeLists.txt.orig    2022-11-02 03:11:40.000000000 +0000
+--- src/CMakeLists.txt.orig    2024-04-17 00:21:15.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -57,6 +57,7 @@ if (MSVC_IDE OR XCODE)
  endif()
@@ -12,15 +12,15 @@ Fix build.
  include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
  
  if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
-@@ -168,7 +169,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
+@@ -166,7 +167,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_shared_objects PRIVATE cxx-headers ${LIBCXXABI_LIBRARIES})
+ if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG)
+   target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY})
+ endif()
+@@ -249,7 +249,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()

Index: pkgsrc/lang/libunwind/Makefile
diff -u pkgsrc/lang/libunwind/Makefile:1.36 pkgsrc/lang/libunwind/Makefile:1.37
--- pkgsrc/lang/libunwind/Makefile:1.36 Mon Apr 22 07:05:14 2024
+++ pkgsrc/lang/libunwind/Makefile      Sat Jul  6 15:45:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/04/22 07:05:14 adam Exp $
+# $NetBSD: Makefile,v 1.37 2024/07/06 15:45:07 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 

Index: pkgsrc/lang/libunwind/PLIST
diff -u pkgsrc/lang/libunwind/PLIST:1.4 pkgsrc/lang/libunwind/PLIST:1.5
--- pkgsrc/lang/libunwind/PLIST:1.4     Fri Oct  6 19:15:21 2023
+++ pkgsrc/lang/libunwind/PLIST Sat Jul  6 15:45:07 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2023/10/06 19:15:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/07/06 15:45:07 adam Exp $
 include/CMakeLists.txt
 include/__libunwind_config.h
 include/libunwind.h

Index: pkgsrc/lang/libunwind/buildlink3.mk
diff -u pkgsrc/lang/libunwind/buildlink3.mk:1.14 pkgsrc/lang/libunwind/buildlink3.mk:1.15
--- pkgsrc/lang/libunwind/buildlink3.mk:1.14    Mon Apr 22 07:05:14 2024
+++ pkgsrc/lang/libunwind/buildlink3.mk Sat Jul  6 15:45:07 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.14 2024/04/22 07:05:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2024/07/06 15:45:07 adam Exp $
 
 BUILDLINK_TREE+=       libunwind
 
 .if !defined(LIBUNWIND_BUILDLINK3_MK)
 LIBUNWIND_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libunwind+=      libunwind>=17.0.0<18
+BUILDLINK_API_DEPENDS.libunwind+=      libunwind>=18.0.0
 BUILDLINK_PKGSRCDIR.libunwind?=                ../../lang/libunwind
 
 .endif # LIBUNWIND_BUILDLINK3_MK

Index: pkgsrc/lang/libunwind/distinfo
diff -u pkgsrc/lang/libunwind/distinfo:1.35 pkgsrc/lang/libunwind/distinfo:1.36
--- pkgsrc/lang/libunwind/distinfo:1.35 Mon Apr 22 07:05:14 2024
+++ pkgsrc/lang/libunwind/distinfo      Sat Jul  6 15:45:07 2024
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.35 2024/04/22 07:05:14 adam Exp $
+$NetBSD: distinfo,v 1.36 2024/07/06 15:45:07 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (libcxx-17.0.6.src.tar.xz) = cf31b1c41185da916ba428f5797e97f5cd8acb6d5a23947b40a94903e80de3ed
-SHA512 (libcxx-17.0.6.src.tar.xz) = 8be288ab14bd34a1946aeadc83c9e11ff68eb0cda707fd6bee711514d0e506112ffc2a40d0317d19f64f05b644e072f1322ed0e8ab238d9640b6b827d42126eb
-Size (libcxx-17.0.6.src.tar.xz) = 3946532 bytes
-BLAKE2s (libunwind-17.0.6.src.tar.xz) = abcd9f59b94b449c0515bd8d98765a09b7adc70f15c18457f83f887424aec819
-SHA512 (libunwind-17.0.6.src.tar.xz) = 4f0c1a38796022a476fab06d91c5c5ec76e060e0697941be83ee896a18e548d02605e4431ea9ac09dc36bc28cc5609fac6a200faff703eba2360dfab2dcf5300
-Size (libunwind-17.0.6.src.tar.xz) = 115088 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.8.src.tar.xz) = a804de6e86f74c0b6f6833f5e87831fdda8d1bc956b1da7f573200b3c4d31c53
+SHA512 (libcxx-18.1.8.src.tar.xz) = b24f8adbc4edd0cde3a28c6ce0ae2d7cd32049c155459c669f30ee6400a7a0e789c968db7f93bb0aa0f972b47b86424b9655af00e99867e242baccece8f323e8
+Size (libcxx-18.1.8.src.tar.xz) = 4028732 bytes
+BLAKE2s (libunwind-18.1.8.src.tar.xz) = 56085c508f5da56519ad67d52758b31875d240b006443224c3513d2ae91a609c
+SHA512 (libunwind-18.1.8.src.tar.xz) = d6bf0e462db5d99bcdc1170c3789e84f21d86e35a6e79b75bea0a6f9aad222a25400944bb7fa030bf94e51cccc5e42b7b7002be98c0936f2852ac5688c0c3a84
+Size (libunwind-18.1.8.src.tar.xz) = 119316 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
 SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4

Index: pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.7 pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.8
--- pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt:1.7  Mon Apr 22 07:05:15 2024
+++ pkgsrc/lang/libunwind/patches/patch-src_CMakeLists.txt      Sat Jul  6 15:45:07 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.7 2024/04/22 07:05:15 adam Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.8 2024/07/06 15:45:07 adam Exp $
 
 Fix building assembler files.
 https://github.com/llvm/llvm-project/issues/59978

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.97 pkgsrc/lang/llvm/Makefile:1.98
--- pkgsrc/lang/llvm/Makefile:1.97      Wed May 29 16:33:14 2024
+++ pkgsrc/lang/llvm/Makefile   Sat Jul  6 15:45:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2024/05/29 16:33:14 adam Exp $
+# $NetBSD: Makefile,v 1.98 2024/07/06 15:45:05 adam Exp $
 #
 # When updating this, please also update:
 # devel/include-what-you-use
@@ -23,7 +23,6 @@
 # Always update all */buildlink3.mk to require the latest stable release
 # version in BUILDLINK_API_DEPENDS, as there is no backwards compatibility.
 
-PKGREVISION= 1
 .include "version.mk"
 
 DISTNAME=      llvm-${LLVM_VERSION}.src
@@ -93,7 +92,6 @@ SOEXT=                so
 PLIST.notdylib=        yes
 .endif
 PLIST_SUBST+=  SOEXT=${SOEXT}
-PLIST_SUBST+=  LLVM_MAJOR_VERSION=${LLVM_MAJOR_VERSION}
 
 NOTDYLIBS=             LTO Remarks
 .for libname in ${NOTDYLIBS}

Index: pkgsrc/lang/llvm/PLIST
diff -u pkgsrc/lang/llvm/PLIST:1.25 pkgsrc/lang/llvm/PLIST:1.26
--- pkgsrc/lang/llvm/PLIST:1.25 Fri May 10 17:22:13 2024
+++ pkgsrc/lang/llvm/PLIST      Sat Jul  6 15:45:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2024/05/10 17:22:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2024/07/06 15:45:05 adam Exp $
 bin/FileCheck
 bin/UnicodeNameMappingGenerator
 bin/bugpoint
@@ -62,8 +62,8 @@ bin/llvm-ranlib
 bin/llvm-rc
 bin/llvm-readelf
 bin/llvm-readobj
+bin/llvm-readtapi
 bin/llvm-reduce
-bin/llvm-remark-size-diff
 bin/llvm-remarkutil
 bin/llvm-rtdyld
 bin/llvm-sim
@@ -73,7 +73,6 @@ bin/llvm-stress
 bin/llvm-strings
 bin/llvm-strip
 bin/llvm-symbolizer
-bin/llvm-tapi-diff
 bin/llvm-tblgen
 bin/llvm-tli-checker
 bin/llvm-undname
@@ -104,6 +103,7 @@ include/llvm-c/ExecutionEngine.h
 include/llvm-c/ExternC.h
 include/llvm-c/IRReader.h
 include/llvm-c/LLJIT.h
+include/llvm-c/LLJITUtils.h
 include/llvm-c/Linker.h
 include/llvm-c/Object.h
 include/llvm-c/Orc.h
@@ -128,6 +128,7 @@ include/llvm/ADT/ArrayRef.h
 include/llvm/ADT/BitVector.h
 include/llvm/ADT/Bitfields.h
 include/llvm/ADT/BitmaskEnum.h
+include/llvm/ADT/Bitset.h
 include/llvm/ADT/BreadthFirstIterator.h
 include/llvm/ADT/CachedHashString.h
 include/llvm/ADT/CoalescingBitVector.h
@@ -147,6 +148,7 @@ include/llvm/ADT/EquivalenceClasses.h
 include/llvm/ADT/FloatingPointMode.h
 include/llvm/ADT/FoldingSet.h
 include/llvm/ADT/FunctionExtras.h
+include/llvm/ADT/GenericConvergenceVerifier.h
 include/llvm/ADT/GenericCycleImpl.h
 include/llvm/ADT/GenericCycleInfo.h
 include/llvm/ADT/GenericSSAContext.h
@@ -162,8 +164,10 @@ include/llvm/ADT/IntEqClasses.h
 include/llvm/ADT/IntervalMap.h
 include/llvm/ADT/IntervalTree.h
 include/llvm/ADT/IntrusiveRefCntPtr.h
+include/llvm/ADT/LazyAtomicPointer.h
 include/llvm/ADT/MapVector.h
 include/llvm/ADT/PackedVector.h
+include/llvm/ADT/PagedVector.h
 include/llvm/ADT/PointerEmbeddedInt.h
 include/llvm/ADT/PointerIntPair.h
 include/llvm/ADT/PointerSumType.h
@@ -189,6 +193,7 @@ include/llvm/ADT/SmallVectorExtras.h
 include/llvm/ADT/SparseBitVector.h
 include/llvm/ADT/SparseMultiSet.h
 include/llvm/ADT/SparseSet.h
+include/llvm/ADT/StableHashing.h
 include/llvm/ADT/Statistic.h
 include/llvm/ADT/StringExtras.h
 include/llvm/ADT/StringMap.h
@@ -244,6 +249,7 @@ include/llvm/Analysis/Delinearization.h
 include/llvm/Analysis/DemandedBits.h
 include/llvm/Analysis/DependenceAnalysis.h
 include/llvm/Analysis/DependenceGraphBuilder.h
+include/llvm/Analysis/DomConditionCache.h
 include/llvm/Analysis/DomPrinter.h
 include/llvm/Analysis/DomTreeUpdater.h
 include/llvm/Analysis/DominanceFrontier.h
@@ -326,9 +332,11 @@ include/llvm/Analysis/ScalarEvolutionExp
 include/llvm/Analysis/ScalarEvolutionNormalization.h
 include/llvm/Analysis/ScalarFuncs.def
 include/llvm/Analysis/ScopedNoAliasAA.h
+include/llvm/Analysis/SimplifyQuery.h
 include/llvm/Analysis/SparsePropagation.h
 include/llvm/Analysis/StackLifetime.h
 include/llvm/Analysis/StackSafetyAnalysis.h
+include/llvm/Analysis/StructuralHash.h
 include/llvm/Analysis/SyntheticCountsUtils.h
 include/llvm/Analysis/TargetFolder.h
 include/llvm/Analysis/TargetLibraryInfo.def
@@ -349,6 +357,7 @@ include/llvm/Analysis/ValueLatticeUtils.
 include/llvm/Analysis/ValueTracking.h
 include/llvm/Analysis/VecFuncs.def
 include/llvm/Analysis/VectorUtils.h
+include/llvm/Analysis/WithCache.h
 include/llvm/AsmParser/LLLexer.h
 include/llvm/AsmParser/LLParser.h
 include/llvm/AsmParser/LLToken.h
@@ -426,9 +435,11 @@ include/llvm/CodeGen/ByteProvider.h
 include/llvm/CodeGen/CFIFixup.h
 include/llvm/CodeGen/CSEConfigBase.h
 include/llvm/CodeGen/CalcSpillWeights.h
+include/llvm/CodeGen/CallBrPrepare.h
 include/llvm/CodeGen/CallingConvLower.h
 include/llvm/CodeGen/CodeGenCommonISel.h
 include/llvm/CodeGen/CodeGenPassBuilder.h
+include/llvm/CodeGen/CodeGenPrepare.h
 include/llvm/CodeGen/CommandFlags.h
 include/llvm/CodeGen/ComplexDeinterleavingPass.h
 include/llvm/CodeGen/CostTable.h
@@ -439,9 +450,13 @@ include/llvm/CodeGen/DIEValue.def
 include/llvm/CodeGen/DbgEntityHistoryCalculator.h
 include/llvm/CodeGen/DebugHandlerBase.h
 include/llvm/CodeGen/DetectDeadLanes.h
+include/llvm/CodeGen/DwarfEHPrepare.h
 include/llvm/CodeGen/DwarfStringPoolEntry.h
 include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/ExecutionDomainFix.h
+include/llvm/CodeGen/ExpandLargeDivRem.h
+include/llvm/CodeGen/ExpandLargeFpConvert.h
+include/llvm/CodeGen/ExpandMemCmp.h
 include/llvm/CodeGen/ExpandReductions.h
 include/llvm/CodeGen/ExpandVectorPredication.h
 include/llvm/CodeGen/FastISel.h
@@ -478,10 +493,15 @@ include/llvm/CodeGen/GlobalISel/MIPatter
 include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h
 include/llvm/CodeGen/GlobalISel/RegBankSelect.h
 include/llvm/CodeGen/GlobalISel/Utils.h
+include/llvm/CodeGen/GlobalMerge.h
 include/llvm/CodeGen/HardwareLoops.h
 include/llvm/CodeGen/ISDOpcodes.h
+include/llvm/CodeGen/IndirectBrExpand.h
 include/llvm/CodeGen/IndirectThunks.h
+include/llvm/CodeGen/InterleavedAccess.h
+include/llvm/CodeGen/InterleavedLoadCombine.h
 include/llvm/CodeGen/IntrinsicLowering.h
+include/llvm/CodeGen/JMCInstrumenter.h
 include/llvm/CodeGen/LatencyPriorityQueue.h
 include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
 include/llvm/CodeGen/LexicalScopes.h
@@ -501,6 +521,7 @@ include/llvm/CodeGen/LiveVariables.h
 include/llvm/CodeGen/LoopTraversal.h
 include/llvm/CodeGen/LowLevelType.h
 include/llvm/CodeGen/LowLevelTypeUtils.h
+include/llvm/CodeGen/LowerEmuTLS.h
 include/llvm/CodeGen/MBFIWrapper.h
 include/llvm/CodeGen/MIRFSDiscriminator.h
 include/llvm/CodeGen/MIRFormatter.h
@@ -565,6 +586,7 @@ include/llvm/CodeGen/ParallelCG.h
 include/llvm/CodeGen/Passes.h
 include/llvm/CodeGen/PreISelIntrinsicLowering.h
 include/llvm/CodeGen/PseudoSourceValue.h
+include/llvm/CodeGen/PseudoSourceValueManager.h
 include/llvm/CodeGen/RDFGraph.h
 include/llvm/CodeGen/RDFLiveness.h
 include/llvm/CodeGen/RDFRegisters.h
@@ -583,6 +605,7 @@ include/llvm/CodeGen/ReplaceWithVeclib.h
 include/llvm/CodeGen/ResourcePriorityQueue.h
 include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/SDNodeProperties.td
+include/llvm/CodeGen/SafeStack.h
 include/llvm/CodeGen/ScheduleDAG.h
 include/llvm/CodeGen/ScheduleDAGInstrs.h
 include/llvm/CodeGen/ScheduleDAGMutation.h
@@ -590,14 +613,16 @@ include/llvm/CodeGen/ScheduleDFS.h
 include/llvm/CodeGen/ScheduleHazardRecognizer.h
 include/llvm/CodeGen/SchedulerRegistry.h
 include/llvm/CodeGen/ScoreboardHazardRecognizer.h
+include/llvm/CodeGen/SelectOptimize.h
 include/llvm/CodeGen/SelectionDAG.h
 include/llvm/CodeGen/SelectionDAGAddressAnalysis.h
 include/llvm/CodeGen/SelectionDAGISel.h
 include/llvm/CodeGen/SelectionDAGNodes.h
 include/llvm/CodeGen/SelectionDAGTargetInfo.h
+include/llvm/CodeGen/ShadowStackGCLowering.h
+include/llvm/CodeGen/SjLjEHPrepare.h
 include/llvm/CodeGen/SlotIndexes.h
 include/llvm/CodeGen/Spiller.h
-include/llvm/CodeGen/StableHashing.h
 include/llvm/CodeGen/StackMaps.h
 include/llvm/CodeGen/StackProtector.h
 include/llvm/CodeGen/SwiftErrorValueTracking.h
@@ -620,9 +645,10 @@ include/llvm/CodeGen/VLIWMachineSchedule
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
 include/llvm/CodeGen/VirtRegMap.h
-include/llvm/CodeGen/WasmAddressSpaces.h
 include/llvm/CodeGen/WasmEHFuncInfo.h
+include/llvm/CodeGen/WasmEHPrepare.h
 include/llvm/CodeGen/WinEHFuncInfo.h
+include/llvm/CodeGen/WinEHPrepare.h
 include/llvm/Config/AsmParsers.def
 include/llvm/Config/AsmPrinters.def
 include/llvm/Config/Disassemblers.def
@@ -631,15 +657,17 @@ include/llvm/Config/TargetMCAs.def
 include/llvm/Config/Targets.def
 include/llvm/Config/abi-breaking.h
 include/llvm/Config/llvm-config.h
-include/llvm/DWARFLinker/DWARFLinker.h
-include/llvm/DWARFLinker/DWARFLinkerCompileUnit.h
-include/llvm/DWARFLinker/DWARFLinkerDeclContext.h
-include/llvm/DWARFLinker/DWARFStreamer.h
-include/llvm/DWARFLinkerParallel/AddressesMap.h
-include/llvm/DWARFLinkerParallel/DWARFFile.h
-include/llvm/DWARFLinkerParallel/DWARFLinker.h
-include/llvm/DWARFLinkerParallel/StringPool.h
-include/llvm/DWARFLinkerParallel/StringTable.h
+include/llvm/DWARFLinker/AddressesMap.h
+include/llvm/DWARFLinker/Classic/DWARFLinker.h
+include/llvm/DWARFLinker/Classic/DWARFLinkerCompileUnit.h
+include/llvm/DWARFLinker/Classic/DWARFLinkerDeclContext.h
+include/llvm/DWARFLinker/Classic/DWARFStreamer.h
+include/llvm/DWARFLinker/DWARFFile.h
+include/llvm/DWARFLinker/DWARFLinkerBase.h
+include/llvm/DWARFLinker/IndexedValuesMap.h
+include/llvm/DWARFLinker/Parallel/DWARFLinker.h
+include/llvm/DWARFLinker/StringPool.h
+include/llvm/DWARFLinker/Utils.h
 include/llvm/DWP/DWP.h
 include/llvm/DWP/DWPError.h
 include/llvm/DWP/DWPStringPool.h
@@ -818,7 +846,6 @@ include/llvm/DebugInfo/PDB/Native/DbiStr
 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
 include/llvm/DebugInfo/PDB/Native/Hash.h
@@ -965,7 +992,10 @@ include/llvm/ExecutionEngine/Orc/Compile
 include/llvm/ExecutionEngine/Orc/Core.h
 include/llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h
 include/llvm/ExecutionEngine/Orc/DebugUtils.h
-include/llvm/ExecutionEngine/Orc/DebuggerSupportPlugin.h
+include/llvm/ExecutionEngine/Orc/Debugging/DebugInfoSupport.h
+include/llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h
+include/llvm/ExecutionEngine/Orc/Debugging/DebuggerSupportPlugin.h
+include/llvm/ExecutionEngine/Orc/Debugging/PerfSupportPlugin.h
 include/llvm/ExecutionEngine/Orc/ELFNixPlatform.h
 include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h
 include/llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h
@@ -985,6 +1015,7 @@ include/llvm/ExecutionEngine/Orc/LLJIT.h
 include/llvm/ExecutionEngine/Orc/Layer.h
 include/llvm/ExecutionEngine/Orc/LazyReexports.h
 include/llvm/ExecutionEngine/Orc/LookupAndRecordAddrs.h
+include/llvm/ExecutionEngine/Orc/MachOBuilder.h
 include/llvm/ExecutionEngine/Orc/MachOPlatform.h
 include/llvm/ExecutionEngine/Orc/Mangling.h
 include/llvm/ExecutionEngine/Orc/MapperJITLinkMemoryManager.h
@@ -1001,6 +1032,7 @@ include/llvm/ExecutionEngine/Orc/Shared/
 include/llvm/ExecutionEngine/Orc/Shared/ObjectFormats.h
 include/llvm/ExecutionEngine/Orc/Shared/OrcError.h
 include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
+include/llvm/ExecutionEngine/Orc/Shared/PerfSharedStructs.h
 include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
 include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h
 include/llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h
@@ -1012,6 +1044,7 @@ include/llvm/ExecutionEngine/Orc/SymbolS
 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/JITLoaderPerf.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorDylibManager.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorMemoryManager.h
@@ -1026,7 +1059,10 @@ include/llvm/ExecutionEngine/SectionMemo
 include/llvm/FileCheck/FileCheck.h
 include/llvm/Frontend/Debug/Options.h
 include/llvm/Frontend/Directive/DirectiveBase.td
+include/llvm/Frontend/Driver/CodeGenOptions.h
 include/llvm/Frontend/HLSL/HLSLResource.h
+include/llvm/Frontend/Offloading/OffloadWrapper.h
+include/llvm/Frontend/Offloading/Utility.h
 include/llvm/Frontend/OpenACC/ACC.h.inc
 include/llvm/Frontend/OpenACC/ACC.inc
 include/llvm/Frontend/OpenACC/ACC.td
@@ -1066,6 +1102,7 @@ include/llvm/IR/ConstantFolder.h
 include/llvm/IR/ConstantRange.h
 include/llvm/IR/Constants.h
 include/llvm/IR/ConstrainedOps.def
+include/llvm/IR/ConvergenceVerifier.h
 include/llvm/IR/CycleInfo.h
 include/llvm/IR/DIBuilder.h
 include/llvm/IR/DataLayout.h
@@ -1073,6 +1110,7 @@ include/llvm/IR/DebugInfo.h
 include/llvm/IR/DebugInfoFlags.def
 include/llvm/IR/DebugInfoMetadata.h
 include/llvm/IR/DebugLoc.h
+include/llvm/IR/DebugProgramInstruction.h
 include/llvm/IR/DerivedTypes.h
 include/llvm/IR/DerivedUser.h
 include/llvm/IR/DiagnosticHandler.h
@@ -1087,6 +1125,7 @@ include/llvm/IR/FixedPointBuilder.h
 include/llvm/IR/Function.h
 include/llvm/IR/GCStrategy.h
 include/llvm/IR/GVMaterializer.h
+include/llvm/IR/GenericConvergenceVerifierImpl.h
 include/llvm/IR/GetElementPtrTypeIterator.h
 include/llvm/IR/GlobalAlias.h
 include/llvm/IR/GlobalIFunc.h
@@ -1132,6 +1171,7 @@ include/llvm/IR/IntrinsicsPowerPC.td
 include/llvm/IR/IntrinsicsR600.h
 include/llvm/IR/IntrinsicsRISCV.h
 include/llvm/IR/IntrinsicsRISCV.td
+include/llvm/IR/IntrinsicsRISCVXCV.td
 include/llvm/IR/IntrinsicsRISCVXTHead.td
 include/llvm/IR/IntrinsicsRISCVXsf.td
 include/llvm/IR/IntrinsicsS390.h
@@ -1190,6 +1230,7 @@ include/llvm/IR/TypedPointerType.h
 include/llvm/IR/Use.h
 include/llvm/IR/UseListOrder.h
 include/llvm/IR/User.h
+include/llvm/IR/VFABIDemangler.h
 include/llvm/IR/VPIntrinsics.def
 include/llvm/IR/Value.def
 include/llvm/IR/Value.h
@@ -1249,6 +1290,8 @@ include/llvm/MC/MCExpr.h
 include/llvm/MC/MCFixup.h
 include/llvm/MC/MCFixupKindInfo.h
 include/llvm/MC/MCFragment.h
+include/llvm/MC/MCGOFFObjectWriter.h
+include/llvm/MC/MCGOFFStreamer.h
 include/llvm/MC/MCInst.h
 include/llvm/MC/MCInstBuilder.h
 include/llvm/MC/MCInstPrinter.h
@@ -1394,6 +1437,7 @@ include/llvm/ObjectYAML/DWARFEmitter.h
 include/llvm/ObjectYAML/DWARFYAML.h
 include/llvm/ObjectYAML/DXContainerYAML.h
 include/llvm/ObjectYAML/ELFYAML.h
+include/llvm/ObjectYAML/GOFFYAML.h
 include/llvm/ObjectYAML/MachOYAML.h
 include/llvm/ObjectYAML/MinidumpYAML.h
 include/llvm/ObjectYAML/ObjectYAML.h
@@ -1420,7 +1464,9 @@ include/llvm/Passes/StandardInstrumentat
 include/llvm/ProfileData/Coverage/CoverageMapping.h
 include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
+include/llvm/ProfileData/FunctionId.h
 include/llvm/ProfileData/GCOV.h
+include/llvm/ProfileData/HashKeyMap.h
 include/llvm/ProfileData/InstrProf.h
 include/llvm/ProfileData/InstrProfCorrelator.h
 include/llvm/ProfileData/InstrProfData.inc
@@ -1448,6 +1494,7 @@ include/llvm/Remarks/RemarkSerializer.h
 include/llvm/Remarks/RemarkStreamer.h
 include/llvm/Remarks/RemarkStringTable.h
 include/llvm/Remarks/YAMLRemarkSerializer.h
+include/llvm/Support/AMDGPUAddrSpace.h
 include/llvm/Support/AMDGPUMetadata.h
 include/llvm/Support/AMDHSAKernelDescriptor.h
 include/llvm/Support/ARMAttributeParser.h
@@ -1542,7 +1589,6 @@ include/llvm/Support/GenericLoopInfoImpl
 include/llvm/Support/GlobPattern.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/HashBuilder.h
-include/llvm/Support/Host.h
 include/llvm/Support/InitLLVM.h
 include/llvm/Support/InstructionCost.h
 include/llvm/Support/JSON.h
@@ -1607,10 +1653,12 @@ include/llvm/Support/SuffixTree.h
 include/llvm/Support/SuffixTreeNode.h
 include/llvm/Support/SwapByteOrder.h
 include/llvm/Support/SystemUtils.h
+include/llvm/Support/SystemZ/zOSSupport.h
 include/llvm/Support/TarWriter.h
 include/llvm/Support/TargetOpcodes.def
 include/llvm/Support/TargetSelect.h
 include/llvm/Support/ThreadPool.h
+include/llvm/Support/ThreadSafeAllocator.h
 include/llvm/Support/Threading.h
 include/llvm/Support/TimeProfiler.h
 include/llvm/Support/Timer.h
@@ -1637,6 +1685,7 @@ include/llvm/Support/circular_raw_ostrea
 include/llvm/Support/raw_os_ostream.h
 include/llvm/Support/raw_ostream.h
 include/llvm/Support/raw_sha1_ostream.h
+include/llvm/Support/raw_socket_stream.h
 include/llvm/Support/thread.h
 include/llvm/Support/type_traits.h
 include/llvm/Support/xxhash.h
@@ -1693,14 +1742,20 @@ include/llvm/Testing/Support/SupportHelp
 include/llvm/TextAPI/Architecture.def
 include/llvm/TextAPI/Architecture.h
 include/llvm/TextAPI/ArchitectureSet.h
+include/llvm/TextAPI/DylibReader.h
 include/llvm/TextAPI/InterfaceFile.h
 include/llvm/TextAPI/PackedVersion.h
 include/llvm/TextAPI/Platform.h
+include/llvm/TextAPI/Record.h
+include/llvm/TextAPI/RecordVisitor.h
+include/llvm/TextAPI/RecordsSlice.h
 include/llvm/TextAPI/Symbol.h
 include/llvm/TextAPI/SymbolSet.h
 include/llvm/TextAPI/Target.h
+include/llvm/TextAPI/TextAPIError.h
 include/llvm/TextAPI/TextAPIReader.h
 include/llvm/TextAPI/TextAPIWriter.h
+include/llvm/TextAPI/Utils.h
 include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
@@ -1710,6 +1765,7 @@ include/llvm/Transforms/Coroutines/CoroC
 include/llvm/Transforms/Coroutines/CoroEarly.h
 include/llvm/Transforms/Coroutines/CoroElide.h
 include/llvm/Transforms/Coroutines/CoroSplit.h
+include/llvm/Transforms/HipStdPar/HipStdPar.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/AlwaysInliner.h
 include/llvm/Transforms/IPO/Annotation2Metadata.h
@@ -1800,6 +1856,7 @@ include/llvm/Transforms/Scalar/IVUsersPr
 include/llvm/Transforms/Scalar/IndVarSimplify.h
 include/llvm/Transforms/Scalar/InductiveRangeCheckElimination.h
 include/llvm/Transforms/Scalar/InferAddressSpaces.h
+include/llvm/Transforms/Scalar/InferAlignment.h
 include/llvm/Transforms/Scalar/InstSimplifyPass.h
 include/llvm/Transforms/Scalar/JumpThreading.h
 include/llvm/Transforms/Scalar/LICM.h
@@ -1874,6 +1931,7 @@ include/llvm/Transforms/Utils/CodeLayout
 include/llvm/Transforms/Utils/CodeMoverUtils.h
 include/llvm/Transforms/Utils/CountVisits.h
 include/llvm/Transforms/Utils/CtorUtils.h
+include/llvm/Transforms/Utils/DXILUpgrade.h
 include/llvm/Transforms/Utils/Debugify.h
 include/llvm/Transforms/Utils/EntryExitInstrumenter.h
 include/llvm/Transforms/Utils/EscapeEnumerator.h
@@ -1891,6 +1949,7 @@ include/llvm/Transforms/Utils/IntegerDiv
 include/llvm/Transforms/Utils/LCSSA.h
 include/llvm/Transforms/Utils/LibCallsShrinkWrap.h
 include/llvm/Transforms/Utils/Local.h
+include/llvm/Transforms/Utils/LoopConstrainer.h
 include/llvm/Transforms/Utils/LoopPeel.h
 include/llvm/Transforms/Utils/LoopRotationUtils.h
 include/llvm/Transforms/Utils/LoopSimplify.h
@@ -1936,7 +1995,6 @@ include/llvm/Transforms/Utils/UnifyLoopE
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/VNCoercion.h
 include/llvm/Transforms/Utils/ValueMapper.h
-include/llvm/Transforms/Vectorize.h
 include/llvm/Transforms/Vectorize/LoadStoreVectorizer.h
 include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h
 include/llvm/Transforms/Vectorize/LoopVectorize.h
@@ -1971,7 +2029,6 @@ 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
 lib/cmake/llvm/DetermineGCCCompatible.cmake
@@ -2000,15 +2057,14 @@ lib/cmake/llvm/LLVMExports.cmake
 lib/cmake/llvm/LLVMExternalProjectUtils.cmake
 lib/cmake/llvm/LLVMInstallSymlink.cmake
 lib/cmake/llvm/LLVMProcessSources.cmake
-lib/cmake/llvm/SetTargetTriple.cmake
 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-17.${SOEXT}
+lib/libLLVM-18.${SOEXT}
 lib/libLLVM.${SOEXT}
+${PLIST.notdylib}lib/libLLVM.${SOEXT}.18.1
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a
 ${PLIST.AArch64}lib/libLLVMAArch64Desc.a
@@ -2063,6 +2119,7 @@ lib/libLLVMCore.a
 lib/libLLVMCoroutines.a
 lib/libLLVMCoverage.a
 lib/libLLVMDWARFLinker.a
+lib/libLLVMDWARFLinkerClassic.a
 lib/libLLVMDWARFLinkerParallel.a
 lib/libLLVMDWP.a
 ${PLIST.DirectX}lib/libLLVMDXILBitWriter.a
@@ -2089,7 +2146,9 @@ ${PLIST.PowerPC}lib/libLLVMExegesisPower
 ${PLIST.X86}lib/libLLVMExegesisX86.a
 lib/libLLVMExtensions.a
 lib/libLLVMFileCheck.a
+lib/libLLVMFrontendDriver.a
 lib/libLLVMFrontendHLSL.a
+lib/libLLVMFrontendOffloading.a
 lib/libLLVMFrontendOpenACC.a
 lib/libLLVMFrontendOpenMP.a
 lib/libLLVMFuzzMutate.a
@@ -2100,6 +2159,7 @@ ${PLIST.Hexagon}lib/libLLVMHexagonCodeGe
 ${PLIST.Hexagon}lib/libLLVMHexagonDesc.a
 ${PLIST.Hexagon}lib/libLLVMHexagonDisassembler.a
 ${PLIST.Hexagon}lib/libLLVMHexagonInfo.a
+lib/libLLVMHipStdPar.a
 lib/libLLVMIRPrinter.a
 lib/libLLVMIRReader.a
 lib/libLLVMInstCombine.a
@@ -2150,6 +2210,7 @@ lib/libLLVMObjCopy.a
 lib/libLLVMObject.a
 lib/libLLVMObjectYAML.a
 lib/libLLVMOption.a
+lib/libLLVMOrcDebugging.a
 lib/libLLVMOrcJIT.a
 lib/libLLVMOrcShared.a
 lib/libLLVMOrcTargetProcess.a
@@ -2191,6 +2252,7 @@ lib/libLLVMTableGenGlobalISel.a
 lib/libLLVMTarget.a
 lib/libLLVMTargetParser.a
 lib/libLLVMTextAPI.a
+lib/libLLVMTextAPIBinaryReader.a
 lib/libLLVMTransformUtils.a
 ${PLIST.VE}lib/libLLVMVEAsmParser.a
 ${PLIST.VE}lib/libLLVMVECodeGen.a
@@ -2224,9 +2286,9 @@ ${PLIST.Xtensa}lib/libLLVMXtensaDisassem
 ${PLIST.Xtensa}lib/libLLVMXtensaInfo.a
 lib/libLLVMipo.a
 lib/libLTO.${SOEXT}
-${PLIST.notdylib}lib/libLTO.${SOEXT}.${LLVM_MAJOR_VERSION}
+${PLIST.notdylib}lib/libLTO.${SOEXT}.18.1
 lib/libRemarks.${SOEXT}
-${PLIST.notdylib}lib/libRemarks.${SOEXT}.${LLVM_MAJOR_VERSION}
+${PLIST.notdylib}lib/libRemarks.${SOEXT}.18.1
 share/opt-viewer/opt-diff.py
 share/opt-viewer/opt-stats.py
 share/opt-viewer/opt-viewer.py

Index: pkgsrc/lang/llvm/buildlink3.mk
diff -u pkgsrc/lang/llvm/buildlink3.mk:1.27 pkgsrc/lang/llvm/buildlink3.mk:1.28
--- pkgsrc/lang/llvm/buildlink3.mk:1.27 Wed May 29 17:18:40 2024
+++ pkgsrc/lang/llvm/buildlink3.mk      Sat Jul  6 15:45:05 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.27 2024/05/29 17:18:40 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2024/07/06 15:45:05 adam Exp $
 
 BUILDLINK_TREE+=       llvm
 
 .if !defined(LLVM_BUILDLINK3_MK)
 LLVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.llvm+=   llvm>=17.0.0<18
+BUILDLINK_API_DEPENDS.llvm+=   llvm>=18.0.0
 BUILDLINK_PKGSRCDIR.llvm?=     ../../lang/llvm
 
 LLVM_CONFIG_PATH?=             ${BUILDLINK_PREFIX.llvm}/bin/llvm-config
@@ -73,8 +73,8 @@ BUILDLINK_FILES.llvm+=                bin/llvm-ranlib
 BUILDLINK_FILES.llvm+=         bin/llvm-rc
 BUILDLINK_FILES.llvm+=         bin/llvm-readelf
 BUILDLINK_FILES.llvm+=         bin/llvm-readobj
+BUILDLINK_FILES.llvm+=         bin/llvm-readtapi
 BUILDLINK_FILES.llvm+=         bin/llvm-reduce
-BUILDLINK_FILES.llvm+=         bin/llvm-remark-size-diff
 BUILDLINK_FILES.llvm+=         bin/llvm-remarkutil
 BUILDLINK_FILES.llvm+=         bin/llvm-rtdyld
 BUILDLINK_FILES.llvm+=         bin/llvm-sim
@@ -84,7 +84,6 @@ BUILDLINK_FILES.llvm+=                bin/llvm-stress
 BUILDLINK_FILES.llvm+=         bin/llvm-strings
 BUILDLINK_FILES.llvm+=         bin/llvm-strip
 BUILDLINK_FILES.llvm+=         bin/llvm-symbolizer
-BUILDLINK_FILES.llvm+=         bin/llvm-tapi-diff
 BUILDLINK_FILES.llvm+=         bin/llvm-tblgen
 BUILDLINK_FILES.llvm+=         bin/llvm-tli-checker
 BUILDLINK_FILES.llvm+=         bin/llvm-undname

Index: pkgsrc/lang/llvm/distinfo
diff -u pkgsrc/lang/llvm/distinfo:1.44 pkgsrc/lang/llvm/distinfo:1.45
--- pkgsrc/lang/llvm/distinfo:1.44      Tue Jul  2 18:14:26 2024
+++ pkgsrc/lang/llvm/distinfo   Sat Jul  6 15:45:05 2024
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.44 2024/07/02 18:14:26 cheusov Exp $
+$NetBSD: distinfo,v 1.45 2024/07/06 15:45:05 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (llvm-17.0.6.src.tar.xz) = b377367982a058f99672f3b9a489547dd9d1a6383c6e9b65d7a4a653565b7455
-SHA512 (llvm-17.0.6.src.tar.xz) = bf9b04d0d45c67168b195c550cd8326e3a01176f92776705846aad3956a494bcb7a053b0b0bde19abd68dc0068e5c97ef99dee7eadfdb727bc0d758b2684f3bd
-Size (llvm-17.0.6.src.tar.xz) = 59298244 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (llvm-18.1.8.src.tar.xz) = b9353b29fb4d0d561b8ed4c5e96b2acef39f08721ef798fb7c48fbf3bd7955df
+SHA512 (llvm-18.1.8.src.tar.xz) = 930814730bb2d80cf7f7b2968f0f1f1442009ca62a7ca29992b69d63823270584b059d16aa845bb381411da566e7e4f255fcfbc38acbdf865eb0419b4dfd7459
+Size (llvm-18.1.8.src.tar.xz) = 61986468 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 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-lib_Support_BLAKE3-blake3__impl.h) = 29624dc764c747b247dbde19e9d186a853b59134
 SHA1 (patch-lib_Target_CSKY_MCTargetDesc_CSKYMCCodeEmitter.cpp) = a769f1533a136f9c50630e3219cafbf005e4e4e1
-SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 6ecb1623a9da13a8b4121cfbead1fd6ca7dfdee4
+SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 4f3d0f527735126293519b42d7fd33dc41a910c2
 SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = 8b18659fe7189c9077b0409e123d41c01e8c8610

Index: pkgsrc/lang/llvm/options.mk
diff -u pkgsrc/lang/llvm/options.mk:1.18 pkgsrc/lang/llvm/options.mk:1.19
--- pkgsrc/lang/llvm/options.mk:1.18    Fri May 10 17:22:13 2024
+++ pkgsrc/lang/llvm/options.mk Sat Jul  6 15:45:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2024/05/10 17:22:13 adam Exp $
+# $NetBSD: options.mk,v 1.19 2024/07/06 15:45:05 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.llvm
 

Index: pkgsrc/lang/llvm/version.mk
diff -u pkgsrc/lang/llvm/version.mk:1.16 pkgsrc/lang/llvm/version.mk:1.17
--- pkgsrc/lang/llvm/version.mk:1.16    Mon Apr 22 06:52:42 2024
+++ pkgsrc/lang/llvm/version.mk Sat Jul  6 15:45:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.16 2024/04/22 06:52:42 adam Exp $
+# $NetBSD: version.mk,v 1.17 2024/07/06 15:45:06 adam Exp $
 # used by devel/lld
 # used by devel/lldb
 # used by devel/polly
@@ -14,7 +14,7 @@
 # used by lang/wasi-libcxx
 # used by parallel/openmp
 
-LLVM_VERSION=  17.0.6
+LLVM_VERSION=  18.1.8
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=llvm/}
 GITHUB_PROJECT=        llvm-project
 GITHUB_RELEASE=        llvmorg-${PKGVERSION_NOREV}

Index: pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
diff -u pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.10 pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.11
--- pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.10 Mon Apr 22 06:52:42 2024
+++ pkgsrc/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt      Sat Jul  6 15:45:06 2024
@@ -1,37 +1,15 @@
-$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.10 2024/04/22 06:52:42 adam Exp $
+$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.11 2024/07/06 15:45:06 adam Exp $
 
-Use the Linux style linking everywhere except Darwin and SunOS.
+Add style linking for SunOS.
 
---- tools/llvm-shlib/CMakeLists.txt.orig       2023-11-28 08:52:28.000000000 +0000
+--- tools/llvm-shlib/CMakeLists.txt.orig       2024-04-17 00:21:15.000000000 +0000
 +++ tools/llvm-shlib/CMakeLists.txt
-@@ -33,16 +33,11 @@ if(LLVM_BUILD_LLVM_DYLIB)
-   add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
- 
+@@ -44,6 +44,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
    list(REMOVE_DUPLICATES LIB_NAMES)
--  if((MINGW) OR (HAIKU)
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "NetBSD")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
--     OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf"
-+  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
+   if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+     set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
++  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
 +    set(LIB_NAMES -Wl,-Bsymbolic -Wl,-z -Wl,allextract ${LIB_NAMES} -Wl,-z -Wl,defaultextract)
-+  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-+    set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
-+  else()
+   else()
      configure_file(
      ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
-     ${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)
-@@ -60,8 +55,6 @@ if(LLVM_BUILD_LLVM_DYLIB)
-       # inside and outside libLLVM.so.
-       target_link_options(LLVM PRIVATE LINKER:-Bsymbolic-functions)
-     endif()
--  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
--    set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
-   endif()
- 
-   target_link_libraries(LLVM PRIVATE ${LIB_NAMES})

Index: pkgsrc/lang/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt
diff -u pkgsrc/lang/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt:1.1 pkgsrc/lang/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt:1.2
--- pkgsrc/lang/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt:1.1    Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt        Sat Jul  6 15:45:06 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-utils_llvm-lit_CMakeLists.txt,v 1.1 2023/10/06 19:15:20 adam Exp $
+$NetBSD: patch-utils_llvm-lit_CMakeLists.txt,v 1.2 2024/07/06 15:45:06 adam Exp $
 
 Install llvm-lit; needed for flang.
 

Index: pkgsrc/lang/mlir/Makefile
diff -u pkgsrc/lang/mlir/Makefile:1.3 pkgsrc/lang/mlir/Makefile:1.4
--- pkgsrc/lang/mlir/Makefile:1.3       Thu Apr 25 07:52:26 2024
+++ pkgsrc/lang/mlir/Makefile   Sat Jul  6 15:45:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/04/25 07:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2024/07/06 15:45:09 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -19,14 +19,6 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=   -DMLIR_INSTALL_AGGREGATE_OBJECTS=NO
 CMAKE_ARGS+=   -DMLIR_BUILD_MLIR_C_DYLIB=YES
 
-PLIST_VARS=    notdarwin
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Darwin"
-PLIST.notdarwin=       yes
-.endif
-
 .include "../../devel/cmake/build.mk"
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/mlir/PLIST
diff -u pkgsrc/lang/mlir/PLIST:1.3 pkgsrc/lang/mlir/PLIST:1.4
--- pkgsrc/lang/mlir/PLIST:1.3  Thu Apr 25 07:52:26 2024
+++ pkgsrc/lang/mlir/PLIST      Sat Jul  6 15:45:09 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2024/04/25 07:52:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/07/06 15:45:09 adam Exp $
 bin/mlir-tblgen
 include/mlir-c/AffineExpr.h
 include/mlir-c/AffineMap.h
@@ -8,6 +8,7 @@ include/mlir-c/BuiltinTypes.h
 include/mlir-c/Conversion.h
 include/mlir-c/Debug.h
 include/mlir-c/Diagnostics.h
+include/mlir-c/Dialect/AMDGPU.h
 include/mlir-c/Dialect/Arith.h
 include/mlir-c/Dialect/Async.h
 include/mlir-c/Dialect/ControlFlow.h
@@ -18,9 +19,14 @@ include/mlir-c/Dialect/Linalg.h
 include/mlir-c/Dialect/MLProgram.h
 include/mlir-c/Dialect/Math.h
 include/mlir-c/Dialect/MemRef.h
+include/mlir-c/Dialect/NVGPU.h
+include/mlir-c/Dialect/NVVM.h
+include/mlir-c/Dialect/OpenMP.h
 include/mlir-c/Dialect/PDL.h
 include/mlir-c/Dialect/Quant.h
+include/mlir-c/Dialect/ROCDL.h
 include/mlir-c/Dialect/SCF.h
+include/mlir-c/Dialect/SPIRV.h
 include/mlir-c/Dialect/Shape.h
 include/mlir-c/Dialect/SparseTensor.h
 include/mlir-c/Dialect/Tensor.h
@@ -33,6 +39,7 @@ include/mlir-c/Interfaces.h
 include/mlir-c/Pass.h
 include/mlir-c/RegisterEverything.h
 include/mlir-c/Support.h
+include/mlir-c/Target/LLVMIR.h
 include/mlir-c/Transforms.h
 include/mlir/Analysis/AliasAnalysis.h
 include/mlir/Analysis/AliasAnalysis/LocalAliasAnalysis.h
@@ -48,7 +55,9 @@ include/mlir/Analysis/DataFlowFramework.
 include/mlir/Analysis/DataLayoutAnalysis.h
 include/mlir/Analysis/FlatLinearValueConstraints.h
 include/mlir/Analysis/Liveness.h
+include/mlir/Analysis/Presburger/Barvinok.h
 include/mlir/Analysis/Presburger/Fraction.h
+include/mlir/Analysis/Presburger/GeneratingFunction.h
 include/mlir/Analysis/Presburger/IntegerRelation.h
 include/mlir/Analysis/Presburger/LinearTransform.h
 include/mlir/Analysis/Presburger/MPInt.h
@@ -56,6 +65,7 @@ include/mlir/Analysis/Presburger/Matrix.
 include/mlir/Analysis/Presburger/PWMAFunction.h
 include/mlir/Analysis/Presburger/PresburgerRelation.h
 include/mlir/Analysis/Presburger/PresburgerSpace.h
+include/mlir/Analysis/Presburger/QuasiPolynomial.h
 include/mlir/Analysis/Presburger/Simplex.h
 include/mlir/Analysis/Presburger/SlowMPInt.h
 include/mlir/Analysis/Presburger/Utils.h
@@ -71,6 +81,7 @@ include/mlir/Bytecode/BytecodeOpInterfac
 include/mlir/Bytecode/BytecodeOpInterface.h.inc
 include/mlir/Bytecode/BytecodeOpInterface.td
 include/mlir/Bytecode/BytecodeReader.h
+include/mlir/Bytecode/BytecodeReaderConfig.h
 include/mlir/Bytecode/BytecodeWriter.h
 include/mlir/Bytecode/Encoding.h
 include/mlir/CAPI/AffineExpr.h
@@ -89,9 +100,13 @@ include/mlir/Config/mlir-config.h
 include/mlir/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.h
 include/mlir/Conversion/AffineToStandard/AffineToStandard.h
 include/mlir/Conversion/ArithCommon/AttrToLLVMConverter.h
+include/mlir/Conversion/ArithToAMDGPU/ArithToAMDGPU.h
+include/mlir/Conversion/ArithToArmSME/ArithToArmSME.h
 include/mlir/Conversion/ArithToLLVM/ArithToLLVM.h
 include/mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h
 include/mlir/Conversion/ArmNeon2dToIntr/ArmNeon2dToIntr.h
+include/mlir/Conversion/ArmSMEToLLVM/ArmSMEToLLVM.h
+include/mlir/Conversion/ArmSMEToSCF/ArmSMEToSCF.h
 include/mlir/Conversion/AsyncToLLVM/AsyncToLLVM.h
 include/mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h
 include/mlir/Conversion/ComplexToLLVM/ComplexToLLVM.h
@@ -100,8 +115,11 @@ include/mlir/Conversion/ComplexToSPIRV/C
 include/mlir/Conversion/ComplexToSPIRV/ComplexToSPIRVPass.h
 include/mlir/Conversion/ComplexToStandard/ComplexToStandard.h
 include/mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h
+include/mlir/Conversion/ControlFlowToSCF/ControlFlowToSCF.h
 include/mlir/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.h
 include/mlir/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRVPass.h
+include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.h
+include/mlir/Conversion/ConvertToLLVM/ToLLVMPass.h
 include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h
 include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h
 include/mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h
@@ -114,14 +132,15 @@ include/mlir/Conversion/GPUToSPIRV/GPUTo
 include/mlir/Conversion/GPUToSPIRV/GPUToSPIRVPass.h
 include/mlir/Conversion/GPUToVulkan/ConvertGPUToVulkanPass.h
 include/mlir/Conversion/IndexToLLVM/IndexToLLVM.h
+include/mlir/Conversion/IndexToSPIRV/IndexToSPIRV.h
 include/mlir/Conversion/LLVMCommon/ConversionTarget.h
 include/mlir/Conversion/LLVMCommon/LoweringOptions.h
 include/mlir/Conversion/LLVMCommon/MemRefBuilder.h
 include/mlir/Conversion/LLVMCommon/Pattern.h
+include/mlir/Conversion/LLVMCommon/PrintCallHelper.h
 include/mlir/Conversion/LLVMCommon/StructBuilder.h
 include/mlir/Conversion/LLVMCommon/TypeConverter.h
 include/mlir/Conversion/LLVMCommon/VectorPattern.h
-include/mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h
 include/mlir/Conversion/LinalgToStandard/LinalgToStandard.h
 include/mlir/Conversion/MathToFuncs/MathToFuncs.h
 include/mlir/Conversion/MathToLLVM/MathToLLVM.h
@@ -144,6 +163,7 @@ include/mlir/Conversion/Passes.h.inc
 include/mlir/Conversion/Passes.td
 include/mlir/Conversion/ReconcileUnrealizedCasts/ReconcileUnrealizedCasts.h
 include/mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h
+include/mlir/Conversion/SCFToEmitC/SCFToEmitC.h
 include/mlir/Conversion/SCFToGPU/SCFToGPU.h
 include/mlir/Conversion/SCFToGPU/SCFToGPUPass.h
 include/mlir/Conversion/SCFToOpenMP/SCFToOpenMP.h
@@ -158,6 +178,7 @@ include/mlir/Conversion/TensorToSPIRV/Te
 include/mlir/Conversion/TensorToSPIRV/TensorToSPIRVPass.h
 include/mlir/Conversion/TosaToArith/TosaToArith.h
 include/mlir/Conversion/TosaToLinalg/TosaToLinalg.h
+include/mlir/Conversion/TosaToMLProgram/TosaToMLProgram.h
 include/mlir/Conversion/TosaToSCF/TosaToSCF.h
 include/mlir/Conversion/TosaToTensor/TosaToTensor.h
 include/mlir/Conversion/UBToLLVM/UBToLLVM.h
@@ -165,6 +186,7 @@ include/mlir/Conversion/UBToSPIRV/UBToSP
 include/mlir/Conversion/VectorToArmSME/VectorToArmSME.h
 include/mlir/Conversion/VectorToGPU/VectorToGPU.h
 include/mlir/Conversion/VectorToLLVM/ConvertVectorToLLVM.h
+include/mlir/Conversion/VectorToLLVM/ConvertVectorToLLVMPass.h
 include/mlir/Conversion/VectorToSCF/VectorToSCF.h
 include/mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h
 include/mlir/Conversion/VectorToSPIRV/VectorToSPIRVPass.h
@@ -176,6 +198,7 @@ include/mlir/Debug/Counter.h
 include/mlir/Debug/DebuggerExecutionContextHook.h
 include/mlir/Debug/ExecutionContext.h
 include/mlir/Debug/Observers/ActionLogging.h
+include/mlir/Debug/Observers/ActionProfiler.h
 include/mlir/Dialect/AMDGPU/IR/AMDGPU.cpp.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPU.h.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPU.td
@@ -250,6 +273,7 @@ include/mlir/Dialect/Arith/IR/ArithOpsIn
 include/mlir/Dialect/Arith/IR/ArithOpsTypes.cpp.inc
 include/mlir/Dialect/Arith/IR/ArithOpsTypes.h.inc
 include/mlir/Dialect/Arith/IR/ValueBoundsOpInterfaceImpl.h
+include/mlir/Dialect/Arith/Transforms/BufferDeallocationOpInterfaceImpl.h
 include/mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h
 include/mlir/Dialect/Arith/Transforms/NarrowTypeEmulationConverter.h
 include/mlir/Dialect/Arith/Transforms/Passes.h
@@ -271,26 +295,45 @@ include/mlir/Dialect/ArmSME/IR/ArmSME.cp
 include/mlir/Dialect/ArmSME/IR/ArmSME.h
 include/mlir/Dialect/ArmSME/IR/ArmSME.h.inc
 include/mlir/Dialect/ArmSME/IR/ArmSME.td
-include/mlir/Dialect/ArmSME/IR/ArmSMEConversions.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEAttrDefs.cpp.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEAttrDefs.h.inc
 include/mlir/Dialect/ArmSME/IR/ArmSMEDialect.cpp.inc
 include/mlir/Dialect/ArmSME/IR/ArmSMEDialect.h.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEEnums.cpp.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEEnums.h
+include/mlir/Dialect/ArmSME/IR/ArmSMEEnums.h.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEIntrinsicConversions.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEIntrinsicOps.cpp.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEIntrinsicOps.h.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEIntrinsicOps.td
+include/mlir/Dialect/ArmSME/IR/ArmSMEOpInterfaces.cpp.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEOpInterfaces.h.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEOps.cpp.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEOps.h.inc
+include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
+include/mlir/Dialect/ArmSME/IR/ArmSMEOpsConversions.inc
 include/mlir/Dialect/ArmSME/IR/ArmSMETypes.cpp.inc
 include/mlir/Dialect/ArmSME/IR/ArmSMETypes.h.inc
 include/mlir/Dialect/ArmSME/Transforms/Passes.h
 include/mlir/Dialect/ArmSME/Transforms/Passes.h.inc
 include/mlir/Dialect/ArmSME/Transforms/Passes.td
+include/mlir/Dialect/ArmSME/Transforms/PassesEnums.cpp.inc
+include/mlir/Dialect/ArmSME/Transforms/PassesEnums.h.inc
 include/mlir/Dialect/ArmSME/Transforms/Transforms.h
 include/mlir/Dialect/ArmSME/Utils/Utils.h
-include/mlir/Dialect/ArmSVE/ArmSVE.cpp.inc
-include/mlir/Dialect/ArmSVE/ArmSVE.h.inc
-include/mlir/Dialect/ArmSVE/ArmSVE.td
-include/mlir/Dialect/ArmSVE/ArmSVEConversions.inc
-include/mlir/Dialect/ArmSVE/ArmSVEDialect.cpp.inc
-include/mlir/Dialect/ArmSVE/ArmSVEDialect.h
-include/mlir/Dialect/ArmSVE/ArmSVEDialect.h.inc
-include/mlir/Dialect/ArmSVE/ArmSVETypes.cpp.inc
-include/mlir/Dialect/ArmSVE/ArmSVETypes.h.inc
-include/mlir/Dialect/ArmSVE/Transforms.h
+include/mlir/Dialect/ArmSVE/IR/ArmSVE.cpp.inc
+include/mlir/Dialect/ArmSVE/IR/ArmSVE.h.inc
+include/mlir/Dialect/ArmSVE/IR/ArmSVE.td
+include/mlir/Dialect/ArmSVE/IR/ArmSVEConversions.inc
+include/mlir/Dialect/ArmSVE/IR/ArmSVEDialect.cpp.inc
+include/mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h
+include/mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h.inc
+include/mlir/Dialect/ArmSVE/IR/ArmSVETypes.cpp.inc
+include/mlir/Dialect/ArmSVE/IR/ArmSVETypes.h.inc
+include/mlir/Dialect/ArmSVE/Transforms/Passes.h
+include/mlir/Dialect/ArmSVE/Transforms/Passes.h.inc
+include/mlir/Dialect/ArmSVE/Transforms/Passes.td
+include/mlir/Dialect/ArmSVE/Transforms/Transforms.h
 include/mlir/Dialect/Async/IR/Async.h
 include/mlir/Dialect/Async/IR/AsyncDialect.td
 include/mlir/Dialect/Async/IR/AsyncOps.cpp.inc
@@ -312,6 +355,10 @@ include/mlir/Dialect/Bufferization/IR/Al
 include/mlir/Dialect/Bufferization/IR/AllocationOpInterface.h
 include/mlir/Dialect/Bufferization/IR/AllocationOpInterface.h.inc
 include/mlir/Dialect/Bufferization/IR/AllocationOpInterface.td
+include/mlir/Dialect/Bufferization/IR/BufferDeallocationOpInterface.cpp.inc
+include/mlir/Dialect/Bufferization/IR/BufferDeallocationOpInterface.h
+include/mlir/Dialect/Bufferization/IR/BufferDeallocationOpInterface.h.inc
+include/mlir/Dialect/Bufferization/IR/BufferDeallocationOpInterface.td
 include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.cpp.inc
 include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h
 include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h.inc
@@ -329,6 +376,8 @@ include/mlir/Dialect/Bufferization/IR/Bu
 include/mlir/Dialect/Bufferization/IR/BufferizationOpsTypes.cpp.inc
 include/mlir/Dialect/Bufferization/IR/BufferizationOpsTypes.h.inc
 include/mlir/Dialect/Bufferization/IR/DstBufferizableOpInterfaceImpl.h
+include/mlir/Dialect/Bufferization/IR/UnstructuredControlFlow.h
+include/mlir/Dialect/Bufferization/Pipelines/Passes.h
 include/mlir/Dialect/Bufferization/TransformOps/BufferizationTransformOps.cpp.inc
 include/mlir/Dialect/Bufferization/TransformOps/BufferizationTransformOps.h
 include/mlir/Dialect/Bufferization/TransformOps/BufferizationTransformOps.h.inc
@@ -365,6 +414,8 @@ include/mlir/Dialect/ControlFlow/IR/Cont
 include/mlir/Dialect/ControlFlow/IR/ControlFlowOpsDialect.h.inc
 include/mlir/Dialect/ControlFlow/IR/ControlFlowOpsTypes.cpp.inc
 include/mlir/Dialect/ControlFlow/IR/ControlFlowOpsTypes.h.inc
+include/mlir/Dialect/ControlFlow/Transforms/BufferDeallocationOpInterfaceImpl.h
+include/mlir/Dialect/ControlFlow/Transforms/BufferizableOpInterfaceImpl.h
 include/mlir/Dialect/DLTI/DLTI.cpp.inc
 include/mlir/Dialect/DLTI/DLTI.h
 include/mlir/Dialect/DLTI/DLTI.h.inc
@@ -385,9 +436,15 @@ include/mlir/Dialect/EmitC/IR/EmitCAttri
 include/mlir/Dialect/EmitC/IR/EmitCBase.td
 include/mlir/Dialect/EmitC/IR/EmitCDialect.cpp.inc
 include/mlir/Dialect/EmitC/IR/EmitCDialect.h.inc
+include/mlir/Dialect/EmitC/IR/EmitCEnums.cpp.inc
+include/mlir/Dialect/EmitC/IR/EmitCEnums.h.inc
 include/mlir/Dialect/EmitC/IR/EmitCTypes.cpp.inc
 include/mlir/Dialect/EmitC/IR/EmitCTypes.h.inc
 include/mlir/Dialect/EmitC/IR/EmitCTypes.td
+include/mlir/Dialect/EmitC/Transforms/Passes.h
+include/mlir/Dialect/EmitC/Transforms/Passes.h.inc
+include/mlir/Dialect/EmitC/Transforms/Passes.td
+include/mlir/Dialect/EmitC/Transforms/Transforms.h
 include/mlir/Dialect/Func/Extensions/AllExtensions.h
 include/mlir/Dialect/Func/Extensions/InlinerExtension.h
 include/mlir/Dialect/Func/IR/FuncOps.cpp.inc
@@ -396,12 +453,21 @@ include/mlir/Dialect/Func/IR/FuncOps.h.i
 include/mlir/Dialect/Func/IR/FuncOps.td
 include/mlir/Dialect/Func/IR/FuncOpsDialect.cpp.inc
 include/mlir/Dialect/Func/IR/FuncOpsDialect.h.inc
+include/mlir/Dialect/Func/TransformOps/FuncTransformOps.cpp.inc
+include/mlir/Dialect/Func/TransformOps/FuncTransformOps.h
+include/mlir/Dialect/Func/TransformOps/FuncTransformOps.h.inc
+include/mlir/Dialect/Func/TransformOps/FuncTransformOps.td
 include/mlir/Dialect/Func/Transforms/DecomposeCallGraphTypes.h
 include/mlir/Dialect/Func/Transforms/FuncConversions.h
 include/mlir/Dialect/Func/Transforms/OneToNFuncConversions.h
 include/mlir/Dialect/Func/Transforms/Passes.h
 include/mlir/Dialect/Func/Transforms/Passes.h.inc
 include/mlir/Dialect/Func/Transforms/Passes.td
+include/mlir/Dialect/GPU/IR/CompilationAttrInterfaces.cpp.inc
+include/mlir/Dialect/GPU/IR/CompilationAttrInterfaces.h.inc
+include/mlir/Dialect/GPU/IR/CompilationAttrInterfaces.td
+include/mlir/Dialect/GPU/IR/CompilationAttrs.td
+include/mlir/Dialect/GPU/IR/CompilationInterfaces.h
 include/mlir/Dialect/GPU/IR/GPUBase.td
 include/mlir/Dialect/GPU/IR/GPUDialect.h
 include/mlir/Dialect/GPU/IR/GPUOpInterfaces.cpp.inc
@@ -420,6 +486,7 @@ include/mlir/Dialect/GPU/IR/GPUOpsTypes.
 include/mlir/Dialect/GPU/IR/ParallelLoopMapperAttr.td
 include/mlir/Dialect/GPU/IR/ParallelLoopMapperEnums.cpp.inc
 include/mlir/Dialect/GPU/IR/ParallelLoopMapperEnums.h.inc
+include/mlir/Dialect/GPU/Pipelines/Passes.h
 include/mlir/Dialect/GPU/TransformOps/GPUDeviceMapperEnums.cpp.inc
 include/mlir/Dialect/GPU/TransformOps/GPUDeviceMapperEnums.h.inc
 include/mlir/Dialect/GPU/TransformOps/GPUDeviceMappingAttr.td
@@ -428,6 +495,7 @@ include/mlir/Dialect/GPU/TransformOps/GP
 include/mlir/Dialect/GPU/TransformOps/GPUTransformOps.h.inc
 include/mlir/Dialect/GPU/TransformOps/GPUTransformOps.td
 include/mlir/Dialect/GPU/TransformOps/Utils.h
+include/mlir/Dialect/GPU/Transforms/BufferDeallocationOpInterfaceImpl.h
 include/mlir/Dialect/GPU/Transforms/MemoryPromotion.h
 include/mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h
 include/mlir/Dialect/GPU/Transforms/Passes.capi.cpp.inc
@@ -440,8 +508,13 @@ include/mlir/Dialect/IRDL/IR/IRDL.cpp.in
 include/mlir/Dialect/IRDL/IR/IRDL.h
 include/mlir/Dialect/IRDL/IR/IRDL.h.inc
 include/mlir/Dialect/IRDL/IR/IRDL.td
+include/mlir/Dialect/IRDL/IR/IRDLAttributes.cpp.inc
+include/mlir/Dialect/IRDL/IR/IRDLAttributes.h.inc
+include/mlir/Dialect/IRDL/IR/IRDLAttributes.td
 include/mlir/Dialect/IRDL/IR/IRDLDialect.cpp.inc
 include/mlir/Dialect/IRDL/IR/IRDLDialect.h.inc
+include/mlir/Dialect/IRDL/IR/IRDLEnums.cpp.inc
+include/mlir/Dialect/IRDL/IR/IRDLEnums.h.inc
 include/mlir/Dialect/IRDL/IR/IRDLInterfaces.cpp.inc
 include/mlir/Dialect/IRDL/IR/IRDLInterfaces.h
 include/mlir/Dialect/IRDL/IR/IRDLInterfaces.h.inc
@@ -473,6 +546,10 @@ include/mlir/Dialect/Index/IR/IndexOpsDi
 include/mlir/Dialect/Index/IR/IndexOpsDialect.h.inc
 include/mlir/Dialect/Index/IR/IndexOpsTypes.cpp.inc
 include/mlir/Dialect/Index/IR/IndexOpsTypes.h.inc
+include/mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.cpp.inc
+include/mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.h
+include/mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.h.inc
+include/mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.td
 include/mlir/Dialect/LLVMIR/FunctionCallUtils.h
 include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
 include/mlir/Dialect/LLVMIR/LLVMAttrs.h
@@ -510,7 +587,9 @@ include/mlir/Dialect/LLVMIR/LLVMTypes.h
 include/mlir/Dialect/LLVMIR/LLVMTypes.h.inc
 include/mlir/Dialect/LLVMIR/LLVMTypes.td
 include/mlir/Dialect/LLVMIR/NVVMConversions.inc
+include/mlir/Dialect/LLVMIR/NVVMConvertibleLLVMIRIntrinsics.inc
 include/mlir/Dialect/LLVMIR/NVVMDialect.h
+include/mlir/Dialect/LLVMIR/NVVMFromLLVMIRConversions.inc
 include/mlir/Dialect/LLVMIR/NVVMOps.cpp.inc
 include/mlir/Dialect/LLVMIR/NVVMOps.h.inc
 include/mlir/Dialect/LLVMIR/NVVMOps.td
@@ -520,8 +599,6 @@ include/mlir/Dialect/LLVMIR/NVVMOpsDiale
 include/mlir/Dialect/LLVMIR/NVVMOpsDialect.h.inc
 include/mlir/Dialect/LLVMIR/NVVMOpsEnums.cpp.inc
 include/mlir/Dialect/LLVMIR/NVVMOpsEnums.h.inc
-include/mlir/Dialect/LLVMIR/NVVMOpsInterface.cpp.inc
-include/mlir/Dialect/LLVMIR/NVVMOpsInterface.h.inc
 include/mlir/Dialect/LLVMIR/NVVMOpsTypes.cpp.inc
 include/mlir/Dialect/LLVMIR/NVVMOpsTypes.h.inc
 include/mlir/Dialect/LLVMIR/ROCDLConversions.inc
@@ -529,11 +606,15 @@ include/mlir/Dialect/LLVMIR/ROCDLDialect
 include/mlir/Dialect/LLVMIR/ROCDLOps.cpp.inc
 include/mlir/Dialect/LLVMIR/ROCDLOps.h.inc
 include/mlir/Dialect/LLVMIR/ROCDLOps.td
+include/mlir/Dialect/LLVMIR/ROCDLOpsAttributes.cpp.inc
+include/mlir/Dialect/LLVMIR/ROCDLOpsAttributes.h.inc
 include/mlir/Dialect/LLVMIR/ROCDLOpsDialect.cpp.inc
 include/mlir/Dialect/LLVMIR/ROCDLOpsDialect.h.inc
 include/mlir/Dialect/LLVMIR/ROCDLOpsTypes.cpp.inc
 include/mlir/Dialect/LLVMIR/ROCDLOpsTypes.h.inc
 include/mlir/Dialect/LLVMIR/Transforms/AddComdats.h
+include/mlir/Dialect/LLVMIR/Transforms/DIExpressionLegalization.h
+include/mlir/Dialect/LLVMIR/Transforms/DIExpressionRewriter.h
 include/mlir/Dialect/LLVMIR/Transforms/LegalizeForExport.h
 include/mlir/Dialect/LLVMIR/Transforms/OptimizeForNVVM.h
 include/mlir/Dialect/LLVMIR/Transforms/Passes.h
@@ -587,6 +668,7 @@ include/mlir/Dialect/Linalg/TransformOps
 include/mlir/Dialect/Linalg/TransformOps/Syntax.h
 include/mlir/Dialect/Linalg/Transforms/BufferizableOpInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/Hoisting.h
+include/mlir/Dialect/Linalg/Transforms/SubsetInsertionOpInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/TilingInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/Transforms.h
 include/mlir/Dialect/Linalg/Utils/Utils.h
@@ -607,6 +689,9 @@ include/mlir/Dialect/MLProgram/IR/MLProg
 include/mlir/Dialect/MLProgram/IR/MLProgramTypes.h
 include/mlir/Dialect/MLProgram/IR/MLProgramTypes.h.inc
 include/mlir/Dialect/MLProgram/IR/MLProgramTypes.td
+include/mlir/Dialect/MLProgram/Transforms/Passes.h
+include/mlir/Dialect/MLProgram/Transforms/Passes.h.inc
+include/mlir/Dialect/MLProgram/Transforms/Passes.td
 include/mlir/Dialect/Math/IR/Math.h
 include/mlir/Dialect/Math/IR/MathBase.td
 include/mlir/Dialect/Math/IR/MathOps.cpp.inc
@@ -635,7 +720,7 @@ include/mlir/Dialect/MemRef/TransformOps
 include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.h
 include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.h.inc
 include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.td
-include/mlir/Dialect/MemRef/Transforms/BufferizableOpInterfaceImpl.h
+include/mlir/Dialect/MemRef/Transforms/AllocationOpInterfaceImpl.h
 include/mlir/Dialect/MemRef/Transforms/ComposeSubView.h
 include/mlir/Dialect/MemRef/Transforms/Passes.h
 include/mlir/Dialect/MemRef/Transforms/Passes.h.inc
@@ -643,6 +728,29 @@ include/mlir/Dialect/MemRef/Transforms/P
 include/mlir/Dialect/MemRef/Transforms/RuntimeOpVerification.h
 include/mlir/Dialect/MemRef/Transforms/Transforms.h
 include/mlir/Dialect/MemRef/Utils/MemRefUtils.h
+include/mlir/Dialect/Mesh/IR/MeshBase.td
+include/mlir/Dialect/Mesh/IR/MeshOps.cpp.inc
+include/mlir/Dialect/Mesh/IR/MeshOps.h
+include/mlir/Dialect/Mesh/IR/MeshOps.h.inc
+include/mlir/Dialect/Mesh/IR/MeshOps.td
+include/mlir/Dialect/Mesh/IR/MeshOpsAttributes.cpp.inc
+include/mlir/Dialect/Mesh/IR/MeshOpsAttributes.h.inc
+include/mlir/Dialect/Mesh/IR/MeshOpsDialect.cpp.inc
+include/mlir/Dialect/Mesh/IR/MeshOpsDialect.h.inc
+include/mlir/Dialect/Mesh/IR/MeshOpsEnums.cpp.inc
+include/mlir/Dialect/Mesh/IR/MeshOpsEnums.h.inc
+include/mlir/Dialect/Mesh/IR/MeshOpsTypes.cpp.inc
+include/mlir/Dialect/Mesh/IR/MeshOpsTypes.h.inc
+include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.cpp.inc
+include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.h
+include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.h.inc
+include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.td
+include/mlir/Dialect/Mesh/Transforms/Passes.h
+include/mlir/Dialect/Mesh/Transforms/Passes.h.inc
+include/mlir/Dialect/Mesh/Transforms/Passes.td
+include/mlir/Dialect/Mesh/Transforms/Simplifications.h
+include/mlir/Dialect/Mesh/Transforms/Spmdization.h
+include/mlir/Dialect/Mesh/Transforms/Transforms.h
 include/mlir/Dialect/NVGPU/IR/NVGPU.cpp.inc
 include/mlir/Dialect/NVGPU/IR/NVGPU.h.inc
 include/mlir/Dialect/NVGPU/IR/NVGPU.td
@@ -672,6 +780,7 @@ include/mlir/Dialect/NVGPU/Utils/MMAUtil
 include/mlir/Dialect/OpenACC/AccCommon.td
 include/mlir/Dialect/OpenACC/OpenACC.h
 include/mlir/Dialect/OpenACC/OpenACCBase.td
+include/mlir/Dialect/OpenACC/OpenACCInterfaces.h
 include/mlir/Dialect/OpenACC/OpenACCOps.cpp.inc
 include/mlir/Dialect/OpenACC/OpenACCOps.h.inc
 include/mlir/Dialect/OpenACC/OpenACCOps.td
@@ -681,12 +790,19 @@ include/mlir/Dialect/OpenACC/OpenACCOpsD
 include/mlir/Dialect/OpenACC/OpenACCOpsDialect.h.inc
 include/mlir/Dialect/OpenACC/OpenACCOpsEnums.cpp.inc
 include/mlir/Dialect/OpenACC/OpenACCOpsEnums.h.inc
+include/mlir/Dialect/OpenACC/OpenACCOpsInterfaces.cpp.inc
+include/mlir/Dialect/OpenACC/OpenACCOpsInterfaces.h.inc
+include/mlir/Dialect/OpenACC/OpenACCOpsInterfaces.td
 include/mlir/Dialect/OpenACC/OpenACCOpsTypes.cpp.inc
 include/mlir/Dialect/OpenACC/OpenACCOpsTypes.h.inc
 include/mlir/Dialect/OpenACC/OpenACCOpsTypes.td
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.cpp.inc
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.h.inc
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.td
+include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.cpp.inc
+include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.h
+include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.h.inc
+include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.td
 include/mlir/Dialect/OpenMP/OmpCommon.td
 include/mlir/Dialect/OpenMP/OpenMPDialect.h
 include/mlir/Dialect/OpenMP/OpenMPInterfaces.h
@@ -702,6 +818,8 @@ include/mlir/Dialect/OpenMP/OpenMPOpsEnu
 include/mlir/Dialect/OpenMP/OpenMPOpsInterfaces.cpp.inc
 include/mlir/Dialect/OpenMP/OpenMPOpsInterfaces.h.inc
 include/mlir/Dialect/OpenMP/OpenMPOpsInterfaces.td
+include/mlir/Dialect/OpenMP/OpenMPOpsTypes.cpp.inc
+include/mlir/Dialect/OpenMP/OpenMPOpsTypes.h.inc
 include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.cpp.inc
 include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.h.inc
 include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.td
@@ -758,6 +876,7 @@ include/mlir/Dialect/SCF/TransformOps/SC
 include/mlir/Dialect/SCF/TransformOps/SCFTransformOps.h
 include/mlir/Dialect/SCF/TransformOps/SCFTransformOps.h.inc
 include/mlir/Dialect/SCF/TransformOps/SCFTransformOps.td
+include/mlir/Dialect/SCF/Transforms/BufferDeallocationOpInterfaceImpl.h
 include/mlir/Dialect/SCF/Transforms/BufferizableOpInterfaceImpl.h
 include/mlir/Dialect/SCF/Transforms/Passes.h
 include/mlir/Dialect/SCF/Transforms/Passes.h.inc
@@ -847,6 +966,10 @@ include/mlir/Dialect/SparseTensor/IR/Spa
 include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrEnums.cpp.inc
 include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrEnums.h.inc
 include/mlir/Dialect/SparseTensor/IR/SparseTensorBase.td
+include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.cpp.inc
+include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.h
+include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.h.inc
+include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.td
 include/mlir/Dialect/SparseTensor/IR/SparseTensorOps.cpp.inc
 include/mlir/Dialect/SparseTensor/IR/SparseTensorOps.h.inc
 include/mlir/Dialect/SparseTensor/IR/SparseTensorOps.td
@@ -860,6 +983,10 @@ include/mlir/Dialect/SparseTensor/IR/Spa
 include/mlir/Dialect/SparseTensor/IR/SparseTensorTypes.h.inc
 include/mlir/Dialect/SparseTensor/IR/SparseTensorTypes.td
 include/mlir/Dialect/SparseTensor/Pipelines/Passes.h
+include/mlir/Dialect/SparseTensor/TransformOps/SparseTensorTransformOps.cpp.inc
+include/mlir/Dialect/SparseTensor/TransformOps/SparseTensorTransformOps.h
+include/mlir/Dialect/SparseTensor/TransformOps/SparseTensorTransformOps.h.inc
+include/mlir/Dialect/SparseTensor/TransformOps/SparseTensorTransformOps.td
 include/mlir/Dialect/SparseTensor/Transforms/BufferizableOpInterfaceImpl.h
 include/mlir/Dialect/SparseTensor/Transforms/Passes.capi.cpp.inc
 include/mlir/Dialect/SparseTensor/Transforms/Passes.capi.h.inc
@@ -867,7 +994,6 @@ include/mlir/Dialect/SparseTensor/Transf
 include/mlir/Dialect/SparseTensor/Transforms/Passes.h.inc
 include/mlir/Dialect/SparseTensor/Transforms/Passes.td
 include/mlir/Dialect/SparseTensor/Utils/Merger.h
-include/mlir/Dialect/SparseTensor/Utils/MergerNewtypes.h
 include/mlir/Dialect/Tensor/IR/Tensor.h
 include/mlir/Dialect/Tensor/IR/TensorBase.td
 include/mlir/Dialect/Tensor/IR/TensorInferTypeOpInterfaceImpl.h
@@ -888,11 +1014,15 @@ include/mlir/Dialect/Tensor/Transforms/B
 include/mlir/Dialect/Tensor/Transforms/Passes.h
 include/mlir/Dialect/Tensor/Transforms/Passes.h.inc
 include/mlir/Dialect/Tensor/Transforms/Passes.td
+include/mlir/Dialect/Tensor/Transforms/SubsetInsertionOpInterfaceImpl.h
 include/mlir/Dialect/Tensor/Transforms/TransformUtils.h
 include/mlir/Dialect/Tensor/Transforms/Transforms.h
 include/mlir/Dialect/Tensor/Utils/Utils.h
+include/mlir/Dialect/Tosa/IR/ShardingInterfaceImpl.h
 include/mlir/Dialect/Tosa/IR/TosaAttributes.cpp.inc
 include/mlir/Dialect/Tosa/IR/TosaAttributes.h.inc
+include/mlir/Dialect/Tosa/IR/TosaDialectBytecode.cpp.inc
+include/mlir/Dialect/Tosa/IR/TosaDialectBytecode.td
 include/mlir/Dialect/Tosa/IR/TosaInterfaces.cpp.inc
 include/mlir/Dialect/Tosa/IR/TosaInterfaces.h.inc
 include/mlir/Dialect/Tosa/IR/TosaInterfaces.td
@@ -916,6 +1046,11 @@ include/mlir/Dialect/Tosa/Utils/Conversi
 include/mlir/Dialect/Tosa/Utils/QuantUtils.h
 include/mlir/Dialect/Tosa/Utils/ShapeUtils.h
 include/mlir/Dialect/Traits.h
+include/mlir/Dialect/Transform/DebugExtension/DebugExtension.h
+include/mlir/Dialect/Transform/DebugExtension/DebugExtensionOps.cpp.inc
+include/mlir/Dialect/Transform/DebugExtension/DebugExtensionOps.h
+include/mlir/Dialect/Transform/DebugExtension/DebugExtensionOps.h.inc
+include/mlir/Dialect/Transform/DebugExtension/DebugExtensionOps.td
 include/mlir/Dialect/Transform/IR/MatchInterfaces.cpp.inc
 include/mlir/Dialect/Transform/IR/MatchInterfaces.h
 include/mlir/Dialect/Transform/IR/MatchInterfaces.h.inc
@@ -946,6 +1081,12 @@ include/mlir/Dialect/Transform/IR/Transf
 include/mlir/Dialect/Transform/IR/TransformTypes.h
 include/mlir/Dialect/Transform/IR/TransformTypes.h.inc
 include/mlir/Dialect/Transform/IR/TransformTypes.td
+include/mlir/Dialect/Transform/IR/Utils.h
+include/mlir/Dialect/Transform/LoopExtension/LoopExtension.h
+include/mlir/Dialect/Transform/LoopExtension/LoopExtensionOps.cpp.inc
+include/mlir/Dialect/Transform/LoopExtension/LoopExtensionOps.h
+include/mlir/Dialect/Transform/LoopExtension/LoopExtensionOps.h.inc
+include/mlir/Dialect/Transform/LoopExtension/LoopExtensionOps.td
 include/mlir/Dialect/Transform/PDLExtension/PDLExtension.h
 include/mlir/Dialect/Transform/PDLExtension/PDLExtensionOps.cpp.inc
 include/mlir/Dialect/Transform/PDLExtension/PDLExtensionOps.h
@@ -955,6 +1096,7 @@ include/mlir/Dialect/Transform/Transform
 include/mlir/Dialect/Transform/Transforms/Passes.h.inc
 include/mlir/Dialect/Transform/Transforms/Passes.td
 include/mlir/Dialect/Transform/Transforms/TransformInterpreterPassBase.h
+include/mlir/Dialect/Transform/Transforms/TransformInterpreterUtils.h
 include/mlir/Dialect/Transform/Utils/DiagnosedSilenceableFailure.h
 include/mlir/Dialect/Transform/Utils/RaggedArray.h
 include/mlir/Dialect/Transform/Utils/Utils.h
@@ -976,18 +1118,22 @@ include/mlir/Dialect/Utils/ReshapeOpsUti
 include/mlir/Dialect/Utils/StaticValueUtils.h
 include/mlir/Dialect/Utils/StructuredOpsUtils.h
 include/mlir/Dialect/Utils/StructuredOpsUtils.td
+include/mlir/Dialect/Vector/IR/Vector.cpp.inc
+include/mlir/Dialect/Vector/IR/Vector.h.inc
+include/mlir/Dialect/Vector/IR/Vector.td
+include/mlir/Dialect/Vector/IR/VectorAttributes.cpp.inc
+include/mlir/Dialect/Vector/IR/VectorAttributes.h.inc
+include/mlir/Dialect/Vector/IR/VectorAttributes.td
+include/mlir/Dialect/Vector/IR/VectorDialect.cpp.inc
+include/mlir/Dialect/Vector/IR/VectorDialect.h.inc
+include/mlir/Dialect/Vector/IR/VectorEnums.cpp.inc
+include/mlir/Dialect/Vector/IR/VectorEnums.h.inc
 include/mlir/Dialect/Vector/IR/VectorOps.cpp.inc
 include/mlir/Dialect/Vector/IR/VectorOps.h
 include/mlir/Dialect/Vector/IR/VectorOps.h.inc
 include/mlir/Dialect/Vector/IR/VectorOps.td
-include/mlir/Dialect/Vector/IR/VectorOpsAttrDefs.cpp.inc
-include/mlir/Dialect/Vector/IR/VectorOpsAttrDefs.h.inc
-include/mlir/Dialect/Vector/IR/VectorOpsDialect.cpp.inc
-include/mlir/Dialect/Vector/IR/VectorOpsDialect.h.inc
-include/mlir/Dialect/Vector/IR/VectorOpsEnums.cpp.inc
-include/mlir/Dialect/Vector/IR/VectorOpsEnums.h.inc
-include/mlir/Dialect/Vector/IR/VectorOpsTypes.cpp.inc
-include/mlir/Dialect/Vector/IR/VectorOpsTypes.h.inc
+include/mlir/Dialect/Vector/IR/VectorTypes.cpp.inc
+include/mlir/Dialect/Vector/IR/VectorTypes.h.inc
 include/mlir/Dialect/Vector/Interfaces/MaskableOpInterface.cpp.inc
 include/mlir/Dialect/Vector/Interfaces/MaskableOpInterface.h
 include/mlir/Dialect/Vector/Interfaces/MaskableOpInterface.h.inc
@@ -1005,6 +1151,7 @@ include/mlir/Dialect/Vector/Transforms/L
 include/mlir/Dialect/Vector/Transforms/Passes.h
 include/mlir/Dialect/Vector/Transforms/Passes.h.inc
 include/mlir/Dialect/Vector/Transforms/Passes.td
+include/mlir/Dialect/Vector/Transforms/SubsetOpInterfaceImpl.h
 include/mlir/Dialect/Vector/Transforms/VectorDistribution.h
 include/mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h
 include/mlir/Dialect/Vector/Transforms/VectorTransforms.h
@@ -1032,11 +1179,10 @@ include/mlir/ExecutionEngine/Msan.h
 include/mlir/ExecutionEngine/OptUtils.h
 include/mlir/ExecutionEngine/RunnerUtils.h
 include/mlir/ExecutionEngine/SparseTensor/ArithmeticUtils.h
-include/mlir/ExecutionEngine/SparseTensor/Attributes.h
 include/mlir/ExecutionEngine/SparseTensor/COO.h
 include/mlir/ExecutionEngine/SparseTensor/ErrorHandling.h
 include/mlir/ExecutionEngine/SparseTensor/File.h
-include/mlir/ExecutionEngine/SparseTensor/PermutationRef.h
+include/mlir/ExecutionEngine/SparseTensor/MapRef.h
 include/mlir/ExecutionEngine/SparseTensor/Storage.h
 include/mlir/ExecutionEngine/SparseTensorRuntime.h
 include/mlir/IR/Action.h
@@ -1081,6 +1227,9 @@ include/mlir/IR/BuiltinTypes.h
 include/mlir/IR/BuiltinTypes.h.inc
 include/mlir/IR/BuiltinTypes.td
 include/mlir/IR/BytecodeBase.td
+include/mlir/IR/CommonAttrConstraints.td
+include/mlir/IR/CommonTypeConstraints.td
+include/mlir/IR/Constraints.td
 include/mlir/IR/Diagnostics.h
 include/mlir/IR/Dialect.h
 include/mlir/IR/DialectBase.td
@@ -1091,14 +1240,10 @@ include/mlir/IR/DialectResourceBlobManag
 include/mlir/IR/Dominance.h
 include/mlir/IR/EnumAttr.td
 include/mlir/IR/ExtensibleDialect.h
-include/mlir/IR/FunctionImplementation.h
-include/mlir/IR/FunctionInterfaces.h
-include/mlir/IR/FunctionInterfaces.td
-include/mlir/IR/FunctionOpInterfaces.cpp.inc
-include/mlir/IR/FunctionOpInterfaces.h.inc
 include/mlir/IR/IRMapping.h
 include/mlir/IR/ImplicitLocOpBuilder.h
 include/mlir/IR/IntegerSet.h
+include/mlir/IR/Interfaces.td
 include/mlir/IR/Iterators.h
 include/mlir/IR/Location.h
 include/mlir/IR/MLIRContext.h
@@ -1113,8 +1258,10 @@ include/mlir/IR/OpImplementation.h
 include/mlir/IR/Operation.h
 include/mlir/IR/OperationSupport.h
 include/mlir/IR/OwningOpRef.h
+include/mlir/IR/PDLPatternMatch.h.inc
 include/mlir/IR/PatternBase.td
 include/mlir/IR/PatternMatch.h
+include/mlir/IR/Properties.td
 include/mlir/IR/Region.h
 include/mlir/IR/RegionGraphTraits.h
 include/mlir/IR/RegionKindInterface.cpp.inc
@@ -1131,12 +1278,14 @@ include/mlir/IR/TensorEncInterfaces.h.in
 include/mlir/IR/TensorEncoding.h
 include/mlir/IR/TensorEncoding.td
 include/mlir/IR/Threading.h
+include/mlir/IR/Traits.td
 include/mlir/IR/TypeRange.h
 include/mlir/IR/TypeSupport.h
 include/mlir/IR/TypeUtilities.h
 include/mlir/IR/Types.h
 include/mlir/IR/Unit.h
 include/mlir/IR/UseDefLists.h
+include/mlir/IR/Utils.td
 include/mlir/IR/Value.h
 include/mlir/IR/ValueRange.h
 include/mlir/IR/Verifier.h
@@ -1178,6 +1327,11 @@ include/mlir/Interfaces/DestinationStyle
 include/mlir/Interfaces/DestinationStyleOpInterface.h.inc
 include/mlir/Interfaces/DestinationStyleOpInterface.td
 include/mlir/Interfaces/FoldInterfaces.h
+include/mlir/Interfaces/FunctionImplementation.h
+include/mlir/Interfaces/FunctionInterfaces.cpp.inc
+include/mlir/Interfaces/FunctionInterfaces.h
+include/mlir/Interfaces/FunctionInterfaces.h.inc
+include/mlir/Interfaces/FunctionInterfaces.td
 include/mlir/Interfaces/InferIntRangeInterface.cpp.inc
 include/mlir/Interfaces/InferIntRangeInterface.h
 include/mlir/Interfaces/InferIntRangeInterface.h.inc
@@ -1213,6 +1367,10 @@ include/mlir/Interfaces/SideEffectInterf
 include/mlir/Interfaces/SideEffectInterfaces.h
 include/mlir/Interfaces/SideEffectInterfaces.h.inc
 include/mlir/Interfaces/SideEffectInterfaces.td
+include/mlir/Interfaces/SubsetOpInterface.cpp.inc
+include/mlir/Interfaces/SubsetOpInterface.h
+include/mlir/Interfaces/SubsetOpInterface.h.inc
+include/mlir/Interfaces/SubsetOpInterface.td
 include/mlir/Interfaces/TilingInterface.cpp.inc
 include/mlir/Interfaces/TilingInterface.h
 include/mlir/Interfaces/TilingInterface.h.inc
@@ -1238,6 +1396,14 @@ include/mlir/Pass/PassInstrumentation.h
 include/mlir/Pass/PassManager.h
 include/mlir/Pass/PassOptions.h
 include/mlir/Pass/PassRegistry.h
+include/mlir/Query/Matcher/ErrorBuilder.h
+include/mlir/Query/Matcher/Marshallers.h
+include/mlir/Query/Matcher/MatchFinder.h
+include/mlir/Query/Matcher/MatchersInternal.h
+include/mlir/Query/Matcher/Registry.h
+include/mlir/Query/Matcher/VariantValue.h
+include/mlir/Query/Query.h
+include/mlir/Query/QuerySession.h
 include/mlir/Reducer/Passes.h
 include/mlir/Reducer/Passes.h.inc
 include/mlir/Reducer/Passes.td
@@ -1247,6 +1413,7 @@ include/mlir/Reducer/Tester.h
 include/mlir/Rewrite/FrozenRewritePatternSet.h
 include/mlir/Rewrite/PassUtil.td
 include/mlir/Rewrite/PatternApplicator.h
+include/mlir/Support/ADTExtras.h
 include/mlir/Support/DebugStringHelper.h
 include/mlir/Support/FileUtilities.h
 include/mlir/Support/IndentedOstream.h
@@ -1254,6 +1421,7 @@ include/mlir/Support/InterfaceSupport.h
 include/mlir/Support/LLVM.h
 include/mlir/Support/LogicalResult.h
 include/mlir/Support/MathExtras.h
+include/mlir/Support/RawOstreamExtras.h
 include/mlir/Support/StorageUniquer.h
 include/mlir/Support/ThreadLocalCache.h
 include/mlir/Support/Timing.h
@@ -1282,6 +1450,11 @@ include/mlir/TableGen/Successor.h
 include/mlir/TableGen/Trait.h
 include/mlir/TableGen/Type.h
 include/mlir/Target/Cpp/CppEmitter.h
+include/mlir/Target/LLVM/ModuleToObject.h
+include/mlir/Target/LLVM/NVVM/Target.h
+include/mlir/Target/LLVM/NVVM/Utils.h
+include/mlir/Target/LLVM/ROCDL/Target.h
+include/mlir/Target/LLVM/ROCDL/Utils.h
 include/mlir/Target/LLVMIR/Dialect/AMX/AMXToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/All.h
 include/mlir/Target/LLVMIR/Dialect/ArmNeon/ArmNeonToLLVMIRTranslation.h
@@ -1291,11 +1464,13 @@ include/mlir/Target/LLVMIR/Dialect/Built
 include/mlir/Target/LLVMIR/Dialect/GPU/GPUToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMIRToLLVMTranslation.h
 include/mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.h
+include/mlir/Target/LLVMIR/Dialect/NVVM/LLVMIRToNVVMTranslation.h
 include/mlir/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/OpenMPCommon.h
 include/mlir/Target/LLVMIR/Dialect/ROCDL/ROCDLToLLVMIRTranslation.h
+include/mlir/Target/LLVMIR/Dialect/SPIRV/SPIRVToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/X86Vector/X86VectorToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Export.h
 include/mlir/Target/LLVMIR/Import.h
@@ -1308,6 +1483,7 @@ include/mlir/Target/LLVMIR/TypeToLLVM.h
 include/mlir/Target/SPIRV/Deserialization.h
 include/mlir/Target/SPIRV/SPIRVBinaryUtils.h
 include/mlir/Target/SPIRV/Serialization.h
+include/mlir/Target/SPIRV/Target.h
 include/mlir/Tools/PDLL/AST/Context.h
 include/mlir/Tools/PDLL/AST/Diagnostic.h
 include/mlir/Tools/PDLL/AST/Nodes.h
@@ -1331,17 +1507,21 @@ include/mlir/Tools/lsp-server-support/Tr
 include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h
 include/mlir/Tools/mlir-opt/MlirOptMain.h
 include/mlir/Tools/mlir-pdll-lsp-server/MlirPdllLspServerMain.h
+include/mlir/Tools/mlir-query/MlirQueryMain.h
 include/mlir/Tools/mlir-reduce/MlirReduceMain.h
 include/mlir/Tools/mlir-tblgen/MlirTblgenMain.h
 include/mlir/Tools/mlir-translate/MlirTranslateMain.h
 include/mlir/Tools/mlir-translate/Translation.h
 include/mlir/Tools/tblgen-lsp-server/TableGenLspServerMain.h
+include/mlir/Transforms/CFGToSCF.h
 include/mlir/Transforms/CSE.h
 include/mlir/Transforms/CommutativityUtils.h
 include/mlir/Transforms/ControlFlowSinkUtils.h
 include/mlir/Transforms/DialectConversion.h
+include/mlir/Transforms/EndomorphismSimplification.h
 include/mlir/Transforms/FoldUtils.h
 include/mlir/Transforms/GreedyPatternRewriteDriver.h
+include/mlir/Transforms/HomomorphismSimplification.h
 include/mlir/Transforms/InliningUtils.h
 include/mlir/Transforms/LocationSnapshot.h
 include/mlir/Transforms/LoopInvariantCodeMotionUtils.h
@@ -1364,7 +1544,7 @@ lib/cmake/mlir/MLIRDetectPythonEnv.cmake
 lib/cmake/mlir/MLIRTargets-release.cmake
 lib/cmake/mlir/MLIRTargets.cmake
 lib/libMLIR-C.so
-${PLIST.notdarwin}lib/libMLIR-C.so.17
+lib/libMLIR-C.so.18.1
 lib/libMLIRAMDGPUDialect.a
 lib/libMLIRAMDGPUToROCDL.a
 lib/libMLIRAMDGPUTransforms.a
@@ -1381,6 +1561,8 @@ lib/libMLIRAffineUtils.a
 lib/libMLIRAnalysis.a
 lib/libMLIRArithAttrToLLVMConversion.a
 lib/libMLIRArithDialect.a
+lib/libMLIRArithToAMDGPU.a
+lib/libMLIRArithToArmSME.a
 lib/libMLIRArithToLLVM.a
 lib/libMLIRArithToSPIRV.a
 lib/libMLIRArithTransforms.a
@@ -1390,9 +1572,10 @@ lib/libMLIRArmNeon2dToIntr.a
 lib/libMLIRArmNeonDialect.a
 lib/libMLIRArmNeonToLLVMIRTranslation.a
 lib/libMLIRArmSMEDialect.a
+lib/libMLIRArmSMEToLLVM.a
 lib/libMLIRArmSMEToLLVMIRTranslation.a
+lib/libMLIRArmSMEToSCF.a
 lib/libMLIRArmSMETransforms.a
-lib/libMLIRArmSMEUtils.a
 lib/libMLIRArmSVEDialect.a
 lib/libMLIRArmSVEToLLVMIRTranslation.a
 lib/libMLIRArmSVETransforms.a
@@ -1401,6 +1584,7 @@ lib/libMLIRAsyncDialect.a
 lib/libMLIRAsyncToLLVM.a
 lib/libMLIRAsyncTransforms.a
 lib/libMLIRBufferizationDialect.a
+lib/libMLIRBufferizationPipelines.a
 lib/libMLIRBufferizationToMemRef.a
 lib/libMLIRBufferizationTransformOps.a
 lib/libMLIRBufferizationTransforms.a
@@ -1408,6 +1592,7 @@ lib/libMLIRBuiltinToLLVMIRTranslation.a
 lib/libMLIRBytecodeOpInterface.a
 lib/libMLIRBytecodeReader.a
 lib/libMLIRBytecodeWriter.a
+lib/libMLIRCAPIAMDGPU.a
 lib/libMLIRCAPIArith.a
 lib/libMLIRCAPIAsync.a
 lib/libMLIRCAPIControlFlow.a
@@ -1423,12 +1608,18 @@ lib/libMLIRCAPILinalg.a
 lib/libMLIRCAPIMLProgram.a
 lib/libMLIRCAPIMath.a
 lib/libMLIRCAPIMemRef.a
+lib/libMLIRCAPINVGPU.a
+lib/libMLIRCAPINVVM.a
+lib/libMLIRCAPIOpenMP.a
 lib/libMLIRCAPIPDL.a
 lib/libMLIRCAPIQuant.a
+lib/libMLIRCAPIROCDL.a
 lib/libMLIRCAPIRegisterEverything.a
 lib/libMLIRCAPISCF.a
+lib/libMLIRCAPISPIRV.a
 lib/libMLIRCAPIShape.a
 lib/libMLIRCAPISparseTensor.a
+lib/libMLIRCAPITarget.a
 lib/libMLIRCAPITensor.a
 lib/libMLIRCAPITransformDialect.a
 lib/libMLIRCAPITransforms.a
@@ -1443,7 +1634,11 @@ lib/libMLIRComplexToStandard.a
 lib/libMLIRControlFlowDialect.a
 lib/libMLIRControlFlowInterfaces.a
 lib/libMLIRControlFlowToLLVM.a
+lib/libMLIRControlFlowToSCF.a
 lib/libMLIRControlFlowToSPIRV.a
+lib/libMLIRControlFlowTransforms.a
+lib/libMLIRConvertToLLVMInterface.a
+lib/libMLIRConvertToLLVMPass.a
 lib/libMLIRCopyOpInterface.a
 lib/libMLIRDLTIDialect.a
 lib/libMLIRDataLayoutInterfaces.a
@@ -1453,6 +1648,7 @@ lib/libMLIRDestinationStyleOpInterface.a
 lib/libMLIRDialect.a
 lib/libMLIRDialectUtils.a
 lib/libMLIREmitCDialect.a
+lib/libMLIREmitCTransforms.a
 lib/libMLIRExecutionEngine.a
 lib/libMLIRExecutionEngineUtils.a
 lib/libMLIRFromLLVMIRTranslationRegistration.a
@@ -1461,8 +1657,11 @@ lib/libMLIRFuncDialect.a
 lib/libMLIRFuncInlinerExtension.a
 lib/libMLIRFuncToLLVM.a
 lib/libMLIRFuncToSPIRV.a
+lib/libMLIRFuncTransformOps.a
 lib/libMLIRFuncTransforms.a
+lib/libMLIRFunctionInterfaces.a
 lib/libMLIRGPUDialect.a
+lib/libMLIRGPUPipelines.a
 lib/libMLIRGPUToGPURuntimeTransforms.a
 lib/libMLIRGPUToLLVMIRTranslation.a
 lib/libMLIRGPUToNVVMTransforms.a
@@ -1475,6 +1674,7 @@ lib/libMLIRIR.a
 lib/libMLIRIRDL.a
 lib/libMLIRIndexDialect.a
 lib/libMLIRIndexToLLVM.a
+lib/libMLIRIndexToSPIRV.a
 lib/libMLIRInferIntRangeCommon.a
 lib/libMLIRInferIntRangeInterface.a
 lib/libMLIRInferTypeOpInterface.a
@@ -1482,10 +1682,10 @@ lib/libMLIRJitRunner.a
 lib/libMLIRLLVMCommonConversion.a
 lib/libMLIRLLVMDialect.a
 lib/libMLIRLLVMIRToLLVMTranslation.a
+lib/libMLIRLLVMIRToNVVMTranslation.a
 lib/libMLIRLLVMIRTransforms.a
 lib/libMLIRLLVMToLLVMIRTranslation.a
 lib/libMLIRLinalgDialect.a
-lib/libMLIRLinalgToLLVM.a
 lib/libMLIRLinalgToStandard.a
 lib/libMLIRLinalgTransformOps.a
 lib/libMLIRLinalgTransforms.a
@@ -1494,6 +1694,7 @@ lib/libMLIRLoopLikeInterface.a
 lib/libMLIRLspServerLib.a
 lib/libMLIRLspServerSupportLib.a
 lib/libMLIRMLProgramDialect.a
+lib/libMLIRMLProgramTransforms.a
 lib/libMLIRMaskableOpInterface.a
 lib/libMLIRMaskingOpInterface.a
 lib/libMLIRMathDialect.a
@@ -1509,6 +1710,8 @@ lib/libMLIRMemRefTransformOps.a
 lib/libMLIRMemRefTransforms.a
 lib/libMLIRMemRefUtils.a
 lib/libMLIRMemorySlotInterfaces.a
+lib/libMLIRMeshDialect.a
+lib/libMLIRMeshTransforms.a
 lib/libMLIRMlirOptMain.a
 lib/libMLIRNVGPUDialect.a
 lib/libMLIRNVGPUToNVVM.a
@@ -1516,10 +1719,12 @@ lib/libMLIRNVGPUTransformOps.a
 lib/libMLIRNVGPUTransforms.a
 lib/libMLIRNVGPUUtils.a
 lib/libMLIRNVVMDialect.a
+lib/libMLIRNVVMTarget.a
 lib/libMLIRNVVMToLLVM.a
 lib/libMLIRNVVMToLLVMIRTranslation.a
 lib/libMLIRObservers.a
 lib/libMLIROpenACCDialect.a
+lib/libMLIROpenACCMPCommon.a
 lib/libMLIROpenACCToLLVMIRTranslation.a
 lib/libMLIROpenACCToSCF.a
 lib/libMLIROpenMPDialect.a
@@ -1539,15 +1744,21 @@ lib/libMLIRPluginsLib.a
 lib/libMLIRPresburger.a
 lib/libMLIRQuantDialect.a
 lib/libMLIRQuantUtils.a
+lib/libMLIRQuery.a
+lib/libMLIRQueryLib.a
+lib/libMLIRQueryMatcher.a
 lib/libMLIRROCDLDialect.a
+lib/libMLIRROCDLTarget.a
 lib/libMLIRROCDLToLLVMIRTranslation.a
 lib/libMLIRReconcileUnrealizedCasts.a
 lib/libMLIRReduce.a
 lib/libMLIRReduceLib.a
 lib/libMLIRRewrite.a
+lib/libMLIRRewritePDL.a
 lib/libMLIRRuntimeVerifiableOpInterface.a
 lib/libMLIRSCFDialect.a
 lib/libMLIRSCFToControlFlow.a
+lib/libMLIRSCFToEmitC.a
 lib/libMLIRSCFToGPU.a
 lib/libMLIRSCFToOpenMP.a
 lib/libMLIRSCFToSPIRV.a
@@ -1560,7 +1771,9 @@ lib/libMLIRSPIRVDeserialization.a
 lib/libMLIRSPIRVDialect.a
 lib/libMLIRSPIRVModuleCombiner.a
 lib/libMLIRSPIRVSerialization.a
+lib/libMLIRSPIRVTarget.a
 lib/libMLIRSPIRVToLLVM.a
+lib/libMLIRSPIRVToLLVMIRTranslation.a
 lib/libMLIRSPIRVTransforms.a
 lib/libMLIRSPIRVTranslateRegistration.a
 lib/libMLIRSPIRVUtils.a
@@ -1568,15 +1781,19 @@ lib/libMLIRShapeDialect.a
 lib/libMLIRShapeOpsTransforms.a
 lib/libMLIRShapeToStandard.a
 lib/libMLIRShapedOpInterfaces.a
+lib/libMLIRShardingInterface.a
 lib/libMLIRSideEffectInterfaces.a
 lib/libMLIRSparseTensorDialect.a
 lib/libMLIRSparseTensorPipelines.a
 lib/libMLIRSparseTensorRuntime.a
+lib/libMLIRSparseTensorTransformOps.a
 lib/libMLIRSparseTensorTransforms.a
 lib/libMLIRSparseTensorUtils.a
+lib/libMLIRSubsetOpInterface.a
 lib/libMLIRSupport.a
 lib/libMLIRTableGen.a
 lib/libMLIRTargetCpp.a
+lib/libMLIRTargetLLVM.a
 lib/libMLIRTargetLLVMIRExport.a
 lib/libMLIRTargetLLVMIRImport.a
 lib/libMLIRTblgenLib.a
@@ -1591,14 +1808,18 @@ lib/libMLIRTensorUtils.a
 lib/libMLIRTilingInterface.a
 lib/libMLIRToLLVMIRTranslationRegistration.a
 lib/libMLIRTosaDialect.a
+lib/libMLIRTosaShardingInterfaceImpl.a
 lib/libMLIRTosaToArith.a
 lib/libMLIRTosaToLinalg.a
+lib/libMLIRTosaToMLProgram.a
 lib/libMLIRTosaToSCF.a
 lib/libMLIRTosaToTensor.a
 lib/libMLIRTosaTransforms.a
+lib/libMLIRTransformDebugExtension.a
 lib/libMLIRTransformDialect.a
 lib/libMLIRTransformDialectTransforms.a
 lib/libMLIRTransformDialectUtils.a
+lib/libMLIRTransformLoopExtension.a
 lib/libMLIRTransformPDLExtension.a
 lib/libMLIRTransformUtils.a
 lib/libMLIRTransforms.a
@@ -1612,6 +1833,7 @@ lib/libMLIRVectorInterfaces.a
 lib/libMLIRVectorToArmSME.a
 lib/libMLIRVectorToGPU.a
 lib/libMLIRVectorToLLVM.a
+lib/libMLIRVectorToLLVMPass.a
 lib/libMLIRVectorToSCF.a
 lib/libMLIRVectorToSPIRV.a
 lib/libMLIRVectorTransformOps.a
@@ -1621,11 +1843,15 @@ lib/libMLIRViewLikeInterface.a
 lib/libMLIRX86VectorDialect.a
 lib/libMLIRX86VectorToLLVMIRTranslation.a
 lib/libMLIRX86VectorTransforms.a
+lib/libmlir_arm_runner_utils.so
+lib/libmlir_arm_runner_utils.so.18.1
+lib/libmlir_arm_sme_abi_stubs.so
+lib/libmlir_arm_sme_abi_stubs.so.18.1
 lib/libmlir_async_runtime.so
-${PLIST.notdarwin}lib/libmlir_async_runtime.so.17
+lib/libmlir_async_runtime.so.18.1
 lib/libmlir_c_runner_utils.so
-${PLIST.notdarwin}lib/libmlir_c_runner_utils.so.17
+lib/libmlir_c_runner_utils.so.18.1
 lib/libmlir_float16_utils.so
-${PLIST.notdarwin}lib/libmlir_float16_utils.so.17
+lib/libmlir_float16_utils.so.18.1
 lib/libmlir_runner_utils.so
-${PLIST.notdarwin}lib/libmlir_runner_utils.so.17
+lib/libmlir_runner_utils.so.18.1

Index: pkgsrc/lang/mlir/buildlink3.mk
diff -u pkgsrc/lang/mlir/buildlink3.mk:1.2 pkgsrc/lang/mlir/buildlink3.mk:1.3
--- pkgsrc/lang/mlir/buildlink3.mk:1.2  Mon Apr 22 07:28:21 2024
+++ pkgsrc/lang/mlir/buildlink3.mk      Sat Jul  6 15:45:09 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2024/04/22 07:28:21 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2024/07/06 15:45:09 adam Exp $
 
 BUILDLINK_TREE+=       mlir
 
 .if !defined(MLIR_BUILDLINK3_MK)
 MLIR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mlir+=   mlir>=17.0.0<18
+BUILDLINK_API_DEPENDS.mlir+=   mlir>=18.0.0
 BUILDLINK_PKGSRCDIR.mlir?=     ../../lang/mlir
 
 BUILDLINK_FILES.mlir+=         bin/mlir-tblgen
Index: pkgsrc/lang/mlir/distinfo
diff -u pkgsrc/lang/mlir/distinfo:1.2 pkgsrc/lang/mlir/distinfo:1.3
--- pkgsrc/lang/mlir/distinfo:1.2       Mon Apr 22 07:28:21 2024
+++ pkgsrc/lang/mlir/distinfo   Sat Jul  6 15:45:09 2024
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2024/04/22 07:28:21 adam Exp $
+$NetBSD: distinfo,v 1.3 2024/07/06 15:45:09 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (mlir-17.0.6.src.tar.xz) = 222120f283eb3cdb326a1cda5161816988cf4f82dac90ca40466c1e05d58bc18
-SHA512 (mlir-17.0.6.src.tar.xz) = 40e5310d1ee613d38d2fc1f72cd4902c402e72e18fc44c275bbd7605e86934093a9b1e64329e91a5e99adb7e95c5cede550dd8c500bf505f037ad264ecba268a
-Size (mlir-17.0.6.src.tar.xz) = 5336028 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
-SHA1 (patch-cmake_modules_MLIRConfig.cmake.in) = 528ffcd98d35b22c168b228daca28af319a47c5c
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (mlir-18.1.8.src.tar.xz) = 5b76035aa1d485be09dae9d4c1c5211cc64420d21c127c7462725e746f2bdf67
+SHA512 (mlir-18.1.8.src.tar.xz) = 5b183b325a3fc2c69056ad517548a07ba2294ab4e3df35c8a477a0824da75c348c62a5ff5ca06be98d993e92830fb7bc0a52ff7fcd47dd1e995cb2830f4ea9d3
+Size (mlir-18.1.8.src.tar.xz) = 5898700 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
+SHA1 (patch-cmake_modules_MLIRConfig.cmake.in) = 69c4f32891e21e239f6bafc9305e79440809cf6c
 SHA1 (patch-tools_mlir-tblgen_CMakeLists.txt) = 7b78acbf8a85443f2cc3f13786bbbda25b0b8d74

Index: pkgsrc/lang/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
diff -u pkgsrc/lang/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in:1.1 pkgsrc/lang/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in:1.2
--- pkgsrc/lang/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in:1.1        Fri Oct  6 19:15:21 2023
+++ pkgsrc/lang/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in    Sat Jul  6 15:45:09 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmake_modules_MLIRConfig.cmake.in,v 1.1 2023/10/06 19:15:21 adam Exp $
+$NetBSD: patch-cmake_modules_MLIRConfig.cmake.in,v 1.2 2024/07/06 15:45:09 adam Exp $
 
 Provide proper path to mlir-tblgen.
 
---- cmake/modules/MLIRConfig.cmake.in.orig     2022-11-16 06:28:29.000000000 +0000
+--- cmake/modules/MLIRConfig.cmake.in.orig     2024-04-17 00:21:15.000000000 +0000
 +++ cmake/modules/MLIRConfig.cmake.in
-@@ -8,14 +8,11 @@ find_package(LLVM REQUIRED CONFIG
+@@ -9,15 +9,12 @@ find_package(LLVM ${LLVM_VERSION} EXACT
  set(MLIR_EXPORTED_TARGETS "@MLIR_EXPORTS@")
  set(MLIR_CMAKE_DIR "@MLIR_CONFIG_CMAKE_DIR@")
  set(MLIR_INCLUDE_DIRS "@MLIR_CONFIG_INCLUDE_DIRS@")
@@ -13,6 +13,7 @@ Provide proper path to mlir-tblgen.
  set(MLIR_PDLL_TABLEGEN_EXE "@MLIR_CONFIG_PDLL_TABLEGEN_EXE@")
  set(MLIR_INSTALL_AGGREGATE_OBJECTS "@MLIR_INSTALL_AGGREGATE_OBJECTS@")
  set(MLIR_ENABLE_BINDINGS_PYTHON "@MLIR_ENABLE_BINDINGS_PYTHON@")
+ set(MLIR_ENABLE_EXECUTION_ENGINE "@MLIR_ENABLE_EXECUTION_ENGINE@")
  
 -# For mlir_tablegen()
 -set(MLIR_INCLUDE_DIR "@MLIR_INCLUDE_DIR@")

Index: pkgsrc/lang/mlir/patches/patch-tools_mlir-tblgen_CMakeLists.txt
diff -u pkgsrc/lang/mlir/patches/patch-tools_mlir-tblgen_CMakeLists.txt:1.2 pkgsrc/lang/mlir/patches/patch-tools_mlir-tblgen_CMakeLists.txt:1.3
--- pkgsrc/lang/mlir/patches/patch-tools_mlir-tblgen_CMakeLists.txt:1.2 Mon Apr 22 07:28:21 2024
+++ pkgsrc/lang/mlir/patches/patch-tools_mlir-tblgen_CMakeLists.txt     Sat Jul  6 15:45:09 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-tools_mlir-tblgen_CMakeLists.txt,v 1.2 2024/04/22 07:28:21 adam Exp $
+$NetBSD: patch-tools_mlir-tblgen_CMakeLists.txt,v 1.3 2024/07/06 15:45:09 adam Exp $
 
 Install mlir-tblgen.
 

Index: pkgsrc/lang/wasi-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.26 pkgsrc/lang/wasi-compiler-rt/Makefile:1.27
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.26  Wed May 29 16:33:18 2024
+++ pkgsrc/lang/wasi-compiler-rt/Makefile       Sat Jul  6 15:45:09 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.26 2024/05/29 16:33:18 adam Exp $
+# $NetBSD: Makefile,v 1.27 2024/07/06 15:45:09 adam Exp $
 
-PKGREVISION= 1
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      compiler-rt-${LLVM_VERSION}.src
@@ -20,8 +19,10 @@ NOT_FOR_PLATFORM=    NetBSD-[0-7].*-*
 TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
 TOOL_DEPENDS+= lld-${LLVM_VERSION}*:../../devel/lld
 
-USE_LANGUAGES= c99 c++17
-USE_TOOLS+=    ggrep
+USE_CC_FEATURES=       c99
+USE_CXX_FEATURES=      c++17
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            ggrep
 
 SSP_SUPPORTED=         no
 PKGSRC_USE_STACK_CHECK=        no
@@ -92,8 +93,7 @@ post-install:
 .endif
 
 ABI=                   # 32
-CFLAGS+=               -fno-exceptions
-CFLAGS+=               -O2
+CFLAGS+=               -O2 -fno-exceptions
 CXXFLAGS+=             -O2
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}

Index: pkgsrc/lang/wasi-compiler-rt/buildlink3.mk
diff -u pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.10 pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.11
--- pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.10     Mon Apr 22 07:26:42 2024
+++ pkgsrc/lang/wasi-compiler-rt/buildlink3.mk  Sat Jul  6 15:45:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2024/04/22 07:26:42 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2024/07/06 15:45:09 adam Exp $
 
 BUILDLINK_TREE+=       wasi-compiler-rt
 
@@ -7,7 +7,7 @@ BUILDLINK_DEPMETHOD.wasi-compiler-rt?=  b
 .if !defined(WASI_COMPILER_RT_BUILDLINK3_MK)
 WASI_COMPILER_RT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wasi-compiler-rt+=       wasi-compiler-rt>=17.0.0<18
+BUILDLINK_API_DEPENDS.wasi-compiler-rt+=       wasi-compiler-rt>=18.0.0
 BUILDLINK_PKGSRCDIR.wasi-compiler-rt?=         ../../lang/wasi-compiler-rt
 
 .endif # WASI_COMPILER_RT_BUILDLINK3_MK

Index: pkgsrc/lang/wasi-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.24 pkgsrc/lang/wasi-libcxx/Makefile:1.25
--- pkgsrc/lang/wasi-libcxx/Makefile:1.24       Wed May 29 16:33:18 2024
+++ pkgsrc/lang/wasi-libcxx/Makefile    Sat Jul  6 15:45:09 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.24 2024/05/29 16:33:18 adam Exp $
+# $NetBSD: Makefile,v 1.25 2024/07/06 15:45:09 adam Exp $
 
-PKGREVISION= 1
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      libcxxabi-${LLVM_VERSION}.src

Index: pkgsrc/lang/wasi-libcxx/PLIST
diff -u pkgsrc/lang/wasi-libcxx/PLIST:1.5 pkgsrc/lang/wasi-libcxx/PLIST:1.6
--- pkgsrc/lang/wasi-libcxx/PLIST:1.5   Mon Apr 22 07:26:42 2024
+++ pkgsrc/lang/wasi-libcxx/PLIST       Sat Jul  6 15:45:09 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2024/04/22 07:26:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2024/07/06 15:45:09 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
@@ -22,6 +22,8 @@ wasi/include/c++/v1/__algorithm/find_end
 wasi/include/c++/v1/__algorithm/find_first_of.h
 wasi/include/c++/v1/__algorithm/find_if.h
 wasi/include/c++/v1/__algorithm/find_if_not.h
+wasi/include/c++/v1/__algorithm/find_segment_if.h
+wasi/include/c++/v1/__algorithm/fold.h
 wasi/include/c++/v1/__algorithm/for_each.h
 wasi/include/c++/v1/__algorithm/for_each_n.h
 wasi/include/c++/v1/__algorithm/for_each_segment.h
@@ -87,6 +89,7 @@ wasi/include/c++/v1/__algorithm/pstl_bac
 wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/transform_reduce.h
 wasi/include/c++/v1/__algorithm/pstl_copy.h
 wasi/include/c++/v1/__algorithm/pstl_count.h
+wasi/include/c++/v1/__algorithm/pstl_equal.h
 wasi/include/c++/v1/__algorithm/pstl_fill.h
 wasi/include/c++/v1/__algorithm/pstl_find.h
 wasi/include/c++/v1/__algorithm/pstl_for_each.h
@@ -94,7 +97,9 @@ wasi/include/c++/v1/__algorithm/pstl_fro
 wasi/include/c++/v1/__algorithm/pstl_generate.h
 wasi/include/c++/v1/__algorithm/pstl_is_partitioned.h
 wasi/include/c++/v1/__algorithm/pstl_merge.h
+wasi/include/c++/v1/__algorithm/pstl_move.h
 wasi/include/c++/v1/__algorithm/pstl_replace.h
+wasi/include/c++/v1/__algorithm/pstl_rotate_copy.h
 wasi/include/c++/v1/__algorithm/pstl_sort.h
 wasi/include/c++/v1/__algorithm/pstl_stable_sort.h
 wasi/include/c++/v1/__algorithm/pstl_transform.h
@@ -104,12 +109,14 @@ wasi/include/c++/v1/__algorithm/ranges_a
 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_contains.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_ends_with.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
@@ -223,6 +230,7 @@ wasi/include/c++/v1/__algorithm/unwrap_i
 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/__assertion_handler
 wasi/include/c++/v1/__atomic/aliases.h
 wasi/include/c++/v1/__atomic/atomic.h
 wasi/include/c++/v1/__atomic/atomic_base.h
@@ -249,6 +257,7 @@ wasi/include/c++/v1/__bit/countl.h
 wasi/include/c++/v1/__bit/countr.h
 wasi/include/c++/v1/__bit/endian.h
 wasi/include/c++/v1/__bit/has_single_bit.h
+wasi/include/c++/v1/__bit/invert_if.h
 wasi/include/c++/v1/__bit/popcount.h
 wasi/include/c++/v1/__bit/rotate.h
 wasi/include/c++/v1/__bit_reference
@@ -282,6 +291,8 @@ wasi/include/c++/v1/__chrono/statically_
 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/tzdb.h
+wasi/include/c++/v1/__chrono/tzdb_list.h
 wasi/include/c++/v1/__chrono/weekday.h
 wasi/include/c++/v1/__chrono/year.h
 wasi/include/c++/v1/__chrono/year_month.h
@@ -417,6 +428,7 @@ wasi/include/c++/v1/__functional/unary_f
 wasi/include/c++/v1/__functional/unary_negate.h
 wasi/include/c++/v1/__functional/weak_result_type.h
 wasi/include/c++/v1/__fwd/array.h
+wasi/include/c++/v1/__fwd/bit_reference.h
 wasi/include/c++/v1/__fwd/fstream.h
 wasi/include/c++/v1/__fwd/get.h
 wasi/include/c++/v1/__fwd/hash.h
@@ -481,11 +493,31 @@ wasi/include/c++/v1/__locale
 wasi/include/c++/v1/__locale_dir/locale_base_api/bsd_locale_defaults.h
 wasi/include/c++/v1/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
 wasi/include/c++/v1/__locale_dir/locale_base_api/locale_guard.h
+wasi/include/c++/v1/__math/abs.h
+wasi/include/c++/v1/__math/copysign.h
+wasi/include/c++/v1/__math/error_functions.h
+wasi/include/c++/v1/__math/exponential_functions.h
+wasi/include/c++/v1/__math/fdim.h
+wasi/include/c++/v1/__math/fma.h
+wasi/include/c++/v1/__math/gamma.h
+wasi/include/c++/v1/__math/hyperbolic_functions.h
+wasi/include/c++/v1/__math/hypot.h
+wasi/include/c++/v1/__math/inverse_hyperbolic_functions.h
+wasi/include/c++/v1/__math/inverse_trigonometric_functions.h
+wasi/include/c++/v1/__math/logarithms.h
+wasi/include/c++/v1/__math/min_max.h
+wasi/include/c++/v1/__math/modulo.h
+wasi/include/c++/v1/__math/remainder.h
+wasi/include/c++/v1/__math/roots.h
+wasi/include/c++/v1/__math/rounding_functions.h
+wasi/include/c++/v1/__math/traits.h
+wasi/include/c++/v1/__math/trigonometric_functions.h
 wasi/include/c++/v1/__mbstate_t.h
 wasi/include/c++/v1/__mdspan/default_accessor.h
 wasi/include/c++/v1/__mdspan/extents.h
 wasi/include/c++/v1/__mdspan/layout_left.h
 wasi/include/c++/v1/__mdspan/layout_right.h
+wasi/include/c++/v1/__mdspan/layout_stride.h
 wasi/include/c++/v1/__mdspan/mdspan.h
 wasi/include/c++/v1/__memory/addressof.h
 wasi/include/c++/v1/__memory/align.h
@@ -524,6 +556,7 @@ wasi/include/c++/v1/__memory_resource/sy
 wasi/include/c++/v1/__memory_resource/unsynchronized_pool_resource.h
 wasi/include/c++/v1/__mutex/lock_guard.h
 wasi/include/c++/v1/__mutex/mutex.h
+wasi/include/c++/v1/__mutex/once_flag.h
 wasi/include/c++/v1/__mutex/tag_types.h
 wasi/include/c++/v1/__mutex/unique_lock.h
 wasi/include/c++/v1/__node_handle
@@ -539,42 +572,10 @@ wasi/include/c++/v1/__numeric/partial_su
 wasi/include/c++/v1/__numeric/pstl_reduce.h
 wasi/include/c++/v1/__numeric/pstl_transform_reduce.h
 wasi/include/c++/v1/__numeric/reduce.h
+wasi/include/c++/v1/__numeric/saturation_arithmetic.h
 wasi/include/c++/v1/__numeric/transform_exclusive_scan.h
 wasi/include/c++/v1/__numeric/transform_inclusive_scan.h
 wasi/include/c++/v1/__numeric/transform_reduce.h
-wasi/include/c++/v1/__pstl/internal/algorithm_fwd.h
-wasi/include/c++/v1/__pstl/internal/algorithm_impl.h
-wasi/include/c++/v1/__pstl/internal/execution_defs.h
-wasi/include/c++/v1/__pstl/internal/execution_impl.h
-wasi/include/c++/v1/__pstl/internal/glue_algorithm_defs.h
-wasi/include/c++/v1/__pstl/internal/glue_algorithm_impl.h
-wasi/include/c++/v1/__pstl/internal/glue_memory_defs.h
-wasi/include/c++/v1/__pstl/internal/glue_memory_impl.h
-wasi/include/c++/v1/__pstl/internal/glue_numeric_defs.h
-wasi/include/c++/v1/__pstl/internal/glue_numeric_impl.h
-wasi/include/c++/v1/__pstl/internal/memory_impl.h
-wasi/include/c++/v1/__pstl/internal/numeric_fwd.h
-wasi/include/c++/v1/__pstl/internal/numeric_impl.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_for.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_for_each.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_invoke.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_merge.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_scan.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_stable_partial_sort.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_stable_sort.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_transform_reduce.h
-wasi/include/c++/v1/__pstl/internal/omp/parallel_transform_scan.h
-wasi/include/c++/v1/__pstl/internal/omp/util.h
-wasi/include/c++/v1/__pstl/internal/parallel_backend.h
-wasi/include/c++/v1/__pstl/internal/parallel_backend_omp.h
-wasi/include/c++/v1/__pstl/internal/parallel_backend_serial.h
-wasi/include/c++/v1/__pstl/internal/parallel_backend_tbb.h
-wasi/include/c++/v1/__pstl/internal/parallel_backend_utils.h
-wasi/include/c++/v1/__pstl/internal/unseq_backend_simd.h
-wasi/include/c++/v1/__pstl/internal/utils.h
-wasi/include/c++/v1/__pstl_algorithm
-wasi/include/c++/v1/__pstl_memory
-wasi/include/c++/v1/__pstl_numeric
 wasi/include/c++/v1/__random/bernoulli_distribution.h
 wasi/include/c++/v1/__random/binomial_distribution.h
 wasi/include/c++/v1/__random/cauchy_distribution.h
@@ -615,6 +616,7 @@ wasi/include/c++/v1/__random/weibull_dis
 wasi/include/c++/v1/__ranges/access.h
 wasi/include/c++/v1/__ranges/all.h
 wasi/include/c++/v1/__ranges/as_rvalue_view.h
+wasi/include/c++/v1/__ranges/chunk_by_view.h
 wasi/include/c++/v1/__ranges/common_view.h
 wasi/include/c++/v1/__ranges/concepts.h
 wasi/include/c++/v1/__ranges/container_compatible_range.h
@@ -687,6 +689,7 @@ wasi/include/c++/v1/__system_error/error
 wasi/include/c++/v1/__system_error/system_error.h
 wasi/include/c++/v1/__thread/formatter.h
 wasi/include/c++/v1/__thread/id.h
+wasi/include/c++/v1/__thread/jthread.h
 wasi/include/c++/v1/__thread/poll_with_backoff.h
 wasi/include/c++/v1/__thread/this_thread.h
 wasi/include/c++/v1/__thread/thread.h
@@ -821,7 +824,6 @@ wasi/include/c++/v1/__type_traits/nat.h
 wasi/include/c++/v1/__type_traits/negation.h
 wasi/include/c++/v1/__type_traits/noexcept_move_assign_container.h
 wasi/include/c++/v1/__type_traits/operation_traits.h
-wasi/include/c++/v1/__type_traits/predicate_traits.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
@@ -842,10 +844,12 @@ wasi/include/c++/v1/__type_traits/unwrap
 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/as_lvalue.h
 wasi/include/c++/v1/__utility/auto_cast.h
 wasi/include/c++/v1/__utility/cmp.h
 wasi/include/c++/v1/__utility/convert_to_integral.h
 wasi/include/c++/v1/__utility/declval.h
+wasi/include/c++/v1/__utility/empty.h
 wasi/include/c++/v1/__utility/exception_guard.h
 wasi/include/c++/v1/__utility/exchange.h
 wasi/include/c++/v1/__utility/forward.h
@@ -854,12 +858,13 @@ wasi/include/c++/v1/__utility/in_place.h
 wasi/include/c++/v1/__utility/integer_sequence.h
 wasi/include/c++/v1/__utility/is_pointer_in_range.h
 wasi/include/c++/v1/__utility/move.h
+wasi/include/c++/v1/__utility/no_destroy.h
 wasi/include/c++/v1/__utility/pair.h
 wasi/include/c++/v1/__utility/piecewise_construct.h
 wasi/include/c++/v1/__utility/priority_tag.h
 wasi/include/c++/v1/__utility/rel_ops.h
+wasi/include/c++/v1/__utility/small_buffer.h
 wasi/include/c++/v1/__utility/swap.h
-wasi/include/c++/v1/__utility/terminate_on_exception.h
 wasi/include/c++/v1/__utility/to_underlying.h
 wasi/include/c++/v1/__utility/unreachable.h
 wasi/include/c++/v1/__variant/monostate.h
@@ -914,22 +919,21 @@ wasi/include/c++/v1/execution
 wasi/include/c++/v1/expected
 wasi/include/c++/v1/experimental/__config
 wasi/include/c++/v1/experimental/__memory
-wasi/include/c++/v1/experimental/deque
-wasi/include/c++/v1/experimental/forward_list
+wasi/include/c++/v1/experimental/__simd/aligned_tag.h
+wasi/include/c++/v1/experimental/__simd/declaration.h
+wasi/include/c++/v1/experimental/__simd/reference.h
+wasi/include/c++/v1/experimental/__simd/scalar.h
+wasi/include/c++/v1/experimental/__simd/simd.h
+wasi/include/c++/v1/experimental/__simd/simd_mask.h
+wasi/include/c++/v1/experimental/__simd/traits.h
+wasi/include/c++/v1/experimental/__simd/utility.h
+wasi/include/c++/v1/experimental/__simd/vec_ext.h
 wasi/include/c++/v1/experimental/iterator
-wasi/include/c++/v1/experimental/list
-wasi/include/c++/v1/experimental/map
-wasi/include/c++/v1/experimental/memory_resource
+wasi/include/c++/v1/experimental/memory
 wasi/include/c++/v1/experimental/propagate_const
-wasi/include/c++/v1/experimental/regex
-wasi/include/c++/v1/experimental/set
 wasi/include/c++/v1/experimental/simd
-wasi/include/c++/v1/experimental/string
 wasi/include/c++/v1/experimental/type_traits
-wasi/include/c++/v1/experimental/unordered_map
-wasi/include/c++/v1/experimental/unordered_set
 wasi/include/c++/v1/experimental/utility
-wasi/include/c++/v1/experimental/vector
 wasi/include/c++/v1/ext/__hash
 wasi/include/c++/v1/ext/hash_map
 wasi/include/c++/v1/ext/hash_set
@@ -952,7 +956,6 @@ wasi/include/c++/v1/iterator
 wasi/include/c++/v1/latch
 wasi/include/c++/v1/libcxx.imp
 wasi/include/c++/v1/limits
-wasi/include/c++/v1/limits.h
 wasi/include/c++/v1/list
 wasi/include/c++/v1/locale
 wasi/include/c++/v1/locale.h
@@ -977,7 +980,6 @@ wasi/include/c++/v1/regex
 wasi/include/c++/v1/scoped_allocator
 wasi/include/c++/v1/semaphore
 wasi/include/c++/v1/set
-wasi/include/c++/v1/setjmp.h
 wasi/include/c++/v1/shared_mutex
 wasi/include/c++/v1/source_location
 wasi/include/c++/v1/span
@@ -996,6 +998,7 @@ wasi/include/c++/v1/string
 wasi/include/c++/v1/string.h
 wasi/include/c++/v1/string_view
 wasi/include/c++/v1/strstream
+wasi/include/c++/v1/syncstream
 wasi/include/c++/v1/system_error
 wasi/include/c++/v1/tgmath.h
 wasi/include/c++/v1/thread

Index: pkgsrc/lang/wasi-libcxx/buildlink3.mk
diff -u pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.8 pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.9
--- pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.8   Mon Apr 22 07:26:42 2024
+++ pkgsrc/lang/wasi-libcxx/buildlink3.mk       Sat Jul  6 15:45:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2024/04/22 07:26:42 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2024/07/06 15:45:09 adam Exp $
 
 BUILDLINK_TREE+=       wasi-libcxx
 
@@ -7,7 +7,7 @@ BUILDLINK_DEPMETHOD.wasi-libcxx?=       build
 .if !defined(WASI_LIBCXX_BUILDLINK3_MK)
 WASI_LIBCXX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wasi-libcxx+=    wasi-libcxx>=17.0.0<18
+BUILDLINK_API_DEPENDS.wasi-libcxx+=    wasi-libcxx>=18.0.0
 BUILDLINK_PKGSRCDIR.wasi-libcxx?=      ../../lang/wasi-libcxx
 
 .endif # WASI_LIBCXX_BUILDLINK3_MK

Index: pkgsrc/lang/wasi-libcxx/distinfo
diff -u pkgsrc/lang/wasi-libcxx/distinfo:1.10 pkgsrc/lang/wasi-libcxx/distinfo:1.11
--- pkgsrc/lang/wasi-libcxx/distinfo:1.10       Mon Apr 22 07:26:42 2024
+++ pkgsrc/lang/wasi-libcxx/distinfo    Sat Jul  6 15:45:09 2024
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.10 2024/04/22 07:26:42 adam Exp $
+$NetBSD: distinfo,v 1.11 2024/07/06 15:45:09 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (libcxx-17.0.6.src.tar.xz) = cf31b1c41185da916ba428f5797e97f5cd8acb6d5a23947b40a94903e80de3ed
-SHA512 (libcxx-17.0.6.src.tar.xz) = 8be288ab14bd34a1946aeadc83c9e11ff68eb0cda707fd6bee711514d0e506112ffc2a40d0317d19f64f05b644e072f1322ed0e8ab238d9640b6b827d42126eb
-Size (libcxx-17.0.6.src.tar.xz) = 3946532 bytes
-BLAKE2s (libcxxabi-17.0.6.src.tar.xz) = 85c5ca07166696fbde2c24716e66f46741d42d69d617c574042b9ba9389ae9da
-SHA512 (libcxxabi-17.0.6.src.tar.xz) = acd2b0b48eee4380625347a955fa3dfafce948aeccd87a2070e09bd91b148ae189aec12b506f3097193a8288095e99496c66ce26974772878622e5892d822cc3
-Size (libcxxabi-17.0.6.src.tar.xz) = 575744 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
-SHA1 (patch-libcxx_include_CMakeLists.txt) = ca1d4f8dbc99bbcfdad6a0bd389f973a48a938d7
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.8.src.tar.xz) = a804de6e86f74c0b6f6833f5e87831fdda8d1bc956b1da7f573200b3c4d31c53
+SHA512 (libcxx-18.1.8.src.tar.xz) = b24f8adbc4edd0cde3a28c6ce0ae2d7cd32049c155459c669f30ee6400a7a0e789c968db7f93bb0aa0f972b47b86424b9655af00e99867e242baccece8f323e8
+Size (libcxx-18.1.8.src.tar.xz) = 4028732 bytes
+BLAKE2s (libcxxabi-18.1.8.src.tar.xz) = c2e29ed27ba6144043b7ab036976f065685752e08995ff3b6ebead9c7cbad9f2
+SHA512 (libcxxabi-18.1.8.src.tar.xz) = 40f8691e86948527cd104b3b7f481757e6f8f4892fbe8632a6f86f35008e0c9d721e5f2d3629c6f0b99e9f150ee9f3d650aa111ea2c5f6df44fec481ff00a1f9
+Size (libcxxabi-18.1.8.src.tar.xz) = 582748 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
+SHA1 (patch-libcxx_include_CMakeLists.txt) = 4a8c384b176ab731dd1adc75d87b4ef4008a754c
 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.2 pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt:1.3
--- pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt:1.2     Mon Nov 14 18:44:07 2022
+++ pkgsrc/lang/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt Sat Jul  6 15:45:09 2024
@@ -1,19 +1,22 @@
-$NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.2 2022/11/14 18:44:07 adam Exp $
+$NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.3 2024/07/06 15:45:09 adam Exp $
 
-* Generate __config_site under source directory. This is wrong.
+* Generate __config_site and __assertion_handler under source directory. This is wrong.
   This fixes non-pthreads wasi-libcxx-14.0.6 build.
 
---- libcxx/include/CMakeLists.txt.orig 2022-11-13 10:03:36.918375190 +0000
+--- libcxx/include/CMakeLists.txt.orig 2024-05-18 14:14:07.000000000 +0000
 +++ libcxx/include/CMakeLists.txt
-@@ -795,9 +795,11 @@ foreach(feature LIBCXX_ENABLE_FILESYSTEM
+@@ -1019,10 +1019,14 @@ 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)
++configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${CMAKE_CURRENT_SOURCE_DIR}/__assertion_handler" COPYONLY)
+ configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler" COPYONLY)
  
-+set(_all_includes "${CMAKE_CURRENT_SOURCE_DIR}/__config_site")
++set(_all_includes "${CMAKE_CURRENT_SOURCE_DIR}/__config_site"
++                   ${CMAKE_CURRENT_SOURCE_DIR}/__assertion_handler)
  set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
-                   "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap")
- foreach(f ${files})
+                   "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap"
+                   "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler")

Index: pkgsrc/parallel/openmp/Makefile
diff -u pkgsrc/parallel/openmp/Makefile:1.19 pkgsrc/parallel/openmp/Makefile:1.20
--- pkgsrc/parallel/openmp/Makefile:1.19        Mon Apr 22 07:25:56 2024
+++ pkgsrc/parallel/openmp/Makefile     Sat Jul  6 15:45:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/04/22 07:25:56 adam Exp $
+# $NetBSD: Makefile,v 1.20 2024/07/06 15:45:08 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
Index: pkgsrc/parallel/openmp/distinfo
diff -u pkgsrc/parallel/openmp/distinfo:1.19 pkgsrc/parallel/openmp/distinfo:1.20
--- pkgsrc/parallel/openmp/distinfo:1.19        Mon Apr 22 07:25:56 2024
+++ pkgsrc/parallel/openmp/distinfo     Sat Jul  6 15:45:08 2024
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.19 2024/04/22 07:25:56 adam Exp $
+$NetBSD: distinfo,v 1.20 2024/07/06 15:45:08 adam Exp $
 
-BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
-SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
-Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
-BLAKE2s (openmp-17.0.6.src.tar.xz) = 6e86a483d736897feb87b3179f43ac55a584f4bec78168f361fd278162120f9c
-SHA512 (openmp-17.0.6.src.tar.xz) = 836c48db873e3da64835913c2c1d80efaebdfc7061f153acc7b478ea0d73b9c546a09d70dd1465e3e92684947c4a9cb197886b29cbd42418a778faa56b08cc5e
-Size (openmp-17.0.6.src.tar.xz) = 1273412 bytes
-BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
-SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
-Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
-SHA1 (patch-runtime_src_kmp__os.h) = 70e8b720cebff0c919387aa4ce0f9e4217934271
+BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
+SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
+Size (cmake-18.1.8.src.tar.xz) = 8708 bytes
+BLAKE2s (openmp-18.1.8.src.tar.xz) = 4efb6e4c22d6421b53c575cfcf1383bf8ff9e88b302911f97afc37fb01c7f7a1
+SHA512 (openmp-18.1.8.src.tar.xz) = 7c2ca736524fb741112be247ac6be39cfe1dc92381c5e2997d97044ab9705c224ae5eabcf43b59cdec9a715a14227c6fb02cb2d1829ebc47b82d3af6e4d197d3
+Size (openmp-18.1.8.src.tar.xz) = 1320200 bytes
+BLAKE2s (runtimes-18.1.8.src.tar.xz) = f9034c238edd0e7809d4a82a0bdb643926ad23566d2447e8f4ce8ad0b068e90e
+SHA512 (runtimes-18.1.8.src.tar.xz) = 6ddf33676a1f4b69111a077e2b4bec951433f9e6d84ba2f1d578be373690e0abd8fccd1104bf34355c8fb9613c002c720b53fa536be4a923dca7e2d7abd1614c
+Size (runtimes-18.1.8.src.tar.xz) = 6788 bytes
+SHA1 (patch-runtime_src_kmp__os.h) = a5b0e015bf21f284468931fb093956752f93700e

Index: pkgsrc/parallel/openmp/PLIST
diff -u pkgsrc/parallel/openmp/PLIST:1.1 pkgsrc/parallel/openmp/PLIST:1.2
--- pkgsrc/parallel/openmp/PLIST:1.1    Mon Jun 17 16:35:44 2019
+++ pkgsrc/parallel/openmp/PLIST        Sat Jul  6 15:45:08 2024
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2019/06/17 16:35:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/07/06 15:45:08 adam Exp $
 include/omp-tools.h
 include/omp.h
 include/ompt.h
+include/ompx.h
 lib/libgomp.so
 lib/libiomp5.so
 lib/libomp.so

Index: pkgsrc/parallel/openmp/buildlink3.mk
diff -u pkgsrc/parallel/openmp/buildlink3.mk:1.5 pkgsrc/parallel/openmp/buildlink3.mk:1.6
--- pkgsrc/parallel/openmp/buildlink3.mk:1.5    Mon Apr 22 07:25:56 2024
+++ pkgsrc/parallel/openmp/buildlink3.mk        Sat Jul  6 15:45:08 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2024/04/22 07:25:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2024/07/06 15:45:08 adam Exp $
 
 BUILDLINK_TREE+=       openmp
 
 .if !defined(OPENMP_BUILDLINK3_MK)
 OPENMP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openmp+= openmp>=17.0.0<18
-BUILDLINK_ABI_DEPENDS.openmp+= openmp>=17.0.0
+BUILDLINK_API_DEPENDS.openmp+= openmp>=18.0.0
+BUILDLINK_ABI_DEPENDS.openmp+= openmp>=18.0.0
 BUILDLINK_PKGSRCDIR.openmp?=   ../../parallel/openmp
 .endif # OPENMP_BUILDLINK3_MK
 

Index: pkgsrc/parallel/openmp/patches/patch-runtime_src_kmp__os.h
diff -u pkgsrc/parallel/openmp/patches/patch-runtime_src_kmp__os.h:1.1 pkgsrc/parallel/openmp/patches/patch-runtime_src_kmp__os.h:1.2
--- pkgsrc/parallel/openmp/patches/patch-runtime_src_kmp__os.h:1.1      Mon Apr 22 07:25:56 2024
+++ pkgsrc/parallel/openmp/patches/patch-runtime_src_kmp__os.h  Sat Jul  6 15:45:09 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-runtime_src_kmp__os.h,v 1.1 2024/04/22 07:25:56 adam Exp $
+$NetBSD: patch-runtime_src_kmp__os.h,v 1.2 2024/07/06 15:45:09 adam Exp $
 
 NetBSD support.
 
---- runtime/src/kmp_os.h.orig  2024-04-22 07:23:29.452631118 +0000
+--- runtime/src/kmp_os.h.orig  2024-04-17 00:21:15.000000000 +0000
 +++ runtime/src/kmp_os.h
-@@ -214,7 +214,7 @@ typedef kmp_uint32 kmp_uint;
+@@ -218,7 +218,7 @@ typedef kmp_uint32 kmp_uint;
  
  // stdarg handling
- #if (KMP_ARCH_ARM || KMP_ARCH_X86_64 || KMP_ARCH_AARCH64) &&                   \
--    (KMP_OS_FREEBSD || KMP_OS_LINUX)
-+    (KMP_OS_FREEBSD || KMP_OS_LINUX || KMP_OS_NETBSD)
+ #if (KMP_ARCH_ARM || KMP_ARCH_X86_64 || KMP_ARCH_AARCH64 || KMP_ARCH_WASM) &&  \
+-    (KMP_OS_FREEBSD || KMP_OS_LINUX || KMP_OS_WASI)
++    (KMP_OS_FREEBSD || KMP_OS_LINUX || KMP_OS_WASI || KMP_OS_NETBSD)
  typedef va_list *kmp_va_list;
  #define kmp_va_deref(ap) (*(ap))
  #define kmp_va_addr_of(ap) (&(ap))

Added files:

Index: pkgsrc/lang/compiler-rt/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp
diff -u /dev/null pkgsrc/lang/compiler-rt/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp:1.1
--- /dev/null   Sat Jul  6 15:45:10 2024
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp        Sat Jul  6 15:45:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_fuzzer_FuzzerUtilLinux.cpp,v 1.1 2024/07/06 15:45:06 adam Exp $
+
+Fix a typo.
+
+--- lib/fuzzer/FuzzerUtilLinux.cpp.orig        2024-07-03 12:00:43.939003953 +0000
++++ lib/fuzzer/FuzzerUtilLinux.cpp
+@@ -44,7 +44,7 @@ void SetThreadName(std::thread &thread, 
+ #if LIBFUZZER_LINUX || LIBFUZZER_FREEBSD
+   (void)pthread_setname_np(thread.native_handle(), name.c_str());
+ #elif LIBFUZZER_NETBSD
+-  (void)pthread_set_name_np(thread.native_handle(), "%s", name.c_str());
++  (void)pthread_setname_np(thread.native_handle(), "%s", (void *)name.c_str());
+ #endif
+ }
+ 
Index: pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
diff -u /dev/null pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp:1.1
--- /dev/null   Sat Jul  6 15:45:10 2024
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp    Sat Jul  6 15:45:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_sanitizer__common_sanitizer__linux.cpp,v 1.1 2024/07/06 15:45:06 adam Exp $
+
+Fix build for platforms other than Linux and FreeBSD.
+
+--- lib/sanitizer_common/sanitizer_linux.cpp.orig      2024-07-03 11:57:05.400879120 +0000
++++ lib/sanitizer_common/sanitizer_linux.cpp
+@@ -1886,7 +1886,7 @@ static bool Aarch64GetESR(ucontext_t *uc
+   }
+   return false;
+ }
+-#  elif SANITIZER_FREEBSD && defined(__aarch64__)
++#  elif defined(__aarch64__)
+ // FreeBSD doesn't provide ESR in the ucontext.
+ static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) { return false; }
+ #  endif



Home | Main Index | Thread Index | Old Index