pkgsrc-WIP-changes archive

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

Updated LLVM family to 18.1.4



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Mon Apr 22 19:09:38 2024 +0200
Changeset:	87b32e83e3c1f2f965c3599ca13f10b9a9758a2f

Modified Files:
	clang-tools-extra/PLIST
	clang-tools-extra/distinfo
	clang/Makefile.common
	clang/PLIST
	clang/buildlink3.mk
	clang/distinfo
	clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
	clang/patches/patch-lib_Driver_ToolChains_Solaris.h
	compiler-rt/buildlink3.mk
	compiler-rt/distinfo
	flang/PLIST
	flang/distinfo
	libcxx/Makefile
	libcxx/PLIST
	libcxx/buildlink3.mk
	libcxx/distinfo
	libcxx/patches/patch-src_filesystem_file__descriptor.h
	libcxx/patches/patch-src_include_to__chars__floating__point.h
	libcxxabi/Makefile
	libcxxabi/buildlink3.mk
	libcxxabi/distinfo
	libcxxabi/patches/patch-src_CMakeLists.txt
	libunwind/Makefile
	libunwind/buildlink3.mk
	libunwind/distinfo
	lld/Makefile
	lld/buildlink3.mk
	lld/distinfo
	lldb/Makefile
	lldb/PLIST
	lldb/PLIST.Darwin
	lldb/buildlink3.mk
	lldb/distinfo
	llvm/Makefile
	llvm/PLIST
	llvm/buildlink3.mk
	llvm/distinfo
	llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
	llvm/version.mk
	mlir/Makefile
	mlir/PLIST
	mlir/buildlink3.mk
	mlir/distinfo
	mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
	openmp/Makefile
	openmp/PLIST
	openmp/buildlink3.mk
	openmp/distinfo
	polly/Makefile
	polly/PLIST
	polly/buildlink3.mk
	polly/distinfo
	wasi-compiler-rt/Makefile
	wasi-compiler-rt/buildlink3.mk
	wasi-libcxx/PLIST
	wasi-libcxx/buildlink3.mk
	wasi-libcxx/distinfo
Added Files:
	libcxxabi/files/__assertion_handler
	libcxxabi/files/__config_site
	openmp/patches/patch-runtime_src_kmp__os.h
Removed Files:
	clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
	clang/patches/patch-tools_clang-shlib_CMakeLists.txt
	clang/patches/patch-tools_libclang_CMakeLists.txt
	lldb/patches/patch-source_Host_netbsd_HostNetBSD.cpp
	lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
	lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
	llvm/patches/patch-lib_Support_BLAKE3-blake3__impl.h

Log Message:
Updated LLVM family to 18.1.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=87b32e83e3c1f2f965c3599ca13f10b9a9758a2f

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

diffstat:
 clang-tools-extra/PLIST                            |  21 ++
 clang-tools-extra/distinfo                         |  24 +-
 clang/Makefile.common                              |   5 +-
 clang/PLIST                                        |  51 +++-
 clang/buildlink3.mk                                |   6 +-
 clang/distinfo                                     |  25 +-
 .../patch-lib_Driver_ToolChains_Solaris.cpp        |  77 +++---
 .../patches/patch-lib_Driver_ToolChains_Solaris.h  |   9 +-
 clang/patches/patch-lib_Lex_InitHeaderSearch.cpp   |  15 --
 .../patches/patch-tools_clang-shlib_CMakeLists.txt |  14 -
 clang/patches/patch-tools_libclang_CMakeLists.txt  |  34 ---
 compiler-rt/buildlink3.mk                          |   4 +-
 compiler-rt/distinfo                               |  18 +-
 flang/PLIST                                        |  20 +-
 flang/distinfo                                     |  18 +-
 libcxx/Makefile                                    |  10 +-
 libcxx/PLIST                                       |  99 +++----
 libcxx/buildlink3.mk                               |   2 +-
 libcxx/distinfo                                    |  28 +-
 .../patch-src_filesystem_file__descriptor.h        |   4 +-
 .../patch-src_include_to__chars__floating__point.h |  18 +-
 libcxxabi/Makefile                                 |  19 +-
 libcxxabi/buildlink3.mk                            |   2 +-
 libcxxabi/distinfo                                 |  26 +-
 libcxxabi/files/__assertion_handler                |  31 +++
 libcxxabi/files/__config_site                      |  55 ++++
 libcxxabi/patches/patch-src_CMakeLists.txt         |  14 +-
 libunwind/Makefile                                 |  11 +-
 libunwind/buildlink3.mk                            |   2 +-
 libunwind/distinfo                                 |  24 +-
 lld/Makefile                                       |   5 +-
 lld/buildlink3.mk                                  |   4 +-
 lld/distinfo                                       |  18 +-
 lldb/Makefile                                      |   3 +-
 lldb/PLIST                                         |  49 ++--
 lldb/PLIST.Darwin                                  |   9 -
 lldb/buildlink3.mk                                 |   4 +-
 lldb/distinfo                                      |  21 +-
 .../patch-source_Host_netbsd_HostNetBSD.cpp        |  15 --
 ..._Plugins_Process_NetBSD_NativeProcessNetBSD.cpp |  54 ----
 ...ce_Plugins_Process_NetBSD_NativeProcessNetBSD.h |  14 -
 llvm/Makefile                                      |  10 +-
 llvm/PLIST                                         | 103 ++++++--
 llvm/buildlink3.mk                                 |   9 +-
 llvm/distinfo                                      |  21 +-
 .../patch-lib_Support_BLAKE3-blake3__impl.h        |  21 --
 llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt |  36 +--
 llvm/version.mk                                    |   4 +-
 mlir/Makefile                                      |   5 +-
 mlir/PLIST                                         | 290 ++++++++++++++++++---
 mlir/buildlink3.mk                                 |   2 +-
 mlir/distinfo                                      |  20 +-
 .../patch-cmake_modules_MLIRConfig.cmake.in        |   5 +-
 openmp/Makefile                                    |   7 +-
 openmp/PLIST                                       |   1 +
 openmp/buildlink3.mk                               |   4 +-
 openmp/distinfo                                    |  19 +-
 openmp/patches/patch-runtime_src_kmp__os.h         |  15 ++
 polly/Makefile                                     |   6 +-
 polly/PLIST                                        |   1 -
 polly/buildlink3.mk                                |   2 +-
 polly/distinfo                                     |  18 +-
 wasi-compiler-rt/Makefile                          |  37 ++-
 wasi-compiler-rt/buildlink3.mk                     |   4 +-
 wasi-libcxx/PLIST                                  | 190 ++++++++++++--
 wasi-libcxx/buildlink3.mk                          |   4 +-
 wasi-libcxx/distinfo                               |  24 +-
 67 files changed, 1090 insertions(+), 650 deletions(-)

diffs:
diff --git a/clang-tools-extra/PLIST b/clang-tools-extra/PLIST
index 01722bb44c..4a9c2f3590 100644
--- a/clang-tools-extra/PLIST
+++ b/clang-tools-extra/PLIST
@@ -75,6 +75,9 @@ include/clang-tidy/bugprone/AssignmentInIfConditionCheck.h
 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/ForwardDeclarationNamespaceCheck.h
 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/MisplacedOperatorInStrlenInAllocCheck.h
 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/UnhandledExceptionAtNewCheck.h
 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/MisleadingCaptureDefaultByValueCheck.h
 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/UnnamedNamespaceInHeaderCheck.h
 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.h
 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/TypeTraitsCheck.h
 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/UseNodiscardCheck.h
 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/RestrictSystemIncludesCheck.h
 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/NonConstParameterCheck.h
 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
diff --git a/clang-tools-extra/distinfo b/clang-tools-extra/distinfo
index 48c66945aa..8cbe1c79c1 100644
--- a/clang-tools-extra/distinfo
+++ b/clang-tools-extra/distinfo
@@ -1,14 +1,14 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:53 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.4.src.tar.xz) = db57cf9f1dcfc734705946542323ba0fbb8839866aa2c54823b6ae029562a4c2
+SHA512 (clang-18.1.4.src.tar.xz) = d6201094ed175e34f469c438a18a0c50209f983bfc0cb3e7f92bb03bc7aa652779085aa2278400b10618691e7d278c17ee5c7c09a09cf147acf9809a77e0e47a
+Size (clang-18.1.4.src.tar.xz) = 22150224 bytes
+BLAKE2s (clang-tools-extra-18.1.4.src.tar.xz) = a3d6488516e85d27d2f8647c867c47da31e5da43780865983e127e46f4c860f0
+SHA512 (clang-tools-extra-18.1.4.src.tar.xz) = a74ee478ad923622b02179efa8b8e620536ee81d4429d427a6828c9f7a58f1cf2489fb4fd8b8d5b8be4e4262d2f923a5ceca9ec84d09a5c1e129f8de9efcbd1f
+Size (clang-tools-extra-18.1.4.src.tar.xz) = 3340100 bytes
+BLAKE2s (cmake-18.1.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
diff --git a/clang/Makefile.common b/clang/Makefile.common
index 2c1cf99c38..36dceb5c36 100644
--- a/clang/Makefile.common
+++ b/clang/Makefile.common
@@ -15,7 +15,8 @@ LICENSE=	apache-2.0
 CONFIGURE_DIRS=		build
 CMAKE_ARG_PATH=		${WRKSRC}
 
-USE_LANGUAGES=		c c++14
+USE_CXX_FEATURES=	c++14
+USE_LANGUAGES=		c c++
 USE_CMAKE=		yes
 GCC_REQD+=		7
 
@@ -128,7 +129,7 @@ CMAKE_ARGS+=    -DCLANG_DEFAULT_CXX_STDLIB:STRING="libc++"
 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
diff --git a/clang/PLIST b/clang/PLIST
index 57d6c1c767..8972bd9447 100644
--- a/clang/PLIST
+++ b/clang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2022/11/14 18:44:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.39 2024/04/22 07:03:35 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/Models/UncheckedOptionalAccessModel.h
 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/AnalyzerOptions.def
 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/__clang_hip_libdevice_declares.h
 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
@@ -794,8 +829,9 @@ 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
+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/invpcidintrin.h
 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/ppc_wrappers/emmintrin.h
 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,6 +962,8 @@ lib/clang/${PKGVERSION_MAJOR}/include/ptwriteintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/raointintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/rdpruintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/rdseedintrin.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
@@ -937,6 +980,7 @@ lib/clang/${PKGVERSION_MAJOR}/include/stdalign.h
 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/tmmintrin.h
 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
diff --git a/clang/buildlink3.mk b/clang/buildlink3.mk
index 2aa541c3b8..25cd423286 100644
--- a/clang/buildlink3.mk
+++ b/clang/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	clang
 .if !defined(CLANG_BUILDLINK3_MK)
 CLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clang+=	clang>=16.0
-BUILDLINK_ABI_DEPENDS.clang?=	clang>=16.0
+BUILDLINK_API_DEPENDS.clang+=	clang>=18.0.0
+BUILDLINK_ABI_DEPENDS.clang?=	clang>=18.0.0
 BUILDLINK_PKGSRCDIR.clang?=	../../wip/clang
 
 BUILDLINK_FILES.clang+=		bin/amdgpu-arch
@@ -14,7 +14,7 @@ BUILDLINK_FILES.clang+=		bin/analyze-build
 BUILDLINK_FILES.clang+=		bin/c-index-test
 BUILDLINK_FILES.clang+=		bin/clang
 BUILDLINK_FILES.clang+=		bin/clang++
-BUILDLINK_FILES.clang+=		bin/clang-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
diff --git a/clang/distinfo b/clang/distinfo
index cd23f78a1a..57297d27ef 100644
--- a/clang/distinfo
+++ b/clang/distinfo
@@ -1,19 +1,16 @@
 $NetBSD: distinfo,v 1.80 2023/01/12 19:32:53 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
+BLAKE2s (clang-18.1.4.src.tar.xz) = db57cf9f1dcfc734705946542323ba0fbb8839866aa2c54823b6ae029562a4c2
+SHA512 (clang-18.1.4.src.tar.xz) = d6201094ed175e34f469c438a18a0c50209f983bfc0cb3e7f92bb03bc7aa652779085aa2278400b10618691e7d278c17ee5c7c09a09cf147acf9809a77e0e47a
+Size (clang-18.1.4.src.tar.xz) = 22150224 bytes
+BLAKE2s (cmake-18.1.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.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_Solaris.cpp) = f1f11228408a8872a1d3d57b18b389db14d592e8
-SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
+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) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
-SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525
diff --git a/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp b/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
index dbf2d9d828..08dc80f301 100644
--- a/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
+++ b/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
@@ -7,10 +7,10 @@ Don't specify --dynamic-linker, makes it impossible for the user to use -Wl,-r
 Ensure we reset to -zdefaultextract prior to adding compiler-rt.
 Test removing -Bdynamic for golang.
 
