pkgsrc-WIP-changes archive

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

llvm: updated to 23.1.3



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Tue Oct 13 08:10:28 2026 +0200
Changeset:	22b1e146d868a8dee9b5e2bbeba29a24d74d3856

Modified Files:
	clang-tools-extra/PLIST
	clang-tools-extra/distinfo
	clang/PLIST
	clang/buildlink3.mk
	clang/distinfo
	compiler-rt/Makefile
	compiler-rt/buildlink3.mk
	compiler-rt/distinfo
	compiler-rt/patches/patch-CMakeLists.txt
	compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
	flang/Makefile
	flang/PLIST
	flang/distinfo
	libclc/buildlink3.mk
	libclc/distinfo
	libcxx/Makefile
	libcxx/PLIST
	libcxx/buildlink3.mk
	libcxx/distinfo
	libcxx/patches/patch-src_CMakeLists.txt
	libcxxabi/Makefile
	libcxxabi/buildlink3.mk
	libcxxabi/distinfo
	libcxxabi/files/__config_site
	libcxxabi/patches/patch-src_CMakeLists.txt
	libunwind/buildlink3.mk
	libunwind/distinfo
	lld/PLIST
	lld/buildlink3.mk
	lld/distinfo
	lldb/Makefile
	lldb/buildlink3.mk
	lldb/distinfo
	llvm/Makefile
	llvm/PLIST
	llvm/buildlink3.mk
	llvm/distinfo
	llvm/patches/patch-cmake_config-ix.cmake
	llvm/patches/patch-cmake_modules_AddLLVM.cmake
	llvm/version.mk
	mlir/Makefile
	mlir/PLIST
	mlir/buildlink3.mk
	mlir/distinfo
	openmp/Makefile
	openmp/buildlink3.mk
	openmp/distinfo
	polly/buildlink3.mk
	polly/distinfo
	spirv-llvm-translator/Makefile
	spirv-llvm-translator/PLIST
	spirv-llvm-translator/distinfo
	wasi-libcxx/distinfo
	wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
Removed Files:
	llvm/patches/patch-203680

Log Message:
llvm: updated to 23.1.3

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

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

diffstat:
 clang-tools-extra/PLIST                            |  36 +-
 clang-tools-extra/distinfo                         |   6 +-
 clang/PLIST                                        | 690 ++++++++++---------
 clang/buildlink3.mk                                |   6 +-
 clang/distinfo                                     |   6 +-
 compiler-rt/Makefile                               |   2 +-
 compiler-rt/buildlink3.mk                          |   2 +-
 compiler-rt/distinfo                               |  10 +-
 compiler-rt/patches/patch-CMakeLists.txt           |   6 +-
 ...atch-lib_sanitizer__common_sanitizer__linux.cpp |   4 +-
 flang/Makefile                                     |   2 +-
 flang/PLIST                                        |  69 +-
 flang/distinfo                                     |   6 +-
 libclc/buildlink3.mk                               |   2 +-
 libclc/distinfo                                    |   6 +-
 libcxx/Makefile                                    |   7 +-
 libcxx/PLIST                                       |  36 +-
 libcxx/buildlink3.mk                               |   2 +-
 libcxx/distinfo                                    |   8 +-
 libcxx/patches/patch-src_CMakeLists.txt            |  18 +-
 libcxxabi/Makefile                                 |   2 +-
 libcxxabi/buildlink3.mk                            |   2 +-
 libcxxabi/distinfo                                 |   8 +-
 libcxxabi/files/__config_site                      |   8 +-
 libcxxabi/patches/patch-src_CMakeLists.txt         |  22 +-
 libunwind/buildlink3.mk                            |   2 +-
 libunwind/distinfo                                 |   6 +-
 lld/PLIST                                          |   1 +
 lld/buildlink3.mk                                  |   2 +-
 lld/distinfo                                       |   6 +-
 lldb/Makefile                                      |   2 +-
 lldb/buildlink3.mk                                 |   4 +-
 lldb/distinfo                                      |   6 +-
 llvm/Makefile                                      |   3 +-
 llvm/PLIST                                         | 116 +++-
 llvm/buildlink3.mk                                 |   6 +-
 llvm/distinfo                                      |  11 +-
 llvm/patches/patch-203680                          | 731 ---------------------
 llvm/patches/patch-cmake_config-ix.cmake           |  10 +-
 llvm/patches/patch-cmake_modules_AddLLVM.cmake     |  14 +-
 llvm/version.mk                                    |  11 +-
 mlir/Makefile                                      |   3 +
 mlir/PLIST                                         | 185 ++++--
 mlir/buildlink3.mk                                 |   3 +-
 mlir/distinfo                                      |   6 +-
 openmp/Makefile                                    |   6 +
 openmp/buildlink3.mk                               |   4 +-
 openmp/distinfo                                    |   6 +-
 polly/buildlink3.mk                                |   2 +-
 polly/distinfo                                     |   6 +-
 spirv-llvm-translator/Makefile                     |   2 +-
 spirv-llvm-translator/PLIST                        |   2 +-
 spirv-llvm-translator/distinfo                     |   6 +-
 wasi-libcxx/distinfo                               |   8 +-
 .../patches/patch-libcxx_src_CMakeLists.txt        |  18 +-
 55 files changed, 892 insertions(+), 1262 deletions(-)

diffs:
diff --git a/clang-tools-extra/PLIST b/clang-tools-extra/PLIST
index a7bc44b2d6..0eae263404 100644
--- a/clang-tools-extra/PLIST
+++ b/clang-tools-extra/PLIST
@@ -73,6 +73,7 @@ include/clang-tidy/boost/UseToStringCheck.h
 include/clang-tidy/bugprone/ArgumentCommentCheck.h
 include/clang-tidy/bugprone/AssertSideEffectCheck.h
 include/clang-tidy/bugprone/AssignmentInIfConditionCheck.h
+include/clang-tidy/bugprone/AssignmentInSelectionStatementCheck.h
 include/clang-tidy/bugprone/BadSignalToKillThreadCheck.h
 include/clang-tidy/bugprone/BitwisePointerCastCheck.h
 include/clang-tidy/bugprone/BoolPointerImplicitConversionCheck.h
@@ -113,6 +114,7 @@ include/clang-tidy/bugprone/MisleadingSetterOfReferenceCheck.h
 include/clang-tidy/bugprone/MisplacedOperatorInStrlenInAllocCheck.h
 include/clang-tidy/bugprone/MisplacedPointerArithmeticInAllocCheck.h
 include/clang-tidy/bugprone/MisplacedWideningCastCheck.h
+include/clang-tidy/bugprone/MissingEndComparisonCheck.h
 include/clang-tidy/bugprone/MoveForwardingReferenceCheck.h
 include/clang-tidy/bugprone/MultiLevelImplicitPointerConversionCheck.h
 include/clang-tidy/bugprone/MultipleNewInOneExpressionCheck.h
@@ -133,12 +135,14 @@ include/clang-tidy/bugprone/ReservedIdentifierCheck.h
 include/clang-tidy/bugprone/ReturnConstRefFromParameterCheck.h
 include/clang-tidy/bugprone/SharedPtrArrayMismatchCheck.h
 include/clang-tidy/bugprone/SignalHandlerCheck.h
+include/clang-tidy/bugprone/SignedBitwiseCheck.h
 include/clang-tidy/bugprone/SignedCharMisuseCheck.h
 include/clang-tidy/bugprone/SizeofContainerCheck.h
 include/clang-tidy/bugprone/SizeofExpressionCheck.h
 include/clang-tidy/bugprone/SmartPtrArrayMismatchCheck.h
 include/clang-tidy/bugprone/SpuriouslyWakeUpFunctionsCheck.h
 include/clang-tidy/bugprone/StandaloneEmptyCheck.h
+include/clang-tidy/bugprone/StdExceptionBaseclassCheck.h
 include/clang-tidy/bugprone/StdNamespaceModificationCheck.h
 include/clang-tidy/bugprone/StringConstructorCheck.h
 include/clang-tidy/bugprone/StringIntegerAssignmentCheck.h
@@ -164,11 +168,13 @@ include/clang-tidy/bugprone/UncheckedOptionalAccessCheck.h
 include/clang-tidy/bugprone/UncheckedStringToNumberConversionCheck.h
 include/clang-tidy/bugprone/UndefinedMemoryManipulationCheck.h
 include/clang-tidy/bugprone/UndelegatedConstructorCheck.h
+include/clang-tidy/bugprone/UnhandledCodePathsCheck.h
 include/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.h
 include/clang-tidy/bugprone/UnhandledSelfAssignmentCheck.h
 include/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.h
 include/clang-tidy/bugprone/UniquePtrArrayMismatchCheck.h
 include/clang-tidy/bugprone/UnsafeFunctionsCheck.h
+include/clang-tidy/bugprone/UnsafeToAllowExceptionsCheck.h
 include/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.h
 include/clang-tidy/bugprone/UnusedRaiiCheck.h
 include/clang-tidy/bugprone/UnusedReturnValueCheck.h
@@ -221,7 +227,6 @@ include/clang-tidy/google/AvoidNSObjectNewCheck.h
 include/clang-tidy/google/AvoidThrowingObjCExceptionCheck.h
 include/clang-tidy/google/AvoidUnderscoreInGoogletestNameCheck.h
 include/clang-tidy/google/DefaultArgumentsCheck.h
-include/clang-tidy/google/ExplicitConstructorCheck.h
 include/clang-tidy/google/ExplicitMakePairCheck.h
 include/clang-tidy/google/FloatTypesCheck.h
 include/clang-tidy/google/FunctionNamingCheck.h
@@ -232,20 +237,19 @@ include/clang-tidy/google/OverloadedUnaryAndCheck.h
 include/clang-tidy/google/TodoCommentCheck.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
 include/clang-tidy/linuxkernel/MustCheckErrsCheck.h
+include/clang-tidy/llvm/FormatvStringCheck.h
 include/clang-tidy/llvm/HeaderGuardCheck.h
 include/clang-tidy/llvm/IncludeOrderCheck.h
 include/clang-tidy/llvm/PreferIsaOrDynCastInConditionalsCheck.h
 include/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.h
 include/clang-tidy/llvm/PreferStaticOverAnonymousNamespaceCheck.h
+include/clang-tidy/llvm/RedundantCastingCheck.h
 include/clang-tidy/llvm/TwineLocalCheck.h
+include/clang-tidy/llvm/TypeSwitchCaseTypesCheck.h
 include/clang-tidy/llvm/UseNewMLIROpBuilderCheck.h
 include/clang-tidy/llvm/UseRangesCheck.h
+include/clang-tidy/llvm/UseVectorUtilsCheck.h
 include/clang-tidy/llvmlibc/CalleeNamespaceCheck.h
 include/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.h
 include/clang-tidy/llvmlibc/InlineFunctionDeclCheck.h
@@ -256,6 +260,7 @@ 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/ExplicitConstructorCheck.h
 include/clang-tidy/misc/HeaderIncludeCycleCheck.h
 include/clang-tidy/misc/IncludeCleanerCheck.h
 include/clang-tidy/misc/MisleadingBidirectionalCheck.h
@@ -270,6 +275,7 @@ include/clang-tidy/misc/OverrideWithDifferentVisibilityCheck.h
 include/clang-tidy/misc/PredictableRandCheck.h
 include/clang-tidy/misc/RedundantExpressionCheck.h
 include/clang-tidy/misc/StaticAssertCheck.h
+include/clang-tidy/misc/StaticInitializationCycleCheck.h
 include/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.h
 include/clang-tidy/misc/UnconventionalAssignOperatorCheck.h
 include/clang-tidy/misc/UniqueptrResetReleaseCheck.h
@@ -320,9 +326,12 @@ include/clang-tidy/modernize/UseOverrideCheck.h
 include/clang-tidy/modernize/UseRangesCheck.h
 include/clang-tidy/modernize/UseScopedLockCheck.h
 include/clang-tidy/modernize/UseStartsEndsWithCheck.h
+include/clang-tidy/modernize/UseStdBitCheck.h
 include/clang-tidy/modernize/UseStdFormatCheck.h
 include/clang-tidy/modernize/UseStdNumbersCheck.h
 include/clang-tidy/modernize/UseStdPrintCheck.h
+include/clang-tidy/modernize/UseStringViewCheck.h
+include/clang-tidy/modernize/UseStructuredBindingCheck.h
 include/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
 include/clang-tidy/modernize/UseTransparentFunctorsCheck.h
 include/clang-tidy/modernize/UseUncaughtExceptionsCheck.h
@@ -342,7 +351,6 @@ 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
 include/clang-tidy/performance/InefficientAlgorithmCheck.h
@@ -356,12 +364,16 @@ include/clang-tidy/performance/NoexceptDestructorCheck.h
 include/clang-tidy/performance/NoexceptFunctionBaseCheck.h
 include/clang-tidy/performance/NoexceptMoveConstructorCheck.h
 include/clang-tidy/performance/NoexceptSwapCheck.h
+include/clang-tidy/performance/PreferSingleCharOverloadsCheck.h
+include/clang-tidy/performance/StringViewConversionsCheck.h
 include/clang-tidy/performance/TriviallyDestructibleCheck.h
 include/clang-tidy/performance/TypePromotionInMathFnCheck.h
 include/clang-tidy/performance/UnnecessaryCopyInitializationCheck.h
 include/clang-tidy/performance/UnnecessaryValueParamCheck.h
+include/clang-tidy/performance/UseStdMoveCheck.h
 @pkgdir include/clang-tidy/plugin
 include/clang-tidy/portability/AvoidPragmaOnceCheck.h
+include/clang-tidy/portability/NoAssemblerCheck.h
 include/clang-tidy/portability/RestrictSystemIncludesCheck.h
 include/clang-tidy/portability/SIMDIntrinsicsCheck.h
 include/clang-tidy/portability/StdAllocatorConstCheck.h
@@ -405,9 +417,12 @@ 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/RedundantLambdaParameterListCheck.h
 include/clang-tidy/readability/RedundantMemberInitCheck.h
+include/clang-tidy/readability/RedundantNestedIfCheck.h
 include/clang-tidy/readability/RedundantParenthesesCheck.h
 include/clang-tidy/readability/RedundantPreprocessorCheck.h
+include/clang-tidy/readability/RedundantQualifiedAliasCheck.h
 include/clang-tidy/readability/RedundantSmartptrGetCheck.h
 include/clang-tidy/readability/RedundantStringCStrCheck.h
 include/clang-tidy/readability/RedundantStringInitCheck.h
@@ -419,6 +434,8 @@ include/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h
 include/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h
 include/clang-tidy/readability/StringCompareCheck.h
 include/clang-tidy/readability/SuspiciousCallArgumentCheck.h
+include/clang-tidy/readability/TrailingCommaCheck.h
+include/clang-tidy/readability/TrivialSwitchCheck.h
 include/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h
 include/clang-tidy/readability/UppercaseLiteralSuffixCheck.h
 include/clang-tidy/readability/UseAnyOfAllOfCheck.h
@@ -428,6 +445,7 @@ include/clang-tidy/tool/ClangTidyMain.h
 include/clang-tidy/utils/ASTUtils.h
 include/clang-tidy/utils/Aliasing.h
 include/clang-tidy/utils/BracesAroundStatement.h
+include/clang-tidy/utils/CheckUtils.h
 include/clang-tidy/utils/DeclRefExprUtils.h
 include/clang-tidy/utils/DesignatedInitializers.h
 include/clang-tidy/utils/ExceptionAnalyzer.h
@@ -448,6 +466,7 @@ include/clang-tidy/utils/TransformerClangTidyCheck.h
 include/clang-tidy/utils/TypeTraits.h
 include/clang-tidy/utils/UseRangesCheck.h
 include/clang-tidy/utils/UsingInserter.h
+lib/libClangdXPCLib.so.23.1
 lib/libclangApplyReplacements.a
 lib/libclangChangeNamespace.a
 lib/libclangDaemon.a
@@ -473,7 +492,6 @@ lib/libclangTidyCustomModule.a
 lib/libclangTidyDarwinModule.a
 lib/libclangTidyFuchsiaModule.a
 lib/libclangTidyGoogleModule.a
-lib/libclangTidyHICPPModule.a
 lib/libclangTidyLLVMLibcModule.a
 lib/libclangTidyLLVMModule.a
 lib/libclangTidyLinuxKernelModule.a
@@ -494,10 +512,12 @@ lib/libclangdRemoteIndex.a
 lib/libclangdSupport.a
 lib/libfindAllSymbols.a
 share/clang-doc/alias-template.mustache
+share/clang-doc/all-files-template.mustache
 share/clang-doc/clang-doc-default-stylesheet.css
 share/clang-doc/clang-doc-mustache.css
 share/clang-doc/class-template.mustache
 share/clang-doc/comment-template.mustache
+share/clang-doc/comments-partial.mustache
 share/clang-doc/enum-template.mustache
 share/clang-doc/function-template.mustache
 share/clang-doc/head-template.mustache
diff --git a/clang-tools-extra/distinfo b/clang-tools-extra/distinfo
index 4df067769d..fcfbc5dd97 100644
--- a/clang-tools-extra/distinfo
+++ b/clang-tools-extra/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
diff --git a/clang/PLIST b/clang/PLIST
index a302e27eaf..d8b75071f6 100644
--- a/clang/PLIST
+++ b/clang/PLIST
@@ -3,7 +3,7 @@ bin/amdgpu-arch
 bin/analyze-build
 bin/clang
 bin/clang++
-bin/clang-22
+bin/clang-23
 bin/clang-check
 bin/clang-cl
 bin/clang-cpp
@@ -16,6 +16,9 @@ bin/clang-offload-bundler
 bin/clang-refactor
 bin/clang-repl
 bin/clang-scan-deps
+bin/clang-ssaf-analyzer
+bin/clang-ssaf-format
+bin/clang-ssaf-linker
 bin/clang-sycl-linker
 bin/diagtool
 bin/git-clang-format
@@ -147,6 +150,7 @@ include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
 include/clang/AST/LocInfoType.h
 include/clang/AST/Mangle.h
 include/clang/AST/MangleNumberingContext.h
+include/clang/AST/MatrixUtils.h
 include/clang/AST/NSAPI.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/NestedNameSpecifierBase.h
@@ -182,6 +186,7 @@ include/clang/AST/StmtOpenACC.h
 include/clang/AST/StmtOpenMP.h
 include/clang/AST/StmtSYCL.h
 include/clang/AST/StmtVisitor.h
+include/clang/AST/SubobjectVisitor.h
 include/clang/AST/TemplateArgumentVisitor.h
 include/clang/AST/TemplateBase.h
 include/clang/AST/TemplateName.h
@@ -197,6 +202,7 @@ include/clang/AST/TypeVisitor.h
 include/clang/AST/UnresolvedSet.h
 include/clang/AST/VTTBuilder.h
 include/clang/AST/VTableBuilder.h
+include/clang/AST/pch.h
 include/clang/ASTMatchers/ASTMatchFinder.h
 include/clang/ASTMatchers/ASTMatchers.h
 include/clang/ASTMatchers/ASTMatchersInternal.h
@@ -221,6 +227,7 @@ include/clang/Analysis/Analyses/LifetimeSafety/LifetimeStats.h
 include/clang/Analysis/Analyses/LifetimeSafety/LiveOrigins.h
 include/clang/Analysis/Analyses/LifetimeSafety/LoanPropagation.h
 include/clang/Analysis/Analyses/LifetimeSafety/Loans.h
+include/clang/Analysis/Analyses/LifetimeSafety/MovedLoans.h
 include/clang/Analysis/Analyses/LifetimeSafety/Origins.h
 include/clang/Analysis/Analyses/LifetimeSafety/Utils.h
 include/clang/Analysis/Analyses/LiveVariables.h
@@ -237,9 +244,11 @@ include/clang/Analysis/Analyses/UninitializedValues.h
 include/clang/Analysis/Analyses/UnsafeBufferUsage.h
 include/clang/Analysis/Analyses/UnsafeBufferUsageGadgets.def
 include/clang/Analysis/AnalysisDeclContext.h
+include/clang/Analysis/AnnexKDetection.h
 include/clang/Analysis/AnyCall.h
 include/clang/Analysis/BodyFarm.h
 include/clang/Analysis/CFG.h
+include/clang/Analysis/CFGBackEdges.h
 include/clang/Analysis/CFGStmtMap.h
 include/clang/Analysis/CallGraph.h
 include/clang/Analysis/CloneDetection.h
@@ -284,16 +293,11 @@ include/clang/Analysis/MacroExpansionContext.h
 include/clang/Analysis/PathDiagnostic.h
 include/clang/Analysis/ProgramPoint.h
 include/clang/Analysis/RetainSummaryManager.h
-include/clang/Analysis/Scalable/ASTEntityMapping.h
-include/clang/Analysis/Scalable/Model/BuildNamespace.h
-include/clang/Analysis/Scalable/Model/EntityId.h
-include/clang/Analysis/Scalable/Model/EntityIdTable.h
-include/clang/Analysis/Scalable/Model/EntityName.h
-include/clang/Analysis/Scalable/Model/SummaryName.h
 include/clang/Analysis/SelectorExtras.h
 include/clang/Analysis/Support/BumpVector.h
 include/clang/Analysis/Support/FixitUtil.h
 include/clang/Basic/AArch64ACLETypes.def
+include/clang/Basic/AArch64CodeGenUtils.h
 include/clang/Basic/ABI.h
 include/clang/Basic/ABIVersions.def
 include/clang/Basic/AMDGPUTypes.def
@@ -301,6 +305,7 @@ include/clang/Basic/ASTSourceDescriptor.h
 include/clang/Basic/AddressSpaces.h
 include/clang/Basic/AlignedAllocation.h
 include/clang/Basic/AllDiagnostics.h
+include/clang/Basic/AtomicLineLogger.h
 include/clang/Basic/AttrHasAttributeImpl.inc
 include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
@@ -317,11 +322,12 @@ include/clang/Basic/BuiltinTemplates.inc
 include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/Builtins.inc
-include/clang/Basic/BuiltinsAArch64.def
+include/clang/Basic/BuiltinsAArch64.inc
 include/clang/Basic/BuiltinsAArch64NeonSVEBridge.def
 include/clang/Basic/BuiltinsAArch64NeonSVEBridge_cg.def
-include/clang/Basic/BuiltinsAMDGPU.def
+include/clang/Basic/BuiltinsAMDGPU.inc
 include/clang/Basic/BuiltinsARM.def
+include/clang/Basic/BuiltinsAVR.def
 include/clang/Basic/BuiltinsBPF.inc
 include/clang/Basic/BuiltinsDirectX.inc
 include/clang/Basic/BuiltinsHexagon.inc
@@ -336,13 +342,14 @@ include/clang/Basic/BuiltinsRISCV.inc
 include/clang/Basic/BuiltinsSPIRVCL.inc
 include/clang/Basic/BuiltinsSPIRVCommon.inc
 include/clang/Basic/BuiltinsSPIRVVK.inc
-include/clang/Basic/BuiltinsSystemZ.def
+include/clang/Basic/BuiltinsSystemZ.inc
 include/clang/Basic/BuiltinsVE.def
 include/clang/Basic/BuiltinsVEVL.gen.def
 include/clang/Basic/BuiltinsWebAssembly.def
 include/clang/Basic/BuiltinsX86.inc
 include/clang/Basic/BuiltinsX86_64.inc
 include/clang/Basic/BuiltinsXCore.def
+include/clang/Basic/BuiltinsZOS.inc
 include/clang/Basic/CFProtectionOptions.def
 include/clang/Basic/CFProtectionOptions.h
 include/clang/Basic/CLWarnings.h
@@ -429,6 +436,7 @@ include/clang/Basic/DiagnosticSerializationCompatIDs.inc
 include/clang/Basic/DiagnosticSerializationEnums.inc
 include/clang/Basic/DiagnosticSerializationInterface.inc
 include/clang/Basic/DiagnosticSerializationKinds.inc
+include/clang/Basic/DiagnosticStableIDs.inc
 include/clang/Basic/DiagnosticTrap.h
 include/clang/Basic/DiagnosticTrapCompatIDs.inc
 include/clang/Basic/DiagnosticTrapEnums.inc
@@ -442,7 +450,6 @@ include/clang/Basic/Features.def
 include/clang/Basic/FileEntry.h
 include/clang/Basic/FileManager.h
 include/clang/Basic/FileSystemOptions.h
-include/clang/Basic/FileSystemStatCache.h
 include/clang/Basic/HLSLIntangibleTypes.def
 include/clang/Basic/HLSLRuntime.h
 include/clang/Basic/HeaderInclude.h
@@ -473,6 +480,7 @@ include/clang/Basic/OpenMPKinds.h
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/OperatorPrecedence.h
+include/clang/Basic/OptionalUnsigned.h
 include/clang/Basic/PPCTypes.def
 include/clang/Basic/ParsedAttrInfo.h
 include/clang/Basic/PartialDiagnostic.h
@@ -509,7 +517,6 @@ include/clang/Basic/TokenKinds.def
 include/clang/Basic/TokenKinds.h
 include/clang/Basic/TransformTypeTraits.def
 include/clang/Basic/TypeTraits.h
-include/clang/Basic/UnsignedOrNone.h
 include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
 include/clang/Basic/Visibility.h
@@ -558,8 +565,12 @@ include/clang/CIR/Dialect/IR/CIRTypes.h
 include/clang/CIR/Dialect/IR/CIRTypesDetails.h
 include/clang/CIR/Dialect/OpenACC/CIROpenACCTypeInterfaces.h
 include/clang/CIR/Dialect/OpenACC/RegisterOpenACCExtensions.h
+include/clang/CIR/Dialect/OpenMP/RegisterOpenMPExtensions.h
 include/clang/CIR/Dialect/Passes.h
+include/clang/CIR/Dialect/Transforms/CIRTransformUtils.h
 include/clang/CIR/FrontendAction/CIRGenAction.h
+include/clang/CIR/InitAllDialects.h
+include/clang/CIR/Interfaces/ASTAttrInterfaces.h
 include/clang/CIR/Interfaces/CIRLoopOpInterface.h
 include/clang/CIR/Interfaces/CIROpInterfaces.h
 include/clang/CIR/Interfaces/CIRTypeInterfaces.h
@@ -575,11 +586,15 @@ include/clang/CodeGen/CodeGenAction.h
 include/clang/CodeGen/ConstantInitBuilder.h
 include/clang/CodeGen/ConstantInitFuture.h
 include/clang/CodeGen/ModuleBuilder.h
+include/clang/CodeGen/ModuleLinker.h
 include/clang/CodeGen/ObjectFilePCHContainerWriter.h
 include/clang/CodeGen/SwiftCallingConv.h
 include/clang/Config/config.h
 include/clang/CrossTU/CrossTUDiagnostic.h
 include/clang/CrossTU/CrossTranslationUnit.h
+include/clang/DependencyScanning/DependencyActionController.h
+include/clang/DependencyScanning/DependencyConsumer.h
+include/clang/DependencyScanning/DependencyGraph.h
 include/clang/DependencyScanning/DependencyScannerImpl.h
 include/clang/DependencyScanning/DependencyScanningFilesystem.h
 include/clang/DependencyScanning/DependencyScanningService.h
@@ -600,6 +615,7 @@ include/clang/Driver/DriverDiagnostic.h
 include/clang/Driver/InputInfo.h
 include/clang/Driver/Job.h
 include/clang/Driver/LazyDetector.h
+include/clang/Driver/ModulesDriver.h
 include/clang/Driver/Multilib.h
 include/clang/Driver/MultilibBuilder.h
 include/clang/Driver/OffloadBundler.h
@@ -650,6 +666,7 @@ include/clang/Frontend/PrecompiledPreamble.h
 include/clang/Frontend/PreprocessorOutputOptions.h
 include/clang/Frontend/SARIFDiagnostic.h
 include/clang/Frontend/SARIFDiagnosticPrinter.h
+include/clang/Frontend/SSAFOptions.h
 include/clang/Frontend/SerializedDiagnosticPrinter.h
 include/clang/Frontend/SerializedDiagnosticReader.h
 include/clang/Frontend/SerializedDiagnostics.h
@@ -666,7 +683,6 @@ include/clang/Index/IndexDataConsumer.h
 include/clang/Index/IndexSymbol.h
 include/clang/Index/IndexingAction.h
 include/clang/Index/IndexingOptions.h
-include/clang/Index/USRGeneration.h
 include/clang/IndexSerialization/SerializablePathCollection.h
 include/clang/InstallAPI/Context.h
 include/clang/InstallAPI/DirectoryScanner.h
@@ -698,6 +714,7 @@ include/clang/Lex/LexHLSLRootSignature.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
 include/clang/Lex/MacroArgs.h
+include/clang/Lex/MacroBase.h
 include/clang/Lex/MacroInfo.h
 include/clang/Lex/ModuleLoader.h
 include/clang/Lex/ModuleMap.h
@@ -714,6 +731,7 @@ include/clang/Lex/Preprocessor.h
 include/clang/Lex/PreprocessorLexer.h
 include/clang/Lex/PreprocessorOptions.h
 include/clang/Lex/ScratchBuffer.h
+include/clang/Lex/TextEncoding.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
 include/clang/Lex/TokenLexer.h
@@ -735,6 +753,67 @@ include/clang/Rewrite/Frontend/ASTConsumers.h
 include/clang/Rewrite/Frontend/FixItRewriter.h
 include/clang/Rewrite/Frontend/FrontendActions.h
 include/clang/Rewrite/Frontend/Rewriters.h