---- lib/Driver/ToolChains/Solaris.cpp.orig	2023-11-14 08:22:39.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.cpp.orig	2024-04-17 00:21:15.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.cpp
-@@ -68,6 +68,25 @@ void solaris::Linker::ConstructJob(Compi
-   const bool IsPIE = getPIE(Args, getToolChain());
+@@ -91,6 +91,25 @@ void solaris::Linker::ConstructJob(Compi
+   const bool LinkerIsGnuLd = isLinkerGnuLd(ToolChain, Args);
    ArgStringList CmdArgs;
  
 +  // XXX: assumes pkgsrc layout
@@ -32,40 +32,32 @@ Test removing -Bdynamic for golang.
 +    llvm_unreachable("Unsupported architecture");
 +  }
 +
-   // Demangle C++ names in errors
-   CmdArgs.push_back("-C");
- 
-@@ -85,7 +104,6 @@ void solaris::Linker::ConstructJob(Compi
-     CmdArgs.push_back("-Bstatic");
-     CmdArgs.push_back("-dn");
-   } else {
--    CmdArgs.push_back("-Bdynamic");
-     if (Args.hasArg(options::OPT_shared)) {
-       CmdArgs.push_back("-shared");
-     }
-@@ -107,9 +125,9 @@ void solaris::Linker::ConstructJob(Compi
+   // Demangle C++ names in errors.  GNU ld already defaults to --demangle.
+   if (!LinkerIsGnuLd)
+     CmdArgs.push_back("-C");
+@@ -164,9 +183,9 @@ void solaris::Linker::ConstructJob(Compi
+   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
                     options::OPT_r)) {
      if (!Args.hasArg(options::OPT_shared))
-       CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crt1.o")));
-+          Args.MakeArgString(SysPath + "crt1.o"));
+-      CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
++      CmdArgs.push_back(Args.MakeArgString(SysPath + "crt1.o"));
  
--    CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
+-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
 +    CmdArgs.push_back(Args.MakeArgString(SysPath + "crti.o"));
  
      const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
      bool HaveAnsi = false;
-@@ -124,7 +142,7 @@ void solaris::Linker::ConstructJob(Compi
+@@ -181,7 +200,7 @@ void solaris::Linker::ConstructJob(Compi
      // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
      if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
        values_X = "values-Xc.o";
--    CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(values_X)));
+-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_X)));
 +    CmdArgs.push_back(Args.MakeArgString(SysPath + values_X));
  
      const char *values_xpg = "values-xpg6.o";
      // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
-@@ -158,13 +176,6 @@ void solaris::Linker::ConstructJob(Compi
-         getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+@@ -229,13 +248,6 @@ void solaris::Linker::ConstructJob(Compi
+       addFortranRuntimeLibs(getToolChain(), Args, CmdArgs);
        CmdArgs.push_back("-lm");
      }
 -    if (Args.hasArg(options::OPT_fstack_protector) ||
@@ -77,46 +69,47 @@ Test removing -Bdynamic for golang.
 -    }
      // LLVM support for atomics on 32-bit SPARC V8+ is incomplete, so
      // forcibly link with libatomic as a workaround.
-     if (getToolChain().getTriple().getArch() == llvm::Triple::sparc) {
-@@ -172,11 +183,13 @@ void solaris::Linker::ConstructJob(Compi
+     if (Arch == llvm::Triple::sparc) {
+@@ -243,13 +255,13 @@ void solaris::Linker::ConstructJob(Compi
        CmdArgs.push_back("-latomic");
-       CmdArgs.push_back(getAsNeededOption(getToolChain(), false));
+       addAsNeededOption(ToolChain, Args, CmdArgs, false);
      }
+-    addAsNeededOption(ToolChain, Args, CmdArgs, true);
 -    CmdArgs.push_back("-lgcc_s");
+-    addAsNeededOption(ToolChain, Args, CmdArgs, false);
 -    CmdArgs.push_back("-lc");
 -    if (!Args.hasArg(options::OPT_shared)) {
 -      CmdArgs.push_back("-lgcc");
 -    }
-+    
++
 +    // This specifically uses -Wl to avoid CMake parsing it and trying to
 +    // feed "-zdefaultextract" back into clang, which doesn't support the
 +    // non-space version.
 +    CmdArgs.push_back("-Wl,-zdefaultextract");
 +    AddRunTimeLibs(getToolChain(), D, CmdArgs, Args);
 +    CmdArgs.push_back(Args.MakeArgString(LibPath + "libunwind.a"));
-     const SanitizerArgs &SA = getToolChain().getSanitizerArgs(Args);
+     const SanitizerArgs &SA = ToolChain.getSanitizerArgs(Args);
      if (NeedsSanitizerDeps) {
-       linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
-@@ -195,17 +208,7 @@ void solaris::Linker::ConstructJob(Compi
-       CmdArgs.push_back("-znow");
+       linkSanitizerRuntimeDeps(ToolChain, Args, CmdArgs);
+@@ -273,16 +285,7 @@ void solaris::Linker::ConstructJob(Compi
+     }
    }
  
 -  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
 -                   options::OPT_r)) {
+-    const char *crtend = nullptr;
 -    if (Args.hasArg(options::OPT_shared) || IsPIE)
--      CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crtendS.o")));
+-      crtend = "crtendS.o";
 -    else
--      CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crtend.o")));
--    CmdArgs.push_back(
--        Args.MakeArgString(getToolChain().GetFilePath("crtn.o")));
+-      crtend = "crtend.o";
+-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtend)));
+-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
 -  }
 +  CmdArgs.push_back(Args.MakeArgString(SysPath + "crtn.o"));
  
-   getToolChain().addProfileRTLibs(Args, CmdArgs);
+   ToolChain.addProfileRTLibs(Args, CmdArgs);
  