+include/clang/ScalableStaticAnalysis/Analyses/CallGraph/CallGraphSummary.h
+include/clang/ScalableStaticAnalysis/Analyses/EntityPointerLevel/EntityPointerLevel.h
+include/clang/ScalableStaticAnalysis/Analyses/EntityPointerLevel/EntityPointerLevelFormat.h
+include/clang/ScalableStaticAnalysis/Analyses/PointerFlow/PointerFlow.h
+include/clang/ScalableStaticAnalysis/Analyses/PointerFlow/PointerFlowAnalysis.h
+include/clang/ScalableStaticAnalysis/Analyses/PointerFlow/PointerFlowFormat.h
+include/clang/ScalableStaticAnalysis/Analyses/TypeConstrainedPointers/TypeConstrainedPointers.h
+include/clang/ScalableStaticAnalysis/Analyses/UnsafeBufferUsage/UnsafeBufferUsage.h
+include/clang/ScalableStaticAnalysis/Analyses/UnsafeBufferUsage/UnsafeBufferUsageAnalysis.h
+include/clang/ScalableStaticAnalysis/BuiltinAnchorSources.def
+include/clang/ScalableStaticAnalysis/Core/ASTEntityMapping.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/EntityLinker.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/EntitySummaryEncoding.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/LUSummary.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/LUSummaryEncoding.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/MultiArchSharedLibrary.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/MultiArchStaticLibrary.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/StaticLibrary.h
+include/clang/ScalableStaticAnalysis/Core/EntityLinker/TUSummaryEncoding.h
+include/clang/ScalableStaticAnalysis/Core/Model/BuildNamespace.h
+include/clang/ScalableStaticAnalysis/Core/Model/EntityId.h
+include/clang/ScalableStaticAnalysis/Core/Model/EntityIdTable.h
+include/clang/ScalableStaticAnalysis/Core/Model/EntityLinkage.h
+include/clang/ScalableStaticAnalysis/Core/Model/EntityName.h
+include/clang/ScalableStaticAnalysis/Core/Model/PrivateFieldNames.def
+include/clang/ScalableStaticAnalysis/Core/Model/SummaryName.h
+include/clang/ScalableStaticAnalysis/Core/Serialization/JSONFormat.h
+include/clang/ScalableStaticAnalysis/Core/Serialization/SerializationFormat.h
+include/clang/ScalableStaticAnalysis/Core/Serialization/SerializationFormatRegistry.h
+include/clang/ScalableStaticAnalysis/Core/SummaryData/LUSummaryConsumer.h
+include/clang/ScalableStaticAnalysis/Core/SummaryData/SummaryData.h
+include/clang/ScalableStaticAnalysis/Core/SummaryData/SummaryDataBuilder.h
+include/clang/ScalableStaticAnalysis/Core/SummaryData/SummaryDataBuilderRegistry.h
+include/clang/ScalableStaticAnalysis/Core/SummaryData/SummaryDataStore.h
+include/clang/ScalableStaticAnalysis/Core/SummaryData/SummaryDataTraits.h
+include/clang/ScalableStaticAnalysis/Core/Support/ErrorBuilder.h
+include/clang/ScalableStaticAnalysis/Core/Support/FormatProviders.h
+include/clang/ScalableStaticAnalysis/Core/TUSummary/EntitySummary.h
+include/clang/ScalableStaticAnalysis/Core/TUSummary/ExtractorRegistry.h
+include/clang/ScalableStaticAnalysis/Core/TUSummary/TUSummary.h
+include/clang/ScalableStaticAnalysis/Core/TUSummary/TUSummaryBuilder.h
+include/clang/ScalableStaticAnalysis/Core/TUSummary/TUSummaryExtractor.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/AnalysisBase.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/AnalysisDriver.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/AnalysisName.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/AnalysisRegistry.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/AnalysisResult.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/AnalysisTraits.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/DerivedAnalysis.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/SummaryAnalysis.h
+include/clang/ScalableStaticAnalysis/Core/WholeProgramAnalysis/WPASuite.h
+include/clang/ScalableStaticAnalysis/Frontend/TUSummaryExtractorFrontendAction.h
+include/clang/ScalableStaticAnalysis/SSAFBuiltinForceLinker.h
+include/clang/ScalableStaticAnalysis/SSAFForceLinker.h
+include/clang/ScalableStaticAnalysis/SourceTransformation/SARIFTransformationReportFormat.h
+include/clang/ScalableStaticAnalysis/SourceTransformation/SourceEditEmitter.h
+include/clang/ScalableStaticAnalysis/SourceTransformation/Transformation.h
+include/clang/ScalableStaticAnalysis/SourceTransformation/TransformationRegistry.h
+include/clang/ScalableStaticAnalysis/SourceTransformation/TransformationReportEmitter.h
+include/clang/ScalableStaticAnalysis/SourceTransformation/YAMLSourceEditFormat.h
+include/clang/ScalableStaticAnalysis/Tool/Utils.h
 include/clang/Sema/AnalysisBasedWarnings.h
 include/clang/Sema/Attr.h
 include/clang/Sema/AttrIsTypeDependent.inc
@@ -962,292 +1041,312 @@ include/clang/Tooling/Transformer/SourceCode.h
 include/clang/Tooling/Transformer/SourceCodeBuilders.h
 include/clang/Tooling/Transformer/Stencil.h
 include/clang/Tooling/Transformer/Transformer.h
-lib/clang/22/include/__clang_cuda_builtin_vars.h
-lib/clang/22/include/__clang_cuda_cmath.h
-lib/clang/22/include/__clang_cuda_complex_builtins.h
-lib/clang/22/include/__clang_cuda_device_functions.h
-lib/clang/22/include/__clang_cuda_intrinsics.h
-lib/clang/22/include/__clang_cuda_libdevice_declares.h
-lib/clang/22/include/__clang_cuda_math.h
-lib/clang/22/include/__clang_cuda_math_forward_declares.h
-lib/clang/22/include/__clang_cuda_runtime_wrapper.h
-lib/clang/22/include/__clang_cuda_texture_intrinsics.h
-lib/clang/22/include/__clang_hip_cmath.h
-lib/clang/22/include/__clang_hip_libdevice_declares.h
-lib/clang/22/include/__clang_hip_math.h
-lib/clang/22/include/__clang_hip_runtime_wrapper.h
-lib/clang/22/include/__clang_hip_stdlib.h
-lib/clang/22/include/__clang_spirv_builtins.h
-lib/clang/22/include/__float_float.h
-lib/clang/22/include/__float_header_macro.h
-lib/clang/22/include/__float_infinity_nan.h
-lib/clang/22/include/__stdarg___gnuc_va_list.h
-lib/clang/22/include/__stdarg___va_copy.h
-lib/clang/22/include/__stdarg_header_macro.h
-lib/clang/22/include/__stdarg_va_arg.h
-lib/clang/22/include/__stdarg_va_copy.h
-lib/clang/22/include/__stdarg_va_list.h
-lib/clang/22/include/__stddef_header_macro.h
-lib/clang/22/include/__stddef_max_align_t.h
-lib/clang/22/include/__stddef_null.h
-lib/clang/22/include/__stddef_nullptr_t.h
-lib/clang/22/include/__stddef_offsetof.h
-lib/clang/22/include/__stddef_ptrdiff_t.h
-lib/clang/22/include/__stddef_rsize_t.h
-lib/clang/22/include/__stddef_size_t.h
-lib/clang/22/include/__stddef_unreachable.h
-lib/clang/22/include/__stddef_wchar_t.h
-lib/clang/22/include/__stddef_wint_t.h
-lib/clang/22/include/__wmmintrin_aes.h
-lib/clang/22/include/__wmmintrin_pclmul.h
-lib/clang/22/include/adcintrin.h
-lib/clang/22/include/adxintrin.h
-lib/clang/22/include/altivec.h
-lib/clang/22/include/amdgpuintrin.h
-lib/clang/22/include/ammintrin.h
-lib/clang/22/include/amo.h
-lib/clang/22/include/amxavx512intrin.h
-lib/clang/22/include/amxcomplexintrin.h
-lib/clang/22/include/amxfp16intrin.h
-lib/clang/22/include/amxfp8intrin.h
-lib/clang/22/include/amxintrin.h
-lib/clang/22/include/amxmovrsintrin.h
-lib/clang/22/include/amxtf32intrin.h
-lib/clang/22/include/andes_vector.h
-lib/clang/22/include/arm64intr.h
-lib/clang/22/include/arm_acle.h
-${PLIST.ARM}lib/clang/22/include/arm_bf16.h
-${PLIST.ARM}lib/clang/22/include/arm_cde.h
-lib/clang/22/include/arm_cmse.h
-${PLIST.ARM}lib/clang/22/include/arm_fp16.h
-${PLIST.ARM}lib/clang/22/include/arm_mve.h
-${PLIST.ARM}lib/clang/22/include/arm_neon.h
-lib/clang/22/include/arm_neon_sve_bridge.h
-${PLIST.ARM}lib/clang/22/include/arm_sme.h
-${PLIST.ARM}lib/clang/22/include/arm_sve.h
-${PLIST.ARM}lib/clang/22/include/arm_vector_types.h
-lib/clang/22/include/armintr.h
-lib/clang/22/include/avx10_2_512bf16intrin.h
-lib/clang/22/include/avx10_2_512convertintrin.h
-lib/clang/22/include/avx10_2_512minmaxintrin.h
-lib/clang/22/include/avx10_2_512niintrin.h
-lib/clang/22/include/avx10_2_512satcvtdsintrin.h
-lib/clang/22/include/avx10_2_512satcvtintrin.h
-lib/clang/22/include/avx10_2bf16intrin.h
-lib/clang/22/include/avx10_2convertintrin.h
-lib/clang/22/include/avx10_2copyintrin.h
-lib/clang/22/include/avx10_2minmaxintrin.h
-lib/clang/22/include/avx10_2niintrin.h
-lib/clang/22/include/avx10_2satcvtdsintrin.h
-lib/clang/22/include/avx10_2satcvtintrin.h
-lib/clang/22/include/avx2intrin.h
-lib/clang/22/include/avx512bf16intrin.h
-lib/clang/22/include/avx512bitalgintrin.h
-lib/clang/22/include/avx512bwintrin.h
-lib/clang/22/include/avx512cdintrin.h
-lib/clang/22/include/avx512dqintrin.h
-lib/clang/22/include/avx512fintrin.h
-lib/clang/22/include/avx512fp16intrin.h
-lib/clang/22/include/avx512ifmaintrin.h
-lib/clang/22/include/avx512ifmavlintrin.h
-lib/clang/22/include/avx512vbmi2intrin.h
-lib/clang/22/include/avx512vbmiintrin.h
-lib/clang/22/include/avx512vbmivlintrin.h
-lib/clang/22/include/avx512vlbf16intrin.h
-lib/clang/22/include/avx512vlbitalgintrin.h
-lib/clang/22/include/avx512vlbwintrin.h
-lib/clang/22/include/avx512vlcdintrin.h
-lib/clang/22/include/avx512vldqintrin.h
-lib/clang/22/include/avx512vlfp16intrin.h
-lib/clang/22/include/avx512vlintrin.h
-lib/clang/22/include/avx512vlvbmi2intrin.h
-lib/clang/22/include/avx512vlvnniintrin.h
-lib/clang/22/include/avx512vlvp2intersectintrin.h
-lib/clang/22/include/avx512vnniintrin.h
-lib/clang/22/include/avx512vp2intersectintrin.h
-lib/clang/22/include/avx512vpopcntdqintrin.h
-lib/clang/22/include/avx512vpopcntdqvlintrin.h
-lib/clang/22/include/avxifmaintrin.h
-lib/clang/22/include/avxintrin.h
-lib/clang/22/include/avxneconvertintrin.h
-lib/clang/22/include/avxvnniint16intrin.h
-lib/clang/22/include/avxvnniint8intrin.h
-lib/clang/22/include/avxvnniintrin.h
-lib/clang/22/include/bmi2intrin.h
-lib/clang/22/include/bmiintrin.h
-lib/clang/22/include/builtins.h
-lib/clang/22/include/cet.h
-lib/clang/22/include/cetintrin.h
-lib/clang/22/include/cldemoteintrin.h
-lib/clang/22/include/clflushoptintrin.h
-lib/clang/22/include/clwbintrin.h
-lib/clang/22/include/clzerointrin.h
-lib/clang/22/include/cmpccxaddintrin.h
-lib/clang/22/include/cpuid.h
-lib/clang/22/include/crc32intrin.h
-lib/clang/22/include/cuda_wrappers/__utility/declval.h
-lib/clang/22/include/cuda_wrappers/algorithm
-lib/clang/22/include/cuda_wrappers/bits/basic_string.h
-lib/clang/22/include/cuda_wrappers/bits/basic_string.tcc
-lib/clang/22/include/cuda_wrappers/bits/c++config.h
-lib/clang/22/include/cuda_wrappers/bits/shared_ptr_base.h
-lib/clang/22/include/cuda_wrappers/cmath
-lib/clang/22/include/cuda_wrappers/complex
-lib/clang/22/include/cuda_wrappers/new
-lib/clang/22/include/emmintrin.h
-lib/clang/22/include/enqcmdintrin.h
-lib/clang/22/include/f16cintrin.h
-lib/clang/22/include/float.h
-lib/clang/22/include/fma4intrin.h
-lib/clang/22/include/fmaintrin.h
-lib/clang/22/include/fxsrintrin.h
-lib/clang/22/include/gfniintrin.h
-lib/clang/22/include/gpuintrin.h
-lib/clang/22/include/hexagon_circ_brev_intrinsics.h
-lib/clang/22/include/hexagon_protos.h
-lib/clang/22/include/hexagon_types.h
-lib/clang/22/include/hresetintrin.h
-lib/clang/22/include/htmintrin.h
-lib/clang/22/include/htmxlintrin.h
-lib/clang/22/include/hvx_hexagon_protos.h
-lib/clang/22/include/ia32intrin.h
-lib/clang/22/include/immintrin.h
-lib/clang/22/include/intrin.h
-lib/clang/22/include/intrin0.h
-lib/clang/22/include/inttypes.h
-lib/clang/22/include/invpcidintrin.h
-lib/clang/22/include/iso646.h
-lib/clang/22/include/keylockerintrin.h
-lib/clang/22/include/larchintrin.h
-lib/clang/22/include/lasxintrin.h
-lib/clang/22/include/limits.h
-lib/clang/22/include/llvm_libc_wrappers/assert.h
-lib/clang/22/include/llvm_libc_wrappers/ctype.h
-lib/clang/22/include/llvm_libc_wrappers/inttypes.h
-lib/clang/22/include/llvm_libc_wrappers/stdio.h
-lib/clang/22/include/llvm_libc_wrappers/stdlib.h
-lib/clang/22/include/llvm_libc_wrappers/string.h
-lib/clang/22/include/llvm_libc_wrappers/time.h
-lib/clang/22/include/llvm_offload_wrappers/__llvm_offload.h
-lib/clang/22/include/llvm_offload_wrappers/__llvm_offload_device.h
-lib/clang/22/include/llvm_offload_wrappers/__llvm_offload_host.h
-lib/clang/22/include/lsxintrin.h
-lib/clang/22/include/lwpintrin.h
-lib/clang/22/include/lzcntintrin.h
-lib/clang/22/include/mm3dnow.h
-lib/clang/22/include/mm_malloc.h
-lib/clang/22/include/mmintrin.h
-lib/clang/22/include/module.modulemap
-lib/clang/22/include/movdirintrin.h
-lib/clang/22/include/movrs_avx10_2_512intrin.h
-lib/clang/22/include/movrs_avx10_2intrin.h
-lib/clang/22/include/movrsintrin.h
-lib/clang/22/include/msa.h
-lib/clang/22/include/mwaitxintrin.h
-lib/clang/22/include/nmmintrin.h
-lib/clang/22/include/nvptxintrin.h
-lib/clang/22/include/opencl-c-base.h
-lib/clang/22/include/opencl-c.h
-lib/clang/22/include/openmp_wrappers/__clang_openmp_device_functions.h
-lib/clang/22/include/openmp_wrappers/cmath
-lib/clang/22/include/openmp_wrappers/complex
-lib/clang/22/include/openmp_wrappers/complex.h
-lib/clang/22/include/openmp_wrappers/complex_cmath.h
-lib/clang/22/include/openmp_wrappers/math.h
-lib/clang/22/include/openmp_wrappers/new
-lib/clang/22/include/pconfigintrin.h
-lib/clang/22/include/pkuintrin.h
-lib/clang/22/include/pmmintrin.h
-lib/clang/22/include/popcntintrin.h
-lib/clang/22/include/ppc_wrappers/bmi2intrin.h
-lib/clang/22/include/ppc_wrappers/bmiintrin.h
-lib/clang/22/include/ppc_wrappers/emmintrin.h
-lib/clang/22/include/ppc_wrappers/immintrin.h
-lib/clang/22/include/ppc_wrappers/mm_malloc.h
-lib/clang/22/include/ppc_wrappers/mmintrin.h
-lib/clang/22/include/ppc_wrappers/nmmintrin.h
-lib/clang/22/include/ppc_wrappers/pmmintrin.h
-lib/clang/22/include/ppc_wrappers/smmintrin.h
-lib/clang/22/include/ppc_wrappers/tmmintrin.h
-lib/clang/22/include/ppc_wrappers/x86gprintrin.h
-lib/clang/22/include/ppc_wrappers/x86intrin.h
-lib/clang/22/include/ppc_wrappers/xmmintrin.h
-lib/clang/22/include/prfchiintrin.h
-lib/clang/22/include/prfchwintrin.h
-lib/clang/22/include/ptrauth.h
-lib/clang/22/include/ptwriteintrin.h
-lib/clang/22/include/raointintrin.h
-lib/clang/22/include/rdpruintrin.h
-lib/clang/22/include/rdseedintrin.h
-lib/clang/22/include/riscv_bitmanip.h
-lib/clang/22/include/riscv_corev_alu.h
-lib/clang/22/include/riscv_crypto.h
-lib/clang/22/include/riscv_mips.h
-lib/clang/22/include/riscv_nds.h
-lib/clang/22/include/riscv_ntlh.h
-${PLIST.RISCV}lib/clang/22/include/riscv_vector.h
-lib/clang/22/include/rtmintrin.h
-lib/clang/22/include/s390intrin.h
-lib/clang/22/include/serializeintrin.h
-lib/clang/22/include/sgxintrin.h
-lib/clang/22/include/sha512intrin.h
-lib/clang/22/include/shaintrin.h
-lib/clang/22/include/sifive_vector.h
-lib/clang/22/include/sm3intrin.h
-lib/clang/22/include/sm4evexintrin.h
-lib/clang/22/include/sm4intrin.h
-lib/clang/22/include/smmintrin.h
-lib/clang/22/include/spirvintrin.h
-lib/clang/22/include/stdalign.h
-lib/clang/22/include/stdarg.h
-lib/clang/22/include/stdatomic.h
-lib/clang/22/include/stdbool.h
-lib/clang/22/include/stdckdint.h
-lib/clang/22/include/stdcountof.h
-lib/clang/22/include/stddef.h
-lib/clang/22/include/stddefer.h
-lib/clang/22/include/stdint.h
-lib/clang/22/include/stdnoreturn.h
-lib/clang/22/include/tbmintrin.h
-lib/clang/22/include/tgmath.h
-lib/clang/22/include/tmmintrin.h
-lib/clang/22/include/tsxldtrkintrin.h
-lib/clang/22/include/uintrintrin.h
-lib/clang/22/include/unwind.h
-lib/clang/22/include/usermsrintrin.h
-lib/clang/22/include/vadefs.h
-lib/clang/22/include/vaesintrin.h
-lib/clang/22/include/varargs.h
-lib/clang/22/include/vecintrin.h
-lib/clang/22/include/velintrin.h
-lib/clang/22/include/velintrin_approx.h
-lib/clang/22/include/velintrin_gen.h
-lib/clang/22/include/vpclmulqdqintrin.h
-lib/clang/22/include/waitpkgintrin.h
-lib/clang/22/include/wasm_simd128.h
-lib/clang/22/include/wbnoinvdintrin.h
-lib/clang/22/include/wmmintrin.h
-lib/clang/22/include/x86gprintrin.h
-lib/clang/22/include/x86intrin.h
-lib/clang/22/include/xmmintrin.h
-lib/clang/22/include/xopintrin.h
-lib/clang/22/include/xsavecintrin.h
-lib/clang/22/include/xsaveintrin.h
-lib/clang/22/include/xsaveoptintrin.h
-lib/clang/22/include/xsavesintrin.h
-lib/clang/22/include/xtestintrin.h
-lib/clang/22/include/yvals_core.h
-lib/clang/22/include/zos_wrappers/builtins.h
+include/clang/UnifiedSymbolResolution/USRGeneration.h
+lib/clang/23/include/__clang_cuda_builtin_vars.h
+lib/clang/23/include/__clang_cuda_cmath.h
+lib/clang/23/include/__clang_cuda_complex_builtins.h
+lib/clang/23/include/__clang_cuda_device_functions.h
+lib/clang/23/include/__clang_cuda_intrinsics.h
+lib/clang/23/include/__clang_cuda_libdevice_declares.h
+lib/clang/23/include/__clang_cuda_math.h
+lib/clang/23/include/__clang_cuda_math_forward_declares.h
+lib/clang/23/include/__clang_cuda_runtime_wrapper.h
+lib/clang/23/include/__clang_cuda_texture_intrinsics.h
+lib/clang/23/include/__clang_gpu_builtin_vars.h
+lib/clang/23/include/__clang_gpu_device_functions.h
+lib/clang/23/include/__clang_gpu_intrinsics.h
+lib/clang/23/include/__clang_hip_cmath.h
+lib/clang/23/include/__clang_hip_libdevice_declares.h
+lib/clang/23/include/__clang_hip_math.h
+lib/clang/23/include/__clang_hip_runtime_wrapper.h
+lib/clang/23/include/__clang_hip_stdlib.h
+lib/clang/23/include/__clang_spirv_builtins.h
+lib/clang/23/include/__clang_spirv_libdevice_declares.h
+lib/clang/23/include/__clang_spirv_math.h
+lib/clang/23/include/__float_float.h
+lib/clang/23/include/__float_header_macro.h
+lib/clang/23/include/__float_infinity_nan.h
+lib/clang/23/include/__stdarg___gnuc_va_list.h
+lib/clang/23/include/__stdarg___va_copy.h
+lib/clang/23/include/__stdarg_header_macro.h
+lib/clang/23/include/__stdarg_va_arg.h
+lib/clang/23/include/__stdarg_va_copy.h
+lib/clang/23/include/__stdarg_va_list.h
+lib/clang/23/include/__stddef_header_macro.h
+lib/clang/23/include/__stddef_max_align_t.h
+lib/clang/23/include/__stddef_null.h
+lib/clang/23/include/__stddef_nullptr_t.h
+lib/clang/23/include/__stddef_offsetof.h
+lib/clang/23/include/__stddef_ptrdiff_t.h
+lib/clang/23/include/__stddef_rsize_t.h
+lib/clang/23/include/__stddef_size_t.h
+lib/clang/23/include/__stddef_unreachable.h
+lib/clang/23/include/__stddef_wchar_t.h
+lib/clang/23/include/__stddef_wint_t.h
+lib/clang/23/include/__wmmintrin_aes.h
+lib/clang/23/include/__wmmintrin_pclmul.h
+lib/clang/23/include/adcintrin.h
+lib/clang/23/include/adxintrin.h
+lib/clang/23/include/altivec.h
+lib/clang/23/include/amdgpuintrin.h
+lib/clang/23/include/amdhsa_abi.h
+lib/clang/23/include/ammintrin.h
+lib/clang/23/include/amo.h
+lib/clang/23/include/amxavx512intrin.h
+lib/clang/23/include/amxcomplexintrin.h
+lib/clang/23/include/amxfp16intrin.h
+lib/clang/23/include/amxfp8intrin.h
+lib/clang/23/include/amxintrin.h
+lib/clang/23/include/amxmovrsintrin.h
+lib/clang/23/include/andes_vector.h
+lib/clang/23/include/arm64_neon.h
+lib/clang/23/include/arm64intr.h
+lib/clang/23/include/arm_acle.h
+lib/clang/23/include/arm_bf16.h
+lib/clang/23/include/arm_cde.h
+lib/clang/23/include/arm_cmse.h
+lib/clang/23/include/arm_fp16.h
+lib/clang/23/include/arm_mve.h
+lib/clang/23/include/arm_neon.h
+lib/clang/23/include/arm_neon_sve_bridge.h
+lib/clang/23/include/arm_sme.h
+lib/clang/23/include/arm_sve.h
+lib/clang/23/include/arm_vector_types.h
+lib/clang/23/include/armintr.h
+lib/clang/23/include/avx10_2_512bf16intrin.h
+lib/clang/23/include/avx10_2_512convertintrin.h
+lib/clang/23/include/avx10_2_512minmaxintrin.h
+lib/clang/23/include/avx10_2_512niintrin.h
+lib/clang/23/include/avx10_2_512satcvtdsintrin.h
+lib/clang/23/include/avx10_2_512satcvtintrin.h
+lib/clang/23/include/avx10_2bf16intrin.h
+lib/clang/23/include/avx10_2convertintrin.h
+lib/clang/23/include/avx10_2copyintrin.h
+lib/clang/23/include/avx10_2minmaxintrin.h
+lib/clang/23/include/avx10_2niintrin.h
+lib/clang/23/include/avx10_2satcvtdsintrin.h
+lib/clang/23/include/avx10_2satcvtintrin.h
+lib/clang/23/include/avx2intrin.h
+lib/clang/23/include/avx512bf16intrin.h
+lib/clang/23/include/avx512bitalgintrin.h
+lib/clang/23/include/avx512bmmintrin.h
+lib/clang/23/include/avx512bmmvlintrin.h
+lib/clang/23/include/avx512bwintrin.h
+lib/clang/23/include/avx512cdintrin.h
+lib/clang/23/include/avx512dqintrin.h
+lib/clang/23/include/avx512fintrin.h
+lib/clang/23/include/avx512fp16intrin.h
+lib/clang/23/include/avx512ifmaintrin.h
+lib/clang/23/include/avx512ifmavlintrin.h
+lib/clang/23/include/avx512vbmi2intrin.h
+lib/clang/23/include/avx512vbmiintrin.h
+lib/clang/23/include/avx512vbmivlintrin.h
+lib/clang/23/include/avx512vlbf16intrin.h
+lib/clang/23/include/avx512vlbitalgintrin.h
+lib/clang/23/include/avx512vlbwintrin.h
+lib/clang/23/include/avx512vlcdintrin.h
+lib/clang/23/include/avx512vldqintrin.h
+lib/clang/23/include/avx512vlfp16intrin.h
+lib/clang/23/include/avx512vlintrin.h
+lib/clang/23/include/avx512vlvbmi2intrin.h
+lib/clang/23/include/avx512vlvnniintrin.h
+lib/clang/23/include/avx512vlvp2intersectintrin.h
+lib/clang/23/include/avx512vnniintrin.h
+lib/clang/23/include/avx512vp2intersectintrin.h
+lib/clang/23/include/avx512vpopcntdqintrin.h
+lib/clang/23/include/avx512vpopcntdqvlintrin.h
+lib/clang/23/include/avxifmaintrin.h
+lib/clang/23/include/avxintrin.h
+lib/clang/23/include/avxneconvertintrin.h
+lib/clang/23/include/avxvnniint16intrin.h
+lib/clang/23/include/avxvnniint8intrin.h
+lib/clang/23/include/avxvnniintrin.h
+lib/clang/23/include/bmi2intrin.h
+lib/clang/23/include/bmiintrin.h
+lib/clang/23/include/builtins.h
+lib/clang/23/include/cet.h
+lib/clang/23/include/cetintrin.h
+lib/clang/23/include/cldemoteintrin.h
+lib/clang/23/include/clflushoptintrin.h
+lib/clang/23/include/clwbintrin.h
+lib/clang/23/include/clzerointrin.h
+lib/clang/23/include/cmpccxaddintrin.h
+lib/clang/23/include/cpuid.h
+lib/clang/23/include/crc32intrin.h
+lib/clang/23/include/cuda_wrappers/__utility/declval.h
+lib/clang/23/include/cuda_wrappers/algorithm
+lib/clang/23/include/cuda_wrappers/bits/basic_string.h
+lib/clang/23/include/cuda_wrappers/bits/basic_string.tcc
+lib/clang/23/include/cuda_wrappers/bits/c++config.h
+lib/clang/23/include/cuda_wrappers/bits/shared_ptr_base.h
+lib/clang/23/include/cuda_wrappers/cmath
+lib/clang/23/include/cuda_wrappers/complex
+lib/clang/23/include/cuda_wrappers/new
+lib/clang/23/include/emmintrin.h
+lib/clang/23/include/endian.h
+lib/clang/23/include/enqcmdintrin.h
+lib/clang/23/include/f16cintrin.h
+lib/clang/23/include/float.h
+lib/clang/23/include/fma4intrin.h
+lib/clang/23/include/fmaintrin.h
+lib/clang/23/include/fxsrintrin.h
+lib/clang/23/include/gfniintrin.h
+lib/clang/23/include/gpuintrin.h
+lib/clang/23/include/hexagon_circ_brev_intrinsics.h
+lib/clang/23/include/hexagon_protos.h
+lib/clang/23/include/hexagon_types.h
+lib/clang/23/include/hlsl_alias_intrinsics_gen.inc
+lib/clang/23/include/hlsl_inline_intrinsics_gen.inc
+lib/clang/23/include/hresetintrin.h
+lib/clang/23/include/htmintrin.h
+lib/clang/23/include/htmxlintrin.h
+lib/clang/23/include/hvx_hexagon_protos.h
+lib/clang/23/include/ia32intrin.h
+lib/clang/23/include/immintrin.h
+lib/clang/23/include/intrin.h
+lib/clang/23/include/intrin0.h
+lib/clang/23/include/inttypes.h
+lib/clang/23/include/invpcidintrin.h
+lib/clang/23/include/iso646.h
+lib/clang/23/include/keylockerintrin.h
+lib/clang/23/include/larchintrin.h
+lib/clang/23/include/lasxintrin.h
+lib/clang/23/include/limits.h
+lib/clang/23/include/llvm_libc_wrappers/assert.h
+lib/clang/23/include/llvm_libc_wrappers/ctype.h
+lib/clang/23/include/llvm_libc_wrappers/inttypes.h
+lib/clang/23/include/llvm_libc_wrappers/stdio.h
+lib/clang/23/include/llvm_libc_wrappers/stdlib.h
+lib/clang/23/include/llvm_libc_wrappers/string.h
+lib/clang/23/include/llvm_libc_wrappers/time.h
+lib/clang/23/include/llvm_offload_wrappers/__llvm_offload.h
+lib/clang/23/include/llvm_offload_wrappers/__llvm_offload_device.h
+lib/clang/23/include/llvm_offload_wrappers/__llvm_offload_host.h
+lib/clang/23/include/lsxintrin.h
+lib/clang/23/include/lwpintrin.h
+lib/clang/23/include/lzcntintrin.h
+lib/clang/23/include/mm3dnow.h
+lib/clang/23/include/mm_malloc.h
+lib/clang/23/include/mmintrin.h
+lib/clang/23/include/module.modulemap
+lib/clang/23/include/movdirintrin.h
+lib/clang/23/include/movrs_avx10_2_512intrin.h
+lib/clang/23/include/movrs_avx10_2intrin.h
+lib/clang/23/include/movrsintrin.h
+lib/clang/23/include/msa.h
+lib/clang/23/include/mwaitxintrin.h
+lib/clang/23/include/nmmintrin.h
+lib/clang/23/include/nvptxintrin.h
+lib/clang/23/include/opencl-c-base.h
+lib/clang/23/include/opencl-c.h
+lib/clang/23/include/openmp_wrappers/__clang_openmp_device_functions.h
+lib/clang/23/include/openmp_wrappers/cmath
+lib/clang/23/include/openmp_wrappers/complex
+lib/clang/23/include/openmp_wrappers/complex.h
+lib/clang/23/include/openmp_wrappers/complex_cmath.h
+lib/clang/23/include/openmp_wrappers/math.h
+lib/clang/23/include/openmp_wrappers/new
+lib/clang/23/include/pconfigintrin.h
+lib/clang/23/include/pkuintrin.h
+lib/clang/23/include/pmmintrin.h
+lib/clang/23/include/popcntintrin.h
+lib/clang/23/include/ppc_wrappers/bmi2intrin.h
+lib/clang/23/include/ppc_wrappers/bmiintrin.h
+lib/clang/23/include/ppc_wrappers/emmintrin.h
+lib/clang/23/include/ppc_wrappers/immintrin.h
+lib/clang/23/include/ppc_wrappers/mm_malloc.h
+lib/clang/23/include/ppc_wrappers/mmintrin.h
+lib/clang/23/include/ppc_wrappers/nmmintrin.h
+lib/clang/23/include/ppc_wrappers/pmmintrin.h
+lib/clang/23/include/ppc_wrappers/smmintrin.h
+lib/clang/23/include/ppc_wrappers/tmmintrin.h
+lib/clang/23/include/ppc_wrappers/x86gprintrin.h
+lib/clang/23/include/ppc_wrappers/x86intrin.h
+lib/clang/23/include/ppc_wrappers/xmmintrin.h
+lib/clang/23/include/prfchiintrin.h
+lib/clang/23/include/prfchwintrin.h
+lib/clang/23/include/ptrauth.h
+lib/clang/23/include/ptwriteintrin.h
+lib/clang/23/include/raointintrin.h
+lib/clang/23/include/rdpruintrin.h
+lib/clang/23/include/rdseedintrin.h
+lib/clang/23/include/riscv_bitmanip.h
+lib/clang/23/include/riscv_corev_alu.h
+lib/clang/23/include/riscv_crypto.h
+lib/clang/23/include/riscv_mips.h
+lib/clang/23/include/riscv_nds.h
+lib/clang/23/include/riscv_ntlh.h
+lib/clang/23/include/riscv_packed_simd.h
+lib/clang/23/include/riscv_vector.h
+lib/clang/23/include/rtmintrin.h
+lib/clang/23/include/s390intrin.h
+lib/clang/23/include/serializeintrin.h
+lib/clang/23/include/sgxintrin.h
+lib/clang/23/include/sha512intrin.h
+lib/clang/23/include/shaintrin.h
+lib/clang/23/include/sifive_vector.h
+lib/clang/23/include/sm3intrin.h
+lib/clang/23/include/sm4evexintrin.h
+lib/clang/23/include/sm4intrin.h
+lib/clang/23/include/smmintrin.h
+lib/clang/23/include/spirvintrin.h
+lib/clang/23/include/stdalign.h
+lib/clang/23/include/stdarg.h
+lib/clang/23/include/stdatomic.h
+lib/clang/23/include/stdbool.h
+lib/clang/23/include/stdckdint.h
+lib/clang/23/include/stdcountof.h
+lib/clang/23/include/stddef.h
+lib/clang/23/include/stddefer.h
+lib/clang/23/include/stdint.h
+lib/clang/23/include/stdnoreturn.h
+lib/clang/23/include/tbmintrin.h
+lib/clang/23/include/tgmath.h
+lib/clang/23/include/tmmintrin.h
+lib/clang/23/include/tsxldtrkintrin.h
+lib/clang/23/include/uintrintrin.h
+lib/clang/23/include/unwind.h
+lib/clang/23/include/usermsrintrin.h
+lib/clang/23/include/vadefs.h
+lib/clang/23/include/vaesintrin.h
+lib/clang/23/include/varargs.h
+lib/clang/23/include/vecintrin.h
+lib/clang/23/include/velintrin.h
+lib/clang/23/include/velintrin_approx.h
+lib/clang/23/include/velintrin_gen.h
+lib/clang/23/include/vpclmulqdqintrin.h
+lib/clang/23/include/waitpkgintrin.h
+lib/clang/23/include/wasm_simd128.h
+lib/clang/23/include/wbnoinvdintrin.h
+lib/clang/23/include/wmmintrin.h
+lib/clang/23/include/x86gprintrin.h
+lib/clang/23/include/x86intrin.h
+lib/clang/23/include/xmmintrin.h
+lib/clang/23/include/xopintrin.h
+lib/clang/23/include/xsavecintrin.h
+lib/clang/23/include/xsaveintrin.h
+lib/clang/23/include/xsaveoptintrin.h
+lib/clang/23/include/xsavesintrin.h
+lib/clang/23/include/xtestintrin.h
+lib/clang/23/include/yvals_core.h
+lib/clang/23/include/zos_wrappers/builtins.h
+lib/clang/23/include/zos_wrappers/grp.h
+lib/clang/23/include/zos_wrappers/locale.h
+lib/clang/23/include/zos_wrappers/math.h
+lib/clang/23/include/zos_wrappers/poll.h
+lib/clang/23/include/zos_wrappers/stdlib.h
+lib/clang/23/include/zos_wrappers/string.h
+lib/clang/23/include/zos_wrappers/time.h
+lib/clang/23/include/zos_wrappers/variant.h
 lib/cmake/clang/AddClang.cmake
 lib/cmake/clang/ClangConfig.cmake
 lib/cmake/clang/ClangConfigVersion.cmake
 lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