-@@ -235,26 +238,9 @@ Solaris::Solaris(const Driver &D, const
+@@ -311,26 +314,9 @@ Solaris::Solaris(const Driver &D, const
                   const ArgList &Args)
      : Generic_ELF(D, Triple, Args) {
  
@@ -136,7 +129,7 @@ Test removing -Bdynamic for golang.
 -
 -  // If we are currently running Clang inside of the requested system root,
 -  // add its parent library path to those searched.
--  if (StringRef(D.Dir).startswith(D.SysRoot))
+-  if (StringRef(D.Dir).starts_with(D.SysRoot))
 -    addPathIfExists(D, D.Dir + "/../lib", Paths);
 -
 -  addPathIfExists(D, D.SysRoot + "/usr/lib" + LibSuffix, Paths);
@@ -146,7 +139,7 @@ Test removing -Bdynamic for golang.
  }
  
  SanitizerMask Solaris::getSupportedSanitizers() const {
-@@ -276,6 +262,31 @@ Tool *Solaris::buildAssembler() const {
+@@ -359,6 +345,31 @@ Tool *Solaris::buildAssembler() const {
  
  Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); }
  
@@ -178,7 +171,7 @@ Test removing -Bdynamic for golang.
  void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
                                          ArgStringList &CC1Args) const {
    const Driver &D = getDriver();
-@@ -308,38 +319,20 @@ void Solaris::AddClangSystemIncludeArgs(
+@@ -391,38 +402,20 @@ void Solaris::AddClangSystemIncludeArgs(
      return;
    }
  
diff --git a/clang/patches/patch-lib_Driver_ToolChains_Solaris.h b/clang/patches/patch-lib_Driver_ToolChains_Solaris.h
index 80f57c36ca..81e104b1f3 100644
--- a/clang/patches/patch-lib_Driver_ToolChains_Solaris.h
+++ b/clang/patches/patch-lib_Driver_ToolChains_Solaris.h
@@ -2,9 +2,9 @@ $NetBSD: patch-lib_Driver_ToolChains_Solaris.h,v 1.4 2021/07/12 18:42:06 adam Ex
 
 Override AddCXXStdlibLibArgs().
 
---- lib/Driver/ToolChains/Solaris.h.orig	2021-04-06 16:38:18.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.h.orig	2024-04-17 00:21:15.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.h
-@@ -59,11 +59,17 @@ public:
+@@ -61,10 +61,16 @@ public:
                              llvm::opt::ArgStringList &CC1Args) const override;
  
    void
@@ -15,10 +15,9 @@ Override AddCXXStdlibLibArgs().
                             llvm::opt::ArgStringList &CC1Args) const override;
  
    SanitizerMask getSupportedSanitizers() const override;
-   unsigned GetDefaultDwarfVersion() const override { return 2; }
 +  void AddCXXStdlibLibArgs(
 +     const llvm::opt::ArgList &Args,
 +     llvm::opt::ArgStringList &CmdArgs) const override;
  
-   const char *getDefaultLinker() const override {
-     // clang currently uses Solaris ld-only options.
+   const char *getDefaultLinker() const override;
+ 
diff --git a/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp b/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
deleted file mode 100644
index fe04f28dc3..0000000000
--- a/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_Lex_InitHeaderSearch.cpp,v 1.2 2022/11/14 18:44:05 adam Exp $
-
-Don't add /usr/local/include by default on Solaris.
-was: patch-lib_Frontend_InitHeaderSearch.cpp
-
---- lib/Lex/InitHeaderSearch.cpp.orig	2023-10-03 06:37:35.000000000 +0000
-+++ lib/Lex/InitHeaderSearch.cpp
-@@ -234,6 +234,7 @@ void InitHeaderSearch::AddDefaultCInclud
-     case llvm::Triple::CloudABI:
-     case llvm::Triple::NaCl:
-     case llvm::Triple::ELFIAMCU:
-+    case llvm::Triple::Solaris:
-       break;
-     case llvm::Triple::Win32:
-       if (triple.getEnvironment() != llvm::Triple::Cygnus)
diff --git a/clang/patches/patch-tools_clang-shlib_CMakeLists.txt b/clang/patches/patch-tools_clang-shlib_CMakeLists.txt
deleted file mode 100644
index 6c9700de3e..0000000000
--- a/clang/patches/patch-tools_clang-shlib_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-tools_clang-shlib_CMakeLists.txt,v 1.2 2022/01/14 08:58:48 tm Exp $
-
--B flag symbolic-functions is not supported on Solaris before 11.4
-
---- tools/clang-shlib/CMakeLists.txt.orig	2021-09-24 16:18:10.000000000 +0000
-+++ tools/clang-shlib/CMakeLists.txt
-@@ -50,6 +50,6 @@ add_clang_library(clang-cpp
-                   ${_DEPS})
- # Optimize function calls for default visibility definitions to avoid PLT and
- # reduce dynamic relocations.
--if (NOT APPLE AND NOT MINGW)
-+if (NOT APPLE AND NOT MINGW AND NOT "SunOS" MATCHES ${CMAKE_SYSTEM_NAME})
-   target_link_options(clang-cpp PRIVATE LINKER:-Bsymbolic-functions)
- endif()
diff --git a/clang/patches/patch-tools_libclang_CMakeLists.txt b/clang/patches/patch-tools_libclang_CMakeLists.txt
deleted file mode 100644
index 56ab216a74..0000000000
--- a/clang/patches/patch-tools_libclang_CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-tools_libclang_CMakeLists.txt,v 1.2 2022/01/14 08:58:48 tm Exp $
-
-Only the linker on Solaris 11.4 supports GNU ld version script and only if
-the special option gnu-version-script-compat is used. Older Solaris linker
-doesn't support version script.
-
---- tools/libclang/CMakeLists.txt.orig	2021-09-24 16:18:10.000000000 +0000
-+++ tools/libclang/CMakeLists.txt
-@@ -167,11 +167,21 @@ if(ENABLE_SHARED)
-     endif()
-   endif()
-   if (USE_VERSION_SCRIPT)
--    target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
--    # The Solaris 11.4 linker supports a subset of GNU ld version scripts,
--    # but requires a special option to enable it.
-     if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
--      target_link_options(libclang PRIVATE "-Wl,-z,gnu-version-script-compat")
-+      include(CheckLinkerFlag)
-+      # The Solaris 11.4 linker supports a subset of GNU ld version scripts,
-+      # but requires a special option to enable it.
-+      llvm_check_linker_flag(CXX "-Wl,-z,gnu-version-script-compat" LINKER_SUPPORTS_Z_GNU_VERSION_SCRIPT_COMPAT)
-+      # Older Solaris (and illumos) linker doesn't support GNU ld version 
-+      # and doesn't support GNU version script compat.
-+      if (LINKER_SUPPORTS_Z_GNU_VERSION_SCRIPT_COMPAT)
-+	target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
-+	target_link_options(libclang PRIVATE "-Wl,-z,gnu-version-script-compat")
-+      else()
-+        target_link_options(libclang PRIVATE "-Wl,-M,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
-+      endif()
-+    else() 
-+      target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
-     endif()
-     # Ensure that libclang.so gets rebuilt when the linker script changes.
-     set_property(SOURCE ARCMigrate.cpp APPEND PROPERTY
diff --git a/compiler-rt/buildlink3.mk b/compiler-rt/buildlink3.mk
index 8df004a552..257b44e1d0 100644
--- a/compiler-rt/buildlink3.mk
+++ b/compiler-rt/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2019/12/29 15:31:21 adam Exp $
+# $NetBSD$
 
 BUILDLINK_TREE+=	compiler-rt
 
 .if !defined(COMPILER_RT_BUILDLINK3_MK)
 COMPILER_RT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.compiler-rt+=	compiler-rt>=9.0.1
+BUILDLINK_API_DEPENDS.compiler-rt+=	compiler-rt>=18.0.0
 BUILDLINK_PKGSRCDIR.compiler-rt?=	../../wip/compiler-rt
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index dbfda55bb5..1b9eedf166 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.23 2023/03/03 09:53:14 wiz 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (compiler-rt-18.1.4.src.tar.xz) = 93c109871ad537890f2379c4604411873cee0df7db25ff47127460c5d1f47bf8
+SHA512 (compiler-rt-18.1.4.src.tar.xz) = 6e89334f56246b78f65aaa3bb373d7fc2c6b5dc6bf41bb473bca7d370547e70c21687b12dc21854df59c2b0d4992c6e5df437b69cf7d759c051d36ebb667f291
+Size (compiler-rt-18.1.4.src.tar.xz) = 2467772 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
 SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
 SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
diff --git a/flang/PLIST b/flang/PLIST
index bf6e9f7999..31af654d61 100644
--- a/flang/PLIST
+++ b/flang/PLIST
@@ -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/TextDiagnosticBuffer.h
 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/Character.h
 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/FIROpsTypes.cpp.inc
 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.h.inc
 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-symbols.h
 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
diff --git a/flang/distinfo b/flang/distinfo
index 6c7fa9d42e..86c69006c2 100644
--- a/flang/distinfo
+++ b/flang/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (flang-18.1.4.src.tar.xz) = b97fad6125c19c6dd0fb3d2b257f68062cd6e13e72bde2717a8022c795597995
+SHA512 (flang-18.1.4.src.tar.xz) = b6af052d35bb4c5e21ed911159210e70062cd0cd4235b0642f7a330a0df81f3a0665151fcacd40b10d9c5b7eac3a9c251cd256adb01d12c111907ea96661c908
+Size (flang-18.1.4.src.tar.xz) = 3073724 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
diff --git a/libcxx/Makefile b/libcxx/Makefile
index 7bcc9a06c6..179f18995e 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -21,9 +21,10 @@ EXTRA_DIST+=	${LIBCXXABI}${EXTRACT_SUFX}
 SITES.${LIBCXXABI}${EXTRACT_SUFX}=	\
 	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-USE_LANGUAGES=	c c++20
-SSP_SUPPORTED=	no
-GCC_REQD+=	12
+USE_CXX_FEATURES=	c++20
+USE_LANGUAGES=		c c++
+SSP_SUPPORTED=		no
+GCC_REQD+=		12
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DLIBCXX_CXX_ABI=system-libcxxabi
@@ -38,7 +39,7 @@ CXXFLAGS.SunOS+=	-D_LIBCPP_NO_ABI_TAG=1
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc-[0-9].*) || !empty(CC_VERSION:Mgcc-10.*)
+.if ${CC_VERSION:Mgcc-[0-9].*} || ${CC_VERSION:Mgcc-10.*}
 # Avoid GCC < 11 error https://github.com/llvm/llvm-project/issues/54018
 CXXFLAGS+=		-std=c++17 -D_LIBCPP_STD_VER=17
 .endif
@@ -47,5 +48,6 @@ post-extract:
 	${LN} -f -s ${WRKDIR}/${LIBCXXABI} ${WRKDIR}/libcxxabi
 
 .include "../../devel/cmake/build.mk"
+.include "../../wip/libcxxabi/buildlink3.mk"
 .include "../../wip/libunwind/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libcxx/PLIST b/libcxx/PLIST
index f58734ee08..3ad00731e7 100644
--- a/libcxx/PLIST
+++ b/libcxx/PLIST
@@ -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/cpu_backends/transform.h
 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_dispatch.h
 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.h
 include/c++/v1/__algorithm/ranges_any_of.h
 include/c++/v1/__algorithm/ranges_binary_search.h
 include/c++/v1/__algorithm/ranges_clamp.h
+include/c++/v1/__algorithm/ranges_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.h
 include/c++/v1/__chrono/steady_clock.h
 include/c++/v1/__chrono/system_clock.h
 include/c++/v1/__chrono/time_point.h
+include/c++/v1/__chrono/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_function.h
 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/synchronized_pool_resource.h
 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_distribution.h
 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_condition.h
 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.h
 include/c++/v1/__type_traits/void_t.h
 include/c++/v1/__undef_macros
 include/c++/v1/__utility/as_const.h
+include/c++/v1/__utility/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
diff --git a/libcxx/buildlink3.mk b/libcxx/buildlink3.mk
index 7b08022464..e85fb7b98e 100644
--- a/libcxx/buildlink3.mk
+++ b/libcxx/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libcxx
 .if !defined(LIBCXX_BUILDLINK3_MK)
 LIBCXX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libcxx+=	libcxx>=14.0.0
+BUILDLINK_API_DEPENDS.libcxx+=	libcxx>=18.0.0
 BUILDLINK_PKGSRCDIR.libcxx?=	../../wip/libcxx
 
 .endif	# LIBCXX_BUILDLINK3_MK
diff --git a/libcxx/distinfo b/libcxx/distinfo
index 8989f9fd4a..41b4f3ead7 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -1,17 +1,17 @@
 $NetBSD: distinfo,v 1.25 2023/01/12 19:32:54 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.4.src.tar.xz) = 8883a470c3d6142bd8e06f8cdc88e68780d91d1cd7b29fe9b80fb7b4ca187756
+SHA512 (libcxx-18.1.4.src.tar.xz) = dde17d74640205f416eeb506079bdcf07ee28193251995e03d54f3c8242463448b2379f8b9aa11e4f57143e972075e67c8a143e7bbf0b52a62debc278287e89b
+Size (libcxx-18.1.4.src.tar.xz) = 4031032 bytes
+BLAKE2s (libcxxabi-18.1.4.src.tar.xz) = a24c1fd8f02ba4db0d9bdb3644468aec2b2ca0f787eb237a24ffcc820135b656
+SHA512 (libcxxabi-18.1.4.src.tar.xz) = 0f0734ae08f27b44ead8740394aa59d993acc5731445c970ee98fadaa1d335b72af6df01895cd7b9873065baa498a820b9a460da4946549a8cd0ede5e5f63489
+Size (libcxxabi-18.1.4.src.tar.xz) = 582676 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.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
diff --git a/libcxx/patches/patch-src_filesystem_file__descriptor.h b/libcxx/patches/patch-src_filesystem_file__descriptor.h
index 4d6fa41596..27fead6e13 100644
--- a/libcxx/patches/patch-src_filesystem_file__descriptor.h
+++ b/libcxx/patches/patch-src_filesystem_file__descriptor.h
@@ -2,10 +2,10 @@ $NetBSD$
 
 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
diff --git a/libcxx/patches/patch-src_include_to__chars__floating__point.h b/libcxx/patches/patch-src_include_to__chars__floating__point.h
index 23d63460f4..f3f76a747c 100644
--- a/libcxx/patches/patch-src_include_to__chars__floating__point.h
+++ b/libcxx/patches/patch-src_include_to__chars__floating__point.h
@@ -2,9 +2,9 @@ $NetBSD: patch-src_include_to__chars__floating__point.h,v 1.1 2022/08/13 09:38:0
 
 #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__floating__point.h,v 1.1 2022/08/13 09:38:0
  // 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__floating__point.h,v 1.1 2022/08/13 09:38:0
  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__floating__point.h,v 1.1 2022/08/13 09:38:0
  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__floating__point.h,v 1.1 2022/08/13 09:38:0
  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(
          }
      }
  }
diff --git a/libcxxabi/Makefile b/libcxxabi/Makefile
index b415e7bf42..afdc0e3486 100644
--- a/libcxxabi/Makefile
+++ b/libcxxabi/Makefile
@@ -21,30 +21,33 @@ EXTRA_DIST+=	${LIBCXX}${EXTRACT_SUFX}
 SITES.${LIBCXX}${EXTRACT_SUFX}=	\
 	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-USE_LANGUAGES=	c c++17
-SSP_SUPPORTED=	no
-GCC_REQD+=	12	# must be in sync with libcxx
+USE_CXX_FEATURES=	c++17
+USE_LANGUAGES=		c c++
+SSP_SUPPORTED=		no
+GCC_REQD+=		12	# 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
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc-[0-9].*) || !empty(CC_VERSION:Mgcc-10.*)
+.if ${CC_VERSION:Mgcc-[0-9].*} || ${CC_VERSION:Mgcc-10.*}
 # Avoid GCC < 11 error https://github.com/llvm/llvm-project/issues/54018
 CXXFLAGS+=	-std=c++17 -D_LIBCPP_STD_VER=17
 .endif
 
+# IMPORTANT: copy __config_site from partial build of libcxx.
 post-extract:
 	${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-# TODO: not sure what should create this and with which contents
-	${CP} ${PREFIX}/include/c++/v1/__config_site \
-		${WRKDIR}/${LIBCXX}/include/__config_site
+	${CP} ${FILESDIR}/__assertion_handler ${FILESDIR}/__config_site \
+		${WRKDIR}/${LIBCXX}/include/
 
 .include "../../devel/cmake/build.mk"
-.include "../../wip/libcxx/buildlink3.mk"
 .include "../../wip/libunwind/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libcxxabi/buildlink3.mk b/libcxxabi/buildlink3.mk
index 532e7d82d0..87b33de627 100644
--- a/libcxxabi/buildlink3.mk
+++ b/libcxxabi/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libcxxabi
 .if !defined(LIBCXXABI_BUILDLINK3_MK)
 LIBCXXABI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libcxxabi+=	libcxxabi>=14.0.0
+BUILDLINK_API_DEPENDS.libcxxabi+=	libcxxabi>=18.0.0
 BUILDLINK_PKGSRCDIR.libcxxabi?=		../../wip/libcxxabi
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
index cdc2aaaa38..27540eb29f 100644
--- a/libcxxabi/distinfo
+++ b/libcxxabi/distinfo
@@ -1,16 +1,16 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:54 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.4.src.tar.xz) = 8883a470c3d6142bd8e06f8cdc88e68780d91d1cd7b29fe9b80fb7b4ca187756
+SHA512 (libcxx-18.1.4.src.tar.xz) = dde17d74640205f416eeb506079bdcf07ee28193251995e03d54f3c8242463448b2379f8b9aa11e4f57143e972075e67c8a143e7bbf0b52a62debc278287e89b
+Size (libcxx-18.1.4.src.tar.xz) = 4031032 bytes
+BLAKE2s (libcxxabi-18.1.4.src.tar.xz) = a24c1fd8f02ba4db0d9bdb3644468aec2b2ca0f787eb237a24ffcc820135b656
+SHA512 (libcxxabi-18.1.4.src.tar.xz) = 0f0734ae08f27b44ead8740394aa59d993acc5731445c970ee98fadaa1d335b72af6df01895cd7b9873065baa498a820b9a460da4946549a8cd0ede5e5f63489
+Size (libcxxabi-18.1.4.src.tar.xz) = 582676 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
+SHA1 (patch-src_CMakeLists.txt) = 0236901cff68aec407538f43f1e6d41b0c6bf26b
 SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95
diff --git a/libcxxabi/files/__assertion_handler b/libcxxabi/files/__assertion_handler
new file mode 100644
index 0000000000..8bc0553c07
--- /dev/null
+++ b/libcxxabi/files/__assertion_handler
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___ASSERTION_HANDLER
+#define _LIBCPP___ASSERTION_HANDLER
+
+#include <__config>
+#include <__verbose_abort>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+#if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
+
+#  define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message)
+
+#else
+
+// TODO(hardening): use `__builtin_verbose_trap(message)` once that becomes available.
+#  define _LIBCPP_ASSERTION_HANDLER(message) ((void)message, __builtin_trap())
+
+#endif // _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
+
+#endif // _LIBCPP___ASSERTION_HANDLER
diff --git a/libcxxabi/files/__config_site b/libcxxabi/files/__config_site
new file mode 100644
index 0000000000..f7adfd7dec
--- /dev/null
+++ b/libcxxabi/files/__config_site
@@ -0,0 +1,55 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___CONFIG_SITE
+#define _LIBCPP___CONFIG_SITE
+
+#define _LIBCPP_ABI_VERSION 1
+#define _LIBCPP_ABI_NAMESPACE __1
+/* #undef _LIBCPP_ABI_FORCE_ITANIUM */
+/* #undef _LIBCPP_ABI_FORCE_MICROSOFT */
+/* #undef _LIBCPP_HAS_NO_THREADS */
+/* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */
+/* #undef _LIBCPP_HAS_MUSL_LIBC */
+/* #undef _LIBCPP_HAS_THREAD_API_PTHREAD */
+/* #undef _LIBCPP_HAS_THREAD_API_EXTERNAL */
+/* #undef _LIBCPP_HAS_THREAD_API_WIN32 */
+/* #undef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS */
+#define _LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS
+/* #undef _LIBCPP_NO_VCRUNTIME */
+/* #undef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION */
+/* #undef _LIBCPP_HAS_NO_FILESYSTEM */
+/* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */
+/* #undef _LIBCPP_HAS_NO_LOCALIZATION */
+/* #undef _LIBCPP_HAS_NO_WIDE_CHARACTERS */
+/* #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 */
+#define _LIBCPP_PSTL_CPU_BACKEND_THREAD
+/* #undef _LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH */
+
+// Hardening.
+#define _LIBCPP_HARDENING_MODE_DEFAULT 2
+
+// __USE_MINGW_ANSI_STDIO gets redefined on MinGW
+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wmacro-redefined"
+#endif
+
+
+
+
+#ifdef __clang__
+#  pragma clang diagnostic pop
+#endif
+
+#endif // _LIBCPP___CONFIG_SITE
diff --git a/libcxxabi/patches/patch-src_CMakeLists.txt b/libcxxabi/patches/patch-src_CMakeLists.txt
index 7ac1a160f1..da3b153b9a 100644
--- a/libcxxabi/patches/patch-src_CMakeLists.txt
+++ b/libcxxabi/patches/patch-src_CMakeLists.txt
@@ -2,7 +2,7 @@ $NetBSD: patch-src_CMakeLists.txt,v 1.1 2022/11/14 18:44:06 adam Exp $
 
 Fix build.
 
---- src/CMakeLists.txt.orig	2022-11-02 03:11:40.000000000 +0000
+--- src/CMakeLists.txt.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()
diff --git a/libunwind/Makefile b/libunwind/Makefile
index b51b8fec49..ac018c6e02 100644
--- a/libunwind/Makefile
+++ b/libunwind/Makefile
@@ -18,10 +18,19 @@ EXTRA_DIST+=	${LIBCXX}${EXTRACT_SUFX}
 SITES.${LIBCXX}${EXTRACT_SUFX}=	\
 	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-USE_LANGUAGES=		c c++11
+USE_CXX_FEATURES=	c++11
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		pax
 SSP_SUPPORTED=		no
+
+.include "../../mk/bsd.prefs.mk"
+
+# Configure fails on Alma8 with "/usr/bin/ld: cannot find -lgcc_s".
+# The pkg works fine with base GCC.
+# The libcxx pkg currently has GCC_REQD=12, while this one is 10.
+.if ${OPSYS} != Linux || !exists(/etc/redhat-release)
 GCC_REQD+=		10	# must be in sync with libcxx
+.endif
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 
diff --git a/libunwind/buildlink3.mk b/libunwind/buildlink3.mk
index f4c84bdf69..621d52cecd 100644
--- a/libunwind/buildlink3.mk
+++ b/libunwind/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libunwind
 .if !defined(LIBUNWIND_BUILDLINK3_MK)
 LIBUNWIND_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libunwind+=	libunwind>=14.0.0
+BUILDLINK_API_DEPENDS.libunwind+=	libunwind>=18.0.0
 BUILDLINK_PKGSRCDIR.libunwind?=		../../wip/libunwind
 
 .endif	# LIBUNWIND_BUILDLINK3_MK
diff --git a/libunwind/distinfo b/libunwind/distinfo
index 834a8384f9..dc53ed56c0 100644
--- a/libunwind/distinfo
+++ b/libunwind/distinfo
@@ -1,15 +1,15 @@
 $NetBSD: distinfo,v 1.32 2023/01/12 22:47:25 wiz 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.4.src.tar.xz) = 8883a470c3d6142bd8e06f8cdc88e68780d91d1cd7b29fe9b80fb7b4ca187756
+SHA512 (libcxx-18.1.4.src.tar.xz) = dde17d74640205f416eeb506079bdcf07ee28193251995e03d54f3c8242463448b2379f8b9aa11e4f57143e972075e67c8a143e7bbf0b52a62debc278287e89b
+Size (libcxx-18.1.4.src.tar.xz) = 4031032 bytes
+BLAKE2s (libunwind-18.1.4.src.tar.xz) = 343d771abb11b7488c615a88595799a2b610f08d65cfacce779d63a7313d6fc0
+SHA512 (libunwind-18.1.4.src.tar.xz) = 5062316fe37396a0a47a898dd402a644b110cb59888d146dd7231d7ebf601a659c4ae4cd82f05db79dd7841a6080284b38a2d1643741aad611c47b0acb9beaeb
+Size (libunwind-18.1.4.src.tar.xz) = 119264 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
 SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
diff --git a/lld/Makefile b/lld/Makefile
index c0e58043f0..b7fceb7e32 100644
--- a/lld/Makefile
+++ b/lld/Makefile
@@ -11,8 +11,9 @@ HOMEPAGE=	https://lld.llvm.org/
 COMMENT=	The LLVM Linker
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=	c c++14
-GCC_REQD+=	7
+USE_CXX_FEATURES=	c++14
+USE_LANGUAGES=		c c++
+GCC_REQD+=		7
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
diff --git a/lld/buildlink3.mk b/lld/buildlink3.mk
index 3fcf36d3d3..db6b900b77 100644
--- a/lld/buildlink3.mk
+++ b/lld/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2019/12/29 15:31:21 adam Exp $
+# $NetBSD$
 
 BUILDLINK_TREE+=	lld
 
 .if !defined(LLD_BUILDLINK3_MK)
 LLD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lld+=	lld>=16.0.0
+BUILDLINK_API_DEPENDS.lld+=	lld>=18.0.0
 BUILDLINK_PKGSRCDIR.lld?=	../../wip/lld
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/lld/distinfo b/lld/distinfo
index 0911f0e823..ffbbdf2138 100644
--- a/lld/distinfo
+++ b/lld/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:53 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (lld-18.1.4.src.tar.xz) = 13e77eaf5fc7ebaa1ca221a19658f76535d063e480b56c9f5d97ca6d94ce6557
+SHA512 (lld-18.1.4.src.tar.xz) = 1ec3b98dae0f9cf3ed8773a9edc63f8948dacc3dc6ed32134e4e1c83cfb6d773603a1b256097534716840107539df06144feef1ed94fdc0d6143f92ff1baaa5a
+Size (lld-18.1.4.src.tar.xz) = 1563244 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
 SHA1 (patch-ELF_Config.h) = 50861ef74c2ff9a9091afcbc8d076e379d9531e5
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lldb/Makefile b/lldb/Makefile
index fee88c23ba..16cfdf472a 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -16,7 +16,8 @@ DEPENDS+=	clang-${PKGVERSION_NOREV}{,nb*}:../../wip/clang
 DEPENDS+=	swig3>=3.0:../../devel/swig3
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-USE_LANGUAGES=		c c++14
+USE_CXX_FEATURES=	c++14
+USE_LANGUAGES=		c c++
 GCC_REQD+=		7
 PY_PATCHPLIST=		yes
 
diff --git a/lldb/PLIST b/lldb/PLIST
index 525a12b434..ae03ecc5c1 100644
--- a/lldb/PLIST
+++ b/lldb/PLIST
@@ -1,9 +1,9 @@
 @comment $NetBSD: PLIST,v 1.16 2022/11/14 18:44:05 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/BreakpointResolverFileRegex.h
 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/CommandObjectMultiword.h
 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/StringExtractorGDBRemote.h
 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
diff --git a/lldb/PLIST.Darwin b/lldb/PLIST.Darwin
index aabc19f973..32378df477 100644
--- a/lldb/PLIST.Darwin
+++ b/lldb/PLIST.Darwin
@@ -1,12 +1,3 @@
 @comment $NetBSD: PLIST.Darwin,v 1.7 2022/11/14 18:44:05 adam Exp $
 bin/darwin-debug
 bin/debugserver