-lib/libclang-cpp.${SHLIB_EXT}
-${PLIST.notdylib}lib/libclang-cpp.so.22.1
+lib/libclang-cpp.so.23.1
 lib/libclang.${SHLIB_EXT}
 ${PLIST.notdylib}lib/libclang.${SHLIB_EXT}.${PKGVERSION}
-${PLIST.notdylib}lib/libclang.${SHLIB_EXT}.22.1
+${PLIST.notdylib}lib/libclang.${SHLIB_EXT}.23.1
 lib/libclangAPINotes.a
 lib/libclangAST.a
 lib/libclangASTMatchers.a
@@ -1255,7 +1354,6 @@ lib/libclangAnalysis.a
 lib/libclangAnalysisFlowSensitive.a
 lib/libclangAnalysisFlowSensitiveModels.a
 lib/libclangAnalysisLifetimeSafety.a
-lib/libclangAnalysisScalable.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
 lib/libclangCrossTU.a
@@ -1279,6 +1377,11 @@ lib/libclangOptions.a
 lib/libclangParse.a
 lib/libclangRewrite.a
 lib/libclangRewriteFrontend.a
+lib/libclangScalableStaticAnalysisAnalyses.a
+lib/libclangScalableStaticAnalysisCore.a
+lib/libclangScalableStaticAnalysisFrontend.a
+lib/libclangScalableStaticAnalysisSourceTransformation.a
+lib/libclangScalableStaticAnalysisTool.a
 lib/libclangSema.a
 lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
@@ -1293,6 +1396,7 @@ lib/libclangToolingInclusionsStdlib.a
 lib/libclangToolingRefactoring.a
 lib/libclangToolingSyntax.a
 lib/libclangTransformer.a
+lib/libclangUnifiedSymbolResolution.a
 lib/libear/__init__.py
 lib/libear/config.h.in
 lib/libear/ear.c
diff --git a/clang/buildlink3.mk b/clang/buildlink3.mk
index 39f597223d..285c69bb61 100644
--- a/clang/buildlink3.mk
+++ b/clang/buildlink3.mk
@@ -5,15 +5,15 @@ BUILDLINK_TREE+=	clang
 .if !defined(CLANG_BUILDLINK3_MK)
 CLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clang+=	clang>=22.1.0
-BUILDLINK_ABI_DEPENDS.clang+=	clang>=22.1.0
+BUILDLINK_API_DEPENDS.clang+=	clang>=23.1.0
+BUILDLINK_ABI_DEPENDS.clang+=	clang>=23.1.0
 BUILDLINK_PKGSRCDIR.clang?=	../../wip/clang
 
 BUILDLINK_FILES.clang+=		bin/amdgpu-arch
 BUILDLINK_FILES.clang+=		bin/analyze-build
 BUILDLINK_FILES.clang+=		bin/clang
 BUILDLINK_FILES.clang+=		bin/clang++
-BUILDLINK_FILES.clang+=		bin/clang-22
+BUILDLINK_FILES.clang+=		bin/clang-23
 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 6860ad96ba..285e7b4c24 100644
--- a/clang/distinfo
+++ b/clang/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile
index e8aafa60df..ff8d39f6aa 100644
--- a/compiler-rt/Makefile
+++ b/compiler-rt/Makefile
@@ -14,7 +14,7 @@ LICENSE=	apache-2.0
 NOT_FOR_PLATFORM=	NetBSD-[0-7].*-*
 
 USE_CC_FEATURES=	c99
-USE_CXX_FEATURES=	c++14
+USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		ggrep
 GCC_REQD+=		4.8
diff --git a/compiler-rt/buildlink3.mk b/compiler-rt/buildlink3.mk
index f034ebee49..d9bd66a4b6 100644
--- a/compiler-rt/buildlink3.mk
+++ b/compiler-rt/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	compiler-rt
 .if !defined(COMPILER_RT_BUILDLINK3_MK)
 COMPILER_RT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.compiler-rt+=	compiler-rt>=21.1.0
+BUILDLINK_API_DEPENDS.compiler-rt+=	compiler-rt>=23.1.0
 BUILDLINK_PKGSRCDIR.compiler-rt?=	../../wip/compiler-rt
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index e19f357227..5c743b8683 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.23 2023/03/03 09:53:14 wiz Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
-SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
+SHA1 (patch-CMakeLists.txt) = 406247986988c21f26ece618d3175b05d6093818
 SHA1 (patch-cmake_config-ix.cmake) = 1a67378de34b048477ef80237ab8a76272288a55
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cpp) = bc04e2d792c8eaffb26b60fdaceef261ffe03371
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cpp) = a58be997665264e16406ced3fdc2d1677ba41c8d
diff --git a/compiler-rt/patches/patch-CMakeLists.txt b/compiler-rt/patches/patch-CMakeLists.txt
index c6e81b520c..9f5766bafa 100644
--- a/compiler-rt/patches/patch-CMakeLists.txt
+++ b/compiler-rt/patches/patch-CMakeLists.txt
@@ -2,13 +2,13 @@ $NetBSD$
 
 Fix build for Darwin.
 
---- CMakeLists.txt.orig	2023-06-04 18:50:42.000000000 +0000
+--- CMakeLists.txt.orig	2026-10-06 07:38:51.000000000 +0000
 +++ CMakeLists.txt
-@@ -471,13 +471,6 @@ if(MSVC)
+@@ -548,13 +548,6 @@ if(MSVC)
      string(REGEX REPLACE "(^| )/Z[i7I]($| )" " /Z7 "
             "${var_to_update}" "${${var_to_update}}")
    endforeach()
--elseif(APPLE)
+-elseif("${COMPILER_RT_DEFAULT_TARGET_TRIPLE}" MATCHES "apple")
 -  # On Apple platforms use full debug info (i.e. not `-gline-tables-only`)
 -  # for all build types so that the runtime can be debugged.
 -  if(NOT COMPILER_RT_HAS_G_FLAG)
diff --git a/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp b/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
index ae85562d6c..a5a5753a11 100644
--- a/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
+++ b/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
@@ -1,6 +1,8 @@
 $NetBSD: patch-lib_sanitizer__common_sanitizer__linux.cpp,v 1.1 2024/07/06 15:45:06 adam Exp $
 
-Fix build for platforms other than Linux and FreeBSD.
+Fix build for platforms other than Linux and FreeBSD. NetBSD/evbarm-aarch64:
+sanitizer_linux.cpp:2057:8: error: 'Aarch64GetESR' was not declared in this scope
+ 2057 |   if (!Aarch64GetESR(ucontext, &esr))
 
 --- lib/sanitizer_common/sanitizer_linux.cpp.orig	2024-07-03 11:57:05.400879120 +0000
 +++ lib/sanitizer_common/sanitizer_linux.cpp
diff --git a/flang/Makefile b/flang/Makefile
index 9b4876e56e..50e3f7160b 100644
--- a/flang/Makefile
+++ b/flang/Makefile
@@ -13,7 +13,7 @@ LICENSE=	apache-2.0
 USE_CXX_FEATURES+=	c++17
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bash:run gmake
-GCC_REQD+=		12
+GCC_REQD+=		12 # needs libquadmath
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+=	-DFLANG_INCLUDE_TESTS=OFF
diff --git a/flang/PLIST b/flang/PLIST
index e854b07a69..721147d73a 100644
--- a/flang/PLIST
+++ b/flang/PLIST
@@ -4,7 +4,7 @@ bin/f18-parse-demo
 bin/fir-lsp-server
 bin/fir-opt
 bin/flang
-bin/flang-22
+bin/flang-23
 bin/flang-new
 bin/tco
 include/flang/Common/Fortran-consts.h
@@ -19,6 +19,7 @@ include/flang/Common/fast-int-set.h
 include/flang/Common/float128.h
 include/flang/Common/float80.h
 include/flang/Common/format.h
+include/flang/Common/fp-control.h
 include/flang/Common/idioms.h
 include/flang/Common/indirection.h
 include/flang/Common/interval.h
@@ -125,6 +126,7 @@ include/flang/Lower/Support/Verifier.h
 include/flang/Lower/SymbolMap.h
 include/flang/Lower/VectorSubscripts.h
 include/flang/Optimizer/Analysis/AliasAnalysis.h
+include/flang/Optimizer/Analysis/ArraySectionAnalyzer.h
 include/flang/Optimizer/Analysis/TBAAForest.h
 include/flang/Optimizer/Builder/BoxValue.h
 include/flang/Optimizer/Builder/CUDAIntrinsicCall.h
@@ -138,7 +140,9 @@ include/flang/Optimizer/Builder/Factory.h
 include/flang/Optimizer/Builder/HLFIRTools.h
 include/flang/Optimizer/Builder/IntrinsicCall.h
 include/flang/Optimizer/Builder/LowLevelIntrinsics.h
+include/flang/Optimizer/Builder/MIFCommon.h
 include/flang/Optimizer/Builder/MutableBox.h
+include/flang/Optimizer/Builder/OpenACCIntrinsicCall.h
 include/flang/Optimizer/Builder/PPCIntrinsicCall.h
 include/flang/Optimizer/Builder/Runtime/Allocatable.h
 include/flang/Optimizer/Builder/Runtime/ArrayConstructor.h
@@ -161,6 +165,7 @@ include/flang/Optimizer/Builder/Runtime/Reduction.h
 include/flang/Optimizer/Builder/Runtime/Stop.h
 include/flang/Optimizer/Builder/Runtime/Support.h
 include/flang/Optimizer/Builder/Runtime/TemporaryStack.h
+include/flang/Optimizer/Builder/Runtime/Trampoline.h
 include/flang/Optimizer/Builder/Runtime/Transformational.h
 include/flang/Optimizer/Builder/TemporaryStorage.h
 include/flang/Optimizer/Builder/Todo.h
@@ -174,6 +179,10 @@ include/flang/Optimizer/CodeGen/LLVMInsertChainFolder.h
 include/flang/Optimizer/CodeGen/TBAABuilder.h
 include/flang/Optimizer/CodeGen/Target.h
 include/flang/Optimizer/CodeGen/TypeConverter.h
+include/flang/Optimizer/Dialect/CUDAKernelOpInterface.cpp.inc
+include/flang/Optimizer/Dialect/CUDAKernelOpInterface.h
+include/flang/Optimizer/Dialect/CUDAKernelOpInterface.h.inc
+include/flang/Optimizer/Dialect/CUDAKernelOpInterface.td
 include/flang/Optimizer/Dialect/CUF/Attributes/CUFAttr.cpp.inc
 include/flang/Optimizer/Dialect/CUF/Attributes/CUFAttr.h
 include/flang/Optimizer/Dialect/CUF/Attributes/CUFAttr.h.inc
@@ -195,6 +204,7 @@ include/flang/Optimizer/Dialect/FIRAttr.cpp.inc
 include/flang/Optimizer/Dialect/FIRAttr.h
 include/flang/Optimizer/Dialect/FIRAttr.h.inc
 include/flang/Optimizer/Dialect/FIRAttr.td
+include/flang/Optimizer/Dialect/FIRBoxUtils.h
 include/flang/Optimizer/Dialect/FIRCG/CGOps.cpp.inc
 include/flang/Optimizer/Dialect/FIRCG/CGOps.h
 include/flang/Optimizer/Dialect/FIRCG/CGOps.h.inc
@@ -205,6 +215,10 @@ include/flang/Optimizer/Dialect/FIRDialect.h.inc
 include/flang/Optimizer/Dialect/FIRDialect.td
 include/flang/Optimizer/Dialect/FIREnumAttr.cpp.inc
 include/flang/Optimizer/Dialect/FIREnumAttr.h.inc
+include/flang/Optimizer/Dialect/FIROperationMoveOpInterface.cpp.inc
+include/flang/Optimizer/Dialect/FIROperationMoveOpInterface.h
+include/flang/Optimizer/Dialect/FIROperationMoveOpInterface.h.inc
+include/flang/Optimizer/Dialect/FIROperationMoveOpInterface.td
 include/flang/Optimizer/Dialect/FIROps.cpp.inc
 include/flang/Optimizer/Dialect/FIROps.h
 include/flang/Optimizer/Dialect/FIROps.h.inc
@@ -274,12 +288,14 @@ include/flang/Optimizer/Support/DataLayout.h
 include/flang/Optimizer/Support/FatalError.h
 include/flang/Optimizer/Support/InitFIR.h
 include/flang/Optimizer/Support/InternalNames.h
+include/flang/Optimizer/Support/LazySymbolTable.h
 include/flang/Optimizer/Support/Matcher.h
 include/flang/Optimizer/Support/TypeCode.h
 include/flang/Optimizer/Support/Utils.h
 include/flang/Optimizer/Transforms/CUDA/CUFAllocationConversion.h
 include/flang/Optimizer/Transforms/CUFGPUToLLVMConversion.h
 include/flang/Optimizer/Transforms/CUFOpConversion.h
+include/flang/Optimizer/Transforms/FIRToMemRefTypeConverter.h
 include/flang/Optimizer/Transforms/MIFOpConversion.h
 include/flang/Optimizer/Transforms/MemoryUtils.h
 include/flang/Optimizer/Transforms/Passes.h
@@ -318,6 +334,7 @@ include/flang/Runtime/CUDA/memmove-function.h
 include/flang/Runtime/CUDA/memory.h
 include/flang/Runtime/CUDA/pointer.h
 include/flang/Runtime/CUDA/registration.h
+include/flang/Runtime/CUDA/stream.h
 include/flang/Runtime/allocatable.h
 include/flang/Runtime/allocator-registry-consts.h
 include/flang/Runtime/array-constructor-consts.h
@@ -353,11 +370,13 @@ include/flang/Runtime/stop.h
 include/flang/Runtime/support.h
 include/flang/Runtime/temporary-stack.h
 include/flang/Runtime/time-intrinsic.h
+include/flang/Runtime/trampoline.h
 include/flang/Runtime/transformational.h
 include/flang/Semantics/attr.h
 include/flang/Semantics/dump-expr.h
 include/flang/Semantics/expression.h
 include/flang/Semantics/module-dependences.h
+include/flang/Semantics/omp-declare-variant.h
 include/flang/Semantics/openmp-directive-sets.h
 include/flang/Semantics/openmp-dsa.h
 include/flang/Semantics/openmp-modifiers.h
@@ -370,6 +389,7 @@ include/flang/Semantics/symbol.h
 include/flang/Semantics/tools.h
 include/flang/Semantics/type.h
 include/flang/Semantics/unparse-with-symbols.h
+include/flang/Support/FPMaxminBehavior.h
 include/flang/Support/Flags.h
 include/flang/Support/Fortran-features.h
 include/flang/Support/Fortran.h
@@ -390,55 +410,66 @@ include/flang/Tools/PointerModels.h
 include/flang/Tools/TargetSetup.h
 include/flang/Utils/OpenMP.h
 include/flang/Version.inc
-include/flang/__cuda_builtins.mod
-include/flang/__cuda_device.mod
-include/flang/__fortran_builtins.mod
-include/flang/__fortran_ieee_exceptions.mod
-include/flang/__fortran_type_info.mod
-include/flang/__ppc_intrinsics.mod
-include/flang/__ppc_types.mod
-include/flang/cooperative_groups.mod
-include/flang/cudadevice.mod
-include/flang/flang_debug.mod
-include/flang/ieee_arithmetic.mod
-include/flang/ieee_exceptions.mod
-include/flang/ieee_features.mod
-include/flang/iso_c_binding.mod
-include/flang/iso_fortran_env.mod
-include/flang/iso_fortran_env_impl.mod
-include/flang/mma.mod
-lib/clang/22/include/ISO_Fortran_binding.h
+lib/clang/23/include/ISO_Fortran_binding.h
 lib/cmake/flang/FlangConfig.cmake
 lib/cmake/flang/FlangConfigVersion.cmake
 lib/cmake/flang/FlangTargets-release.cmake
 lib/cmake/flang/FlangTargets.cmake
 lib/libCUFAttrs.so
+lib/libCUFAttrs.so.23.1
 lib/libCUFDialect.so
+lib/libCUFDialect.so.23.1
 lib/libFIRAnalysis.so
+lib/libFIRAnalysis.so.23.1
 lib/libFIRBuilder.so
+lib/libFIRBuilder.so.23.1
 lib/libFIRCodeGen.so
+lib/libFIRCodeGen.so.23.1
 lib/libFIRCodeGenDialect.so
+lib/libFIRCodeGenDialect.so.23.1
 lib/libFIRDialect.so
+lib/libFIRDialect.so.23.1
 lib/libFIRDialectSupport.so
+lib/libFIRDialectSupport.so.23.1
 lib/libFIROpenACCAnalysis.so
+lib/libFIROpenACCAnalysis.so.23.1
 lib/libFIROpenACCSupport.so
+lib/libFIROpenACCSupport.so.23.1
 lib/libFIROpenACCTransforms.so
+lib/libFIROpenACCTransforms.so.23.1
 lib/libFIROpenMPSupport.so
+lib/libFIROpenMPSupport.so.23.1
 lib/libFIRSupport.so
+lib/libFIRSupport.so.23.1
 lib/libFIRTransforms.so
+lib/libFIRTransforms.so.23.1
 lib/libFlangOpenMPTransforms.so
+lib/libFlangOpenMPTransforms.so.23.1
 lib/libFortranCommon.so
 lib/libFortranDecimal.so
+lib/libFortranDecimal.so.23.1
 lib/libFortranEvaluate.so
+lib/libFortranEvaluate.so.23.1
 lib/libFortranLower.so
+lib/libFortranLower.so.23.1
 lib/libFortranParser.so
+lib/libFortranParser.so.23.1
 lib/libFortranRuntime.so
 lib/libFortranSemantics.so
+lib/libFortranSemantics.so.23.1
 lib/libFortranSupport.so
+lib/libFortranSupport.so.23.1
 lib/libFortranUtils.so
+lib/libFortranUtils.so.23.1
 lib/libHLFIRDialect.so
+lib/libHLFIRDialect.so.23.1
 lib/libHLFIRTransforms.so
+lib/libHLFIRTransforms.so.23.1
 lib/libMIFDialect.so
+lib/libMIFDialect.so.23.1
 lib/libflangFrontend.so
+lib/libflangFrontend.so.23.1
 lib/libflangFrontendTool.so
+lib/libflangFrontendTool.so.23.1
 lib/libflangPasses.so
+lib/libflangPasses.so.23.1
diff --git a/flang/distinfo b/flang/distinfo
index ea37cf55f2..b53bd163a0 100644
--- a/flang/distinfo
+++ b/flang/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
diff --git a/libclc/buildlink3.mk b/libclc/buildlink3.mk
index 654ba6e65f..2d0a7f3c01 100644
--- a/libclc/buildlink3.mk
+++ b/libclc/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libclc
 .if !defined(LIBCLC_BUILDLINK3_MK)
 LIBCLC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libclc+=	libclc>=22.1.0
+BUILDLINK_API_DEPENDS.libclc+=	libclc>=23.1.0
 BUILDLINK_PKGSRCDIR.libclc?=	../../wip/libclc
 
 .include "../../lang/llvm/buildlink3.mk"
diff --git a/libclc/distinfo b/libclc/distinfo
index e609588824..496be36e96 100644
--- a/libclc/distinfo
+++ b/libclc/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.24 2024/07/06 15:45:08 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
diff --git a/libcxx/Makefile b/libcxx/Makefile
index 900632c332..0e5e8e92b1 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -16,13 +16,18 @@ LICENSE=	apache-2.0
 USE_CXX_FEATURES=	c++20
 USE_LANGUAGES=		c c++
 SSP_SUPPORTED=		no
-GCC_REQD+=		14 # must be in sync with libcxxabi
+# for __decay
+GCC_REQD+=		15 # must be in sync with libcxxabi
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_CXX_ABI=system-libcxxabi
 CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKSRC}/../libcxxabi/include
 CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
 CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+# wants to use uselocale()
+CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_ENABLE_LOCALIZATION=OFF
+# libcxx/src/filesystem/operations.cpp:370:10: error: 'copy_file_impl_fstream' was not declared in this scope; did you mean 'copy_file_impl'?
+CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_ENABLE_FILESYSTEM=OFF
 
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
diff --git a/libcxx/PLIST b/libcxx/PLIST
index b0f93cebad..0247fb796a 100644
--- a/libcxx/PLIST
+++ b/libcxx/PLIST
@@ -157,6 +157,8 @@ include/c++/v1/__algorithm/ranges_set_difference.h
 include/c++/v1/__algorithm/ranges_set_intersection.h
 include/c++/v1/__algorithm/ranges_set_symmetric_difference.h
 include/c++/v1/__algorithm/ranges_set_union.h
+include/c++/v1/__algorithm/ranges_shift_left.h
+include/c++/v1/__algorithm/ranges_shift_right.h
 include/c++/v1/__algorithm/ranges_shuffle.h
 include/c++/v1/__algorithm/ranges_sort.h
 include/c++/v1/__algorithm/ranges_sort_heap.h
@@ -322,6 +324,8 @@ include/c++/v1/__concepts/equality_comparable.h
 include/c++/v1/__concepts/invocable.h
 include/c++/v1/__concepts/movable.h
 include/c++/v1/__concepts/predicate.h
+include/c++/v1/__concepts/primary_template.h
+include/c++/v1/__concepts/referenceable.h
 include/c++/v1/__concepts/regular.h
 include/c++/v1/__concepts/relation.h
 include/c++/v1/__concepts/same_as.h
@@ -332,12 +336,17 @@ include/c++/v1/__condition_variable/condition_variable.h
 include/c++/v1/__config
 include/c++/v1/__config_site
 include/c++/v1/__configuration/abi.h
+include/c++/v1/__configuration/attributes.h
 include/c++/v1/__configuration/availability.h
 include/c++/v1/__configuration/compiler.h
+include/c++/v1/__configuration/diagnostic_suppression.h
 include/c++/v1/__configuration/experimental.h
 include/c++/v1/__configuration/hardening.h
 include/c++/v1/__configuration/language.h
+include/c++/v1/__configuration/namespace.h
 include/c++/v1/__configuration/platform.h
+include/c++/v1/__configuration/pstl.h
+include/c++/v1/__configuration/utility.h
 include/c++/v1/__coroutine/coroutine_handle.h
 include/c++/v1/__coroutine/coroutine_traits.h
 include/c++/v1/__coroutine/noop_coroutine_handle.h
@@ -975,6 +984,7 @@ include/c++/v1/__format/format_string.h
 include/c++/v1/__format/format_to_n_result.h
 include/c++/v1/__format/formatter.h
 include/c++/v1/__format/formatter_bool.h
+include/c++/v1/__format/formatter_bool_impl.h
 include/c++/v1/__format/formatter_char.h
 include/c++/v1/__format/formatter_floating_point.h
 include/c++/v1/__format/formatter_integer.h
@@ -1052,6 +1062,7 @@ include/c++/v1/__iterator/advance.h
 include/c++/v1/__iterator/aliasing_iterator.h
 include/c++/v1/__iterator/back_insert_iterator.h
 include/c++/v1/__iterator/bounded_iter.h
+include/c++/v1/__iterator/capacity_aware_iterator.h
 include/c++/v1/__iterator/common_iterator.h
 include/c++/v1/__iterator/concepts.h
 include/c++/v1/__iterator/counted_iterator.h
@@ -1098,7 +1109,6 @@ include/c++/v1/__locale_dir/get_c_locale.h
 include/c++/v1/__locale_dir/locale_base_api.h
 include/c++/v1/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
 include/c++/v1/__locale_dir/locale_base_api/ibm.h
-include/c++/v1/__locale_dir/locale_base_api/openbsd.h
 include/c++/v1/__locale_dir/messages.h
 include/c++/v1/__locale_dir/money.h
 include/c++/v1/__locale_dir/num.h
@@ -1110,10 +1120,14 @@ include/c++/v1/__locale_dir/support/bsd_like.h
 include/c++/v1/__locale_dir/support/freebsd.h
 include/c++/v1/__locale_dir/support/fuchsia.h
 include/c++/v1/__locale_dir/support/linux.h
+include/c++/v1/__locale_dir/support/llvm_libc.h
 include/c++/v1/__locale_dir/support/netbsd.h
 include/c++/v1/__locale_dir/support/newlib.h
 include/c++/v1/__locale_dir/support/no_locale/characters.h
+include/c++/v1/__locale_dir/support/no_locale/conversions.h
+include/c++/v1/__locale_dir/support/no_locale/formatting.h
 include/c++/v1/__locale_dir/support/no_locale/strtonum.h
+include/c++/v1/__locale_dir/support/openbsd.h
 include/c++/v1/__locale_dir/support/windows.h
 include/c++/v1/__locale_dir/time.h
 include/c++/v1/__locale_dir/wbuffer_convert.h
@@ -1178,10 +1192,12 @@ include/c++/v1/__memory/swap_allocator.h
 include/c++/v1/__memory/temp_value.h
 include/c++/v1/__memory/temporary_buffer.h
 include/c++/v1/__memory/uninitialized_algorithms.h
+include/c++/v1/__memory/uninitialized_multidimensional_algorithms.h
 include/c++/v1/__memory/unique_ptr.h
 include/c++/v1/__memory/unique_temporary_buffer.h
 include/c++/v1/__memory/uses_allocator.h
 include/c++/v1/__memory/uses_allocator_construction.h
+include/c++/v1/__memory/valid_range.h
 include/c++/v1/__memory_resource/memory_resource.h
 include/c++/v1/__memory_resource/monotonic_buffer_resource.h
 include/c++/v1/__memory_resource/polymorphic_allocator.h