-${PYSITELIB}/lldb/diagnose/__init__.py
-${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
diff --git a/lldb/buildlink3.mk b/lldb/buildlink3.mk
index 66d42793a4..b78b278fd2 100644
--- a/lldb/buildlink3.mk
+++ b/lldb/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	lldb
 .if !defined(LLDB_BUILDLINK3_MK)
 LLDB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lldb+=	lldb>=9.0.1
-BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=15.0.7nb1
+BUILDLINK_API_DEPENDS.lldb+=	lldb>=18.0.0
+BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=18.0.0
 BUILDLINK_PKGSRCDIR.lldb?=	../../wip/lldb
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/lldb/distinfo b/lldb/distinfo
index 4667a32954..6d5b1f542f 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -1,17 +1,14 @@
 $NetBSD: distinfo,v 1.35 2023/01/12 19:32:53 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (lldb-18.1.4.src.tar.xz) = 7b1ca717c68581c81a58c1ec5b813106a83a8bbc85a8bd9171b29211b4564824
+SHA512 (lldb-18.1.4.src.tar.xz) = 28813bc425673cbdb184b74a5322fe14c7415abd5b9f8a2dce8647ebd0a764bbde962d88cab304f0209fdc83071b50f5e9a15634334b7b38d5b1b4abd9d00638
+Size (lldb-18.1.4.src.tar.xz) = 10599148 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.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
diff --git a/lldb/patches/patch-source_Host_netbsd_HostNetBSD.cpp b/lldb/patches/patch-source_Host_netbsd_HostNetBSD.cpp
deleted file mode 100644
index 42f3827786..0000000000
--- a/lldb/patches/patch-source_Host_netbsd_HostNetBSD.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-source_Host_netbsd_HostNetBSD.cpp,v 1.1 2022/11/14 18:46:39 adam Exp $
-
-Fix build on NetBSD.
-
---- source/Host/netbsd/HostNetBSD.cpp.orig	2022-11-10 13:48:56.029150970 +0000
-+++ source/Host/netbsd/HostNetBSD.cpp
-@@ -109,7 +109,7 @@ static bool GetNetBSDProcessCPUType(Proc
-         process_info.GetExecutableFile(), 0x20, 0);
-     if (buffer_sp) {
-       uint8_t exe_class = llvm::object::getElfArchType(
--                              {reinterpret_cast<char *>(buffer_sp->GetBytes()),
-+                              {reinterpret_cast<const char *>(buffer_sp->GetBytes()),
-                                size_t(buffer_sp->GetByteSize())})
-                               .first;
- 
diff --git a/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp b/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
deleted file mode 100644
index d1ba202278..0000000000
--- a/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp,v 1.3 2022/08/12 08:54:31 pin Exp $
-
-Provide StopProcess.
-
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig	2022-06-22 16:46:24.000000000 +0000
-+++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp
-@@ -381,6 +381,29 @@ void NativeProcessNetBSD::MonitorSignal(
-   SetState(StateType::eStateStopped, true);
- }
- 
-+Status NativeProcessNetBSD::StopProcess(lldb::pid_t pid) {
-+#ifdef PT_STOP
-+  return PtraceWrapper(PT_STOP, pid);
-+#else
-+  Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PTRACE));
-+  int ret;
-+  Status error;
-+
-+  errno = 0;
-+  ret = kill(pid, SIGSTOP);
-+
-+  if (ret == -1)
-+    error.SetErrorToErrno();
-+
-+  LLDB_LOG(log, "kill({0}, SIGSTOP)", pid);
-+
-+  if (error.Fail())
-+    LLDB_LOG(log, "kill() failed: {0}", error);
-+
-+  return error;  
-+#endif
-+}
-+
- Status NativeProcessNetBSD::PtraceWrapper(int req, lldb::pid_t pid, void *addr,
-                                           int data, int *result) {
-   Log *log = GetLog(POSIXLog::Ptrace);
-@@ -533,7 +556,7 @@ Status NativeProcessNetBSD::Resume(const
-   return ret;
- }
- 
--Status NativeProcessNetBSD::Halt() { return PtraceWrapper(PT_STOP, GetID()); }
-+Status NativeProcessNetBSD::Halt() { return StopProcess(GetID()); }
- 
- Status NativeProcessNetBSD::Detach() {
-   Status error;
-@@ -558,7 +581,7 @@ Status NativeProcessNetBSD::Signal(int s
- }
- 
- Status NativeProcessNetBSD::Interrupt() {
--  return PtraceWrapper(PT_STOP, GetID());
-+  return StopProcess(GetID());
- }
- 
- Status NativeProcessNetBSD::Kill() {
diff --git a/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h b/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
deleted file mode 100644
index 3a5caa4676..0000000000
--- a/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h,v 1.4 2022/08/12 08:54:31 pin Exp $
-
-Declare StopProcess.
-
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig	2022-06-22 16:46:24.000000000 +0000
-+++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h
-@@ -87,6 +87,7 @@ public:
-   // Interface used by NativeRegisterContext-derived classes.
-   static Status PtraceWrapper(int req, lldb::pid_t pid, void *addr = nullptr,
-                               int data = 0, int *result = nullptr);
-+  static Status StopProcess(lldb::pid_t pid);
- 
-   llvm::Expected<std::string> SaveCore(llvm::StringRef path_hint) override;
- 
diff --git a/llvm/Makefile b/llvm/Makefile
index 7a6c11ecc0..89703a40e8 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -34,9 +34,10 @@ HOMEPAGE=	https://llvm.org/
 COMMENT=	Low Level Virtual Machine compiler infrastructure
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=		c c++14
+USE_CXX_FEATURES=	c++14
+USE_LANGUAGES=		c c++
 GCC_REQD+=		7
-PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_FOR_BUILD_ONLY=	tool
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
@@ -132,6 +133,11 @@ PLIST_SUBST+=	RELEASE_TYPE=${RELEASE_TYPE}
 CMAKE_ARGS+=	-DPKGSRC_LLVM_PTHREADLIB=-lpthread
 .endif
 
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+TOOL_DEPENDS+=	${PKGNAME}:../../${PKGPATH}
+CMAKE_ARGS+=	-DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/bin/llvm-tblgen
+.endif
+
 .include "options.mk"
 
 # replacing config.guess is required even for cmake.
diff --git a/llvm/PLIST b/llvm/PLIST
index fa897b5add..a634295774 100644
--- a/llvm/PLIST
+++ b/llvm/PLIST
@@ -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/ScalarEvolutionExpressions.h
 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.h
 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/MIPatternMatch.h
 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/VLIWMachineScheduler.h
 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/DbiStream.h
 include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/EnumTables.h
 include/llvm/DebugInfo/PDB/Native/FormatUtil.h
-include/llvm/DebugInfo/PDB/Native/Formatters.h
 include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
 include/llvm/DebugInfo/PDB/Native/Hash.h
@@ -965,7 +992,10 @@ include/llvm/ExecutionEngine/Orc/CompileUtils.h
 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/MemoryFlags.h
 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/SymbolStringPool.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorBootstrapService.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
+include/llvm/ExecutionEngine/Orc/TargetProcess/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/SectionMemoryManager.h
 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/StandardInstrumentations.h
 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.h
 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_ostream.h
 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/SupportHelpers.h
 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/CoroConditionalWrapper.h
 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/IVUsersPrinter.h
 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.h
 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/IntegerDivision.h
 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/UnifyLoopExits.h
 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,14 +2057,12 @@ 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.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a
@@ -2063,6 +2118,7 @@ lib/libLLVMCore.a
 lib/libLLVMCoroutines.a
 lib/libLLVMCoverage.a
 lib/libLLVMDWARFLinker.a
+lib/libLLVMDWARFLinkerClassic.a
 lib/libLLVMDWARFLinkerParallel.a
 lib/libLLVMDWP.a
 lib/libLLVMDebugInfoBTF.a
@@ -2084,7 +2140,9 @@ ${PLIST.PowerPC}lib/libLLVMExegesisPowerPC.a
 ${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
@@ -2095,6 +2153,7 @@ ${PLIST.Hexagon}lib/libLLVMHexagonCodeGen.a
 ${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
@@ -2140,6 +2199,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
@@ -2178,6 +2238,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
diff --git a/llvm/buildlink3.mk b/llvm/buildlink3.mk
index 5c82e56364..a35ffb9928 100644
--- a/llvm/buildlink3.mk
+++ b/llvm/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.20 2022/11/14 18:44:05 adam Exp $
+# $NetBSD$
 
 BUILDLINK_TREE+=	llvm
 
 .if !defined(LLVM_BUILDLINK3_MK)
 LLVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.llvm+=	llvm>=16
-BUILDLINK_PKGSRCDIR.llvm?=	../../lang/llvm
+BUILDLINK_API_DEPENDS.llvm+=	llvm>=18.0.0
+BUILDLINK_PKGSRCDIR.llvm?=	../../wip/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
diff --git a/llvm/distinfo b/llvm/distinfo
index ca0ba483b1..fc32d6ee9a 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -1,19 +1,18 @@
 $NetBSD: distinfo,v 1.41 2023/03/05 17:26:09 he 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (llvm-18.1.4.src.tar.xz) = 052cd00d18075d05f150a8613ee3569626f4c4b7012b95407b0c18093a213387
+SHA512 (llvm-18.1.4.src.tar.xz) = 00352c568ae248e811f32c5a68dabc186fad98af12c1ab12b3e1182b17f6ba0379ff3907365beda74d21a77a959f5473a5948d097807838b2885b276c0ef00ae
+Size (llvm-18.1.4.src.tar.xz) = 61991952 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.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-tools_llvm-shlib_CMakeLists.txt) = 6ecb1623a9da13a8b4121cfbead1fd6ca7dfdee4
+SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 4f3d0f527735126293519b42d7fd33dc41a910c2
 SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = 8b18659fe7189c9077b0409e123d41c01e8c8610
diff --git a/llvm/patches/patch-lib_Support_BLAKE3-blake3__impl.h b/llvm/patches/patch-lib_Support_BLAKE3-blake3__impl.h
deleted file mode 100644
index 91483301f1..0000000000
--- a/llvm/patches/patch-lib_Support_BLAKE3-blake3__impl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-lib_Support_BLAKE3-blake3__impl.h,v 1.1 2023/03/05 17:26:09 he Exp $
-
-Pull patch over from rust:
-Do not try to use neon on big-endian aarch64, as we have
-an #error waiting there.
-
---- lib/Support/BLAKE3/blake3_impl.h.orig	2023-01-12 07:12:30.000000000 +0000
-+++ lib/Support/BLAKE3/blake3_impl.h
-@@ -64,7 +64,11 @@ enum blake3_flags {
- #if !defined(BLAKE3_USE_NEON) 
-   // If BLAKE3_USE_NEON not manually set, autodetect based on AArch64ness
-   #if defined(IS_AARCH64)
--    #define BLAKE3_USE_NEON 1
-+    #if defined(__ARM_BIG_ENDIAN)
-+      #define BLAKE3_USE_NEON 0
-+    #else
-+      #define BLAKE3_USE_NEON 1
-+    #endif
-   #else
-     #define BLAKE3_USE_NEON 0
-   #endif
diff --git a/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt b/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
index 98ab95c874..f381758c23 100644
--- a/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
+++ b/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
@@ -1,37 +1,15 @@
 $NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.8 2022/11/14 18:44:05 adam Exp $
 
-Use the Linux style linking everywhere except Darwin and SunOS.
+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})
diff --git a/llvm/version.mk b/llvm/version.mk
index 420efb583a..2a296cb333 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.14 2023/01/12 19:32:53 adam Exp $
+# $NetBSD$
 # 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.4
 MASTER_SITES=	${MASTER_SITE_GITHUB:=llvm/}
 GITHUB_PROJECT=	llvm-project
 GITHUB_RELEASE=	llvmorg-${PKGVERSION_NOREV}
diff --git a/mlir/Makefile b/mlir/Makefile
index aba7ff74c1..f29a048088 100644
--- a/mlir/Makefile
+++ b/mlir/Makefile
@@ -11,8 +11,9 @@ HOMEPAGE=	http://mlir.llvm.org/
 COMMENT=	Multi-Level Intermediate Representation
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=	c c++14
-USE_TOOLS+=	gmake
+USE_CXX_FEATURES=	c++14
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DMLIR_INSTALL_AGGREGATE_OBJECTS=NO
diff --git a/mlir/PLIST b/mlir/PLIST
index caafe01a21..c16699515d 100644
--- a/mlir/PLIST
+++ b/mlir/PLIST
@@ -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.h
 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.h
 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/BytecodeOpInterface.h
 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/ComplexToSPIRV.h
 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/GPUToSPIRV.h
 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/TensorToSPIRV.h
 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/UBToSPIRV.h
 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/ArithOpsInterfaces.td
 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.cpp.inc
 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/AllocationOpInterface.cpp.inc
 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/BufferizationOpsDialect.h.inc
 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/ControlFlowOpsDialect.cpp.inc
 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/EmitCAttributes.td
 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.inc
 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.h.inc
 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/GPUTransformOps.h
 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.inc
 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/IndexOpsDialect.cpp.inc
 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/NVVMOpsDialect.cpp.inc
 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.h
 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/LinalgTransformOpsEnums.h.inc
 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/MLProgramTypes.cpp.inc
 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/MemRefTransformOps.cpp.inc
 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/Passes.td
 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/MMAUtils.h
 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/OpenACCOpsDialect.cpp.inc
 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/OpenMPOpsEnums.h.inc
 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/SCFTransformOps.cpp.inc
 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/SparseTensorAttrDefs.td
 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/SparseTensorTypes.cpp.inc
 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/Transforms/Passes.h
 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/BufferizableOpInterfaceImpl.h
 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/ConversionUtils.h
 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/TransformTypes.cpp.inc
 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/Transforms/Passes.h
 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/ReshapeOpsUtils.h
 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/LoweringPatterns.h
 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/DialectResourceBlobManager.h
 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.inc
 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/DestinationStyleOpInterface.h
 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/SideEffectInterfaces.cpp.inc
 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/Builtin/BuiltinToLLVMIRTranslation.h
 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/Transport.h
 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
@@ -1380,6 +1560,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
@@ -1389,9 +1571,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
@@ -1400,6 +1583,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
@@ -1407,6 +1591,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
@@ -1422,12 +1607,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
@@ -1442,7 +1633,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
@@ -1452,6 +1647,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
@@ -1460,8 +1656,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
@@ -1474,6 +1673,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
@@ -1481,10 +1681,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
@@ -1493,6 +1693,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
@@ -1508,6 +1709,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
@@ -1515,10 +1718,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
@@ -1538,15 +1743,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
@@ -1559,7 +1770,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
@@ -1567,15 +1780,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
@@ -1590,14 +1807,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
@@ -1611,6 +1832,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
@@ -1620,6 +1842,8 @@ lib/libMLIRViewLikeInterface.a
 lib/libMLIRX86VectorDialect.a
 lib/libMLIRX86VectorToLLVMIRTranslation.a
 lib/libMLIRX86VectorTransforms.a
+lib/libmlir_arm_runner_utils.so
+lib/libmlir_arm_sme_abi_stubs.so
 lib/libmlir_async_runtime.so
 lib/libmlir_c_runner_utils.so
 lib/libmlir_float16_utils.so
diff --git a/mlir/buildlink3.mk b/mlir/buildlink3.mk
index 89bf416e4a..381b393efb 100644
--- a/mlir/buildlink3.mk
+++ b/mlir/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	mlir
 .if !defined(MLIR_BUILDLINK3_MK)
 MLIR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mlir+=	mlir>=14.0.6
+BUILDLINK_API_DEPENDS.mlir+=	mlir>=18.0.0
 BUILDLINK_PKGSRCDIR.mlir?=	../../wip/mlir
 
 BUILDLINK_FILES.mlir+=		bin/mlir-tblgen
diff --git a/mlir/distinfo b/mlir/distinfo
index cb7d61d44b..c7ad710a70 100644
--- a/mlir/distinfo
+++ b/mlir/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (mlir-18.1.4.src.tar.xz) = 2020ab8eafcc2ea2f1c505e0f6eec7a94f2beeeea594ffe4f3298ccb29fdd46c
+SHA512 (mlir-18.1.4.src.tar.xz) = 393e8f5883d40fb9b05e3ec5d6404799b4355e03cb8f7f185b14b7676c4373bf1590ee27ad2b3f4f89aa0437d5c877df32a3d755fe14582d646f8dd03759a430
+Size (mlir-18.1.4.src.tar.xz) = 5898956 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
+SHA1 (patch-cmake_modules_MLIRConfig.cmake.in) = 69c4f32891e21e239f6bafc9305e79440809cf6c
 SHA1 (patch-tools_mlir-tblgen_CMakeLists.txt) = 7b78acbf8a85443f2cc3f13786bbbda25b0b8d74
diff --git a/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in b/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
index 8029f5c6f1..416526104e 100644
--- a/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
+++ b/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
@@ -2,9 +2,9 @@ $NetBSD$
 
 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@")
diff --git a/openmp/Makefile b/openmp/Makefile
index 446cf7ef9b..95de92ad6d 100644
--- a/openmp/Makefile
+++ b/openmp/Makefile
@@ -11,15 +11,16 @@ HOMEPAGE=	https://openmp.llvm.org/
 COMMENT=	Support for the OpenMP language
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=		c gnu++14
+USE_CXX_FEATURES=	c++17
+USE_LANGUAGES=		c gnu++17
 USE_TOOLS+=		perl pkg-config
-GCC_REQD+=		4.8
+GCC_REQD+=		7
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DOPENMP_ENABLE_LIBOMPTARGET=OFF
 CMAKE_ARGS+=	-DOPENMP_ENABLE_OMPT_TOOLS=OFF
 
-BUILDLINK_TRANSFORM.NetBSD+=	opt:-std=c++14:-std=gnu++14 # alloca
+BUILDLINK_TRANSFORM.NetBSD+=	opt:-std=c++17:-std=gnu++17 # alloca
 
 .include "../../devel/cmake/build.mk"
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/openmp/PLIST b/openmp/PLIST
index a16edf1f18..54ae8338d1 100644
--- a/openmp/PLIST
+++ b/openmp/PLIST
@@ -2,6 +2,7 @@
 include/omp-tools.h
 include/omp.h
 include/ompt.h
+include/ompx.h
 lib/libgomp.so
 lib/libiomp5.so
 lib/libomp.so
diff --git a/openmp/buildlink3.mk b/openmp/buildlink3.mk
index e9719399d8..37f6e2be71 100644
--- a/openmp/buildlink3.mk
+++ b/openmp/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	openmp
 .if !defined(OPENMP_BUILDLINK3_MK)
 OPENMP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openmp+=	openmp>=9.0.1
-BUILDLINK_ABI_DEPENDS.openmp?=	openmp>=13.0.1nb1
+BUILDLINK_API_DEPENDS.openmp+=	openmp>=18.0.0
+BUILDLINK_ABI_DEPENDS.openmp+=	openmp>=18.0.0
 BUILDLINK_PKGSRCDIR.openmp?=	../../wip/openmp
 .endif	# OPENMP_BUILDLINK3_MK
 
diff --git a/openmp/distinfo b/openmp/distinfo
index 6f325900fe..22aaf5eeda 100644
--- a/openmp/distinfo
+++ b/openmp/distinfo
@@ -1,11 +1,12 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:54 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
+BLAKE2s (cmake-18.1.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (openmp-18.1.4.src.tar.xz) = 8231d8c82ec3ccb064b1f362225bc7792361aefd7c10653b49bca2acdc743954
+SHA512 (openmp-18.1.4.src.tar.xz) = 02346584d04db52f3bc7d112fee26c330d155f919e96f79061eec4218fb1a37e8205f5c2b779476590fa287ab810aa0259e6fd453098a06babbce8636b74b214
+Size (openmp-18.1.4.src.tar.xz) = 1320244 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
+SHA1 (patch-runtime_src_kmp__os.h) = a5b0e015bf21f284468931fb093956752f93700e
diff --git a/openmp/patches/patch-runtime_src_kmp__os.h b/openmp/patches/patch-runtime_src_kmp__os.h
new file mode 100644
index 0000000000..78325d2210
--- /dev/null
+++ b/openmp/patches/patch-runtime_src_kmp__os.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-runtime_src_kmp__os.h,v 1.1 2024/04/22 07:25:56 adam Exp $
+
+NetBSD support.
+
+--- runtime/src/kmp_os.h.orig	2024-04-17 00:21:15.000000000 +0000
++++ runtime/src/kmp_os.h
+@@ -218,7 +218,7 @@ typedef kmp_uint32 kmp_uint;
+ 
+ // stdarg handling
+ #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))
diff --git a/polly/Makefile b/polly/Makefile
index de8ab7a809..f5e1eb35de 100644
--- a/polly/Makefile
+++ b/polly/Makefile
@@ -13,8 +13,10 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	llvm-${PKGVERSION_NOREV}{,nb*}:../../wip/llvm
 
-USE_LANGUAGES=	c c++17
-GCC_REQD+=	4.8
+USE_CXX_FEATURES=	c++17
+FORCE_CXX_STD=		c++17
+USE_LANGUAGES=		c c++
+GCC_REQD+=		4.8
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
diff --git a/polly/PLIST b/polly/PLIST
index b5314445b2..f0ec97a9e6 100644
--- a/polly/PLIST
+++ b/polly/PLIST
@@ -2,7 +2,6 @@
 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
diff --git a/polly/buildlink3.mk b/polly/buildlink3.mk
index 0b436e7429..49a6359bf2 100644
--- a/polly/buildlink3.mk
+++ b/polly/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	polly
 .if !defined(POLLY_BUILDLINK3_MK)
 POLLY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.polly+=	polly>=9.0.1
+BUILDLINK_API_DEPENDS.polly+=	polly>=18.0.0
 BUILDLINK_PKGSRCDIR.polly?=	../../wip/polly
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/polly/distinfo b/polly/distinfo
index 4149f13e7d..f053d5a4af 100644
--- a/polly/distinfo
+++ b/polly/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.29 2023/01/12 19:32:53 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.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (polly-18.1.4.src.tar.xz) = 93bc850108118cdef1156a9b002b65fddb177d862a0cc37b211210fd9814263a
+SHA512 (polly-18.1.4.src.tar.xz) = c11f4fd783e0b1ed2ef1a0184c6aef620a8a9578a1ca884aa20a6818a9666df8a89994d6663c93b24ffa0e74857014aa559978a62092cf43cfd4c08304701e05
+Size (polly-18.1.4.src.tar.xz) = 9152524 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
diff --git a/wasi-compiler-rt/Makefile b/wasi-compiler-rt/Makefile
index 8f0f906253..57b384b89a 100644
--- a/wasi-compiler-rt/Makefile
+++ b/wasi-compiler-rt/Makefile
@@ -16,7 +16,10 @@ DISTINFO_FILE=	${.CURDIR}/../../wip/compiler-rt/distinfo
 
 NOT_FOR_PLATFORM=	NetBSD-[0-7].*-*
 
-USE_LANGUAGES=	c99 c++11
+TOOL_DEPENDS+=	cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+=	lld-${LLVM_VERSION}*:../../devel/lld
+
+USE_LANGUAGES=	c99 c++17
 USE_TOOLS+=	ggrep
 
 SSP_SUPPORTED=		no
@@ -25,6 +28,8 @@ PKGSRC_USE_STACK_CHECK=	no
 BUILDLINK_TRANSFORM+=	rm:-I/usr/include
 BUILDLINK_TRANSFORM+=	rm:-I${PREFIX}/include
 
+CMAKE_BUILD_DIR=	cmake-pkgsrc-build
+
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCOMPILER_RT_TEST_COMPILER=${CC:Q}
 CMAKE_ARGS+=	-DCOMPILER_RT_OS_DIR:STRING=wasi
@@ -47,30 +52,50 @@ CMAKE_ARGS+=	-DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF
 CMAKE_ARGS+=	-DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
-CMAKE_ARGS+=	-DCOMPILER_RT_ENABLE_IOS=OFF
+CMAKE_ARGS+=	-DCOMPILER_RT_ENABLE_IOS:BOOL=OFF
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}
+CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
 
 GENERATE_PLIST+=	find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
 			sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
 
 .include "../../mk/bsd.prefs.mk"
 
+pre-configure:
+	${RUN} ${MKDIR} ${WRKSRC}/${CMAKE_BUILD_DIR}
+
+do-configure:
+	${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
+	${SETENV} ${CONFIGURE_ENV} cmake \
+		${CMAKE_ARGS} \
+		${WRKSRC}/lib/builtins
+
+do-build:
+	${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
+		${SETENV} ${MAKE_ENV} \
+		${MAKE} ${CMAKE_ARGS} ${BUILD_TARGET}
+
+do-install:
+	${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
+		${SETENV} ${INSTALL_ENV} \
+		${MAKE} ${CMAKE_ARGS} ${INSTALL_TARGET}
+
 # Run llvm-ranlib again on the archive. Fixes mystery build failure
 # in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
 # problem in this package?
 .if ${OPSYS} != "Darwin"
 post-install:
 	${PREFIX}/bin/llvm-ranlib \
-	  ${DESTDIR}${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a
+	  ${DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/wasi/libclang_rt.builtins-wasm32.a
 .endif
 
 ABI=			# 32
-CFLAGS=			-O2
-CXXFLAGS=		-O2
+CFLAGS+=		-O2 -fno-exceptions
+CXXFLAGS+=		-O2
 PKGSRC_COMPILER=	clang
 CLANGBASE=		${PREFIX}
-.include "../../devel/cmake/build.mk"
+#.include "../../devel/cmake/build.mk"
 BUILDLINK_DEPMETHOD.clang=	build
 .include "../../wip/clang/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/wasi-compiler-rt/buildlink3.mk b/wasi-compiler-rt/buildlink3.mk
index a58923aa08..9be2ec0d16 100644
--- a/wasi-compiler-rt/buildlink3.mk
+++ b/wasi-compiler-rt/buildlink3.mk
@@ -7,9 +7,7 @@ BUILDLINK_DEPMETHOD.wasi-compiler-rt?=	build
 .if !defined(WASI_COMPILER_RT_BUILDLINK3_MK)
 WASI_COMPILER_RT_BUILDLINK3_MK:=
 
-# This exact version must be kept in sync with llvm, or firefox
-# minimum build dependencies will be incorrect.
-BUILDLINK_API_DEPENDS.wasi-compiler-rt+=	wasi-compiler-rt>=15.0.7
+BUILDLINK_API_DEPENDS.wasi-compiler-rt+=	wasi-compiler-rt>=18.0.0
 BUILDLINK_PKGSRCDIR.wasi-compiler-rt?=		../../wip/wasi-compiler-rt
 
 .endif	# WASI_COMPILER_RT_BUILDLINK3_MK
diff --git a/wasi-libcxx/PLIST b/wasi-libcxx/PLIST
index dc99e868d2..c9a7f5ccef 100644
--- a/wasi-libcxx/PLIST
+++ b/wasi-libcxx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.5 2024/04/22 07:26:42 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
@@ -24,6 +24,7 @@ wasi/include/c++/v1/__algorithm/find_if.h
 wasi/include/c++/v1/__algorithm/find_if_not.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
 wasi/include/c++/v1/__algorithm/generate.h
 wasi/include/c++/v1/__algorithm/generate_n.h
 wasi/include/c++/v1/__algorithm/half_positive.h
@@ -44,6 +45,7 @@ wasi/include/c++/v1/__algorithm/is_sorted_until.h
 wasi/include/c++/v1/__algorithm/iter_swap.h
 wasi/include/c++/v1/__algorithm/iterator_operations.h
 wasi/include/c++/v1/__algorithm/lexicographical_compare.h
+wasi/include/c++/v1/__algorithm/lexicographical_compare_three_way.h
 wasi/include/c++/v1/__algorithm/lower_bound.h
 wasi/include/c++/v1/__algorithm/make_heap.h
 wasi/include/c++/v1/__algorithm/make_projected.h
@@ -68,6 +70,34 @@ wasi/include/c++/v1/__algorithm/partition_copy.h
 wasi/include/c++/v1/__algorithm/partition_point.h
 wasi/include/c++/v1/__algorithm/pop_heap.h
 wasi/include/c++/v1/__algorithm/prev_permutation.h
+wasi/include/c++/v1/__algorithm/pstl_any_all_none_of.h
+wasi/include/c++/v1/__algorithm/pstl_backend.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backend.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/any_of.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/backend.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/fill.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/find_if.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/for_each.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/libdispatch.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/merge.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/serial.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/stable_sort.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/thread.h
+wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/transform.h
+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_fill.h
+wasi/include/c++/v1/__algorithm/pstl_find.h
+wasi/include/c++/v1/__algorithm/pstl_for_each.h
+wasi/include/c++/v1/__algorithm/pstl_frontend_dispatch.h
+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_replace.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
 wasi/include/c++/v1/__algorithm/push_heap.h
 wasi/include/c++/v1/__algorithm/ranges_adjacent_find.h
 wasi/include/c++/v1/__algorithm/ranges_all_of.h
@@ -150,6 +180,7 @@ wasi/include/c++/v1/__algorithm/ranges_sort.h
 wasi/include/c++/v1/__algorithm/ranges_sort_heap.h
 wasi/include/c++/v1/__algorithm/ranges_stable_partition.h
 wasi/include/c++/v1/__algorithm/ranges_stable_sort.h
+wasi/include/c++/v1/__algorithm/ranges_starts_with.h
 wasi/include/c++/v1/__algorithm/ranges_swap_ranges.h
 wasi/include/c++/v1/__algorithm/ranges_transform.h
 wasi/include/c++/v1/__algorithm/ranges_unique.h
@@ -183,6 +214,7 @@ wasi/include/c++/v1/__algorithm/sort_heap.h
 wasi/include/c++/v1/__algorithm/stable_partition.h
 wasi/include/c++/v1/__algorithm/stable_sort.h
 wasi/include/c++/v1/__algorithm/swap_ranges.h
+wasi/include/c++/v1/__algorithm/three_way_comp_ref_type.h
 wasi/include/c++/v1/__algorithm/transform.h
 wasi/include/c++/v1/__algorithm/uniform_random_bit_generator_adaptor.h
 wasi/include/c++/v1/__algorithm/unique.h
@@ -191,6 +223,20 @@ wasi/include/c++/v1/__algorithm/unwrap_iter.h
 wasi/include/c++/v1/__algorithm/unwrap_range.h
 wasi/include/c++/v1/__algorithm/upper_bound.h
 wasi/include/c++/v1/__assert
+wasi/include/c++/v1/__atomic/aliases.h
+wasi/include/c++/v1/__atomic/atomic.h
+wasi/include/c++/v1/__atomic/atomic_base.h
+wasi/include/c++/v1/__atomic/atomic_flag.h
+wasi/include/c++/v1/__atomic/atomic_init.h
+wasi/include/c++/v1/__atomic/atomic_lock_free.h
+wasi/include/c++/v1/__atomic/atomic_sync.h
+wasi/include/c++/v1/__atomic/check_memory_order.h
+wasi/include/c++/v1/__atomic/contention_t.h
+wasi/include/c++/v1/__atomic/cxx_atomic_impl.h
+wasi/include/c++/v1/__atomic/fence.h
+wasi/include/c++/v1/__atomic/is_always_lock_free.h
+wasi/include/c++/v1/__atomic/kill_dependency.h
+wasi/include/c++/v1/__atomic/memory_order.h
 wasi/include/c++/v1/__availability
 wasi/include/c++/v1/__bit/bit_cast.h
 wasi/include/c++/v1/__bit/bit_ceil.h
@@ -206,14 +252,18 @@ wasi/include/c++/v1/__bit/has_single_bit.h
 wasi/include/c++/v1/__bit/popcount.h
 wasi/include/c++/v1/__bit/rotate.h
 wasi/include/c++/v1/__bit_reference
-wasi/include/c++/v1/__bsd_locale_defaults.h
-wasi/include/c++/v1/__bsd_locale_fallbacks.h
 wasi/include/c++/v1/__charconv/chars_format.h
+wasi/include/c++/v1/__charconv/from_chars_integral.h
 wasi/include/c++/v1/__charconv/from_chars_result.h
 wasi/include/c++/v1/__charconv/tables.h
+wasi/include/c++/v1/__charconv/to_chars.h
 wasi/include/c++/v1/__charconv/to_chars_base_10.h
+wasi/include/c++/v1/__charconv/to_chars_floating_point.h
+wasi/include/c++/v1/__charconv/to_chars_integral.h
 wasi/include/c++/v1/__charconv/to_chars_result.h
+wasi/include/c++/v1/__charconv/traits.h
 wasi/include/c++/v1/__chrono/calendar.h
+wasi/include/c++/v1/__chrono/concepts.h
 wasi/include/c++/v1/__chrono/convert_to_timespec.h
 wasi/include/c++/v1/__chrono/convert_to_tm.h
 wasi/include/c++/v1/__chrono/day.h
@@ -272,6 +322,7 @@ wasi/include/c++/v1/__concepts/same_as.h
 wasi/include/c++/v1/__concepts/semiregular.h
 wasi/include/c++/v1/__concepts/swappable.h
 wasi/include/c++/v1/__concepts/totally_ordered.h
+wasi/include/c++/v1/__condition_variable/condition_variable.h
 wasi/include/c++/v1/__config
 wasi/include/c++/v1/__config_site
 wasi/include/c++/v1/__coroutine/coroutine_handle.h
@@ -279,9 +330,13 @@ wasi/include/c++/v1/__coroutine/coroutine_traits.h
 wasi/include/c++/v1/__coroutine/noop_coroutine_handle.h
 wasi/include/c++/v1/__coroutine/trivial_awaitables.h
 wasi/include/c++/v1/__cxxabi_config.h
-wasi/include/c++/v1/__debug
 wasi/include/c++/v1/__debug_utils/randomize_range.h
-wasi/include/c++/v1/__errc
+wasi/include/c++/v1/__debug_utils/strict_weak_ordering_check.h
+wasi/include/c++/v1/__exception/exception.h
+wasi/include/c++/v1/__exception/exception_ptr.h
+wasi/include/c++/v1/__exception/nested_exception.h
+wasi/include/c++/v1/__exception/operations.h
+wasi/include/c++/v1/__exception/terminate.h
 wasi/include/c++/v1/__expected/bad_expected_access.h
 wasi/include/c++/v1/__expected/expected.h
 wasi/include/c++/v1/__expected/unexpect.h
@@ -332,6 +387,8 @@ wasi/include/c++/v1/__format/parser_std_format_spec.h
 wasi/include/c++/v1/__format/range_default_formatter.h
 wasi/include/c++/v1/__format/range_formatter.h
 wasi/include/c++/v1/__format/unicode.h
+wasi/include/c++/v1/__format/width_estimation_table.h
+wasi/include/c++/v1/__format/write_escaped.h
 wasi/include/c++/v1/__functional/binary_function.h
 wasi/include/c++/v1/__functional/binary_negate.h
 wasi/include/c++/v1/__functional/bind.h
@@ -358,14 +415,20 @@ wasi/include/c++/v1/__functional/ranges_operations.h
 wasi/include/c++/v1/__functional/reference_wrapper.h
 wasi/include/c++/v1/__functional/unary_function.h
 wasi/include/c++/v1/__functional/unary_negate.h
-wasi/include/c++/v1/__functional/unwrap_ref.h
 wasi/include/c++/v1/__functional/weak_result_type.h
 wasi/include/c++/v1/__fwd/array.h
+wasi/include/c++/v1/__fwd/fstream.h
 wasi/include/c++/v1/__fwd/get.h
 wasi/include/c++/v1/__fwd/hash.h
+wasi/include/c++/v1/__fwd/ios.h
+wasi/include/c++/v1/__fwd/istream.h
+wasi/include/c++/v1/__fwd/mdspan.h
 wasi/include/c++/v1/__fwd/memory_resource.h
+wasi/include/c++/v1/__fwd/ostream.h
 wasi/include/c++/v1/__fwd/pair.h
 wasi/include/c++/v1/__fwd/span.h
+wasi/include/c++/v1/__fwd/sstream.h
+wasi/include/c++/v1/__fwd/streambuf.h
 wasi/include/c++/v1/__fwd/string.h
 wasi/include/c++/v1/__fwd/string_view.h
 wasi/include/c++/v1/__fwd/subrange.h
@@ -379,6 +442,7 @@ wasi/include/c++/v1/__iterator/bounded_iter.h
 wasi/include/c++/v1/__iterator/common_iterator.h
 wasi/include/c++/v1/__iterator/concepts.h
 wasi/include/c++/v1/__iterator/counted_iterator.h
+wasi/include/c++/v1/__iterator/cpp17_iterator_concepts.h
 wasi/include/c++/v1/__iterator/data.h
 wasi/include/c++/v1/__iterator/default_sentinel.h
 wasi/include/c++/v1/__iterator/distance.h
@@ -404,6 +468,7 @@ wasi/include/c++/v1/__iterator/ostreambuf_iterator.h
 wasi/include/c++/v1/__iterator/permutable.h
 wasi/include/c++/v1/__iterator/prev.h
 wasi/include/c++/v1/__iterator/projected.h
+wasi/include/c++/v1/__iterator/ranges_iterator_traits.h
 wasi/include/c++/v1/__iterator/readable_traits.h
 wasi/include/c++/v1/__iterator/reverse_access.h
 wasi/include/c++/v1/__iterator/reverse_iterator.h
@@ -413,9 +478,18 @@ wasi/include/c++/v1/__iterator/sortable.h
 wasi/include/c++/v1/__iterator/unreachable_sentinel.h
 wasi/include/c++/v1/__iterator/wrap_iter.h
 wasi/include/c++/v1/__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/__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/mdspan.h
 wasi/include/c++/v1/__memory/addressof.h
 wasi/include/c++/v1/__memory/align.h
+wasi/include/c++/v1/__memory/aligned_alloc.h
 wasi/include/c++/v1/__memory/allocate_at_least.h
 wasi/include/c++/v1/__memory/allocation_guard.h
 wasi/include/c++/v1/__memory/allocator.h
@@ -448,7 +522,10 @@ wasi/include/c++/v1/__memory_resource/polymorphic_allocator.h
 wasi/include/c++/v1/__memory_resource/pool_options.h
 wasi/include/c++/v1/__memory_resource/synchronized_pool_resource.h
 wasi/include/c++/v1/__memory_resource/unsynchronized_pool_resource.h
-wasi/include/c++/v1/__mutex_base
+wasi/include/c++/v1/__mutex/lock_guard.h
+wasi/include/c++/v1/__mutex/mutex.h
+wasi/include/c++/v1/__mutex/tag_types.h
+wasi/include/c++/v1/__mutex/unique_lock.h
 wasi/include/c++/v1/__node_handle
 wasi/include/c++/v1/__numeric/accumulate.h
 wasi/include/c++/v1/__numeric/adjacent_difference.h
@@ -459,10 +536,45 @@ wasi/include/c++/v1/__numeric/inner_product.h
 wasi/include/c++/v1/__numeric/iota.h
 wasi/include/c++/v1/__numeric/midpoint.h
 wasi/include/c++/v1/__numeric/partial_sum.h
+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/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
@@ -505,7 +617,7 @@ wasi/include/c++/v1/__ranges/all.h
 wasi/include/c++/v1/__ranges/as_rvalue_view.h
 wasi/include/c++/v1/__ranges/common_view.h
 wasi/include/c++/v1/__ranges/concepts.h
-wasi/include/c++/v1/__ranges/copyable_box.h
+wasi/include/c++/v1/__ranges/container_compatible_range.h
 wasi/include/c++/v1/__ranges/counted.h
 wasi/include/c++/v1/__ranges/dangling.h
 wasi/include/c++/v1/__ranges/data.h
@@ -517,16 +629,19 @@ wasi/include/c++/v1/__ranges/empty_view.h
 wasi/include/c++/v1/__ranges/enable_borrowed_range.h
 wasi/include/c++/v1/__ranges/enable_view.h
 wasi/include/c++/v1/__ranges/filter_view.h
+wasi/include/c++/v1/__ranges/from_range.h
 wasi/include/c++/v1/__ranges/iota_view.h
 wasi/include/c++/v1/__ranges/istream_view.h
 wasi/include/c++/v1/__ranges/join_view.h
 wasi/include/c++/v1/__ranges/lazy_split_view.h
+wasi/include/c++/v1/__ranges/movable_box.h
 wasi/include/c++/v1/__ranges/non_propagating_cache.h
 wasi/include/c++/v1/__ranges/owning_view.h
 wasi/include/c++/v1/__ranges/range_adaptor.h
 wasi/include/c++/v1/__ranges/rbegin.h
 wasi/include/c++/v1/__ranges/ref_view.h
 wasi/include/c++/v1/__ranges/rend.h
+wasi/include/c++/v1/__ranges/repeat_view.h
 wasi/include/c++/v1/__ranges/reverse_view.h
 wasi/include/c++/v1/__ranges/single_view.h
 wasi/include/c++/v1/__ranges/size.h
@@ -534,13 +649,23 @@ wasi/include/c++/v1/__ranges/split_view.h
 wasi/include/c++/v1/__ranges/subrange.h
 wasi/include/c++/v1/__ranges/take_view.h
 wasi/include/c++/v1/__ranges/take_while_view.h
+wasi/include/c++/v1/__ranges/to.h
 wasi/include/c++/v1/__ranges/transform_view.h
 wasi/include/c++/v1/__ranges/view_interface.h
 wasi/include/c++/v1/__ranges/views.h
 wasi/include/c++/v1/__ranges/zip_view.h
 wasi/include/c++/v1/__split_buffer
-wasi/include/c++/v1/__std_stream
+wasi/include/c++/v1/__std_clang_module
+wasi/include/c++/v1/__std_mbstate_t.h
+wasi/include/c++/v1/__stop_token/atomic_unique_lock.h
+wasi/include/c++/v1/__stop_token/intrusive_list_view.h
+wasi/include/c++/v1/__stop_token/intrusive_shared_ptr.h
+wasi/include/c++/v1/__stop_token/stop_callback.h
+wasi/include/c++/v1/__stop_token/stop_source.h
+wasi/include/c++/v1/__stop_token/stop_state.h
+wasi/include/c++/v1/__stop_token/stop_token.h
 wasi/include/c++/v1/__string/char_traits.h
+wasi/include/c++/v1/__string/constexpr_c_functions.h
 wasi/include/c++/v1/__string/extern_template_lists.h
 wasi/include/c++/v1/__support/android/locale_bionic.h
 wasi/include/c++/v1/__support/fuchsia/xlocale.h
@@ -551,27 +676,32 @@ wasi/include/c++/v1/__support/ibm/xlocale.h
 wasi/include/c++/v1/__support/musl/xlocale.h
 wasi/include/c++/v1/__support/newlib/xlocale.h
 wasi/include/c++/v1/__support/openbsd/xlocale.h
-wasi/include/c++/v1/__support/solaris/floatingpoint.h
-wasi/include/c++/v1/__support/solaris/wchar.h
-wasi/include/c++/v1/__support/solaris/xlocale.h
 wasi/include/c++/v1/__support/win32/locale_win32.h
 wasi/include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
 wasi/include/c++/v1/__support/xlocale/__posix_l_fallback.h
 wasi/include/c++/v1/__support/xlocale/__strtonum_fallback.h
+wasi/include/c++/v1/__system_error/errc.h
+wasi/include/c++/v1/__system_error/error_category.h
+wasi/include/c++/v1/__system_error/error_code.h
+wasi/include/c++/v1/__system_error/error_condition.h
+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/poll_with_backoff.h
+wasi/include/c++/v1/__thread/this_thread.h
+wasi/include/c++/v1/__thread/thread.h
 wasi/include/c++/v1/__thread/timed_backoff_policy.h
 wasi/include/c++/v1/__threading_support
 wasi/include/c++/v1/__tree
-wasi/include/c++/v1/__tuple_dir/apply_cv.h
-wasi/include/c++/v1/__tuple_dir/make_tuple_types.h
-wasi/include/c++/v1/__tuple_dir/pair_like.h
-wasi/include/c++/v1/__tuple_dir/sfinae_helpers.h
-wasi/include/c++/v1/__tuple_dir/tuple_element.h
-wasi/include/c++/v1/__tuple_dir/tuple_indices.h
-wasi/include/c++/v1/__tuple_dir/tuple_like.h
-wasi/include/c++/v1/__tuple_dir/tuple_like_ext.h
-wasi/include/c++/v1/__tuple_dir/tuple_size.h
-wasi/include/c++/v1/__tuple_dir/tuple_types.h
+wasi/include/c++/v1/__tuple/make_tuple_types.h
+wasi/include/c++/v1/__tuple/pair_like.h
+wasi/include/c++/v1/__tuple/sfinae_helpers.h
+wasi/include/c++/v1/__tuple/tuple_element.h
+wasi/include/c++/v1/__tuple/tuple_indices.h
+wasi/include/c++/v1/__tuple/tuple_like.h
+wasi/include/c++/v1/__tuple/tuple_like_ext.h
+wasi/include/c++/v1/__tuple/tuple_size.h
+wasi/include/c++/v1/__tuple/tuple_types.h
 wasi/include/c++/v1/__type_traits/add_const.h
 wasi/include/c++/v1/__type_traits/add_cv.h
 wasi/include/c++/v1/__type_traits/add_lvalue_reference.h
@@ -589,6 +719,7 @@ wasi/include/c++/v1/__type_traits/conditional.h
 wasi/include/c++/v1/__type_traits/conjunction.h
 wasi/include/c++/v1/__type_traits/copy_cv.h
 wasi/include/c++/v1/__type_traits/copy_cvref.h
+wasi/include/c++/v1/__type_traits/datasizeof.h
 wasi/include/c++/v1/__type_traits/decay.h
 wasi/include/c++/v1/__type_traits/dependent_type.h
 wasi/include/c++/v1/__type_traits/disjunction.h
@@ -597,6 +728,7 @@ wasi/include/c++/v1/__type_traits/extent.h
 wasi/include/c++/v1/__type_traits/has_unique_object_representation.h
 wasi/include/c++/v1/__type_traits/has_virtual_destructor.h
 wasi/include/c++/v1/__type_traits/integral_constant.h
+wasi/include/c++/v1/__type_traits/invoke.h
 wasi/include/c++/v1/__type_traits/is_abstract.h
 wasi/include/c++/v1/__type_traits/is_aggregate.h
 wasi/include/c++/v1/__type_traits/is_allocator.h
@@ -621,6 +753,8 @@ wasi/include/c++/v1/__type_traits/is_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_destructible.h
 wasi/include/c++/v1/__type_traits/is_empty.h
 wasi/include/c++/v1/__type_traits/is_enum.h
+wasi/include/c++/v1/__type_traits/is_equality_comparable.h
+wasi/include/c++/v1/__type_traits/is_execution_policy.h
 wasi/include/c++/v1/__type_traits/is_final.h
 wasi/include/c++/v1/__type_traits/is_floating_point.h
 wasi/include/c++/v1/__type_traits/is_function.h
@@ -667,6 +801,7 @@ wasi/include/c++/v1/__type_traits/is_trivially_copy_constructible.h
 wasi/include/c++/v1/__type_traits/is_trivially_copyable.h
 wasi/include/c++/v1/__type_traits/is_trivially_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_trivially_destructible.h
+wasi/include/c++/v1/__type_traits/is_trivially_lexicographically_comparable.h
 wasi/include/c++/v1/__type_traits/is_trivially_move_assignable.h
 wasi/include/c++/v1/__type_traits/is_trivially_move_constructible.h
 wasi/include/c++/v1/__type_traits/is_unbounded_array.h
@@ -685,6 +820,8 @@ wasi/include/c++/v1/__type_traits/maybe_const.h
 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
@@ -701,6 +838,7 @@ wasi/include/c++/v1/__type_traits/strip_signature.h
 wasi/include/c++/v1/__type_traits/type_identity.h
 wasi/include/c++/v1/__type_traits/type_list.h
 wasi/include/c++/v1/__type_traits/underlying_type.h
+wasi/include/c++/v1/__type_traits/unwrap_ref.h
 wasi/include/c++/v1/__type_traits/void_t.h
 wasi/include/c++/v1/__undef_macros
 wasi/include/c++/v1/__utility/as_const.h
@@ -714,12 +852,14 @@ wasi/include/c++/v1/__utility/forward.h
 wasi/include/c++/v1/__utility/forward_like.h
 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/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/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
@@ -774,11 +914,8 @@ 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/algorithm
-wasi/include/c++/v1/experimental/coroutine
 wasi/include/c++/v1/experimental/deque
 wasi/include/c++/v1/experimental/forward_list
-wasi/include/c++/v1/experimental/functional
 wasi/include/c++/v1/experimental/iterator
 wasi/include/c++/v1/experimental/list
 wasi/include/c++/v1/experimental/map
@@ -821,6 +958,7 @@ wasi/include/c++/v1/locale
 wasi/include/c++/v1/locale.h
 wasi/include/c++/v1/map
 wasi/include/c++/v1/math.h
+wasi/include/c++/v1/mdspan
 wasi/include/c++/v1/memory
 wasi/include/c++/v1/memory_resource
 wasi/include/c++/v1/module.modulemap
@@ -830,6 +968,7 @@ wasi/include/c++/v1/numbers
 wasi/include/c++/v1/numeric
 wasi/include/c++/v1/optional
 wasi/include/c++/v1/ostream
+wasi/include/c++/v1/print
 wasi/include/c++/v1/queue
 wasi/include/c++/v1/random
 wasi/include/c++/v1/ranges
@@ -851,6 +990,7 @@ wasi/include/c++/v1/stdexcept
 wasi/include/c++/v1/stdint.h
 wasi/include/c++/v1/stdio.h
 wasi/include/c++/v1/stdlib.h
+wasi/include/c++/v1/stop_token
 wasi/include/c++/v1/streambuf
 wasi/include/c++/v1/string
 wasi/include/c++/v1/string.h
diff --git a/wasi-libcxx/buildlink3.mk b/wasi-libcxx/buildlink3.mk
index f887991e3e..fd1cecd233 100644
--- a/wasi-libcxx/buildlink3.mk
+++ b/wasi-libcxx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/12/15 01:11:17 gutteridge Exp $
+# $NetBSD$
 
 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>=15.0.6
+BUILDLINK_API_DEPENDS.wasi-libcxx+=	wasi-libcxx>=18.0.0
 BUILDLINK_PKGSRCDIR.wasi-libcxx?=	../../wip/wasi-libcxx
 
 .endif	# WASI_LIBCXX_BUILDLINK3_MK
diff --git a/wasi-libcxx/distinfo b/wasi-libcxx/distinfo
index 071b3adc53..6e82a3e2d2 100644
--- a/wasi-libcxx/distinfo
+++ b/wasi-libcxx/distinfo
@@ -1,16 +1,16 @@
 $NetBSD: distinfo,v 1.8 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (cmake-17.0.5.src.tar.xz) = 5c7b379a31f1de5b643afd7ea4ddc007cb176464f7f6c67903391a9d973c5320
-SHA512 (cmake-17.0.5.src.tar.xz) = 3ef19c40975e18ba38862d0e5cc5db15f269f7705b8a9f37e39467eda0424b56ee0e390f94809972be41513074aa4dac997c668280e94e6d7b1ada088f75d73e
-Size (cmake-17.0.5.src.tar.xz) = 8712 bytes
-BLAKE2s (libcxx-17.0.5.src.tar.xz) = be9462fbcdf7c996343e10d1b60a0246e69eb27e4b78f4df693721a5e9bf60fa
-SHA512 (libcxx-17.0.5.src.tar.xz) = 9a699a59b3ef6a5cfb190b9109d5a409048b969b8c6e25c088404b24716d0de1d1cbf3afea3c77afab269107b7917263014c26e3322f2ec259fd9fc1ebf3add2
-Size (libcxx-17.0.5.src.tar.xz) = 3955896 bytes
-BLAKE2s (libcxxabi-17.0.5.src.tar.xz) = 5fe41ea35aadadac441e13bde5f351acb634d208e276ad2279b5c20da26f79bc
-SHA512 (libcxxabi-17.0.5.src.tar.xz) = 646724280e5e197d1275bd42d27b72e23390791f80317ff89d15849b8b43857a27e58f7522ac6a5e86707523cdf6e193bd724510b807c0e44f95e122c64b8c62
-Size (libcxxabi-17.0.5.src.tar.xz) = 575600 bytes
-BLAKE2s (runtimes-17.0.5.src.tar.xz) = d6c83b93e6f9ce8ee88b419a99d45b12fc61f0d8f837d8318a155393e49a816e
-SHA512 (runtimes-17.0.5.src.tar.xz) = d66436cf33bc6eb0bd3630d8c903df9250f30be09a41e6127e55cd23e6b66abdcd96dc796552b406cd752842ffbf9a939e71664571132bf1e5208cbf2728c72d
-Size (runtimes-17.0.5.src.tar.xz) = 6244 bytes
+BLAKE2s (cmake-18.1.4.src.tar.xz) = 7c5b5533948c5b96f16e5932e55698ee00cf5e873bb09f3f2e5c1d48ab706801
+SHA512 (cmake-18.1.4.src.tar.xz) = 500ebe5dc7ec2c7d553222c37111020d7ba4d902d102389e105a1a4ae5810ef20ef890b9af42018ef93485688fa7505b0c173ca734ee64eeb93b9a1ecaf3f171
+Size (cmake-18.1.4.src.tar.xz) = 8708 bytes
+BLAKE2s (libcxx-18.1.4.src.tar.xz) = 8883a470c3d6142bd8e06f8cdc88e68780d91d1cd7b29fe9b80fb7b4ca187756
+SHA512 (libcxx-18.1.4.src.tar.xz) = dde17d74640205f416eeb506079bdcf07ee28193251995e03d54f3c8242463448b2379f8b9aa11e4f57143e972075e67c8a143e7bbf0b52a62debc278287e89b
+Size (libcxx-18.1.4.src.tar.xz) = 4031032 bytes
+BLAKE2s (libcxxabi-18.1.4.src.tar.xz) = a24c1fd8f02ba4db0d9bdb3644468aec2b2ca0f787eb237a24ffcc820135b656
+SHA512 (libcxxabi-18.1.4.src.tar.xz) = 0f0734ae08f27b44ead8740394aa59d993acc5731445c970ee98fadaa1d335b72af6df01895cd7b9873065baa498a820b9a460da4946549a8cd0ede5e5f63489
+Size (libcxxabi-18.1.4.src.tar.xz) = 582676 bytes
+BLAKE2s (runtimes-18.1.4.src.tar.xz) = 9dc20d3b0844d478d663394d9e29a8e6b523d5c868de2ca08759504a2f663b05
+SHA512 (runtimes-18.1.4.src.tar.xz) = ce9e08b85796c2e500e6787743c29140121f15dfcd3a3ed838f86f2757bc1c9e0e21c6a76dc9d35700a312abc376fee1678f61bfc3aa3f4cd0a0d1e0c759eb4d
+Size (runtimes-18.1.4.src.tar.xz) = 6788 bytes
 SHA1 (patch-libcxx_include_CMakeLists.txt) = ca1d4f8dbc99bbcfdad6a0bd389f973a48a938d7
 SHA1 (patch-libcxxabi_src_CMakeLists.txt) = ccd70bb5902b31a6bb989521e9a5f50fe0a4021d


Home | Main Index | Thread Index | Old Index