@@ -1284,6 +1300,7 @@ 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/concat_view.h
 include/c++/v1/__ranges/concepts.h
 include/c++/v1/__ranges/container_compatible_range.h
 include/c++/v1/__ranges/counted.h
@@ -1297,6 +1314,7 @@ include/c++/v1/__ranges/empty.h
 include/c++/v1/__ranges/empty_view.h
 include/c++/v1/__ranges/enable_borrowed_range.h
 include/c++/v1/__ranges/enable_view.h
+include/c++/v1/__ranges/enumerate_view.h
 include/c++/v1/__ranges/filter_view.h
 include/c++/v1/__ranges/from_range.h
 include/c++/v1/__ranges/iota_view.h
@@ -1316,6 +1334,7 @@ include/c++/v1/__ranges/reverse_view.h
 include/c++/v1/__ranges/single_view.h
 include/c++/v1/__ranges/size.h
 include/c++/v1/__ranges/split_view.h
+include/c++/v1/__ranges/stride_view.h
 include/c++/v1/__ranges/subrange.h
 include/c++/v1/__ranges/take_view.h
 include/c++/v1/__ranges/take_while_view.h
@@ -1340,9 +1359,7 @@ include/c++/v1/__string/extern_template_lists.h
 include/c++/v1/__support/ibm/gettod_zos.h
 include/c++/v1/__support/ibm/locale_mgmt_zos.h
 include/c++/v1/__support/ibm/nanosleep.h
-include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
 include/c++/v1/__support/xlocale/__posix_l_fallback.h
-include/c++/v1/__support/xlocale/__strtonum_fallback.h
 include/c++/v1/__system_error/errc.h
 include/c++/v1/__system_error/error_category.h
 include/c++/v1/__system_error/error_code.h
@@ -1385,7 +1402,6 @@ include/c++/v1/__type_traits/copy_cv.h
 include/c++/v1/__type_traits/copy_cvref.h
 include/c++/v1/__type_traits/datasizeof.h
 include/c++/v1/__type_traits/decay.h
-include/c++/v1/__type_traits/dependent_type.h
 include/c++/v1/__type_traits/desugars_to.h
 include/c++/v1/__type_traits/detected_or.h
 include/c++/v1/__type_traits/disjunction.h
@@ -1436,10 +1452,8 @@ include/c++/v1/__type_traits/is_object.h
 include/c++/v1/__type_traits/is_pod.h
 include/c++/v1/__type_traits/is_pointer.h
 include/c++/v1/__type_traits/is_polymorphic.h
-include/c++/v1/__type_traits/is_primary_template.h
 include/c++/v1/__type_traits/is_reference.h
 include/c++/v1/__type_traits/is_reference_wrapper.h
-include/c++/v1/__type_traits/is_referenceable.h
 include/c++/v1/__type_traits/is_same.h
 include/c++/v1/__type_traits/is_scalar.h
 include/c++/v1/__type_traits/is_signed.h
@@ -1456,11 +1470,9 @@ include/c++/v1/__type_traits/is_trivially_relocatable.h
 include/c++/v1/__type_traits/is_union.h
 include/c++/v1/__type_traits/is_unqualified.h
 include/c++/v1/__type_traits/is_unsigned.h
-include/c++/v1/__type_traits/is_valid_expansion.h
 include/c++/v1/__type_traits/is_void.h
 include/c++/v1/__type_traits/is_volatile.h
 include/c++/v1/__type_traits/is_within_lifetime.h
-include/c++/v1/__type_traits/lazy.h
 include/c++/v1/__type_traits/make_32_64_or_128_bit.h
 include/c++/v1/__type_traits/make_const_lvalue_ref.h
 include/c++/v1/__type_traits/make_signed.h
@@ -1494,6 +1506,7 @@ 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/constant_wrapper.h
 include/c++/v1/__utility/convert_to_integral.h
 include/c++/v1/__utility/declval.h
 include/c++/v1/__utility/default_three_way_comparator.h
@@ -1506,7 +1519,6 @@ include/c++/v1/__utility/forward_like.h
 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/is_valid_range.h
 include/c++/v1/__utility/lazy_synth_three_way_comparator.h
 include/c++/v1/__utility/move.h
 include/c++/v1/__utility/no_destroy.h
@@ -1525,6 +1537,7 @@ include/c++/v1/__variant/monostate.h
 include/c++/v1/__vector/comparison.h
 include/c++/v1/__vector/container_traits.h
 include/c++/v1/__vector/erase.h
+include/c++/v1/__vector/layout.h
 include/c++/v1/__vector/pmr.h
 include/c++/v1/__vector/swap.h
 include/c++/v1/__vector/vector.h
@@ -1571,7 +1584,6 @@ include/c++/v1/cstdlib
 include/c++/v1/cstring
 include/c++/v1/ctgmath
 include/c++/v1/ctime
-include/c++/v1/ctype.h
 include/c++/v1/cuchar
 include/c++/v1/cwchar
 include/c++/v1/cwctype
@@ -1598,18 +1610,15 @@ include/c++/v1/experimental/utility
 include/c++/v1/ext/__hash
 include/c++/v1/ext/hash_map
 include/c++/v1/ext/hash_set
-include/c++/v1/fenv.h
 include/c++/v1/filesystem
 include/c++/v1/flat_map
 include/c++/v1/flat_set
-include/c++/v1/float.h
 include/c++/v1/format
 include/c++/v1/forward_list
 include/c++/v1/fstream
 include/c++/v1/functional
 include/c++/v1/future
 include/c++/v1/initializer_list
-include/c++/v1/inttypes.h
 include/c++/v1/iomanip
 include/c++/v1/ios
 include/c++/v1/iosfwd
@@ -1660,6 +1669,7 @@ include/c++/v1/string_view
 include/c++/v1/strstream
 include/c++/v1/syncstream
 include/c++/v1/system_error
+include/c++/v1/text_encoding
 include/c++/v1/tgmath.h
 include/c++/v1/thread
 include/c++/v1/tuple
diff --git a/libcxx/buildlink3.mk b/libcxx/buildlink3.mk
index 2d5f41cac2..88b80c4afd 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>=21.1.0
+BUILDLINK_API_DEPENDS.libcxx+=	libcxx>=23.1.0
 BUILDLINK_PKGSRCDIR.libcxx?=	../../wip/libcxx
 
 .endif	# LIBCXX_BUILDLINK3_MK
diff --git a/libcxx/distinfo b/libcxx/distinfo
index 468837e107..937d5fb228 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.25 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
-SHA1 (patch-src_CMakeLists.txt) = 4554c675b778d8d631f2fc664364f0d3ffc3ed5e
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
+SHA1 (patch-src_CMakeLists.txt) = 291bf269b1d4e1ea2e9abc5d450fe8d2f86e8061
 SHA1 (patch-src_charconv.cpp) = 658a0727c6e2ddc051fbd22a536033bae19a22ba
 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_CMakeLists.txt b/libcxx/patches/patch-src_CMakeLists.txt
index 994fa0dd37..f5cc6ff733 100644
--- a/libcxx/patches/patch-src_CMakeLists.txt
+++ b/libcxx/patches/patch-src_CMakeLists.txt
@@ -2,14 +2,14 @@ $NetBSD$
 
 cxxabi-reexports is not available.
 
---- src/CMakeLists.txt.orig	2025-04-29 23:05:17.000000000 +0000
+--- src/CMakeLists.txt.orig	2026-10-06 07:38:51.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -209,7 +209,7 @@ endif()
+@@ -210,7 +210,7 @@ if (LIBCXX_SUPPORTS_SHARED_LIBRARY)
  
- # Maybe force some symbols to be weak, not weak or not exported.
- # TODO: This shouldn't depend on the platform, and ideally it should be done in the sources.
--if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
-+if (FALSE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
-           AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
-   target_link_libraries(cxx_shared PRIVATE
-     "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
+   # Maybe force some symbols to be weak, not weak or not exported.
+   # TODO: This shouldn't depend on the platform, and ideally it should be done in the sources.
+-  if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
++  if (FALSE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
+             AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
+     target_link_libraries(cxx_shared PRIVATE
+       "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
diff --git a/libcxxabi/Makefile b/libcxxabi/Makefile
index e4c7afb4db..7fdee96af3 100644
--- a/libcxxabi/Makefile
+++ b/libcxxabi/Makefile
@@ -17,7 +17,7 @@ LICENSE=	apache-2.0
 USE_CXX_FEATURES=	c++20
 USE_LANGUAGES=		c c++
 SSP_SUPPORTED=		no
-GCC_REQD+=		14 # must be in sync with libcxx
+GCC_REQD+=		15 # must be in sync with libcxx
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 # "LIBCXXABI_USE_LLVM_UNWINDER is set to ON, but libunwind is not specified in LLVM_ENABLE_RUNTIMES."
diff --git a/libcxxabi/buildlink3.mk b/libcxxabi/buildlink3.mk
index 5f2af75917..20cd3e3f27 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>=22.1.0
+BUILDLINK_API_DEPENDS.libcxxabi+=	libcxxabi>=23.1.0
 BUILDLINK_PKGSRCDIR.libcxxabi?=		../../wip/libcxxabi
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
index 45d44ea723..af1488de3a 100644
--- a/libcxxabi/distinfo
+++ b/libcxxabi/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
-SHA1 (patch-src_CMakeLists.txt) = 4824994ca6f2f4f0ebc154fff7a17418660e5959
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
+SHA1 (patch-src_CMakeLists.txt) = 08399726e80e0193e7b8e220b7840f9084ddae74
 SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95
diff --git a/libcxxabi/files/__config_site b/libcxxabi/files/__config_site
index 393b6ddd2c..8ce96a25d4 100644
--- a/libcxxabi/files/__config_site
+++ b/libcxxabi/files/__config_site
@@ -15,19 +15,18 @@
 #define _LIBCPP_ABI_FORCE_MICROSOFT 0
 #define _LIBCPP_HAS_THREADS 1
 #define _LIBCPP_HAS_MONOTONIC_CLOCK 1
-#define _LIBCPP_HAS_TERMINAL 1
 #define _LIBCPP_HAS_MUSL_LIBC 0
 #define _LIBCPP_HAS_THREAD_API_PTHREAD 0
 #define _LIBCPP_HAS_THREAD_API_EXTERNAL 0
 #define _LIBCPP_HAS_THREAD_API_WIN32 0
-#define _LIBCPP_HAS_THREAD_API_C11 0 // FIXME: Is this guarding dead code?
+#define _LIBCPP_HAS_THREAD_API_C11 0
 /* #undef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS */
 #define _LIBCPP_HAS_VENDOR_AVAILABILITY_ANNOTATIONS 0
 /* #undef _LIBCPP_NO_VCRUNTIME */
 /* #undef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION */
-#define _LIBCPP_HAS_FILESYSTEM 1
+#define _LIBCPP_HAS_FILESYSTEM 0
 #define _LIBCPP_HAS_RANDOM_DEVICE 1
-#define _LIBCPP_HAS_LOCALIZATION 1
+#define _LIBCPP_HAS_LOCALIZATION 0
 #define _LIBCPP_HAS_UNICODE 1
 #define _LIBCPP_HAS_WIDE_CHARACTERS 1
 #define _LIBCPP_HAS_TIME_ZONE_DATABASE 0
@@ -45,6 +44,7 @@
 // C libraries
 #define _LIBCPP_LIBC_PICOLIBC 0
 #define _LIBCPP_LIBC_NEWLIB 0
+#define _LIBCPP_LIBC_LLVM_LIBC 0
 
 // __USE_MINGW_ANSI_STDIO gets redefined on MinGW
 #ifdef __clang__
diff --git a/libcxxabi/patches/patch-src_CMakeLists.txt b/libcxxabi/patches/patch-src_CMakeLists.txt
index 775f470e87..8a55dc656c 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	2025-10-21 08:14:55.000000000 +0000
+--- src/CMakeLists.txt.orig	2026-10-06 07:38:51.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -57,6 +57,7 @@ if (MSVC_IDE OR XCODE)
  endif()
@@ -12,16 +12,16 @@ Fix build.
  include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
  
  if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
-@@ -174,7 +175,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
- endif()
- target_link_libraries(cxxabi_shared_objects
-   PUBLIC cxxabi-headers
--  PRIVATE cxx-headers runtimes-libc-headers ${LIBCXXABI_LIBRARIES})
-+  PRIVATE runtimes-libc-headers ${LIBCXXABI_LIBRARIES})
- if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG)
-   target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY})
- endif()
-@@ -277,7 +278,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBC
+@@ -175,7 +176,7 @@ if (LIBCXXABI_SUPPORTS_SHARED_LIBRARY)
+   endif()
+   target_link_libraries(cxxabi_shared_objects
+     PUBLIC cxxabi-headers
+-    PRIVATE cxx-headers runtimes-libc-headers ${LIBCXXABI_LIBRARIES})
++    PRIVATE runtimes-libc-headers ${LIBCXXABI_LIBRARIES})
+   if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG)
+     target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY})
+   endif()
+@@ -280,7 +281,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBC
  endif()
  target_link_libraries(cxxabi_static_objects
    PUBLIC cxxabi-headers
diff --git a/libunwind/buildlink3.mk b/libunwind/buildlink3.mk
index 835485e00a..e7a0c1f468 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>=22.1.0
+BUILDLINK_API_DEPENDS.libunwind+=	libunwind>=23.1.0
 BUILDLINK_PKGSRCDIR.libunwind?=		../../wip/libunwind
 
 .endif	# LIBUNWIND_BUILDLINK3_MK
diff --git a/libunwind/distinfo b/libunwind/distinfo
index faa2651296..fc7513c2f9 100644
--- a/libunwind/distinfo
+++ b/libunwind/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.32 2023/01/12 22:47:25 wiz Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
 SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
diff --git a/lld/PLIST b/lld/PLIST
index 38b72091fc..e2768f7350 100644
--- a/lld/PLIST
+++ b/lld/PLIST
@@ -6,6 +6,7 @@ bin/lld-link
 bin/wasm-ld
 include/lld/Common/Args.h
 include/lld/Common/Arrays.h
+include/lld/Common/BPSectionOrdererBase.h
 include/lld/Common/BPSectionOrdererBase.inc
 include/lld/Common/CommonLinkerContext.h
 include/lld/Common/DWARF.h
diff --git a/lld/buildlink3.mk b/lld/buildlink3.mk
index aedaa93ee0..a1cab9f675 100644
--- a/lld/buildlink3.mk
+++ b/lld/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	lld
 .if !defined(LLD_BUILDLINK3_MK)
 LLD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lld+=	lld>=22.1.0
+BUILDLINK_API_DEPENDS.lld+=	lld>=23.1.0
 BUILDLINK_PKGSRCDIR.lld?=	../../wip/lld
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/lld/distinfo b/lld/distinfo
index f6ee54956b..3410bc27bb 100644
--- a/lld/distinfo
+++ b/lld/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
 SHA1 (patch-ELF_Config.h) = 484d0818bd4a92f2faafa1337d3f2f08cab4c0fc
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lldb/Makefile b/lldb/Makefile
index 64b9e4be7a..173710cc71 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -32,7 +32,7 @@ CMAKE_CONFIGURE_ARGS+=	-DPYTHON_HOME=${PREFIX}
 
 CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
 
-LUA_VERSIONS_ACCEPTED=	53
+LUA_VERSIONS_ACCEPTED=	54
 PLIST_SUBST+=		LUA_VERSION=${LUA_VERSION:R}
 
 REPLACE_PERL+=		scripts/disasm-gdb-remote.pl
diff --git a/lldb/buildlink3.mk b/lldb/buildlink3.mk
index 5e4b6af830..2dcabb0fd2 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>=22.1.0
-BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=22.1.0
+BUILDLINK_API_DEPENDS.lldb+=	lldb>=23.1.0
+BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=23.1.0
 BUILDLINK_PKGSRCDIR.lldb?=	../../wip/lldb
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/lldb/distinfo b/lldb/distinfo
index ebc8ac6f23..b91eab7ca5 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.35 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
 SHA1 (patch-source_API_CMakeLists.txt) = 32840580507b3a7d05e76485da5830e92a76bb06
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 5c193615d4c2c33e6d7d0c0e820adc3832e124ea
diff --git a/llvm/Makefile b/llvm/Makefile
index 38b73fcd2c..53453d9569 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -24,6 +24,7 @@
 # version in BUILDLINK_API_DEPENDS, as there is no backwards compatibility.
 
 .include "version.mk"
+EXTRACT_ELEMENTS+=	${DISTNAME}/libc
 
 PKGNAME=	llvm-${LLVM_VERSION}
 CATEGORIES=	lang devel
@@ -145,8 +146,8 @@ post-extract:
 	${CP} ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
 .endfor
 
-.include "../../devel/cmake/build.mk"
 .include "../../archivers/zstd/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
diff --git a/llvm/PLIST b/llvm/PLIST
index 8ae7ae96e1..e005f10c25 100644
--- a/llvm/PLIST
+++ b/llvm/PLIST
@@ -1,13 +1,13 @@
 @comment $NetBSD: PLIST,v 1.22 2022/11/14 18:44:05 adam Exp $
 bin/FileCheck
 bin/UnicodeNameMappingGenerator
-bin/bugpoint
 bin/clang-offload-packager
 bin/count
 bin/dsymutil
 bin/llc
 bin/lli
 bin/lli-child-target
+bin/llubi
 bin/llvm-PerfectShuffle
 bin/llvm-addr2line
 bin/llvm-ar
@@ -37,6 +37,8 @@ bin/llvm-dwarfutil
 bin/llvm-dwp
 bin/llvm-exegesis
 bin/llvm-extract
+bin/llvm-extract-bundle-entry
+bin/llvm-gpu-loader
 bin/llvm-gsymutil
 bin/llvm-ifs
 bin/llvm-install-name-tool
@@ -127,6 +129,9 @@ include/llvm-c/Types.h
 include/llvm-c/Visibility.h
 include/llvm-c/blake3.h
 include/llvm-c/lto.h
+include/llvm/ABI/FunctionInfo.h
+include/llvm/ABI/IRTypeMapper.h
+include/llvm/ABI/TargetInfo.h
 include/llvm/ABI/Types.h
 include/llvm/ADT/ADL.h
 include/llvm/ADT/APFixedPoint.h
@@ -156,9 +161,11 @@ include/llvm/ADT/DenseSet.h
 include/llvm/ADT/DepthFirstIterator.h
 include/llvm/ADT/DirectedGraph.h
 include/llvm/ADT/DynamicAPInt.h
+include/llvm/ADT/Enum.h
 include/llvm/ADT/EnumeratedArray.h
 include/llvm/ADT/EpochTracker.h
 include/llvm/ADT/EquivalenceClasses.h
+include/llvm/ADT/Eytzinger.h
 include/llvm/ADT/FloatingPointMode.h
 include/llvm/ADT/FoldingSet.h
 include/llvm/ADT/FunctionExtras.h
@@ -190,6 +197,7 @@ include/llvm/ADT/PostOrderIterator.h
 include/llvm/ADT/PriorityQueue.h
 include/llvm/ADT/PriorityWorklist.h
 include/llvm/ADT/RadixTree.h
+include/llvm/ADT/Repeated.h
 include/llvm/ADT/RewriteBuffer.h
 include/llvm/ADT/RewriteRope.h
 include/llvm/ADT/SCCIterator.h
@@ -465,15 +473,19 @@ include/llvm/CAS/BuiltinCASContext.h
 include/llvm/CAS/BuiltinObjectHasher.h
 include/llvm/CAS/BuiltinUnifiedCASDatabases.h
 include/llvm/CAS/CASID.h
+include/llvm/CAS/CASNodeSchema.h
 include/llvm/CAS/CASReference.h
 include/llvm/CAS/FileOffset.h
 include/llvm/CAS/MappedFileRegionArena.h
+include/llvm/CAS/NamedValuesSchema.h
 include/llvm/CAS/ObjectStore.h
+include/llvm/CAS/OnDiskCASLogger.h
 include/llvm/CAS/OnDiskDataAllocator.h
 include/llvm/CAS/OnDiskGraphDB.h
 include/llvm/CAS/OnDiskKeyValueDB.h
 include/llvm/CAS/OnDiskTrieRawHashMap.h
 include/llvm/CAS/UnifiedOnDiskCache.h
+include/llvm/CAS/ValidationResult.h
 include/llvm/CGData/CGDataPatchItem.h
 include/llvm/CGData/CodeGenData.h
 include/llvm/CGData/CodeGenData.inc
@@ -487,22 +499,22 @@ include/llvm/CodeGen/AccelTable.h
 include/llvm/CodeGen/Analysis.h
 include/llvm/CodeGen/AntiDepBreaker.h
 include/llvm/CodeGen/AsmPrinter.h
+include/llvm/CodeGen/AsmPrinterAnalysis.h
 include/llvm/CodeGen/AsmPrinterHandler.h
 include/llvm/CodeGen/AssignmentTrackingAnalysis.h
 include/llvm/CodeGen/AtomicExpand.h
-include/llvm/CodeGen/AtomicExpandUtils.h
 include/llvm/CodeGen/BasicBlockMatchingAndInference.h
 include/llvm/CodeGen/BasicBlockSectionUtils.h
 include/llvm/CodeGen/BasicBlockSectionsProfileReader.h
 include/llvm/CodeGen/BasicTTIImpl.h
 include/llvm/CodeGen/BranchFoldingPass.h
 include/llvm/CodeGen/BranchRelaxation.h
+include/llvm/CodeGen/BreakFalseDeps.h
 include/llvm/CodeGen/ByteProvider.h
 include/llvm/CodeGen/CFIFixup.h
 include/llvm/CodeGen/CFIInstBuilder.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/CodeGenPrepare.h
@@ -525,7 +537,6 @@ include/llvm/CodeGen/EarlyIfConversion.h
 include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/ExecutionDomainFix.h
 include/llvm/CodeGen/ExpandIRInsts.h
-include/llvm/CodeGen/ExpandMemCmp.h
 include/llvm/CodeGen/ExpandPostRAPseudos.h
 include/llvm/CodeGen/ExpandReductions.h
 include/llvm/CodeGen/ExpandVectorPredication.h
@@ -555,7 +566,6 @@ include/llvm/CodeGen/GlobalISel/IRTranslator.h
 include/llvm/CodeGen/GlobalISel/InlineAsmLowering.h
 include/llvm/CodeGen/GlobalISel/InstructionSelect.h
 include/llvm/CodeGen/GlobalISel/InstructionSelector.h
-include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h
 include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
 include/llvm/CodeGen/GlobalISel/Legalizer.h
 include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
@@ -575,10 +585,13 @@ include/llvm/CodeGen/ISDOpcodes.h
 include/llvm/CodeGen/IndirectBrExpand.h
 include/llvm/CodeGen/IndirectThunks.h
 include/llvm/CodeGen/InitUndef.h
+include/llvm/CodeGen/InlineAsmPrepare.h
+include/llvm/CodeGen/InsertCodePrefetch.h
 include/llvm/CodeGen/InterleavedAccess.h
 include/llvm/CodeGen/InterleavedLoadCombine.h
 include/llvm/CodeGen/IntrinsicLowering.h
 include/llvm/CodeGen/JMCInstrumenter.h
+include/llvm/CodeGen/KCFI.h
 include/llvm/CodeGen/LatencyPriorityQueue.h
 include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
 include/llvm/CodeGen/LexicalScopes.h
@@ -620,11 +633,13 @@ include/llvm/CodeGen/MachineBlockPlacement.h
 include/llvm/CodeGen/MachineBranchProbabilityInfo.h
 include/llvm/CodeGen/MachineCFGPrinter.h
 include/llvm/CodeGen/MachineCSE.h
+include/llvm/CodeGen/MachineCheckDebugify.h
 include/llvm/CodeGen/MachineCombinerPattern.h
 include/llvm/CodeGen/MachineConstantPool.h
 include/llvm/CodeGen/MachineConvergenceVerifier.h
 include/llvm/CodeGen/MachineCopyPropagation.h
 include/llvm/CodeGen/MachineCycleAnalysis.h
+include/llvm/CodeGen/MachineDebugify.h
 include/llvm/CodeGen/MachineDomTreeUpdater.h
 include/llvm/CodeGen/MachineDominanceFrontier.h
 include/llvm/CodeGen/MachineDominators.h
@@ -633,6 +648,7 @@ include/llvm/CodeGen/MachineFunction.h
 include/llvm/CodeGen/MachineFunctionAnalysis.h
 include/llvm/CodeGen/MachineFunctionAnalysisManager.h
 include/llvm/CodeGen/MachineFunctionPass.h
+include/llvm/CodeGen/MachineIDFSSAUpdater.h
 include/llvm/CodeGen/MachineInstr.h
 include/llvm/CodeGen/MachineInstrBuilder.h
 include/llvm/CodeGen/MachineInstrBundle.h
@@ -661,6 +677,7 @@ include/llvm/CodeGen/MachineScheduler.h
 include/llvm/CodeGen/MachineSink.h
 include/llvm/CodeGen/MachineSizeOpts.h
 include/llvm/CodeGen/MachineStableHash.h
+include/llvm/CodeGen/MachineStripDebug.h
 include/llvm/CodeGen/MachineTraceMetrics.h
 include/llvm/CodeGen/MachineUniformityAnalysis.h
 include/llvm/CodeGen/MachineVerifier.h
@@ -708,6 +725,7 @@ include/llvm/CodeGen/RegisterCoalescerPass.h
 include/llvm/CodeGen/RegisterPressure.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/RegisterUsageInfo.h
+include/llvm/CodeGen/Rematerializer.h
 include/llvm/CodeGen/RemoveLoadsIntoFakeUses.h
 include/llvm/CodeGen/RemoveRedundantDebugValues.h
 include/llvm/CodeGen/RenameIndependentSubregs.h
@@ -743,6 +761,8 @@ include/llvm/CodeGen/StackFrameLayoutAnalysisPass.h
 include/llvm/CodeGen/StackMaps.h
 include/llvm/CodeGen/StackProtector.h
 include/llvm/CodeGen/StackSlotColoring.h
+include/llvm/CodeGen/StaticDataAnnotator.h
+include/llvm/CodeGen/StaticDataSplitter.h
 include/llvm/CodeGen/SwiftErrorValueTracking.h
 include/llvm/CodeGen/SwitchLoweringUtils.h
 include/llvm/CodeGen/TailDuplication.h
@@ -765,12 +785,13 @@ include/llvm/CodeGen/VLIWMachineScheduler.h
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
 include/llvm/CodeGen/VirtRegMap.h
-include/llvm/CodeGen/WasmEHFuncInfo.h
+include/llvm/CodeGen/WasmEHInfo.h
 include/llvm/CodeGen/WasmEHPrepare.h
 include/llvm/CodeGen/WinEHFuncInfo.h
 include/llvm/CodeGen/WinEHPrepare.h
 include/llvm/CodeGen/WindowScheduler.h
 include/llvm/CodeGen/XRayInstrumentation.h
+include/llvm/CodeGen/pch.h
 include/llvm/CodeGenTypes/LowLevelType.h
 include/llvm/CodeGenTypes/MachineValueType.h
 include/llvm/Config/AsmParsers.def
@@ -801,7 +822,7 @@ 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
+include/llvm/DWP/ELFWriter.h
 include/llvm/DebugInfo/BTF/BTF.def
 include/llvm/DebugInfo/BTF/BTF.h
 include/llvm/DebugInfo/BTF/BTFContext.h
@@ -913,10 +934,18 @@ include/llvm/DebugInfo/GSYM/ExtractRanges.h
 include/llvm/DebugInfo/GSYM/FileEntry.h
 include/llvm/DebugInfo/GSYM/FileWriter.h
 include/llvm/DebugInfo/GSYM/FunctionInfo.h
+include/llvm/DebugInfo/GSYM/GlobalData.h
 include/llvm/DebugInfo/GSYM/GsymContext.h
 include/llvm/DebugInfo/GSYM/GsymCreator.h
+include/llvm/DebugInfo/GSYM/GsymCreatorV1.h
+include/llvm/DebugInfo/GSYM/GsymCreatorV2.h
+include/llvm/DebugInfo/GSYM/GsymDataExtractor.h
 include/llvm/DebugInfo/GSYM/GsymReader.h
+include/llvm/DebugInfo/GSYM/GsymReaderV1.h
+include/llvm/DebugInfo/GSYM/GsymReaderV2.h
+include/llvm/DebugInfo/GSYM/GsymTypes.h
 include/llvm/DebugInfo/GSYM/Header.h
+include/llvm/DebugInfo/GSYM/HeaderV2.h
 include/llvm/DebugInfo/GSYM/InlineInfo.h
 include/llvm/DebugInfo/GSYM/LineEntry.h
 include/llvm/DebugInfo/GSYM/LineTable.h
@@ -945,6 +974,7 @@ include/llvm/DebugInfo/LogicalView/Readers/LVBinaryReader.h
 include/llvm/DebugInfo/LogicalView/Readers/LVCodeViewReader.h
 include/llvm/DebugInfo/LogicalView/Readers/LVCodeViewVisitor.h
 include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h
+include/llvm/DebugInfo/LogicalView/Readers/LVIRReader.h
 include/llvm/DebugInfo/MSF/IMSFFile.h
 include/llvm/DebugInfo/MSF/MSFBuilder.h
 include/llvm/DebugInfo/MSF/MSFCommon.h
@@ -1084,8 +1114,6 @@ include/llvm/DebugInfo/Symbolize/SymbolizableObjectFile.h
 include/llvm/DebugInfo/Symbolize/Symbolize.h
 include/llvm/Debuginfod/BuildIDFetcher.h
 include/llvm/Debuginfod/Debuginfod.h
-include/llvm/Debuginfod/HTTPClient.h
-include/llvm/Debuginfod/HTTPServer.h
 include/llvm/Demangle/Demangle.h
 include/llvm/Demangle/DemangleConfig.h
 include/llvm/Demangle/ItaniumDemangle.h
@@ -1105,6 +1133,7 @@ include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
 include/llvm/ExecutionEngine/JITLink/ELF.h
 include/llvm/ExecutionEngine/JITLink/ELF_aarch32.h
 include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h
+include/llvm/ExecutionEngine/JITLink/ELF_hexagon.h
 include/llvm/ExecutionEngine/JITLink/ELF_loongarch.h
 include/llvm/ExecutionEngine/JITLink/ELF_ppc64.h
 include/llvm/ExecutionEngine/JITLink/ELF_riscv.h
@@ -1122,6 +1151,7 @@ include/llvm/ExecutionEngine/JITLink/XCOFF.h
 include/llvm/ExecutionEngine/JITLink/XCOFF_ppc64.h
 include/llvm/ExecutionEngine/JITLink/aarch32.h
 include/llvm/ExecutionEngine/JITLink/aarch64.h
+include/llvm/ExecutionEngine/JITLink/hexagon.h
 include/llvm/ExecutionEngine/JITLink/loongarch.h
 include/llvm/ExecutionEngine/JITLink/ppc64.h
 include/llvm/ExecutionEngine/JITLink/riscv.h
@@ -1166,6 +1196,7 @@ include/llvm/ExecutionEngine/Orc/ExecutorResolutionGenerator.h
 include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
 include/llvm/ExecutionEngine/Orc/IRPartitionLayer.h
 include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
+include/llvm/ExecutionEngine/Orc/InProcessEPC.h
 include/llvm/ExecutionEngine/Orc/InProcessMemoryAccess.h
 include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
 include/llvm/ExecutionEngine/Orc/JITLinkRedirectableSymbolManager.h
@@ -1215,6 +1246,7 @@ include/llvm/ExecutionEngine/Orc/SimpleRemoteEPC.h
 include/llvm/ExecutionEngine/Orc/SimpleRemoteMemoryMapper.h
 include/llvm/ExecutionEngine/Orc/SpeculateAnalyses.h
 include/llvm/ExecutionEngine/Orc/Speculation.h
+include/llvm/ExecutionEngine/Orc/SymbolLookupSet.h
 include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/DefaultHostBootstrapValues.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorBootstrapService.h
@@ -1235,6 +1267,7 @@ include/llvm/ExecutionEngine/Orc/TaskDispatch.h
 include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
 include/llvm/ExecutionEngine/Orc/UnwindInfoRegistrationPlugin.h
 include/llvm/ExecutionEngine/Orc/WaitingOnGraph.h
+include/llvm/ExecutionEngine/Orc/WaitingOnGraphOpReplay.h
 include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 include/llvm/ExecutionEngine/RuntimeDyld.h
 include/llvm/ExecutionEngine/RuntimeDyldChecker.h
@@ -1277,6 +1310,9 @@ include/llvm/FuzzMutate/OpDescriptor.h
 include/llvm/FuzzMutate/Operations.h
 include/llvm/FuzzMutate/Random.h
 include/llvm/FuzzMutate/RandomIRBuilder.h
+include/llvm/HTTP/HTTPClient.h
+include/llvm/HTTP/HTTPServer.h
+include/llvm/HTTP/StreamedHTTPResponseHandler.h
 include/llvm/IR/AbstractCallSite.h
 include/llvm/IR/Analysis.h
 include/llvm/IR/Argument.h
@@ -1289,6 +1325,8 @@ include/llvm/IR/Attributes.td
 include/llvm/IR/AutoUpgrade.h
 include/llvm/IR/BasicBlock.h
 include/llvm/IR/BuiltinGCs.h
+include/llvm/IR/BundleAttributes.def
+include/llvm/IR/BundleAttributes.h
 include/llvm/IR/CFG.h
 include/llvm/IR/CallingConv.h
 include/llvm/IR/CmpPredicate.h
@@ -1358,6 +1396,8 @@ include/llvm/IR/IntrinsicsAMDGPU.h
 include/llvm/IR/IntrinsicsAMDGPU.td
 include/llvm/IR/IntrinsicsARM.h
 include/llvm/IR/IntrinsicsARM.td
+include/llvm/IR/IntrinsicsAVR.h
+include/llvm/IR/IntrinsicsAVR.td
 include/llvm/IR/IntrinsicsBPF.h
 include/llvm/IR/IntrinsicsBPF.td
 include/llvm/IR/IntrinsicsDirectX.h
@@ -1452,6 +1492,7 @@ include/llvm/IR/ValueMap.h
 include/llvm/IR/ValueSymbolTable.h
 include/llvm/IR/VectorTypeUtils.h
 include/llvm/IR/Verifier.h
+include/llvm/IR/pch.h
 include/llvm/IRPrinter/IRPrintingPasses.h
 include/llvm/IRReader/IRReader.h
 include/llvm/InitializePasses.h
@@ -1471,6 +1512,7 @@ include/llvm/LinkAllPasses.h
 include/llvm/Linker/IRMover.h
 include/llvm/Linker/Linker.h
 include/llvm/MC/ConstantPools.h
+include/llvm/MC/DXContainerInfo.h
 include/llvm/MC/DXContainerPSVInfo.h
 include/llvm/MC/DXContainerRootSignature.h
 include/llvm/MC/LaneBitmask.h
@@ -1483,6 +1525,7 @@ include/llvm/MC/MCAsmInfoGOFF.h
 include/llvm/MC/MCAsmInfoWasm.h
 include/llvm/MC/MCAsmInfoXCOFF.h
 include/llvm/MC/MCAsmMacro.h
+include/llvm/MC/MCAsmStreamer.h
 include/llvm/MC/MCAssembler.h
 include/llvm/MC/MCCodeEmitter.h
 include/llvm/MC/MCCodeView.h
@@ -1512,6 +1555,8 @@ include/llvm/MC/MCInstrAnalysis.h
 include/llvm/MC/MCInstrDesc.h
 include/llvm/MC/MCInstrInfo.h
 include/llvm/MC/MCInstrItineraries.h
+include/llvm/MC/MCLFI.h
+include/llvm/MC/MCLFIRewriter.h
 include/llvm/MC/MCLabel.h
 include/llvm/MC/MCLinkerOptimizationHint.h
 include/llvm/MC/MCMachObjectWriter.h
@@ -1609,6 +1654,8 @@ include/llvm/ObjCopy/wasm/WasmConfig.h
 include/llvm/ObjCopy/wasm/WasmObjcopy.h
 include/llvm/Object/Archive.h
 include/llvm/Object/ArchiveWriter.h
+include/llvm/Object/BBAddrMap.def
+include/llvm/Object/BBAddrMap.h
 include/llvm/Object/Binary.h
 include/llvm/Object/BuildID.h
 include/llvm/Object/COFF.h
@@ -1646,11 +1693,13 @@ include/llvm/Object/WindowsMachineFlag.h
 include/llvm/Object/WindowsResource.h
 include/llvm/Object/XCOFFObjectFile.h
 include/llvm/ObjectYAML/ArchiveYAML.h
+include/llvm/ObjectYAML/BBAddrMapYAML.h
 include/llvm/ObjectYAML/COFFYAML.h
 include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
 include/llvm/ObjectYAML/CodeViewYAMLSymbols.h
 include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h
 include/llvm/ObjectYAML/CodeViewYAMLTypes.h
+include/llvm/ObjectYAML/ContiguousBlobAccumulator.h
 include/llvm/ObjectYAML/DWARFEmitter.h
 include/llvm/ObjectYAML/DWARFYAML.h
 include/llvm/ObjectYAML/DXContainerYAML.h
@@ -1688,6 +1737,7 @@ include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
 include/llvm/ProfileData/Coverage/MCDCTypes.h
 include/llvm/ProfileData/CtxInstrContextNode.h
 include/llvm/ProfileData/DataAccessProf.h
+include/llvm/ProfileData/ETMTraceDecoder.h
 include/llvm/ProfileData/FunctionId.h
 include/llvm/ProfileData/GCOV.h
 include/llvm/ProfileData/HashKeyMap.h
@@ -1744,10 +1794,12 @@ include/llvm/SandboxIR/User.h
 include/llvm/SandboxIR/Utils.h
 include/llvm/SandboxIR/Value.h
 include/llvm/SandboxIR/Values.def
+include/llvm/SandboxIR/ValuesDefFilesList.def
 include/llvm/Support/AArch64AttributeParser.h
 include/llvm/Support/AArch64BuildAttributes.h
 include/llvm/Support/AMDGPUAddrSpace.h
 include/llvm/Support/AMDGPUMetadata.h
+include/llvm/Support/AMDGPUObjLinkingInfo.h
 include/llvm/Support/AMDHSAKernelDescriptor.h
 include/llvm/Support/ARMAttributeParser.h
 include/llvm/Support/ARMBuildAttributes.h
@@ -1783,6 +1835,7 @@ include/llvm/Support/BuryPointer.h
 include/llvm/Support/CBindingWrapping.h
 include/llvm/Support/CFGDiff.h
 include/llvm/Support/CFGUpdate.h
+include/llvm/Support/CHERICapabilityFormat.h
 include/llvm/Support/COM.h
 include/llvm/Support/CRC.h
 include/llvm/Support/CSKYAttributeParser.h
@@ -1822,6 +1875,7 @@ include/llvm/Support/EndianStream.h
 include/llvm/Support/Errc.h
 include/llvm/Support/Errno.h
 include/llvm/Support/Error.h
+include/llvm/Support/ErrorExtras.h
 include/llvm/Support/ErrorHandling.h
 include/llvm/Support/ErrorOr.h
 include/llvm/Support/ExitCodes.h
@@ -1847,7 +1901,6 @@ include/llvm/Support/GenericLoopInfo.h
 include/llvm/Support/GenericLoopInfoImpl.h
 include/llvm/Support/GlobPattern.h
 include/llvm/Support/GraphWriter.h
-include/llvm/Support/Hash.h
 include/llvm/Support/HashBuilder.h
 include/llvm/Support/HashingOutputBackend.h
 include/llvm/Support/HexagonAttributeParser.h
@@ -1886,6 +1939,7 @@ include/llvm/Support/ModRef.h
 include/llvm/Support/Mustache.h
 include/llvm/Support/Mutex.h
 include/llvm/Support/NVPTXAddrSpace.h
+include/llvm/Support/NVVMAttributes.h
 include/llvm/Support/NativeFormatting.h
 include/llvm/Support/OnDiskHashTable.h
 include/llvm/Support/OptimizedStructLayout.h
@@ -1893,6 +1947,7 @@ include/llvm/Support/OptionStrCmp.h
 include/llvm/Support/PGOOptions.h
 include/llvm/Support/Parallel.h
 include/llvm/Support/Path.h
+include/llvm/Support/PatternMatchHelpers.h
 include/llvm/Support/PerThreadBumpPtrAllocator.h
 include/llvm/Support/PluginLoader.h
 include/llvm/Support/PointerLikeTypeTraits.h
@@ -1944,6 +1999,7 @@ include/llvm/Support/ToolOutputFile.h
 include/llvm/Support/TrailingObjects.h
 include/llvm/Support/TypeName.h
 include/llvm/Support/TypeSize.h
+include/llvm/Support/UndefPoison.h
 include/llvm/Support/Unicode.h
 include/llvm/Support/UnicodeCharRanges.h
 include/llvm/Support/UniqueBBID.h
@@ -1968,6 +2024,7 @@ include/llvm/Support/YAMLParser.h
 include/llvm/Support/YAMLTraits.h
 include/llvm/Support/circular_raw_ostream.h
 include/llvm/Support/float128.h
+include/llvm/Support/pch.h
 include/llvm/Support/raw_os_ostream.h
 include/llvm/Support/raw_ostream.h
 include/llvm/Support/raw_ostream_proxy.h
@@ -2014,10 +2071,13 @@ include/llvm/TargetParser/AArch64CPUFeatures.inc
 include/llvm/TargetParser/AArch64FeatPriorities.inc
 include/llvm/TargetParser/AArch64TargetParser.h
 include/llvm/TargetParser/AArch64TargetParserDef.inc
+include/llvm/TargetParser/AMDGPUTargetParser.def
+include/llvm/TargetParser/AMDGPUTargetParser.h
 include/llvm/TargetParser/ARMTargetParser.def
 include/llvm/TargetParser/ARMTargetParser.h
 include/llvm/TargetParser/ARMTargetParserCommon.h
 include/llvm/TargetParser/ARMTargetParserDef.inc
+include/llvm/TargetParser/AVRTargetParser.h
 include/llvm/TargetParser/CSKYTargetParser.def
 include/llvm/TargetParser/CSKYTargetParser.h
 include/llvm/TargetParser/Host.h
@@ -2032,6 +2092,7 @@ include/llvm/TargetParser/RISCVTargetParserDef.inc
 include/llvm/TargetParser/SubtargetFeature.h
 include/llvm/TargetParser/TargetParser.h
 include/llvm/TargetParser/Triple.h
+include/llvm/TargetParser/TripleName.def
 include/llvm/TargetParser/X86TargetParser.def
 include/llvm/TargetParser/X86TargetParser.h
 include/llvm/TargetParser/XtensaTargetParser.def
@@ -2104,6 +2165,12 @@ include/llvm/Transforms/IPO/HotColdSplitting.h
 include/llvm/Transforms/IPO/IROutliner.h
 include/llvm/Transforms/IPO/InferFunctionAttrs.h
 include/llvm/Transforms/IPO/Inliner.h
+include/llvm/Transforms/IPO/Instrumentor.h
+include/llvm/Transforms/IPO/InstrumentorConfigFile.h
+include/llvm/Transforms/IPO/InstrumentorRuntimeHelper.h
+include/llvm/Transforms/IPO/InstrumentorStubPrinter.h
+include/llvm/Transforms/IPO/InstrumentorUtils.h
+include/llvm/Transforms/IPO/InstrumentorVariables.inc
 include/llvm/Transforms/IPO/Internalize.h
 include/llvm/Transforms/IPO/LoopExtractor.h
 include/llvm/Transforms/IPO/LowerTypeTests.h
@@ -2168,6 +2235,7 @@ include/llvm/Transforms/Scalar/DeadStoreElimination.h
 include/llvm/Transforms/Scalar/DivRemPairs.h
 include/llvm/Transforms/Scalar/DropUnnecessaryAssumes.h
 include/llvm/Transforms/Scalar/EarlyCSE.h
+include/llvm/Transforms/Scalar/ExpandMemCmp.h
 include/llvm/Transforms/Scalar/FlattenCFG.h
 include/llvm/Transforms/Scalar/Float2Int.h
 include/llvm/Transforms/Scalar/GVN.h
@@ -2237,6 +2305,7 @@ include/llvm/Transforms/Utils.h
 include/llvm/Transforms/Utils/AMDGPUEmitPrintf.h
 include/llvm/Transforms/Utils/ASanStackFrameLayout.h
 include/llvm/Transforms/Utils/AddDiscriminators.h
+include/llvm/Transforms/Utils/AssignGUID.h
 include/llvm/Transforms/Utils/AssumeBundleBuilder.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
 include/llvm/Transforms/Utils/BreakCriticalEdges.h
@@ -2273,6 +2342,7 @@ include/llvm/Transforms/Utils/InstructionNamer.h
 include/llvm/Transforms/Utils/InstructionWorklist.h
 include/llvm/Transforms/Utils/Instrumentation.h
 include/llvm/Transforms/Utils/IntegerDivision.h
+include/llvm/Transforms/Utils/KCFIHash.h
 include/llvm/Transforms/Utils/LCSSA.h
 include/llvm/Transforms/Utils/LibCallsShrinkWrap.h
 include/llvm/Transforms/Utils/Local.h
@@ -2285,6 +2355,7 @@ include/llvm/Transforms/Utils/LoopSimplify.h
 include/llvm/Transforms/Utils/LoopUtils.h
 include/llvm/Transforms/Utils/LoopVersioning.h
 include/llvm/Transforms/Utils/LowerAtomic.h
+include/llvm/Transforms/Utils/LowerCommentStringPass.h
 include/llvm/Transforms/Utils/LowerGlobalDtors.h
 include/llvm/Transforms/Utils/LowerIFunc.h
 include/llvm/Transforms/Utils/LowerInvoke.h
@@ -2319,10 +2390,11 @@ include/llvm/Transforms/Utils/SimplifyLibCalls.h
 include/llvm/Transforms/Utils/SizeOpts.h
 include/llvm/Transforms/Utils/SplitModule.h
 include/llvm/Transforms/Utils/SplitModuleByCategory.h
+include/llvm/Transforms/Utils/StripConvergenceIntrinsics.h
 include/llvm/Transforms/Utils/StripGCRelocates.h
 include/llvm/Transforms/Utils/StripNonLineTableDebugInfo.h
 include/llvm/Transforms/Utils/SymbolRewriter.h
-include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
+include/llvm/Transforms/Utils/TriggerCrashPass.h
 include/llvm/Transforms/Utils/UnifyLoopExits.h
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/VNCoercion.h
@@ -2338,6 +2410,7 @@ include/llvm/Transforms/Vectorize/SandboxVectorizer/InstrMaps.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Legality.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/LoadStoreVec.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/NullPass.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PackReuse.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PrintInstructionCount.h
@@ -2349,7 +2422,10 @@ include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionAcceptOrRe
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionAlwaysAccept.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionAlwaysRevert.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionSave.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/RegionWithScore.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizer.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizerIR.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizerIRValues.def
 include/llvm/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizerPassBuilder.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Scheduler.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/SeedCollector.h
@@ -2388,8 +2464,10 @@ lib/cmake/llvm/CoverageReport.cmake
 lib/cmake/llvm/CrossCompile.cmake
 lib/cmake/llvm/DetermineGCCCompatible.cmake
 lib/cmake/llvm/FileLock.cmake
+lib/cmake/llvm/FindDIASDK.cmake
 lib/cmake/llvm/FindFFI.cmake
 lib/cmake/llvm/FindLibEdit.cmake
+lib/cmake/llvm/FindLibXml2.cmake
 lib/cmake/llvm/FindLibpfm.cmake
 lib/cmake/llvm/FindOCaml.cmake
 lib/cmake/llvm/FindSphinx.cmake
@@ -2416,9 +2494,9 @@ 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-22.${SHLIB_EXT}
-lib/libLLVM.${SHLIB_EXT}
-${PLIST.notdylib}lib/libLLVM.${SHLIB_EXT}.22.1
+lib/libLLVM-23.${SHLIB_EXT}
+${PLIST.notdylib}lib/libLLVM.${SHLIB_EXT}
+lib/libLLVM.so.23.1
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a
 ${PLIST.AArch64}lib/libLLVMAArch64Desc.a
@@ -2495,8 +2573,8 @@ lib/libLLVMDemangle.a
 lib/libLLVMDiff.a
 ${PLIST.DirectX}lib/libLLVMDirectXCodeGen.a
 ${PLIST.DirectX}lib/libLLVMDirectXDesc.a
+lib/libLLVMDirectXIRPasses.a
 ${PLIST.DirectX}lib/libLLVMDirectXInfo.a
-${PLIST.DirectX}lib/libLLVMDirectXPointerTypeAnalysis.a
 lib/libLLVMDlltoolDriver.a
 lib/libLLVMExecutionEngine.a
 lib/libLLVMExegesis.a
@@ -2517,6 +2595,7 @@ lib/libLLVMFrontendOpenMP.a
 lib/libLLVMFuzzMutate.a
 lib/libLLVMFuzzerCLI.a
 lib/libLLVMGlobalISel.a
+lib/libLLVMHTTP.a
 ${PLIST.Hexagon}lib/libLLVMHexagonAsmParser.a
 ${PLIST.Hexagon}lib/libLLVMHexagonCodeGen.a
 ${PLIST.Hexagon}lib/libLLVMHexagonDesc.a
@@ -2623,6 +2702,7 @@ lib/libLLVMTelemetry.a
 lib/libLLVMTextAPI.a
 lib/libLLVMTextAPIBinaryReader.a
 lib/libLLVMTransformUtils.a
+lib/libLLVMUBAwareInterpreter.a
 ${PLIST.VE}lib/libLLVMVEAsmParser.a
 ${PLIST.VE}lib/libLLVMVECodeGen.a
 ${PLIST.VE}lib/libLLVMVEDesc.a
@@ -2655,9 +2735,9 @@ ${PLIST.Xtensa}lib/libLLVMXtensaDisassembler.a
 ${PLIST.Xtensa}lib/libLLVMXtensaInfo.a
 lib/libLLVMipo.a
 lib/libLTO.${SHLIB_EXT}
-${PLIST.notdylib}lib/libLTO.${SHLIB_EXT}.22.1
-lib/libRemarks.${SHLIB_EXT}
-${PLIST.notdylib}lib/libRemarks.${SHLIB_EXT}.22.1
+${PLIST.notdylib}lib/libLTO.so.23.1
+${PLIST.notdylib}lib/libRemarks.${SHLIB_EXT}
+lib/libRemarks.so.23.1
 share/opt-viewer/opt-diff.py
 share/opt-viewer/opt-stats.py
 share/opt-viewer/opt-viewer.py
diff --git a/llvm/buildlink3.mk b/llvm/buildlink3.mk
index 91bc6dd566..204335971e 100644
--- a/llvm/buildlink3.mk
+++ b/llvm/buildlink3.mk
@@ -5,20 +5,20 @@ BUILDLINK_TREE+=	llvm
 .if !defined(LLVM_BUILDLINK3_MK)
 LLVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.llvm+=	llvm>=21.1.0
+BUILDLINK_API_DEPENDS.llvm+=	llvm>=23.1.0
 BUILDLINK_PKGSRCDIR.llvm?=	../../wip/llvm
 
 LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
 
 BUILDLINK_FILES.llvm+=		bin/FileCheck
 BUILDLINK_FILES.llvm+=		bin/UnicodeNameMappingGenerator
-BUILDLINK_FILES.llvm+=		bin/bugpoint
 BUILDLINK_FILES.llvm+=		bin/clang-offload-packager
 BUILDLINK_FILES.llvm+=		bin/count
 BUILDLINK_FILES.llvm+=		bin/dsymutil
 BUILDLINK_FILES.llvm+=		bin/llc
 BUILDLINK_FILES.llvm+=		bin/lli
 BUILDLINK_FILES.llvm+=		bin/lli-child-target
+BUILDLINK_FILES.llvm+=		bin/llubi
 BUILDLINK_FILES.llvm+=		bin/llvm-PerfectShuffle
 BUILDLINK_FILES.llvm+=		bin/llvm-addr2line
 BUILDLINK_FILES.llvm+=		bin/llvm-ar
@@ -47,6 +47,8 @@ BUILDLINK_FILES.llvm+=		bin/llvm-dwarfutil
 BUILDLINK_FILES.llvm+=		bin/llvm-dwp
 BUILDLINK_FILES.llvm+=		bin/llvm-exegesis
 BUILDLINK_FILES.llvm+=		bin/llvm-extract
+BUILDLINK_FILES.llvm+=		bin/llvm-extract-bundle-entry
+BUILDLINK_FILES.llvm+=		bin/llvm-gpu-loader
 BUILDLINK_FILES.llvm+=		bin/llvm-gsymutil
 BUILDLINK_FILES.llvm+=		bin/llvm-ifs
 BUILDLINK_FILES.llvm+=		bin/llvm-install-name-tool
diff --git a/llvm/distinfo b/llvm/distinfo
index 0d38cdb584..00df498f41 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -1,12 +1,11 @@
 $NetBSD: distinfo,v 1.41 2023/03/05 17:26:09 he Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
-SHA1 (patch-203680) = 6e8eb01006fbb70fcdea84edaeddcfd882256878
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
 SHA1 (patch-CMakeLists.txt) = e7ed5046d2f6f2f6338bc842e83666ed109bd2b0
-SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
-SHA1 (patch-cmake_modules_AddLLVM.cmake) = a1a1ef44dfb5a3298587b40e0e56704fd5bbe3b8
+SHA1 (patch-cmake_config-ix.cmake) = f3167fbdd0ca3fea9f9e5516760b072af62d121a
+SHA1 (patch-cmake_modules_AddLLVM.cmake) = 036eec53f8a2c5921235341db1bf2f504dca8fea
 SHA1 (patch-include_llvm-c_DataTypes.h) = ff547cae5bdf90c5a1371b9eb196e7537a03b18d
 SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 92558f2d7d87b7a26f7f3a2b3b3dc539ae13e672
 SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = e6f223e68b8ef03175282af1afbfcd7e0b30c6ca
diff --git a/llvm/patches/patch-203680 b/llvm/patches/patch-203680
deleted file mode 100644
index 45c29f4fea..0000000000
--- a/llvm/patches/patch-203680
+++ /dev/null
@@ -1,731 +0,0 @@
-$NetBSD$
-
-Align Mach-O __LINKEDIT entries to the target pointer size when
-building the tail layout. This matches the behavior of ld64 and
-lld-macho.
-
-dyld on macOS 27 rejects loading dylibs with misaligned __LINKEDIT
-entries.
----
- llvm/lib/ObjCopy/MachO/MachOLayoutBuilder.cpp |  85 ++--
- llvm/lib/ObjCopy/MachO/MachOWriter.cpp        |  42 +-
- .../MachO/linkedit-alignment.test             | 366 ++++++++++++++++++
- .../llvm-objcopy/MachO/linkedit-order-1.test  |   3 +-
- .../llvm-objcopy/MachO/linkedit-order-2.test  |   3 +-
- .../llvm-objcopy/MachO/symbol-table.test      |   4 +-
- 6 files changed, 453 insertions(+), 50 deletions(-)
- create mode 100644 llvm/test/tools/llvm-objcopy/MachO/linkedit-alignment.test
-
-diff --git a/llvm/lib/ObjCopy/MachO/MachOLayoutBuilder.cpp b/llvm/lib/ObjCopy/MachO/MachOLayoutBuilder.cpp
-index 8660c903c617d..aa4c0654eabed 100644
---- lib/ObjCopy/MachO/MachOLayoutBuilder.cpp
-+++ lib/ObjCopy/MachO/MachOLayoutBuilder.cpp
-@@ -235,24 +235,27 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
-          "Incorrect tail offset");
-   Offset = std::max(Offset, HeaderSize + O.Header.SizeOfCmds);
- 
-+  const uint64_t LinkEditAlign = Is64Bit ? 8 : 4;
-+  Offset = alignToPowerOf2(Offset, LinkEditAlign);
-+
-   // The exports trie can be in either LC_DYLD_INFO or in
-   // LC_DYLD_EXPORTS_TRIE, but not both.
--  size_t DyldInfoExportsTrieSize = 0;
--  size_t DyldExportsTrieSize = 0;
-+  uint64_t DyldInfoExportsTrieRawSize = 0;
-+  uint64_t DyldExportsTrieRawSize = 0;
-   for (const auto &LC : O.LoadCommands) {
-     switch (LC.MachOLoadCommand.load_command_data.cmd) {
-     case MachO::LC_DYLD_INFO:
-     case MachO::LC_DYLD_INFO_ONLY:
--      DyldInfoExportsTrieSize = O.Exports.Trie.size();
-+      DyldInfoExportsTrieRawSize = O.Exports.Trie.size();
-       break;
-     case MachO::LC_DYLD_EXPORTS_TRIE:
--      DyldExportsTrieSize = O.Exports.Trie.size();
-+      DyldExportsTrieRawSize = O.Exports.Trie.size();
-       break;
-     default:
-       break;
-     }
-   }
--  assert((DyldInfoExportsTrieSize == 0 || DyldExportsTrieSize == 0) &&
-+  assert((DyldInfoExportsTrieRawSize == 0 || DyldExportsTrieRawSize == 0) &&
-          "Export trie in both LCs");
- 
-   uint64_t NListSize = Is64Bit ? sizeof(MachO::nlist_64) : sizeof(MachO::nlist);
-@@ -263,28 +266,43 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
-   // trie, chained fixups, dyld exports trie, function starts, data-in-code,
-   // symbol table, indirect symbol table, symbol table strings,
-   // dylib codesign drs, and code signature.
--  auto updateOffset = [&Offset](size_t Size) {
-+  auto updateOffset = [&Offset, LinkEditAlign](uint64_t Size) {
-     uint64_t PreviousOffset = Offset;
--    Offset += Size;
--    return PreviousOffset;
-+    // Match ld64 and lld-macho behavior by aligning all LINKEDIT entries to
-+    // pointer size. This is safe because zero padding is valid for all entries.
-+    uint64_t PaddedSize = alignToPowerOf2(Size, LinkEditAlign);
-+    Offset += PaddedSize;
-+    return std::make_pair(PreviousOffset, PaddedSize);
-   };
- 
--  uint64_t StartOfRebaseInfo = updateOffset(O.Rebases.Opcodes.size());
--  uint64_t StartOfBindingInfo = updateOffset(O.Binds.Opcodes.size());
--  uint64_t StartOfWeakBindingInfo = updateOffset(O.WeakBinds.Opcodes.size());
--  uint64_t StartOfLazyBindingInfo = updateOffset(O.LazyBinds.Opcodes.size());
--  uint64_t StartOfExportTrie = updateOffset(DyldInfoExportsTrieSize);
--  uint64_t StartOfChainedFixups = updateOffset(O.ChainedFixups.Data.size());
--  uint64_t StartOfDyldExportsTrie = updateOffset(DyldExportsTrieSize);
--  uint64_t StartOfFunctionStarts = updateOffset(O.FunctionStarts.Data.size());
--  uint64_t StartOfDataInCode = updateOffset(O.DataInCode.Data.size());
--  uint64_t StartOfLinkerOptimizationHint =
-+  auto [StartOfRebaseInfo, RebaseInfoSize] =
-+      updateOffset(O.Rebases.Opcodes.size());
-+  auto [StartOfBindingInfo, BindingInfoSize] =
-+      updateOffset(O.Binds.Opcodes.size());
-+  auto [StartOfWeakBindingInfo, WeakBindingInfoSize] =
-+      updateOffset(O.WeakBinds.Opcodes.size());
-+  auto [StartOfLazyBindingInfo, LazyBindingInfoSize] =
-+      updateOffset(O.LazyBinds.Opcodes.size());
-+  auto [StartOfExportTrie, ExportTrieSize] =
-+      updateOffset(DyldInfoExportsTrieRawSize);
-+  auto [StartOfChainedFixups, ChainedFixupsSize] =
-+      updateOffset(O.ChainedFixups.Data.size());
-+  auto [StartOfDyldExportsTrie, DyldExportsTrieSize] =
-+      updateOffset(DyldExportsTrieRawSize);
-+  auto [StartOfFunctionStarts, FunctionStartsSize] =
-+      updateOffset(O.FunctionStarts.Data.size());
-+  auto [StartOfDataInCode, DataInCodeSize] =
-+      updateOffset(O.DataInCode.Data.size());
-+  auto [StartOfLinkerOptimizationHint, LinkerOptimizationHintSize] =
-       updateOffset(O.LinkerOptimizationHint.Data.size());
--  uint64_t StartOfSymbols = updateOffset(NListSize * O.SymTable.Symbols.size());
-+  uint64_t StartOfSymbols =
-+      updateOffset(NListSize * O.SymTable.Symbols.size()).first;
-   uint64_t StartOfIndirectSymbols =
--      updateOffset(sizeof(uint32_t) * O.IndirectSymTable.Symbols.size());
--  uint64_t StartOfSymbolStrings = updateOffset(StrTableBuilder.getSize());
--  uint64_t StartOfDylibCodeSignDRs = updateOffset(O.DylibCodeSignDRs.Data.size());
-+      updateOffset(sizeof(uint32_t) * O.IndirectSymTable.Symbols.size()).first;
-+  auto [StartOfSymbolStrings, SymbolStringsSize] =
-+      updateOffset(StrTableBuilder.getSize());
-+  auto [StartOfDylibCodeSignDRs, DylibCodeSignDRsSize] =
-+      updateOffset(O.DylibCodeSignDRs.Data.size());
- 
-   uint64_t StartOfCodeSignature = Offset;
-   uint32_t CodeSignatureSize = 0;
-@@ -343,13 +361,13 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
-       break;
-     case MachO::LC_DYLIB_CODE_SIGN_DRS:
-       MLC.linkedit_data_command_data.dataoff = StartOfDylibCodeSignDRs;
--      MLC.linkedit_data_command_data.datasize = O.DylibCodeSignDRs.Data.size();
-+      MLC.linkedit_data_command_data.datasize = DylibCodeSignDRsSize;
-       break;
-     case MachO::LC_SYMTAB:
-       MLC.symtab_command_data.symoff = StartOfSymbols;
-       MLC.symtab_command_data.nsyms = O.SymTable.Symbols.size();
-       MLC.symtab_command_data.stroff = StartOfSymbolStrings;
--      MLC.symtab_command_data.strsize = StrTableBuilder.getSize();
-+      MLC.symtab_command_data.strsize = SymbolStringsSize;
-       break;
-     case MachO::LC_DYSYMTAB: {
-       if (MLC.dysymtab_command_data.ntoc != 0 ||
-@@ -368,20 +386,19 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
-     }
-     case MachO::LC_DATA_IN_CODE:
-       MLC.linkedit_data_command_data.dataoff = StartOfDataInCode;
--      MLC.linkedit_data_command_data.datasize = O.DataInCode.Data.size();
-+      MLC.linkedit_data_command_data.datasize = DataInCodeSize;
-       break;
-     case MachO::LC_LINKER_OPTIMIZATION_HINT:
-       MLC.linkedit_data_command_data.dataoff = StartOfLinkerOptimizationHint;
--      MLC.linkedit_data_command_data.datasize =
--          O.LinkerOptimizationHint.Data.size();
-+      MLC.linkedit_data_command_data.datasize = LinkerOptimizationHintSize;
-       break;
-     case MachO::LC_FUNCTION_STARTS:
-       MLC.linkedit_data_command_data.dataoff = StartOfFunctionStarts;
--      MLC.linkedit_data_command_data.datasize = O.FunctionStarts.Data.size();
-+      MLC.linkedit_data_command_data.datasize = FunctionStartsSize;
-       break;
-     case MachO::LC_DYLD_CHAINED_FIXUPS:
-       MLC.linkedit_data_command_data.dataoff = StartOfChainedFixups;
--      MLC.linkedit_data_command_data.datasize = O.ChainedFixups.Data.size();
-+      MLC.linkedit_data_command_data.datasize = ChainedFixupsSize;
-       break;
-     case MachO::LC_DYLD_EXPORTS_TRIE:
-       MLC.linkedit_data_command_data.dataoff = StartOfDyldExportsTrie;
-@@ -391,19 +408,19 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
-     case MachO::LC_DYLD_INFO_ONLY:
-       MLC.dyld_info_command_data.rebase_off =
-           O.Rebases.Opcodes.empty() ? 0 : StartOfRebaseInfo;
--      MLC.dyld_info_command_data.rebase_size = O.Rebases.Opcodes.size();
-+      MLC.dyld_info_command_data.rebase_size = RebaseInfoSize;
-       MLC.dyld_info_command_data.bind_off =
-           O.Binds.Opcodes.empty() ? 0 : StartOfBindingInfo;
--      MLC.dyld_info_command_data.bind_size = O.Binds.Opcodes.size();
-+      MLC.dyld_info_command_data.bind_size = BindingInfoSize;
-       MLC.dyld_info_command_data.weak_bind_off =
-           O.WeakBinds.Opcodes.empty() ? 0 : StartOfWeakBindingInfo;
--      MLC.dyld_info_command_data.weak_bind_size = O.WeakBinds.Opcodes.size();
-+      MLC.dyld_info_command_data.weak_bind_size = WeakBindingInfoSize;
-       MLC.dyld_info_command_data.lazy_bind_off =
-           O.LazyBinds.Opcodes.empty() ? 0 : StartOfLazyBindingInfo;
--      MLC.dyld_info_command_data.lazy_bind_size = O.LazyBinds.Opcodes.size();
-+      MLC.dyld_info_command_data.lazy_bind_size = LazyBindingInfoSize;
-       MLC.dyld_info_command_data.export_off =
-           O.Exports.Trie.empty() ? 0 : StartOfExportTrie;
--      MLC.dyld_info_command_data.export_size = DyldInfoExportsTrieSize;
-+      MLC.dyld_info_command_data.export_size = ExportTrieSize;
-       break;
-     // Note that LC_ENCRYPTION_INFO.cryptoff despite its name and the comment in
-     // <mach-o/loader.h> is not an offset in the binary file, instead, it is a
-diff --git a/llvm/lib/ObjCopy/MachO/MachOWriter.cpp b/llvm/lib/ObjCopy/MachO/MachOWriter.cpp
-index 07514dd2f8d6a..d83a82cee73ae 100644
---- lib/ObjCopy/MachO/MachOWriter.cpp
-+++ lib/ObjCopy/MachO/MachOWriter.cpp
-@@ -24,6 +24,12 @@ using namespace llvm;
- using namespace llvm::objcopy::macho;
- using namespace llvm::support::endian;
- 
-+#ifndef NDEBUG
-+static uint64_t paddedLinkEditEntrySize(uint64_t Size, bool Is64Bit) {
-+  return alignToPowerOf2(Size, Is64Bit ? 8 : 4);
-+}
-+#endif
-+
- size_t MachOWriter::headerSize() const {
-   return Is64Bit ? sizeof(MachO::mach_header_64) : sizeof(MachO::mach_header);
- }
-@@ -55,29 +61,34 @@ size_t MachOWriter::totalSize() const {
-         O.LoadCommands[*O.DyLdInfoCommandIndex]
-             .MachOLoadCommand.dyld_info_command_data;
-     if (DyLdInfoCommand.rebase_off) {
--      assert((DyLdInfoCommand.rebase_size == O.Rebases.Opcodes.size()) &&
-+      assert((DyLdInfoCommand.rebase_size ==
-+              paddedLinkEditEntrySize(O.Rebases.Opcodes.size(), Is64Bit)) &&
-              "Incorrect rebase opcodes size");
-       Ends.push_back(DyLdInfoCommand.rebase_off + DyLdInfoCommand.rebase_size);
-     }
-     if (DyLdInfoCommand.bind_off) {
--      assert((DyLdInfoCommand.bind_size == O.Binds.Opcodes.size()) &&
-+      assert((DyLdInfoCommand.bind_size ==
-+              paddedLinkEditEntrySize(O.Binds.Opcodes.size(), Is64Bit)) &&
-              "Incorrect bind opcodes size");
-       Ends.push_back(DyLdInfoCommand.bind_off + DyLdInfoCommand.bind_size);
-     }
-     if (DyLdInfoCommand.weak_bind_off) {
--      assert((DyLdInfoCommand.weak_bind_size == O.WeakBinds.Opcodes.size()) &&
-+      assert((DyLdInfoCommand.weak_bind_size ==
-+              paddedLinkEditEntrySize(O.WeakBinds.Opcodes.size(), Is64Bit)) &&
-              "Incorrect weak bind opcodes size");
-       Ends.push_back(DyLdInfoCommand.weak_bind_off +
-                      DyLdInfoCommand.weak_bind_size);
-     }
-     if (DyLdInfoCommand.lazy_bind_off) {
--      assert((DyLdInfoCommand.lazy_bind_size == O.LazyBinds.Opcodes.size()) &&
-+      assert((DyLdInfoCommand.lazy_bind_size ==
-+              paddedLinkEditEntrySize(O.LazyBinds.Opcodes.size(), Is64Bit)) &&
-              "Incorrect lazy bind opcodes size");
-       Ends.push_back(DyLdInfoCommand.lazy_bind_off +
-                      DyLdInfoCommand.lazy_bind_size);
-     }
-     if (DyLdInfoCommand.export_off) {
--      assert((DyLdInfoCommand.export_size == O.Exports.Trie.size()) &&
-+      assert((DyLdInfoCommand.export_size ==
-+              paddedLinkEditEntrySize(O.Exports.Trie.size(), Is64Bit)) &&
-              "Incorrect trie size");
-       Ends.push_back(DyLdInfoCommand.export_off + DyLdInfoCommand.export_size);
-     }
-@@ -320,7 +331,8 @@ void MachOWriter::writeRebaseInfo() {
-       O.LoadCommands[*O.DyLdInfoCommandIndex]
-           .MachOLoadCommand.dyld_info_command_data;
-   char *Out = Buf->getBufferStart() + DyLdInfoCommand.rebase_off;
--  assert((DyLdInfoCommand.rebase_size == O.Rebases.Opcodes.size()) &&
-+  assert((DyLdInfoCommand.rebase_size ==
-+          paddedLinkEditEntrySize(O.Rebases.Opcodes.size(), Is64Bit)) &&
-          "Incorrect rebase opcodes size");
-   memcpy(Out, O.Rebases.Opcodes.data(), O.Rebases.Opcodes.size());
- }
-@@ -332,7 +344,8 @@ void MachOWriter::writeBindInfo() {
-       O.LoadCommands[*O.DyLdInfoCommandIndex]
-           .MachOLoadCommand.dyld_info_command_data;
-   char *Out = Buf->getBufferStart() + DyLdInfoCommand.bind_off;
--  assert((DyLdInfoCommand.bind_size == O.Binds.Opcodes.size()) &&
-+  assert((DyLdInfoCommand.bind_size ==
-+          paddedLinkEditEntrySize(O.Binds.Opcodes.size(), Is64Bit)) &&
-          "Incorrect bind opcodes size");
-   memcpy(Out, O.Binds.Opcodes.data(), O.Binds.Opcodes.size());
- }
-@@ -344,7 +357,8 @@ void MachOWriter::writeWeakBindInfo() {
-       O.LoadCommands[*O.DyLdInfoCommandIndex]
-           .MachOLoadCommand.dyld_info_command_data;
-   char *Out = Buf->getBufferStart() + DyLdInfoCommand.weak_bind_off;
--  assert((DyLdInfoCommand.weak_bind_size == O.WeakBinds.Opcodes.size()) &&
-+  assert((DyLdInfoCommand.weak_bind_size ==
-+          paddedLinkEditEntrySize(O.WeakBinds.Opcodes.size(), Is64Bit)) &&
-          "Incorrect weak bind opcodes size");
-   memcpy(Out, O.WeakBinds.Opcodes.data(), O.WeakBinds.Opcodes.size());
- }
-@@ -356,7 +370,8 @@ void MachOWriter::writeLazyBindInfo() {
-       O.LoadCommands[*O.DyLdInfoCommandIndex]
-           .MachOLoadCommand.dyld_info_command_data;
-   char *Out = Buf->getBufferStart() + DyLdInfoCommand.lazy_bind_off;
--  assert((DyLdInfoCommand.lazy_bind_size == O.LazyBinds.Opcodes.size()) &&
-+  assert((DyLdInfoCommand.lazy_bind_size ==
-+          paddedLinkEditEntrySize(O.LazyBinds.Opcodes.size(), Is64Bit)) &&
-          "Incorrect lazy bind opcodes size");
-   memcpy(Out, O.LazyBinds.Opcodes.data(), O.LazyBinds.Opcodes.size());
- }
-@@ -368,7 +383,8 @@ void MachOWriter::writeExportInfo() {
-       O.LoadCommands[*O.DyLdInfoCommandIndex]
-           .MachOLoadCommand.dyld_info_command_data;
-   char *Out = Buf->getBufferStart() + DyLdInfoCommand.export_off;
--  assert((DyLdInfoCommand.export_size == O.Exports.Trie.size()) &&
-+  assert((DyLdInfoCommand.export_size ==
-+          paddedLinkEditEntrySize(O.Exports.Trie.size(), Is64Bit)) &&
-          "Incorrect export trie size");
-   memcpy(Out, O.Exports.Trie.data(), O.Exports.Trie.size());
- }
-@@ -398,7 +414,8 @@ void MachOWriter::writeLinkData(std::optional<size_t> LCIndex,
-   const MachO::linkedit_data_command &LinkEditDataCommand =
-       O.LoadCommands[*LCIndex].MachOLoadCommand.linkedit_data_command_data;
-   char *Out = Buf->getBufferStart() + LinkEditDataCommand.dataoff;
--  assert((LinkEditDataCommand.datasize == LD.Data.size()) &&
-+  assert((LinkEditDataCommand.datasize ==
-+          paddedLinkEditEntrySize(LD.Data.size(), Is64Bit)) &&
-          "Incorrect data size");
-   memcpy(Out, LD.Data.data(), LD.Data.size());
- }
-@@ -575,7 +592,8 @@ void MachOWriter::writeExportsTrieData() {
-       O.LoadCommands[*O.ExportsTrieCommandIndex]
-           .MachOLoadCommand.linkedit_data_command_data;
-   char *Out = Buf->getBufferStart() + ExportsTrieCmd.dataoff;
--  assert((ExportsTrieCmd.datasize == O.Exports.Trie.size()) &&
-+  assert((ExportsTrieCmd.datasize ==
-+          paddedLinkEditEntrySize(O.Exports.Trie.size(), Is64Bit)) &&
-          "Incorrect export trie size");
-   memcpy(Out, O.Exports.Trie.data(), O.Exports.Trie.size());
- }
-diff --git a/llvm/test/tools/llvm-objcopy/MachO/linkedit-alignment.test b/llvm/test/tools/llvm-objcopy/MachO/linkedit-alignment.test
-new file mode 100644
-index 0000000000000..86f826968cbb7
---- /dev/null
-+++ test/tools/llvm-objcopy/MachO/linkedit-alignment.test
-@@ -0,0 +1,366 @@
-+## This test verifies that all LINKEDIT entry offset and sizes are
-+## aligned to the target word size.
-+
-+# RUN: yaml2obj --docnum=1 %s -o %t.arm64
-+# RUN: llvm-objcopy %t.arm64 %t.arm64.copy
-+# RUN: obj2yaml %t.arm64.copy > %t.arm64.yaml
-+## Print the result twice: first to capture the LINKEDIT offsets and sizes,
-+## then to check that the captured values are aligned.
-+# RUN: cat %t.arm64.yaml %t.arm64.yaml | FileCheck %s --check-prefix=ARM64
-+
-+# ARM64: cmd:             LC_SEGMENT_64
-+# ARM64: segname:         __LINKEDIT
-+# ARM64: fileoff:         [[#ARM64_LINKEDIT_FILEOFF:]]
-+# ARM64: filesize:        [[#ARM64_LINKEDIT_FILESIZE:]]
-+
-+# ARM64: cmd:             LC_DYLD_INFO_ONLY
-+# ARM64: rebase_off:      [[#ARM64_REBASE_OFF:]]
-+# ARM64: rebase_size:     [[#ARM64_REBASE_SIZE:]]
-+# ARM64: bind_off:        [[#ARM64_BIND_OFF:]]
-+# ARM64: bind_size:       [[#ARM64_BIND_SIZE:]]
-+# ARM64: weak_bind_off:   [[#ARM64_WEAK_BIND_OFF:]]
-+# ARM64: weak_bind_size:  [[#ARM64_WEAK_BIND_SIZE:]]
-+# ARM64: lazy_bind_off:   [[#ARM64_LAZY_BIND_OFF:]]
-+# ARM64: lazy_bind_size:  [[#ARM64_LAZY_BIND_SIZE:]]
-+# ARM64: export_off:      [[#ARM64_EXPORT_OFF:]]
-+# ARM64: export_size:     [[#ARM64_EXPORT_SIZE:]]
-+
-+# ARM64: cmd:             LC_SYMTAB
-+# ARM64: symoff:          [[#ARM64_SYMOFF:]]
-+# ARM64: stroff:          [[#ARM64_STROFF:]]
-+# ARM64: strsize:         [[#ARM64_STRSIZE:]]
-+
-+# ARM64: cmd:             LC_DYSYMTAB
-+# ARM64: indirectsymoff:  [[#ARM64_INDIRECTSYMOFF:]]
-+
-+# ARM64: cmd:             LC_FUNCTION_STARTS
-+# ARM64: dataoff:         [[#ARM64_FUNCTION_STARTS_OFF:]]
-+# ARM64: datasize:        [[#ARM64_FUNCTION_STARTS_SIZE:]]
-+
-+# ARM64: cmd:             LC_DATA_IN_CODE
-+# ARM64: dataoff:         [[#ARM64_DATA_IN_CODE_OFF:]]
-+# ARM64: datasize:        [[#ARM64_DATA_IN_CODE_SIZE:]]
-+
-+# ARM64: --- !mach-o
-+
-+# ARM64: cmd:             LC_SEGMENT_64
-+# ARM64: segname:         __LINKEDIT
-+# ARM64: fileoff:         [[#mul(div(ARM64_LINKEDIT_FILEOFF, 8), 8)]]
-+# ARM64: filesize:        [[#mul(div(ARM64_LINKEDIT_FILESIZE, 8), 8)]]
-+
-+# ARM64: cmd:             LC_DYLD_INFO_ONLY
-+# ARM64: rebase_off:      [[#mul(div(ARM64_REBASE_OFF, 8), 8)]]
-+# ARM64: rebase_size:     [[#mul(div(ARM64_REBASE_SIZE, 8), 8)]]
-+# ARM64: bind_off:        [[#mul(div(ARM64_BIND_OFF, 8), 8)]]
-+# ARM64: bind_size:       [[#mul(div(ARM64_BIND_SIZE, 8), 8)]]
-+# ARM64: weak_bind_off:   [[#mul(div(ARM64_WEAK_BIND_OFF, 8), 8)]]
-+# ARM64: weak_bind_size:  [[#mul(div(ARM64_WEAK_BIND_SIZE, 8), 8)]]
-+# ARM64: lazy_bind_off:   [[#mul(div(ARM64_LAZY_BIND_OFF, 8), 8)]]
-+# ARM64: lazy_bind_size:  [[#mul(div(ARM64_LAZY_BIND_SIZE, 8), 8)]]
-+# ARM64: export_off:      [[#mul(div(ARM64_EXPORT_OFF, 8), 8)]]
-+# ARM64: export_size:     [[#mul(div(ARM64_EXPORT_SIZE, 8), 8)]]
-+
-+# ARM64: cmd:             LC_SYMTAB
-+# ARM64: symoff:          [[#mul(div(ARM64_SYMOFF, 8), 8)]]
-+# ARM64: stroff:          [[#mul(div(ARM64_STROFF, 8), 8)]]
-+# ARM64: strsize:         [[#mul(div(ARM64_STRSIZE, 8), 8)]]
-+
-+# ARM64: cmd:             LC_DYSYMTAB
-+# ARM64: indirectsymoff:  [[#mul(div(ARM64_INDIRECTSYMOFF, 8), 8)]]
-+
-+# ARM64: cmd:             LC_FUNCTION_STARTS
-+# ARM64: dataoff:         [[#mul(div(ARM64_FUNCTION_STARTS_OFF, 8), 8)]]
-+# ARM64: datasize:        [[#mul(div(ARM64_FUNCTION_STARTS_SIZE, 8), 8)]]
-+
-+# ARM64: cmd:             LC_DATA_IN_CODE
-+# ARM64: dataoff:         [[#mul(div(ARM64_DATA_IN_CODE_OFF, 8), 8)]]
-+# ARM64: datasize:        [[#mul(div(ARM64_DATA_IN_CODE_SIZE, 8), 8)]]
-+
-+# RUN: yaml2obj --docnum=2 %s -o %t.armv7
-+# RUN: llvm-objcopy %t.armv7 %t.armv7.copy
-+# RUN: obj2yaml %t.armv7.copy > %t.armv7.yaml
-+# RUN: cat %t.armv7.yaml %t.armv7.yaml | FileCheck %s --check-prefix=ARMV7
-+
-+# ARMV7: cmd:             LC_SEGMENT
-+# ARMV7: segname:         __LINKEDIT
-+# ARMV7: fileoff:         [[#ARMV7_LINKEDIT_FILEOFF:]]
-+# ARMV7: filesize:        [[#ARMV7_LINKEDIT_FILESIZE:]]
-+
-+# ARMV7: cmd:             LC_DYLD_INFO_ONLY
-+# ARMV7: rebase_off:      [[#ARMV7_REBASE_OFF:]]
-+# ARMV7: rebase_size:     [[#ARMV7_REBASE_SIZE:]]
-+# ARMV7: bind_off:        [[#ARMV7_BIND_OFF:]]
-+# ARMV7: bind_size:       [[#ARMV7_BIND_SIZE:]]
-+# ARMV7: weak_bind_off:   [[#ARMV7_WEAK_BIND_OFF:]]
-+# ARMV7: weak_bind_size:  [[#ARMV7_WEAK_BIND_SIZE:]]
-+# ARMV7: lazy_bind_off:   [[#ARMV7_LAZY_BIND_OFF:]]
-+# ARMV7: lazy_bind_size:  [[#ARMV7_LAZY_BIND_SIZE:]]
-+# ARMV7: export_off:      [[#ARMV7_EXPORT_OFF:]]
-+# ARMV7: export_size:     [[#ARMV7_EXPORT_SIZE:]]
-+
-+# ARMV7: cmd:             LC_SYMTAB
-+# ARMV7: symoff:          [[#ARMV7_SYMOFF:]]
-+# ARMV7: stroff:          [[#ARMV7_STROFF:]]
-+# ARMV7: strsize:         [[#ARMV7_STRSIZE:]]
-+
-+# ARMV7: cmd:             LC_DYSYMTAB
-+# ARMV7: indirectsymoff:  [[#ARMV7_INDIRECTSYMOFF:]]
-+
-+# ARMV7: cmd:             LC_FUNCTION_STARTS
-+# ARMV7: dataoff:         [[#ARMV7_FUNCTION_STARTS_OFF:]]
-+# ARMV7: datasize:        [[#ARMV7_FUNCTION_STARTS_SIZE:]]
-+
-+# ARMV7: cmd:             LC_DATA_IN_CODE
-+# ARMV7: dataoff:         [[#ARMV7_DATA_IN_CODE_OFF:]]
-+# ARMV7: datasize:        [[#ARMV7_DATA_IN_CODE_SIZE:]]
-+
-+# ARMV7: --- !mach-o
-+
-+# ARMV7: cmd:             LC_SEGMENT
-+# ARMV7: segname:         __LINKEDIT
-+# ARMV7: fileoff:         [[#mul(div(ARMV7_LINKEDIT_FILEOFF, 4), 4)]]
-+# ARMV7: filesize:        [[#mul(div(ARMV7_LINKEDIT_FILESIZE, 4), 4)]]
-+
-+# ARMV7: cmd:             LC_DYLD_INFO_ONLY
-+# ARMV7: rebase_off:      [[#mul(div(ARMV7_REBASE_OFF, 4), 4)]]
-+# ARMV7: rebase_size:     [[#mul(div(ARMV7_REBASE_SIZE, 4), 4)]]
-+# ARMV7: bind_off:        [[#mul(div(ARMV7_BIND_OFF, 4), 4)]]
-+# ARMV7: bind_size:       [[#mul(div(ARMV7_BIND_SIZE, 4), 4)]]
-+# ARMV7: weak_bind_off:   [[#mul(div(ARMV7_WEAK_BIND_OFF, 4), 4)]]
-+# ARMV7: weak_bind_size:  [[#mul(div(ARMV7_WEAK_BIND_SIZE, 4), 4)]]
-+# ARMV7: lazy_bind_off:   [[#mul(div(ARMV7_LAZY_BIND_OFF, 4), 4)]]
-+# ARMV7: lazy_bind_size:  [[#mul(div(ARMV7_LAZY_BIND_SIZE, 4), 4)]]
-+# ARMV7: export_off:      [[#mul(div(ARMV7_EXPORT_OFF, 4), 4)]]
-+# ARMV7: export_size:     [[#mul(div(ARMV7_EXPORT_SIZE, 4), 4)]]
-+
-+# ARMV7: cmd:             LC_SYMTAB
-+# ARMV7: symoff:          [[#mul(div(ARMV7_SYMOFF, 4), 4)]]
-+# ARMV7: stroff:          [[#mul(div(ARMV7_STROFF, 4), 4)]]
-+# ARMV7: strsize:         [[#mul(div(ARMV7_STRSIZE, 4), 4)]]
-+
-+# ARMV7: cmd:             LC_DYSYMTAB
-+# ARMV7: indirectsymoff:  [[#mul(div(ARMV7_INDIRECTSYMOFF, 4), 4)]]
-+
-+# ARMV7: cmd:             LC_FUNCTION_STARTS
-+# ARMV7: dataoff:         [[#mul(div(ARMV7_FUNCTION_STARTS_OFF, 4), 4)]]
-+# ARMV7: datasize:        [[#mul(div(ARMV7_FUNCTION_STARTS_SIZE, 4), 4)]]
-+
-+# ARMV7: cmd:             LC_DATA_IN_CODE
-+# ARMV7: dataoff:         [[#mul(div(ARMV7_DATA_IN_CODE_OFF, 4), 4)]]
-+# ARMV7: datasize:        [[#mul(div(ARMV7_DATA_IN_CODE_SIZE, 4), 4)]]
-+
-+--- !mach-o
-+FileHeader:
-+  magic:           0xFEEDFACF
-+  cputype:         0x0100000C
-+  cpusubtype:      0x00000000
-+  filetype:        0x00000002
-+  ncmds:           6
-+  sizeofcmds:      256
-+  flags:           0x00000085
-+  reserved:        0x00000000
-+LoadCommands:
-+  - cmd:             LC_SEGMENT_64
-+    cmdsize:         72
-+    segname:         __LINKEDIT
-+    vmaddr:          288
-+    vmsize:          256
-+    fileoff:         288
-+    filesize:        256
-+    maxprot:         1
-+    initprot:        1
-+    nsects:          0
-+    flags:           0
-+  - cmd:             LC_DYLD_INFO_ONLY
-+    cmdsize:         48
-+    rebase_off:      288
-+    rebase_size:     1
-+    bind_off:        289
-+    bind_size:       1
-+    weak_bind_off:   290
-+    weak_bind_size:  1
-+    lazy_bind_off:   291
-+    lazy_bind_size:  1
-+    export_off:      0
-+    export_size:     0
-+  - cmd:             LC_SYMTAB
-+    cmdsize:         24
-+    symoff:          304
-+    nsyms:           2
-+    stroff:          340
-+    strsize:         24
-+  - cmd:             LC_DYSYMTAB
-+    cmdsize:         80
-+    ilocalsym:       0
-+    nlocalsym:       0
-+    iextdefsym:      0
-+    nextdefsym:      0
-+    iundefsym:       0
-+    nundefsym:       2
-+    tocoff:          0
-+    ntoc:            0
-+    modtaboff:       0
-+    nmodtab:         0
-+    extrefsymoff:    0
-+    nextrefsyms:     0
-+    indirectsymoff:  336
-+    nindirectsyms:   1
-+    extreloff:       0
-+    nextrel:         0
-+    locreloff:       0
-+    nlocrel:         0
-+  - cmd:             LC_FUNCTION_STARTS
-+    cmdsize:         16
-+    dataoff:         292
-+    datasize:        1
-+  - cmd:             LC_DATA_IN_CODE
-+    cmdsize:         16
-+    dataoff:         293
-+    datasize:        8
-+LinkEditData:
-+  RebaseOpcodes:
-+    - Opcode:          REBASE_OPCODE_DONE
-+      Imm:             0
-+  BindOpcodes:
-+    - Opcode:          BIND_OPCODE_DONE
-+      Imm:             0
-+      Symbol:          ''
-+  WeakBindOpcodes:
-+    - Opcode:          BIND_OPCODE_DONE
-+      Imm:             0
-+      Symbol:          ''
-+  LazyBindOpcodes:
-+    - Opcode:          BIND_OPCODE_DONE
-+      Imm:             0
-+      Symbol:          ''
-+  NameList:
-+    - n_strx:          1
-+      n_type:          0x01
-+      n_sect:          0
-+      n_desc:          0
-+      n_value:         0
-+    - n_strx:          6
-+      n_type:          0x01
-+      n_sect:          0
-+      n_desc:          0
-+      n_value:         0
-+  StringTable:
-+    - ''
-+    - _foo
-+    - _bar
-+    - ''
-+  IndirectSymbols: [ 0x1 ]
-+  FunctionStarts:  [ 0x0 ]
-+  DataInCode:
-+    - Offset:          0x0
-+      Length:          4
-+      Kind:            0x4
-+...
-+
-+--- !mach-o
-+IsLittleEndian:  true
-+FileHeader:
-+  magic:           0xFEEDFACE
-+  cputype:         0x0000000C
-+  cpusubtype:      0x00000009
-+  filetype:        0x00000002
-+  ncmds:           6
-+  sizeofcmds:      240
-+  flags:           0x00000085
-+LoadCommands:
-+  - cmd:             LC_SEGMENT
-+    cmdsize:         56
-+    segname:         __LINKEDIT
-+    vmaddr:          268
-+    vmsize:          128
-+    fileoff:         268
-+    filesize:        128
-+    maxprot:         1
-+    initprot:        1
-+    nsects:          0
-+    flags:           0
-+  - cmd:             LC_DYLD_INFO_ONLY
-+    cmdsize:         48
-+    rebase_off:      268
-+    rebase_size:     1
-+    bind_off:        269
-+    bind_size:       1
-+    weak_bind_off:   270
-+    weak_bind_size:  1
-+    lazy_bind_off:   271
-+    lazy_bind_size:  1
-+    export_off:      0
-+    export_size:     0
-+  - cmd:             LC_SYMTAB
-+    cmdsize:         24
-+    symoff:          284
-+    nsyms:           2
-+    stroff:          312
-+    strsize:         16
-+  - cmd:             LC_DYSYMTAB
-+    cmdsize:         80
-+    ilocalsym:       0
-+    nlocalsym:       0
-+    iextdefsym:      0
-+    nextdefsym:      0
-+    iundefsym:       0
-+    nundefsym:       2
-+    tocoff:          0
-+    ntoc:            0
-+    modtaboff:       0
-+    nmodtab:         0
-+    extrefsymoff:    0
-+    nextrefsyms:     0
-+    indirectsymoff:  308
-+    nindirectsyms:   1
-+    extreloff:       0
-+    nextrel:         0
-+    locreloff:       0
-+    nlocrel:         0
-+  - cmd:             LC_FUNCTION_STARTS
-+    cmdsize:         16
-+    dataoff:         272
-+    datasize:        4
-+  - cmd:             LC_DATA_IN_CODE
-+    cmdsize:         16
-+    dataoff:         276
-+    datasize:        8
-+LinkEditData:
-+  RebaseOpcodes:
-+    - Opcode:          REBASE_OPCODE_DONE
-+      Imm:             0
-+  BindOpcodes:
-+    - Opcode:          BIND_OPCODE_DONE
-+      Imm:             0
-+      Symbol:          ''
-+  WeakBindOpcodes:
-+    - Opcode:          BIND_OPCODE_DONE
-+      Imm:             0
-+      Symbol:          ''
-+  LazyBindOpcodes:
-+    - Opcode:          BIND_OPCODE_DONE
-+      Imm:             0
-+      Symbol:          ''
-+  NameList:
-+    - n_strx:          1
-+      n_type:          0x01
-+      n_sect:          0
-+      n_desc:          0
-+      n_value:         0
-+    - n_strx:          6
-+      n_type:          0x01
-+      n_sect:          0
-+      n_desc:          0
-+      n_value:         0
-+  StringTable:
-+    - ''
-+    - _foo
-+    - _bar
-+    - ''
-+  IndirectSymbols: [ 0x1 ]
-+  FunctionStarts:  [ 0x0 ]
-+  DataInCode:
-+    - Offset:          0x0
-+      Length:          4
-+      Kind:            0x4
-+...
-diff --git a/llvm/test/tools/llvm-objcopy/MachO/linkedit-order-1.test b/llvm/test/tools/llvm-objcopy/MachO/linkedit-order-1.test
-index 4915f344c1e7e..b7ee56ed47dba 100644
---- test/tools/llvm-objcopy/MachO/linkedit-order-1.test
-+++ test/tools/llvm-objcopy/MachO/linkedit-order-1.test
-@@ -51,7 +51,8 @@
- # CHECK: --- !mach-o
- 
- # CHECK: cmd:             LC_SYMTAB
--# CHECK: stroff:          [[#SYMTAB_STROFF: DYSYMTAB_INDIRECTSYMOFF + mul(DYSYMTAB_NINDIRECTSYMS, 4)]]
-+## LINKEDIT entries are aligned to the target word size.
-+# CHECK: stroff:          [[#SYMTAB_STROFF: DYSYMTAB_INDIRECTSYMOFF + mul(div(mul(DYSYMTAB_NINDIRECTSYMS, 4) + 4, 8), 8)]]
- # CHECK: strsize:         [[#SYMTAB_STRSIZE:]]
- 
- # CHECK: cmd:             LC_CODE_SIGNATURE
-diff --git a/llvm/test/tools/llvm-objcopy/MachO/linkedit-order-2.test b/llvm/test/tools/llvm-objcopy/MachO/linkedit-order-2.test
-index 0c5521ece0e44..dfbb7277a4fa1 100644
---- test/tools/llvm-objcopy/MachO/linkedit-order-2.test
-+++ test/tools/llvm-objcopy/MachO/linkedit-order-2.test
-@@ -50,7 +50,8 @@
- # CHECK: --- !mach-o
- 
- # CHECK: cmd:             LC_SYMTAB
--# CHECK: stroff:          [[#SYMTAB_STROFF: DYSYMTAB_INDIRECTSYMOFF + mul(DYSYMTAB_NINDIRECTSYMS, 4)]]
-+## LINKEDIT entries are aligned to the target word size.
-+# CHECK: stroff:          [[#SYMTAB_STROFF: DYSYMTAB_INDIRECTSYMOFF + mul(div(mul(DYSYMTAB_NINDIRECTSYMS, 4) + 4, 8), 8)]]
- # CHECK: strsize:         [[#SYMTAB_STRSIZE:]]
- 
- # CHECK: cmd:             LC_CODE_SIGNATURE
-diff --git a/llvm/test/tools/llvm-objcopy/MachO/symbol-table.test b/llvm/test/tools/llvm-objcopy/MachO/symbol-table.test
-index 7e0e1421c0646..a95c2ac7a358b 100644
---- test/tools/llvm-objcopy/MachO/symbol-table.test
-+++ test/tools/llvm-objcopy/MachO/symbol-table.test
-@@ -301,7 +301,7 @@ LoadCommands:
-     vmaddr:          4294975488
-     vmsize:          4096
-     fileoff:         8192
--    filesize:        508
-+    filesize:        512
-     maxprot:         1
-     initprot:        1
-     nsects:          0
-@@ -310,7 +310,7 @@ LoadCommands:
-     cmdsize:         24
-     symoff:          8192
-     nsyms:           18
--    stroff:          8484
-+    stroff:          8488
-     strsize:         216
-   - cmd:             LC_DYSYMTAB
-     cmdsize:         80
diff --git a/llvm/patches/patch-cmake_config-ix.cmake b/llvm/patches/patch-cmake_config-ix.cmake
index d021da3e17..ad002dd6fb 100644
--- a/llvm/patches/patch-cmake_config-ix.cmake
+++ b/llvm/patches/patch-cmake_config-ix.cmake
@@ -3,9 +3,9 @@ $NetBSD: patch-cmake_config-ix.cmake,v 1.8 2022/11/14 18:44:05 adam Exp $
 Do not generate invalid llvm-config in pkgsrc.
 Allow override of pthread library selection via PKGSRC_LLVM_PTHREADLIB.
 
---- cmake/config-ix.cmake.orig	2022-09-20 06:05:50.000000000 +0000
+--- cmake/config-ix.cmake.orig	2026-10-06 07:38:51.000000000 +0000
 +++ cmake/config-ix.cmake
-@@ -112,7 +112,11 @@ if(HAVE_LIBPTHREAD)
+@@ -154,7 +154,11 @@ if(HAVE_LIBPTHREAD)
    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
    set(THREADS_HAVE_PTHREAD_ARG Off)
    find_package(Threads REQUIRED)
@@ -15,6 +15,6 @@ Allow override of pthread library selection via PKGSRC_LLVM_PTHREADLIB.
 +  else()
 +    set(LLVM_PTHREAD_LIB ${CMAKE_THREAD_LIBS_INIT})
 +  endif()
- endif()
- 
- if(LLVM_ENABLE_ZLIB)
+   if(LLVM_PTHREAD_LIB)
+     list(APPEND CMAKE_REQUIRED_LIBRARIES ${LLVM_PTHREAD_LIB})
+   endif()
diff --git a/llvm/patches/patch-cmake_modules_AddLLVM.cmake b/llvm/patches/patch-cmake_modules_AddLLVM.cmake
index b04672c217..6e7e154a28 100644
--- a/llvm/patches/patch-cmake_modules_AddLLVM.cmake
+++ b/llvm/patches/patch-cmake_modules_AddLLVM.cmake
@@ -1,20 +1,10 @@
 $NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.9 2022/11/14 18:44:05 adam Exp $
 
-On Darwin, create symbolic links to shared libraries.
 On Darwin, use correct install-name for shared libraries.
 
---- cmake/modules/AddLLVM.cmake.orig	2026-03-23 18:46:22.000000000 +0000
+--- cmake/modules/AddLLVM.cmake.orig	2026-10-06 07:38:51.000000000 +0000
 +++ cmake/modules/AddLLVM.cmake
-@@ -723,7 +723,7 @@ function(llvm_add_library name)
-   endif()
- 
-   if(ARG_SHARED)
--    if(NOT APPLE AND ARG_SONAME)
-+    if(ARG_SONAME)
-       get_target_property(output_name ${name} OUTPUT_NAME)
-       if(${output_name} STREQUAL "output_name-NOTFOUND")
-         set(output_name ${name})
-@@ -2554,7 +2554,7 @@ function(llvm_setup_rpath name)
+@@ -2694,7 +2694,7 @@ function(llvm_setup_rpath name)
    endif()
  
    if (APPLE)
diff --git a/llvm/version.mk b/llvm/version.mk
index 33fdcc7214..22711f0121 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -15,7 +15,7 @@
 # used by lang/wasi-libcxx
 # used by parallel/openmp
 
-LLVM_VERSION=	22.1.8
+LLVM_VERSION=	23.1.3
 
 DISTNAME=	llvm-project-${LLVM_VERSION}.src
 MASTER_SITES=	${MASTER_SITE_GITHUB:=llvm/}
@@ -31,3 +31,12 @@ EXTRACT_ELEMENTS=	${DISTNAME}/${PKGBASE:S/wasi-//}
 EXTRACT_ELEMENTS+=	${DISTNAME}/cmake
 EXTRACT_ELEMENTS+=	${DISTNAME}/runtimes
 EXTRACT_ELEMENTS+=	${DISTNAME}/third-party
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M9.*}
+# Gcc 8 (induced elsewhere) blows up on per-process VM space.
+# Ref. https://mail-index.netbsd.org/pkgsrc-users/2025/06/21/msg041678.html
+# Also, the llvm produced by gcc 8 or 10 crashes when building wasi-libc.
+GCC_REQD+=	14
+.endif
diff --git a/mlir/Makefile b/mlir/Makefile
index e3d16c60e0..7527d6567c 100644
--- a/mlir/Makefile
+++ b/mlir/Makefile
@@ -15,10 +15,13 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+=	-DMLIR_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+=	-DMLIR_INCLUDE_INTEGRATION_TESTS=OFF
 CMAKE_CONFIGURE_ARGS+=	-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
 CMAKE_CONFIGURE_ARGS+=	-DMLIR_BUILD_MLIR_C_DYLIB=ON
 # Fix for: lib 'MLIR' not found.
 # MLIR_LINK_MLIR_DYLIB defaults to LLVM_LINK_LLVM_DYLIB, but libMLIR.so is not built.
+# https://github.com/llvm/llvm-project/issues/181584
 CMAKE_CONFIGURE_ARGS+=	-DMLIR_LINK_MLIR_DYLIB=OFF
 
 .include "../../devel/cmake/build.mk"
diff --git a/mlir/PLIST b/mlir/PLIST
index 840c365656..60571c953b 100644
--- a/mlir/PLIST
+++ b/mlir/PLIST
@@ -1,4 +1,5 @@
 @comment $NetBSD$
+bin/mlir-irdl-to-cpp
 bin/mlir-tblgen
 include/mlir-c/AffineExpr.h
 include/mlir-c/AffineMap.h
@@ -9,7 +10,6 @@ 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/AMX.h
 include/mlir-c/Dialect/Affine.h
 include/mlir-c/Dialect/Arith.h
 include/mlir-c/Dialect/ArmNeon.h
@@ -54,10 +54,12 @@ include/mlir-c/Dialect/UB.h
 include/mlir-c/Dialect/VCIX.h
 include/mlir-c/Dialect/Vector.h
 include/mlir-c/Dialect/WasmSSA.h
-include/mlir-c/Dialect/X86Vector.h
+include/mlir-c/Dialect/X86.h
 include/mlir-c/Dialect/XeGPU.h
 include/mlir-c/Dialect/XeVM.h
+include/mlir-c/Dominance.h
 include/mlir-c/ExecutionEngine.h
+include/mlir-c/ExtensibleDialect.h
 include/mlir-c/IR.h
 include/mlir-c/IntegerSet.h
 include/mlir-c/Interfaces.h
@@ -68,6 +70,9 @@ include/mlir-c/Support.h
 include/mlir-c/Target/ExportSMTLIB.h
 include/mlir-c/Target/LLVMIR.h
 include/mlir-c/Transforms.h
+include/mlir/ABI/ABIRewriteContext.h
+include/mlir/ABI/ABITypeMapper.h
+include/mlir/ABI/Targets/Test/TestTarget.h
 include/mlir/Analysis/AliasAnalysis.h
 include/mlir/Analysis/AliasAnalysis/LocalAliasAnalysis.h
 include/mlir/Analysis/CFGLoopInfo.h
@@ -75,6 +80,7 @@ include/mlir/Analysis/CallGraph.h
 include/mlir/Analysis/DataFlow/ConstantPropagationAnalysis.h
 include/mlir/Analysis/DataFlow/DeadCodeAnalysis.h
 include/mlir/Analysis/DataFlow/DenseAnalysis.h
+include/mlir/Analysis/DataFlow/IntegerDivisibilityAnalysis.h
 include/mlir/Analysis/DataFlow/IntegerRangeAnalysis.h
 include/mlir/Analysis/DataFlow/LivenessAnalysis.h
 include/mlir/Analysis/DataFlow/SparseAnalysis.h
@@ -107,10 +113,14 @@ include/mlir/Bindings/Python/Diagnostics.h
 include/mlir/Bindings/Python/Globals.h
 include/mlir/Bindings/Python/IRAttributes.h
 include/mlir/Bindings/Python/IRCore.h
+include/mlir/Bindings/Python/IRInterfaces.h
 include/mlir/Bindings/Python/IRTypes.h
 include/mlir/Bindings/Python/Nanobind.h
 include/mlir/Bindings/Python/NanobindAdaptors.h
 include/mlir/Bindings/Python/NanobindUtils.h
+include/mlir/Bindings/Python/PythonBindings.td
+include/mlir/Bytecode/BytecodeDialectInterface.h.inc
+include/mlir/Bytecode/BytecodeDialectInterface.td
 include/mlir/Bytecode/BytecodeImplementation.h
 include/mlir/Bytecode/BytecodeOpInterface.cpp.inc
 include/mlir/Bytecode/BytecodeOpInterface.h
@@ -123,8 +133,11 @@ include/mlir/Bytecode/Encoding.h
 include/mlir/CAPI/AffineExpr.h
 include/mlir/CAPI/AffineMap.h
 include/mlir/CAPI/Diagnostics.h
+include/mlir/CAPI/Dialect/Transform.h
+include/mlir/CAPI/Dominance.h
 include/mlir/CAPI/ExecutionEngine.h
 include/mlir/CAPI/IR.h
+include/mlir/CAPI/IRMapping.h
 include/mlir/CAPI/IntegerSet.h
 include/mlir/CAPI/Interfaces.h
 include/mlir/CAPI/Pass.h
@@ -162,14 +175,18 @@ include/mlir/Conversion/ControlFlowToSCF/ControlFlowToSCF.h
 include/mlir/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.h
 include/mlir/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRVPass.h
 include/mlir/Conversion/ConvertToEmitC/ConvertToEmitCPass.h
+include/mlir/Conversion/ConvertToEmitC/ConvertToEmitCPatternInterface.h.inc
+include/mlir/Conversion/ConvertToEmitC/ConvertToEmitCPatternInterface.td
 include/mlir/Conversion/ConvertToEmitC/ToEmitCInterface.h
 include/mlir/Conversion/ConvertToLLVM/ToLLVMAttrInterface.cpp.inc
 include/mlir/Conversion/ConvertToLLVM/ToLLVMAttrInterface.h.inc
+include/mlir/Conversion/ConvertToLLVM/ToLLVMDialectInterface.h.inc
 include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.h
 include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.td
 include/mlir/Conversion/ConvertToLLVM/ToLLVMOpInterface.cpp.inc
 include/mlir/Conversion/ConvertToLLVM/ToLLVMOpInterface.h.inc
 include/mlir/Conversion/ConvertToLLVM/ToLLVMPass.h
+include/mlir/Conversion/EmitCCommon/TypeConverter.h
 include/mlir/Conversion/FuncToEmitC/FuncToEmitC.h
 include/mlir/Conversion/FuncToEmitC/FuncToEmitCPass.h
 include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h
@@ -189,6 +206,7 @@ include/mlir/Conversion/GPUToSPIRV/GPUToSPIRVPass.h
 include/mlir/Conversion/IndexToLLVM/IndexToLLVM.h
 include/mlir/Conversion/IndexToSPIRV/IndexToSPIRV.h
 include/mlir/Conversion/LLVMCommon/ConversionTarget.h
+include/mlir/Conversion/LLVMCommon/LowerFunctionDiscardablesToLLVM.h
 include/mlir/Conversion/LLVMCommon/LoweringOptions.h
 include/mlir/Conversion/LLVMCommon/MemRefBuilder.h
 include/mlir/Conversion/LLVMCommon/Pattern.h
@@ -203,6 +221,7 @@ include/mlir/Conversion/MathToEmitC/MathToEmitCPass.h
 include/mlir/Conversion/MathToFuncs/MathToFuncs.h
 include/mlir/Conversion/MathToLLVM/MathToLLVM.h
 include/mlir/Conversion/MathToLibm/MathToLibm.h
+include/mlir/Conversion/MathToNVVM/MathToNVVM.h
 include/mlir/Conversion/MathToROCDL/MathToROCDL.h
 include/mlir/Conversion/MathToSPIRV/MathToSPIRV.h
 include/mlir/Conversion/MathToSPIRV/MathToSPIRVPass.h
@@ -223,6 +242,7 @@ include/mlir/Conversion/Passes.h
 include/mlir/Conversion/Passes.h.inc
 include/mlir/Conversion/Passes.td
 include/mlir/Conversion/PtrToLLVM/PtrToLLVM.h
+include/mlir/Conversion/RaiseWasm/RaiseWasmMLIR.h
 include/mlir/Conversion/ReconcileUnrealizedCasts/ReconcileUnrealizedCasts.h
 include/mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h
 include/mlir/Conversion/SCFToEmitC/SCFToEmitC.h
@@ -244,6 +264,7 @@ 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/TosaToSPIRVTosa/TosaToSPIRVTosa.h
 include/mlir/Conversion/TosaToTensor/TosaToTensor.h
 include/mlir/Conversion/UBToLLVM/UBToLLVM.h
 include/mlir/Conversion/UBToSPIRV/UBToSPIRV.h
@@ -270,33 +291,29 @@ 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
-include/mlir/Dialect/AMDGPU/IR/AMDGPUAttributes.cpp.inc
-include/mlir/Dialect/AMDGPU/IR/AMDGPUAttributes.h.inc
+include/mlir/Dialect/AMDGPU/IR/AMDGPUAttrs.cpp.inc
+include/mlir/Dialect/AMDGPU/IR/AMDGPUAttrs.h.inc
+include/mlir/Dialect/AMDGPU/IR/AMDGPUAttrs.td
+include/mlir/Dialect/AMDGPU/IR/AMDGPUBase.td
 include/mlir/Dialect/AMDGPU/IR/AMDGPUDialect.cpp.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPUDialect.h
 include/mlir/Dialect/AMDGPU/IR/AMDGPUDialect.h.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPUEnums.cpp.inc
+include/mlir/Dialect/AMDGPU/IR/AMDGPUEnums.h
 include/mlir/Dialect/AMDGPU/IR/AMDGPUEnums.h.inc
+include/mlir/Dialect/AMDGPU/IR/AMDGPUEnums.td
+include/mlir/Dialect/AMDGPU/IR/AMDGPUOps.td
 include/mlir/Dialect/AMDGPU/IR/AMDGPUTypes.cpp.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPUTypes.h.inc
+include/mlir/Dialect/AMDGPU/IR/AMDGPUTypes.td
+include/mlir/Dialect/AMDGPU/Transforms/MemoryAccessOpInterfacesImpl.h
 include/mlir/Dialect/AMDGPU/Transforms/Passes.capi.cpp.inc
 include/mlir/Dialect/AMDGPU/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/AMDGPU/Transforms/Passes.h
 include/mlir/Dialect/AMDGPU/Transforms/Passes.h.inc
 include/mlir/Dialect/AMDGPU/Transforms/Passes.td
 include/mlir/Dialect/AMDGPU/Utils/Chipset.h
-include/mlir/Dialect/AMX/AMX.cpp.inc
-include/mlir/Dialect/AMX/AMX.h.inc
-include/mlir/Dialect/AMX/AMX.td
-include/mlir/Dialect/AMX/AMXDialect.cpp.inc
-include/mlir/Dialect/AMX/AMXDialect.h
-include/mlir/Dialect/AMX/AMXDialect.h.inc
-include/mlir/Dialect/AMX/AMXInterfaces.cpp.inc
-include/mlir/Dialect/AMX/AMXInterfaces.h.inc
-include/mlir/Dialect/AMX/AMXInterfaces.td
-include/mlir/Dialect/AMX/AMXTypes.cpp.inc
-include/mlir/Dialect/AMX/AMXTypes.h.inc
-include/mlir/Dialect/AMX/Transforms.h
+include/mlir/Dialect/AMDGPU/Utils/MemorySpaceUtils.h
 include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h
 include/mlir/Dialect/Affine/Analysis/AffineStructures.h
 include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h
@@ -443,6 +460,8 @@ include/mlir/Dialect/Async/Passes.h
 include/mlir/Dialect/Async/Passes.h.inc
 include/mlir/Dialect/Async/Passes.td
 include/mlir/Dialect/Async/Transforms.h
+include/mlir/Dialect/Bufferization/Extensions/AllExtensions.h
+include/mlir/Dialect/Bufferization/Extensions/ShardingExtensions.h
 include/mlir/Dialect/Bufferization/IR/AllocationOpInterface.cpp.inc
 include/mlir/Dialect/Bufferization/IR/AllocationOpInterface.h
 include/mlir/Dialect/Bufferization/IR/AllocationOpInterface.h.inc
@@ -493,6 +512,7 @@ include/mlir/Dialect/Bufferization/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Bufferization/Transforms/Passes.h
 include/mlir/Dialect/Bufferization/Transforms/Passes.h.inc
 include/mlir/Dialect/Bufferization/Transforms/Passes.td
+include/mlir/Dialect/Bufferization/Transforms/StaticMemoryPlanning.h
 include/mlir/Dialect/Bufferization/Transforms/Transforms.h
 include/mlir/Dialect/CommonFolders.h
 include/mlir/Dialect/Complex/IR/Complex.h
@@ -618,6 +638,7 @@ 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/IndexedAccessOpInterfaceImpl.h
 include/mlir/Dialect/GPU/Transforms/MemoryPromotion.h
 include/mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h
 include/mlir/Dialect/GPU/Transforms/Passes.capi.cpp.inc
@@ -717,6 +738,8 @@ 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/NVVMDialect.td
+include/mlir/Dialect/LLVMIR/NVVMEnums.td
 include/mlir/Dialect/LLVMIR/NVVMFromLLVMIRConversions.inc
 include/mlir/Dialect/LLVMIR/NVVMOps.cpp.inc
 include/mlir/Dialect/LLVMIR/NVVMOps.h.inc
@@ -733,8 +756,11 @@ include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.cpp.inc
 include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h
 include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.h.inc
 include/mlir/Dialect/LLVMIR/NVVMRequiresSMTraits.td
+include/mlir/Dialect/LLVMIR/ROCDLAttrs.td
 include/mlir/Dialect/LLVMIR/ROCDLConversions.inc
 include/mlir/Dialect/LLVMIR/ROCDLDialect.h
+include/mlir/Dialect/LLVMIR/ROCDLDialect.td
+include/mlir/Dialect/LLVMIR/ROCDLEnums.td
 include/mlir/Dialect/LLVMIR/ROCDLOps.cpp.inc
 include/mlir/Dialect/LLVMIR/ROCDLOps.h.inc
 include/mlir/Dialect/LLVMIR/ROCDLOps.td
@@ -742,6 +768,8 @@ 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/ROCDLOpsEnums.cpp.inc
+include/mlir/Dialect/LLVMIR/ROCDLOpsEnums.h.inc
 include/mlir/Dialect/LLVMIR/ROCDLOpsTypes.cpp.inc
 include/mlir/Dialect/LLVMIR/ROCDLOpsTypes.h.inc
 include/mlir/Dialect/LLVMIR/Transforms/AddComdats.h
@@ -749,7 +777,6 @@ include/mlir/Dialect/LLVMIR/Transforms/DIExpressionLegalization.h
 include/mlir/Dialect/LLVMIR/Transforms/DIExpressionRewriter.h
 include/mlir/Dialect/LLVMIR/Transforms/InlinerInterfaceImpl.h
 include/mlir/Dialect/LLVMIR/Transforms/LegalizeForExport.h
-include/mlir/Dialect/LLVMIR/Transforms/OptimizeForNVVM.h
 include/mlir/Dialect/LLVMIR/Transforms/Passes.capi.cpp.inc
 include/mlir/Dialect/LLVMIR/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/LLVMIR/Transforms/Passes.h
@@ -882,6 +909,7 @@ include/mlir/Dialect/MPI/IR/MPITypes.h.inc
 include/mlir/Dialect/MPI/IR/MPITypes.td
 include/mlir/Dialect/MPI/IR/MPITypesGen.cpp.inc
 include/mlir/Dialect/MPI/IR/MPITypesGen.h.inc
+include/mlir/Dialect/MPI/IR/Utils.h
 include/mlir/Dialect/Math/IR/Math.h
 include/mlir/Dialect/Math/IR/MathBase.td
 include/mlir/Dialect/Math/IR/MathOps.cpp.inc
@@ -907,6 +935,10 @@ include/mlir/Dialect/MemRef/IR/MemRefOpsDialect.cpp.inc
 include/mlir/Dialect/MemRef/IR/MemRefOpsDialect.h.inc
 include/mlir/Dialect/MemRef/IR/MemRefOpsTypes.cpp.inc
 include/mlir/Dialect/MemRef/IR/MemRefOpsTypes.h.inc
+include/mlir/Dialect/MemRef/IR/MemoryAccessOpInterfaces.cpp.inc
+include/mlir/Dialect/MemRef/IR/MemoryAccessOpInterfaces.h
+include/mlir/Dialect/MemRef/IR/MemoryAccessOpInterfaces.h.inc
+include/mlir/Dialect/MemRef/IR/MemoryAccessOpInterfaces.td
 include/mlir/Dialect/MemRef/IR/ValueBoundsOpInterfaceImpl.h
 include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp.inc
 include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.h
@@ -945,6 +977,7 @@ include/mlir/Dialect/NVGPU/TransformOps/NVGPUTransformOps.cpp.inc
 include/mlir/Dialect/NVGPU/TransformOps/NVGPUTransformOps.h
 include/mlir/Dialect/NVGPU/TransformOps/NVGPUTransformOps.h.inc
 include/mlir/Dialect/NVGPU/TransformOps/NVGPUTransformOps.td
+include/mlir/Dialect/NVGPU/Transforms/MemoryAccessOpInterfacesImpl.h
 include/mlir/Dialect/NVGPU/Transforms/Passes.capi.cpp.inc
 include/mlir/Dialect/NVGPU/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/NVGPU/Transforms/Passes.h
@@ -953,10 +986,17 @@ include/mlir/Dialect/NVGPU/Transforms/Passes.td
 include/mlir/Dialect/NVGPU/Transforms/Transforms.h
 include/mlir/Dialect/NVGPU/Transforms/Utils.h
 include/mlir/Dialect/NVGPU/Utils/MMAUtils.h
+include/mlir/Dialect/NVVM/Transforms/OptimizeForNVVM.h
+include/mlir/Dialect/NVVM/Transforms/Passes.h
+include/mlir/Dialect/NVVM/Transforms/Passes.h.inc
+include/mlir/Dialect/NVVM/Transforms/Passes.td
 include/mlir/Dialect/OpenACC/AccCommon.td
 include/mlir/Dialect/OpenACC/Analysis/OpenACCSupport.h
 include/mlir/Dialect/OpenACC/OpenACC.h
+include/mlir/Dialect/OpenACC/OpenACCAttributes.td
 include/mlir/Dialect/OpenACC/OpenACCBase.td
+include/mlir/Dialect/OpenACC/OpenACCCGAttributes.td
+include/mlir/Dialect/OpenACC/OpenACCCGOps.td
 include/mlir/Dialect/OpenACC/OpenACCOps.cpp.inc
 include/mlir/Dialect/OpenACC/OpenACCOps.h.inc
 include/mlir/Dialect/OpenACC/OpenACCOps.td
@@ -972,12 +1012,18 @@ 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/OpenACCParMapping.h
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.cpp.inc
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.h.inc
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.td
 include/mlir/Dialect/OpenACC/OpenACCUtils.h
+include/mlir/Dialect/OpenACC/OpenACCUtilsCG.h
+include/mlir/Dialect/OpenACC/OpenACCUtilsGPU.h
 include/mlir/Dialect/OpenACC/OpenACCUtilsLoop.h
+include/mlir/Dialect/OpenACC/OpenACCUtilsReduction.h
 include/mlir/Dialect/OpenACC/OpenACCUtilsTiling.h
+include/mlir/Dialect/OpenACC/OpenACCUtilsType.h
+include/mlir/Dialect/OpenACC/OpenACCVariableInfo.h
 include/mlir/Dialect/OpenACC/Transforms/ACCSpecializePatterns.h
 include/mlir/Dialect/OpenACC/Transforms/Passes.capi.cpp.inc
 include/mlir/Dialect/OpenACC/Transforms/Passes.capi.h.inc
@@ -1001,6 +1047,7 @@ include/mlir/Dialect/OpenMP/OpenMPDialect.h
 include/mlir/Dialect/OpenMP/OpenMPDialect.td
 include/mlir/Dialect/OpenMP/OpenMPEnums.td
 include/mlir/Dialect/OpenMP/OpenMPInterfaces.h
+include/mlir/Dialect/OpenMP/OpenMPOffloadUtils.h
 include/mlir/Dialect/OpenMP/OpenMPOpBase.td
 include/mlir/Dialect/OpenMP/OpenMPOps.cpp.inc
 include/mlir/Dialect/OpenMP/OpenMPOps.h.inc
@@ -1026,6 +1073,7 @@ include/mlir/Dialect/OpenMP/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/OpenMP/Transforms/Passes.h
 include/mlir/Dialect/OpenMP/Transforms/Passes.h.inc
 include/mlir/Dialect/OpenMP/Transforms/Passes.td
+include/mlir/Dialect/OpenMP/Utils/Utils.h
 include/mlir/Dialect/PDL/IR/PDL.h
 include/mlir/Dialect/PDL/IR/PDLDialect.td
 include/mlir/Dialect/PDL/IR/PDLOps.cpp.inc
@@ -1167,6 +1215,7 @@ include/mlir/Dialect/SPIRV/IR/SPIRVEnumAvailability.h.inc
 include/mlir/Dialect/SPIRV/IR/SPIRVEnums.cpp.inc
 include/mlir/Dialect/SPIRV/IR/SPIRVEnums.h
 include/mlir/Dialect/SPIRV/IR/SPIRVEnums.h.inc
+include/mlir/Dialect/SPIRV/IR/SPIRVExperimentalMLOps.td
 include/mlir/Dialect/SPIRV/IR/SPIRVGLCanonicalization.h
 include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td
 include/mlir/Dialect/SPIRV/IR/SPIRVGraphOps.td
@@ -1193,6 +1242,9 @@ include/mlir/Dialect/SPIRV/IR/SPIRVOpsTypes.h.inc
 include/mlir/Dialect/SPIRV/IR/SPIRVPrimitiveOps.td
 include/mlir/Dialect/SPIRV/IR/SPIRVSerialization.inc
 include/mlir/Dialect/SPIRV/IR/SPIRVStructureOps.td
+include/mlir/Dialect/SPIRV/IR/SPIRVTosaOps.h
+include/mlir/Dialect/SPIRV/IR/SPIRVTosaOps.td
+include/mlir/Dialect/SPIRV/IR/SPIRVTosaTypes.td
 include/mlir/Dialect/SPIRV/IR/SPIRVTypes.h
 include/mlir/Dialect/SPIRV/IR/TargetAndABI.h
 include/mlir/Dialect/SPIRV/Interfaces/SPIRVImageInterfaces.cpp.inc
@@ -1249,7 +1301,7 @@ include/mlir/Dialect/Shard/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Shard/Transforms/Passes.h
 include/mlir/Dialect/Shard/Transforms/Passes.h.inc
 include/mlir/Dialect/Shard/Transforms/Passes.td
-include/mlir/Dialect/Shard/Transforms/Simplifications.h
+include/mlir/Dialect/Shard/Transforms/Simplify.h
 include/mlir/Dialect/Shard/Transforms/Transforms.h
 include/mlir/Dialect/SparseTensor/IR/Enums.h
 include/mlir/Dialect/SparseTensor/IR/SparseTensor.h
@@ -1289,7 +1341,6 @@ include/mlir/Dialect/SparseTensor/Transforms/Passes.td
 include/mlir/Dialect/SparseTensor/Utils/Merger.h
 include/mlir/Dialect/Tensor/Extensions/AllExtensions.h
 include/mlir/Dialect/Tensor/Extensions/ShardingExtensions.h
-include/mlir/Dialect/Tensor/IR/ShardingInterfaceImpl.h
 include/mlir/Dialect/Tensor/IR/Tensor.h
 include/mlir/Dialect/Tensor/IR/TensorBase.td
 include/mlir/Dialect/Tensor/IR/TensorInferTypeOpInterfaceImpl.h
@@ -1395,6 +1446,8 @@ include/mlir/Dialect/Transform/Interfaces/MatchInterfaces.cpp.inc
 include/mlir/Dialect/Transform/Interfaces/MatchInterfaces.h
 include/mlir/Dialect/Transform/Interfaces/MatchInterfaces.h.inc
 include/mlir/Dialect/Transform/Interfaces/MatchInterfaces.td
+include/mlir/Dialect/Transform/Interfaces/TransformAttrInterfaces.cpp.inc
+include/mlir/Dialect/Transform/Interfaces/TransformAttrInterfaces.h.inc
 include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.cpp.inc
 include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.h
 include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.h.inc
@@ -1430,6 +1483,7 @@ include/mlir/Dialect/Transform/TuneExtension/TuneExtensionOps.td
 include/mlir/Dialect/Transform/Utils/DiagnosedSilenceableFailure.h
 include/mlir/Dialect/Transform/Utils/RaggedArray.h
 include/mlir/Dialect/Transform/Utils/Utils.h
+include/mlir/Dialect/UB/IR/UBMatchers.h
 include/mlir/Dialect/UB/IR/UBOps.cpp.inc
 include/mlir/Dialect/UB/IR/UBOps.h
 include/mlir/Dialect/UB/IR/UBOps.h.inc
@@ -1480,6 +1534,7 @@ include/mlir/Dialect/Vector/TransformOps/VectorTransformOps.h
 include/mlir/Dialect/Vector/TransformOps/VectorTransformOps.h.inc
 include/mlir/Dialect/Vector/TransformOps/VectorTransformOps.td
 include/mlir/Dialect/Vector/Transforms/BufferizableOpInterfaceImpl.h
+include/mlir/Dialect/Vector/Transforms/IndexedAccessOpInterfaceImpl.h
 include/mlir/Dialect/Vector/Transforms/LoweringPatterns.h
 include/mlir/Dialect/Vector/Transforms/Passes.capi.cpp.inc
 include/mlir/Dialect/Vector/Transforms/Passes.capi.h.inc
@@ -1510,23 +1565,23 @@ include/mlir/Dialect/WasmSSA/IR/WasmSSAOpsTypes.h.inc
 include/mlir/Dialect/WasmSSA/IR/WasmSSATypeConstraints.cpp.inc
 include/mlir/Dialect/WasmSSA/IR/WasmSSATypeConstraints.h.inc
 include/mlir/Dialect/WasmSSA/IR/WasmSSATypes.td
-include/mlir/Dialect/X86Vector/TransformOps/X86VectorTransformOps.cpp.inc
-include/mlir/Dialect/X86Vector/TransformOps/X86VectorTransformOps.h
-include/mlir/Dialect/X86Vector/TransformOps/X86VectorTransformOps.h.inc
-include/mlir/Dialect/X86Vector/TransformOps/X86VectorTransformOps.td
-include/mlir/Dialect/X86Vector/Transforms.h
-include/mlir/Dialect/X86Vector/Utils/X86VectorUtils.h
-include/mlir/Dialect/X86Vector/X86Vector.cpp.inc
-include/mlir/Dialect/X86Vector/X86Vector.h.inc
-include/mlir/Dialect/X86Vector/X86Vector.td
-include/mlir/Dialect/X86Vector/X86VectorDialect.cpp.inc
-include/mlir/Dialect/X86Vector/X86VectorDialect.h
-include/mlir/Dialect/X86Vector/X86VectorDialect.h.inc
-include/mlir/Dialect/X86Vector/X86VectorInterfaces.cpp.inc
-include/mlir/Dialect/X86Vector/X86VectorInterfaces.h.inc
-include/mlir/Dialect/X86Vector/X86VectorInterfaces.td
-include/mlir/Dialect/X86Vector/X86VectorTypes.cpp.inc
-include/mlir/Dialect/X86Vector/X86VectorTypes.h.inc
+include/mlir/Dialect/X86/TransformOps/X86TransformOps.cpp.inc
+include/mlir/Dialect/X86/TransformOps/X86TransformOps.h
+include/mlir/Dialect/X86/TransformOps/X86TransformOps.h.inc
+include/mlir/Dialect/X86/TransformOps/X86TransformOps.td
+include/mlir/Dialect/X86/Transforms.h
+include/mlir/Dialect/X86/Utils/X86Utils.h
+include/mlir/Dialect/X86/X86.cpp.inc
+include/mlir/Dialect/X86/X86.h.inc
+include/mlir/Dialect/X86/X86.td
+include/mlir/Dialect/X86/X86Dialect.cpp.inc
+include/mlir/Dialect/X86/X86Dialect.h
+include/mlir/Dialect/X86/X86Dialect.h.inc
+include/mlir/Dialect/X86/X86Interfaces.cpp.inc
+include/mlir/Dialect/X86/X86Interfaces.h.inc
+include/mlir/Dialect/X86/X86Interfaces.td
+include/mlir/Dialect/X86/X86Types.cpp.inc
+include/mlir/Dialect/X86/X86Types.h.inc
 include/mlir/Dialect/XeGPU/IR/XeGPU.cpp.inc
 include/mlir/Dialect/XeGPU/IR/XeGPU.h
 include/mlir/Dialect/XeGPU/IR/XeGPU.h.inc
@@ -1557,9 +1612,12 @@ include/mlir/Dialect/XeGPU/Transforms/Passes.h
 include/mlir/Dialect/XeGPU/Transforms/Passes.h.inc
 include/mlir/Dialect/XeGPU/Transforms/Passes.td
 include/mlir/Dialect/XeGPU/Transforms/Transforms.h
+include/mlir/Dialect/XeGPU/Transforms/XeGPULayoutImpl.h
 include/mlir/Dialect/XeGPU/Utils/XeGPUUtils.h
 include/mlir/Dialect/XeGPU/uArch/IntelGpuXe2.h
+include/mlir/Dialect/XeGPU/uArch/IntelGpuXe3.h
 include/mlir/Dialect/XeGPU/uArch/uArchBase.h
+include/mlir/Dialect/XeGPU/uArch/uArchCommon.h
 include/mlir/ExecutionEngine/AsyncRuntime.h
 include/mlir/ExecutionEngine/CRunnerUtils.h
 include/mlir/ExecutionEngine/ExecutionEngine.h
@@ -1643,6 +1701,8 @@ include/mlir/IR/Matchers.h
 include/mlir/IR/ODSSupport.h
 include/mlir/IR/OpAsmAttrInterface.cpp.inc
 include/mlir/IR/OpAsmAttrInterface.h.inc
+include/mlir/IR/OpAsmDialectInterface.h.inc
+include/mlir/IR/OpAsmDialectInterface.td
 include/mlir/IR/OpAsmInterface.td
 include/mlir/IR/OpAsmOpInterface.cpp.inc
 include/mlir/IR/OpAsmOpInterface.h.inc
@@ -1659,6 +1719,10 @@ include/mlir/IR/PDLPatternMatch.h.inc
 include/mlir/IR/PatternBase.td
 include/mlir/IR/PatternMatch.h
 include/mlir/IR/Properties.td
+include/mlir/IR/QuantStorageTypeInterface.cpp.inc
+include/mlir/IR/QuantStorageTypeInterface.h
+include/mlir/IR/QuantStorageTypeInterface.h.inc
+include/mlir/IR/QuantStorageTypeInterface.td
 include/mlir/IR/Region.h
 include/mlir/IR/RegionGraphTraits.h
 include/mlir/IR/RegionKindInterface.cpp.inc
@@ -1713,6 +1777,7 @@ include/mlir/Interfaces/ControlFlowInterfaces.h.inc
 include/mlir/Interfaces/ControlFlowInterfaces.td
 include/mlir/Interfaces/DataLayoutAttrInterface.cpp.inc
 include/mlir/Interfaces/DataLayoutAttrInterface.h.inc
+include/mlir/Interfaces/DataLayoutDialectInterface.h.inc
 include/mlir/Interfaces/DataLayoutInterfaces.h
 include/mlir/Interfaces/DataLayoutInterfaces.td
 include/mlir/Interfaces/DataLayoutOpInterface.cpp.inc
@@ -1727,6 +1792,8 @@ include/mlir/Interfaces/DestinationStyleOpInterface.cpp.inc
 include/mlir/Interfaces/DestinationStyleOpInterface.h
 include/mlir/Interfaces/DestinationStyleOpInterface.h.inc
 include/mlir/Interfaces/DestinationStyleOpInterface.td
+include/mlir/Interfaces/DialectFoldInterface.h.inc
+include/mlir/Interfaces/DialectFoldInterface.td
 include/mlir/Interfaces/FoldInterfaces.h
 include/mlir/Interfaces/FunctionImplementation.h
 include/mlir/Interfaces/FunctionInterfaces.cpp.inc
@@ -1737,6 +1804,10 @@ include/mlir/Interfaces/IndexingMapOpInterface.cpp.inc
 include/mlir/Interfaces/IndexingMapOpInterface.h
 include/mlir/Interfaces/IndexingMapOpInterface.h.inc
 include/mlir/Interfaces/IndexingMapOpInterface.td
+include/mlir/Interfaces/InferIntDivisibilityOpInterface.cpp.inc
+include/mlir/Interfaces/InferIntDivisibilityOpInterface.h
+include/mlir/Interfaces/InferIntDivisibilityOpInterface.h.inc
+include/mlir/Interfaces/InferIntDivisibilityOpInterface.td
 include/mlir/Interfaces/InferIntRangeInterface.cpp.inc
 include/mlir/Interfaces/InferIntRangeInterface.h
 include/mlir/Interfaces/InferIntRangeInterface.h.inc
@@ -1789,6 +1860,7 @@ include/mlir/Interfaces/TilingInterface.h
 include/mlir/Interfaces/TilingInterface.h.inc
 include/mlir/Interfaces/TilingInterface.td
 include/mlir/Interfaces/Utils/InferIntRangeCommon.h
+include/mlir/Interfaces/Utils/MemorySlotUtils.h
 include/mlir/Interfaces/ValueBoundsOpInterface.cpp.inc
 include/mlir/Interfaces/ValueBoundsOpInterface.h
 include/mlir/Interfaces/ValueBoundsOpInterface.h.inc
@@ -1818,6 +1890,8 @@ include/mlir/Query/Matcher/SliceMatchers.h
 include/mlir/Query/Matcher/VariantValue.h
 include/mlir/Query/Query.h
 include/mlir/Query/QuerySession.h
+include/mlir/Reducer/DialectReductionPatternInterface.h.inc
+include/mlir/Reducer/DialectReductionPatternInterface.td
 include/mlir/Reducer/Passes.h
 include/mlir/Reducer/Passes.h.inc
 include/mlir/Reducer/Passes.td
@@ -1829,6 +1903,7 @@ include/mlir/Rewrite/FrozenRewritePatternSet.h
 include/mlir/Rewrite/PassUtil.td
 include/mlir/Rewrite/PatternApplicator.h
 include/mlir/Support/ADTExtras.h
+include/mlir/Support/Complex.h
 include/mlir/Support/CyclicReplacerCache.h
 include/mlir/Support/DebugStringHelper.h
 include/mlir/Support/FileUtilities.h
@@ -1898,7 +1973,11 @@ include/mlir/Target/LLVMIR/Dialect/VCIX/VCIXToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/XeVM/XeVMToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Export.h
 include/mlir/Target/LLVMIR/Import.h
+include/mlir/Target/LLVMIR/LLVMImportDialectInterface.h.inc
+include/mlir/Target/LLVMIR/LLVMImportDialectInterface.td
 include/mlir/Target/LLVMIR/LLVMImportInterface.h
+include/mlir/Target/LLVMIR/LLVMTranslationDialectInterface.h.inc
+include/mlir/Target/LLVMIR/LLVMTranslationDialectInterface.td
 include/mlir/Target/LLVMIR/LLVMTranslationInterface.h
 include/mlir/Target/LLVMIR/ModuleImport.h
 include/mlir/Target/LLVMIR/ModuleTranslation.h
@@ -1913,6 +1992,7 @@ include/mlir/Target/SMTLIB/Namespace.h
 include/mlir/Target/SMTLIB/SymCache.h
 include/mlir/Target/SPIRV/Deserialization.h
 include/mlir/Target/SPIRV/SPIRVBinaryUtils.h
+include/mlir/Target/SPIRV/SPIRVExtInstSets.h
 include/mlir/Target/SPIRV/Serialization.h
 include/mlir/Target/SPIRV/Target.h
 include/mlir/Target/Wasm/WasmBinaryEncoding.h
@@ -1950,6 +2030,7 @@ include/mlir/Transforms/CSE.h
 include/mlir/Transforms/CommutativityUtils.h
 include/mlir/Transforms/ControlFlowSinkUtils.h
 include/mlir/Transforms/DialectConversion.h
+include/mlir/Transforms/DialectConversion.pdll
 include/mlir/Transforms/DialectInlinerInterface.h.inc
 include/mlir/Transforms/DialectInlinerInterface.td
 include/mlir/Transforms/EndomorphismSimplification.h
@@ -1979,12 +2060,12 @@ lib/cmake/mlir/MLIRDetectPythonEnv.cmake
 lib/cmake/mlir/MLIRTargets-release.cmake
 lib/cmake/mlir/MLIRTargets.cmake
 lib/libMLIR-C.so
+lib/libMLIR-C.so.23.1
+lib/libMLIRABI.a
 lib/libMLIRAMDGPUDialect.a
 lib/libMLIRAMDGPUToROCDL.a
 lib/libMLIRAMDGPUTransforms.a
 lib/libMLIRAMDGPUUtils.a
-lib/libMLIRAMXDialect.a
-lib/libMLIRAMXTransforms.a
 lib/libMLIRAffineAnalysis.a
 lib/libMLIRAffineDialect.a
 lib/libMLIRAffineToStandard.a
@@ -2023,8 +2104,10 @@ lib/libMLIRAsmParser.a
 lib/libMLIRAsyncDialect.a
 lib/libMLIRAsyncToLLVM.a
 lib/libMLIRAsyncTransforms.a
+lib/libMLIRBufferizationAllExtensions.a
 lib/libMLIRBufferizationDialect.a
 lib/libMLIRBufferizationPipelines.a
+lib/libMLIRBufferizationShardingExtensions.a
 lib/libMLIRBufferizationToMemRef.a
 lib/libMLIRBufferizationTransformOps.a
 lib/libMLIRBufferizationTransforms.a
@@ -2033,7 +2116,6 @@ lib/libMLIRBytecodeOpInterface.a
 lib/libMLIRBytecodeReader.a
 lib/libMLIRBytecodeWriter.a
 lib/libMLIRCAPIAMDGPU.a
-lib/libMLIRCAPIAMX.a
 lib/libMLIRCAPIAffine.a
 lib/libMLIRCAPIArith.a
 lib/libMLIRCAPIArmNeon.a
@@ -2087,7 +2169,7 @@ lib/libMLIRCAPIUB.a
 lib/libMLIRCAPIVCIX.a
 lib/libMLIRCAPIVector.a
 lib/libMLIRCAPIWasmSSA.a
-lib/libMLIRCAPIX86Vector.a
+lib/libMLIRCAPIX86.a
 lib/libMLIRCAPIXeGPU.a
 lib/libMLIRCAPIXeVM.a
 lib/libMLIRCallInterfaces.a
@@ -2116,6 +2198,7 @@ lib/libMLIRDerivedAttributeOpInterface.a
 lib/libMLIRDestinationStyleOpInterface.a
 lib/libMLIRDialect.a
 lib/libMLIRDialectUtils.a
+lib/libMLIREmitCCommonConversion.a
 lib/libMLIREmitCDialect.a
 lib/libMLIREmitCTransforms.a
 lib/libMLIRExecutionEngine.a
@@ -2150,6 +2233,7 @@ lib/libMLIRIndexDialect.a
 lib/libMLIRIndexToLLVM.a
 lib/libMLIRIndexToSPIRV.a
 lib/libMLIRIndexingMapOpInterface.a
+lib/libMLIRInferIntDivisibilityOpInterface.a
 lib/libMLIRInferIntRangeCommon.a
 lib/libMLIRInferIntRangeInterface.a
 lib/libMLIRInferStridedMetadataInterface.a
@@ -2181,6 +2265,7 @@ lib/libMLIRMathToEmitC.a
 lib/libMLIRMathToFuncs.a
 lib/libMLIRMathToLLVM.a
 lib/libMLIRMathToLibm.a
+lib/libMLIRMathToNVVM.a
 lib/libMLIRMathToROCDL.a
 lib/libMLIRMathToSPIRV.a
 lib/libMLIRMathToXeVM.a
@@ -2194,6 +2279,7 @@ lib/libMLIRMemRefTransformOps.a
 lib/libMLIRMemRefTransforms.a
 lib/libMLIRMemRefUtils.a
 lib/libMLIRMemorySlotInterfaces.a
+lib/libMLIRMemorySlotUtils.a
 lib/libMLIRMlirOptMain.a
 lib/libMLIRNVGPUDialect.a
 lib/libMLIRNVGPUToNVVM.a
@@ -2204,6 +2290,7 @@ lib/libMLIRNVVMDialect.a
 lib/libMLIRNVVMTarget.a
 lib/libMLIRNVVMToLLVM.a
 lib/libMLIRNVVMToLLVMIRTranslation.a
+lib/libMLIRNVVMTransforms.a
 lib/libMLIRObservers.a
 lib/libMLIROpenACCAnalysis.a
 lib/libMLIROpenACCDialect.a
@@ -2216,6 +2303,7 @@ lib/libMLIROpenMPDialect.a
 lib/libMLIROpenMPToLLVM.a
 lib/libMLIROpenMPToLLVMIRTranslation.a
 lib/libMLIROpenMPTransforms.a
+lib/libMLIROpenMPUtils.a
 lib/libMLIROptLib.a
 lib/libMLIRPDLDialect.a
 lib/libMLIRPDLInterpDialect.a
@@ -2319,6 +2407,7 @@ lib/libMLIRTosaToArith.a
 lib/libMLIRTosaToLinalg.a
 lib/libMLIRTosaToMLProgram.a
 lib/libMLIRTosaToSCF.a
+lib/libMLIRTosaToSPIRVTosa.a
 lib/libMLIRTosaToTensor.a
 lib/libMLIRTosaTransforms.a
 lib/libMLIRTransformDebugExtension.a
@@ -2354,11 +2443,12 @@ lib/libMLIRVectorTransformOps.a
 lib/libMLIRVectorTransforms.a
 lib/libMLIRVectorUtils.a
 lib/libMLIRViewLikeInterface.a
+lib/libMLIRWasmRaise.a
 lib/libMLIRWasmSSADialect.a
-lib/libMLIRX86VectorDialect.a
-lib/libMLIRX86VectorTransformOps.a
-lib/libMLIRX86VectorTransforms.a
-lib/libMLIRX86VectorUtils.a
+lib/libMLIRX86Dialect.a
+lib/libMLIRX86TransformOps.a
+lib/libMLIRX86Transforms.a
+lib/libMLIRX86Utils.a
 lib/libMLIRXeGPUDialect.a
 lib/libMLIRXeGPUToXeVM.a
 lib/libMLIRXeGPUTransformOps.a
@@ -2369,9 +2459,16 @@ lib/libMLIRXeVMTarget.a
 lib/libMLIRXeVMToLLVM.a
 lib/libMLIRXeVMToLLVMIRTranslation.a
 lib/libmlir_apfloat_wrappers.so
+lib/libmlir_apfloat_wrappers.so.23.1
 lib/libmlir_arm_runner_utils.so
+lib/libmlir_arm_runner_utils.so.23.1
 lib/libmlir_arm_sme_abi_stubs.so
+lib/libmlir_arm_sme_abi_stubs.so.23.1
 lib/libmlir_async_runtime.so
+lib/libmlir_async_runtime.so.23.1
 lib/libmlir_c_runner_utils.so
+lib/libmlir_c_runner_utils.so.23.1
 lib/libmlir_float16_utils.so
+lib/libmlir_float16_utils.so.23.1
 lib/libmlir_runner_utils.so
+lib/libmlir_runner_utils.so.23.1
diff --git a/mlir/buildlink3.mk b/mlir/buildlink3.mk
index d9f824b7f5..3642b5c702 100644
--- a/mlir/buildlink3.mk
+++ b/mlir/buildlink3.mk
@@ -5,9 +5,10 @@ BUILDLINK_TREE+=	mlir
 .if !defined(MLIR_BUILDLINK3_MK)
 MLIR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mlir+=	mlir>=22.1.0
+BUILDLINK_API_DEPENDS.mlir+=	mlir>=23.1.0
 BUILDLINK_PKGSRCDIR.mlir?=	../../wip/mlir
 
+BUILDLINK_FILES.mlir+=		bin/mlir-irdl-to-cpp
 BUILDLINK_FILES.mlir+=		bin/mlir-tblgen
 
 .include "../../lang/llvm/buildlink3.mk"
diff --git a/mlir/distinfo b/mlir/distinfo
index 2193a55a34..2c2406cd8e 100644
--- a/mlir/distinfo
+++ b/mlir/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
 SHA1 (patch-cmake_modules_MLIRConfig.cmake.in) = ec96152743be4c33231899399f9e7cde5655b321
 SHA1 (patch-tools_mlir-tblgen_CMakeLists.txt) = 7b78acbf8a85443f2cc3f13786bbbda25b0b8d74
diff --git a/openmp/Makefile b/openmp/Makefile
index f45e93b201..713be91cd2 100644
--- a/openmp/Makefile
+++ b/openmp/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../wip/llvm/version.mk"
 
+EXTRACT_ELEMENTS+=	${DISTNAME}/llvm
+
 PKGNAME=	openmp-${LLVM_VERSION}
 CATEGORIES=	parallel
 
@@ -10,12 +12,16 @@ HOMEPAGE=	https://openmp.llvm.org/
 COMMENT=	Support for the OpenMP language
 LICENSE=	apache-2.0
 
+# https://openmp.llvm.org/Building.html
+WRKSRC=		${WRKDIR}/${DISTNAME}/runtimes
+
 USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c gnu++17
 USE_TOOLS+=		perl pkg-config
 GCC_REQD+=		7	# Not supported by ancient GCCs
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+=	-DLLVM_ENABLE_RUNTIMES=openmp
 CMAKE_CONFIGURE_ARGS+=	-DOPENMP_ENABLE_LIBOMPTARGET=OFF
 CMAKE_CONFIGURE_ARGS+=	-DOPENMP_ENABLE_OMPT_TOOLS=OFF
 
diff --git a/openmp/buildlink3.mk b/openmp/buildlink3.mk
index 23061e84f5..488b803997 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>=21.1.0
-BUILDLINK_ABI_DEPENDS.openmp+=	openmp>=21.1.0
+BUILDLINK_API_DEPENDS.openmp+=	openmp>=23.1.0
+BUILDLINK_ABI_DEPENDS.openmp+=	openmp>=23.1.0
 BUILDLINK_PKGSRCDIR.openmp?=	../../wip/openmp
 .endif	# OPENMP_BUILDLINK3_MK
 
diff --git a/openmp/distinfo b/openmp/distinfo
index 764c85dff2..5dbc470270 100644
--- a/openmp/distinfo
+++ b/openmp/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
diff --git a/polly/buildlink3.mk b/polly/buildlink3.mk
index faa7d9cca3..fc0ca06fef 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>=21.1.0
+BUILDLINK_API_DEPENDS.polly+=	polly>=23.1.0
 BUILDLINK_PKGSRCDIR.polly?=	../../wip/polly
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/polly/distinfo b/polly/distinfo
index 56e2517c2e..175c7ebb54 100644
--- a/polly/distinfo
+++ b/polly/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.29 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
diff --git a/spirv-llvm-translator/Makefile b/spirv-llvm-translator/Makefile
index 471a37ea34..08627515d9 100644
--- a/spirv-llvm-translator/Makefile
+++ b/spirv-llvm-translator/Makefile
@@ -2,7 +2,7 @@
 
 # Note that parallel/spirv-headers must be kept in sync with what this
 # package expects.
-DISTNAME=	SPIRV-LLVM-Translator-22.1.6
+DISTNAME=	SPIRV-LLVM-Translator-23.1.2
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	parallel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=KhronosGroup/}
diff --git a/spirv-llvm-translator/PLIST b/spirv-llvm-translator/PLIST
index d58819ebcf..b1f9769961 100644
--- a/spirv-llvm-translator/PLIST
+++ b/spirv-llvm-translator/PLIST
@@ -4,5 +4,5 @@ include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
 include/LLVMSPIRVLib/LLVMSPIRVLib.h
 include/LLVMSPIRVLib/LLVMSPIRVOpts.h
 lib/libLLVMSPIRVLib.so
-lib/libLLVMSPIRVLib.so.22.1
+lib/libLLVMSPIRVLib.so.23.1
 lib/pkgconfig/LLVMSPIRVLib.pc
diff --git a/spirv-llvm-translator/distinfo b/spirv-llvm-translator/distinfo
index 7cdd049977..45e7433d22 100644
--- a/spirv-llvm-translator/distinfo
+++ b/spirv-llvm-translator/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.16 2026/09/02 14:11:41 adam Exp $
 
-BLAKE2s (SPIRV-LLVM-Translator-22.1.6.tar.gz) = 5be7b49421e237c2aff45234ac3c09e8986d20d91725239415a9d066ef71829b
-SHA512 (SPIRV-LLVM-Translator-22.1.6.tar.gz) = da0326c93a3988c11a32a298e82b07b33978e2d5ae080d65a243a8125017d63824d1d42d759232f7bf138663eba25e57e45b2d4b2e9f77c01f1e21b80353f461
-Size (SPIRV-LLVM-Translator-22.1.6.tar.gz) = 1884210 bytes
+BLAKE2s (SPIRV-LLVM-Translator-23.1.2.tar.gz) = 04d5dbb1981e12dc7de03e77abab55917901a982a4ce881596094e4618808a03
+SHA512 (SPIRV-LLVM-Translator-23.1.2.tar.gz) = fff2224f63926819e29d5f2daa54015b486497f131ecf4b563cfde75a594812a5c395b67971022be13de42d7429db1fc747c725c15978894baa3a62013d98777
+Size (SPIRV-LLVM-Translator-23.1.2.tar.gz) = 1939238 bytes
diff --git a/wasi-libcxx/distinfo b/wasi-libcxx/distinfo
index e3d156d160..ec7bd0f7ad 100644
--- a/wasi-libcxx/distinfo
+++ b/wasi-libcxx/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.8 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-22.1.8.src.tar.xz) = 07f9fe26ade885b62c6d7349df72a723a33df8f130703c2bdbd733ba7c2e94bc
-SHA512 (llvm-project-22.1.8.src.tar.xz) = 2615b20ba08534f83ab8ecc7b5ba43b5f1dfcf9cdb2534a32fcdbf0ccdd9a008b46276e45ef26ed9377f65b5e4ae89ea798f3863fd034484b5715140f3a7b35c
-Size (llvm-project-22.1.8.src.tar.xz) = 167061596 bytes
+BLAKE2s (llvm-project-23.1.3.src.tar.xz) = 7176752180f78f3c41b08da44b9a4291e02f67b57aabd8b40a9ff25a9f63f60e
+SHA512 (llvm-project-23.1.3.src.tar.xz) = eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
+Size (llvm-project-23.1.3.src.tar.xz) = 179220548 bytes
 SHA1 (patch-libcxx_include_CMakeLists.txt) = 6f6a65619f7d283a40e3511a309199d0c28e02d8
-SHA1 (patch-libcxx_src_CMakeLists.txt) = c4707f5b0b5eacc0ab02f25dfc7281a484507cc5
+SHA1 (patch-libcxx_src_CMakeLists.txt) = ed0737b69cf6c0564625df20ab6e39df3b780fe6
 SHA1 (patch-libcxxabi_src_CMakeLists.txt) = deaa2a57f409ac215eb6b9d219086cc3f72b0d7d
diff --git a/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt b/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
index d5a7d0f1f8..a1460bfe89 100644
--- a/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
+++ b/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
@@ -2,14 +2,14 @@ $NetBSD$
 
 Fix build.
 
---- libcxx/src/CMakeLists.txt.orig	2025-12-12 10:35:47.000000000 +0000
+--- libcxx/src/CMakeLists.txt.orig	2026-10-06 07:38:51.000000000 +0000
 +++ libcxx/src/CMakeLists.txt
-@@ -209,7 +209,7 @@ endif()
+@@ -210,7 +210,7 @@ if (LIBCXX_SUPPORTS_SHARED_LIBRARY)
  
- # Maybe force some symbols to be weak, not weak or not exported.
- # TODO: This shouldn't depend on the platform, and ideally it should be done in the sources.
--if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
-+if (FALSE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
-           AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
-   target_link_libraries(cxx_shared PRIVATE
-     "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
+   # Maybe force some symbols to be weak, not weak or not exported.
+   # TODO: This shouldn't depend on the platform, and ideally it should be done in the sources.
+-  if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
++  if (FALSE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
+             AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
+     target_link_libraries(cxx_shared PRIVATE
+       "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"


Home | Main Index | Thread Index | Old Index