pkgsrc-WIP-changes archive

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

llvm: updated to 22.1.2



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Mon Mar 30 17:28:16 2026 +0200
Changeset:	b4ad5a20c82553e7199056ff1e68b1b11ea0e166

Modified Files:
	clang-tools-extra/PLIST
	clang-tools-extra/distinfo
	clang/Makefile.common
	clang/PLIST
	clang/buildlink3.mk
	clang/distinfo
	compiler-rt/distinfo
	flang/PLIST
	flang/distinfo
	libcxx/Makefile
	libcxx/PLIST
	libcxx/distinfo
	libcxxabi/Makefile
	libcxxabi/buildlink3.mk
	libcxxabi/distinfo
	libcxxabi/files/__assertion_handler
	libcxxabi/files/__config_site
	libunwind/buildlink3.mk
	libunwind/distinfo
	lld/Makefile
	lld/buildlink3.mk
	lld/distinfo
	lldb/Makefile
	lldb/PLIST
	lldb/buildlink3.mk
	lldb/distinfo
	llvm/PLIST
	llvm/buildlink3.mk
	llvm/distinfo
	llvm/patches/patch-CMakeLists.txt
	llvm/patches/patch-cmake_modules_AddLLVM.cmake
	llvm/patches/patch-utils_llvm-lit_CMakeLists.txt
	llvm/version.mk
	mlir/Makefile
	mlir/PLIST
	mlir/buildlink3.mk
	mlir/distinfo
	openmp/distinfo
	polly/PLIST
	polly/distinfo
	wasi-libcxx/Makefile
	wasi-libcxx/PLIST
	wasi-libcxx/distinfo
	wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
Added Files:
	compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp

Log Message:
llvm: updated to 22.1.2

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

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

diffstat:
 clang-tools-extra/PLIST                            |  65 ++-
 clang-tools-extra/distinfo                         |   6 +-
 clang/Makefile.common                              |   2 +-
 clang/PLIST                                        | 617 +++++++++++----------
 clang/buildlink3.mk                                |   8 +-
 clang/distinfo                                     |   6 +-
 compiler-rt/distinfo                               |   7 +-
 ...atch-lib_sanitizer__common_sanitizer__linux.cpp |  15 +
 flang/PLIST                                        |  36 +-
 flang/distinfo                                     |   6 +-
 libcxx/Makefile                                    |   2 +-
 libcxx/PLIST                                       |  49 +-
 libcxx/distinfo                                    |   6 +-
 libcxxabi/Makefile                                 |   9 +-
 libcxxabi/buildlink3.mk                            |   2 +-
 libcxxabi/distinfo                                 |   6 +-
 libcxxabi/files/__assertion_handler                |  46 +-
 libcxxabi/files/__config_site                      |   6 +-
 libunwind/buildlink3.mk                            |   2 +-
 libunwind/distinfo                                 |   6 +-
 lld/Makefile                                       |   2 +-
 lld/buildlink3.mk                                  |   2 +-
 lld/distinfo                                       |   6 +-
 lldb/Makefile                                      |   4 +-
 lldb/PLIST                                         |  27 +-
 lldb/buildlink3.mk                                 |   4 +-
 lldb/distinfo                                      |   6 +-
 llvm/PLIST                                         | 115 +++-
 llvm/buildlink3.mk                                 |   1 +
 llvm/distinfo                                      |  12 +-
 llvm/patches/patch-CMakeLists.txt                  |   9 +-
 llvm/patches/patch-cmake_modules_AddLLVM.cmake     |   8 +-
 llvm/patches/patch-utils_llvm-lit_CMakeLists.txt   |   8 +-
 llvm/version.mk                                    |   2 +-
 mlir/Makefile                                      |   4 +-
 mlir/PLIST                                         | 297 ++++++++--
 mlir/buildlink3.mk                                 |   2 +-
 mlir/distinfo                                      |   6 +-
 openmp/distinfo                                    |   6 +-
 polly/PLIST                                        |   7 +-
 polly/distinfo                                     |   6 +-
 wasi-libcxx/Makefile                               |  18 +-
 wasi-libcxx/PLIST                                  |  49 +-
 wasi-libcxx/distinfo                               |   8 +-
 .../patches/patch-libcxx_include_CMakeLists.txt    |  13 +-
 45 files changed, 971 insertions(+), 553 deletions(-)

diffs:
diff --git a/clang-tools-extra/PLIST b/clang-tools-extra/PLIST
index 42e848a9b2..a7bc44b2d6 100644
--- a/clang-tools-extra/PLIST
+++ b/clang-tools-extra/PLIST
@@ -45,6 +45,7 @@ include/clang-tidy/abseil/StringFindStartswithCheck.h
 include/clang-tidy/abseil/StringFindStrContainsCheck.h
 include/clang-tidy/abseil/TimeComparisonCheck.h
 include/clang-tidy/abseil/TimeSubtractionCheck.h
+include/clang-tidy/abseil/UncheckedStatusOrAccessCheck.h
 include/clang-tidy/abseil/UpgradeDurationConversionsCheck.h
 include/clang-tidy/altera/IdDependentBackwardBranchCheck.h
 include/clang-tidy/altera/KernelNameRestrictionCheck.h
@@ -79,14 +80,20 @@ include/clang-tidy/bugprone/BranchCloneCheck.h
 include/clang-tidy/bugprone/CapturingThisInMemberVariableCheck.h
 include/clang-tidy/bugprone/CastingThroughVoidCheck.h
 include/clang-tidy/bugprone/ChainedComparisonCheck.h
+include/clang-tidy/bugprone/CommandProcessorCheck.h
 include/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.h
 include/clang-tidy/bugprone/CopyConstructorInitCheck.h
+include/clang-tidy/bugprone/CopyConstructorMutatesArgumentCheck.h
 include/clang-tidy/bugprone/CrtpConstructorAccessibilityCheck.h
 include/clang-tidy/bugprone/DanglingHandleCheck.h
+include/clang-tidy/bugprone/DefaultOperatorNewOnOveralignedTypeCheck.h
+include/clang-tidy/bugprone/DerivedMethodShadowingBaseMethodCheck.h
 include/clang-tidy/bugprone/DynamicStaticInitializersCheck.h
 include/clang-tidy/bugprone/EasilySwappableParametersCheck.h
 include/clang-tidy/bugprone/EmptyCatchCheck.h
+include/clang-tidy/bugprone/ExceptionCopyConstructorThrowsCheck.h
 include/clang-tidy/bugprone/ExceptionEscapeCheck.h
+include/clang-tidy/bugprone/FloatLoopCounterCheck.h
 include/clang-tidy/bugprone/FoldInitTypeCheck.h
 include/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.h
 include/clang-tidy/bugprone/ForwardingReferenceOverloadCheck.h
@@ -98,6 +105,7 @@ include/clang-tidy/bugprone/IncorrectEnableSharedFromThisCheck.h
 include/clang-tidy/bugprone/IncorrectRoundingsCheck.h
 include/clang-tidy/bugprone/InfiniteLoopCheck.h
 include/clang-tidy/bugprone/IntegerDivisionCheck.h
+include/clang-tidy/bugprone/InvalidEnumDefaultInitializationCheck.h
 include/clang-tidy/bugprone/LambdaFunctionNameCheck.h
 include/clang-tidy/bugprone/MacroParenthesesCheck.h
 include/clang-tidy/bugprone/MacroRepeatedSideEffectsCheck.h
@@ -118,6 +126,8 @@ include/clang-tidy/bugprone/OptionalValueConversionCheck.h
 include/clang-tidy/bugprone/ParentVirtualCallCheck.h
 include/clang-tidy/bugprone/PointerArithmeticOnPolymorphicObjectCheck.h
 include/clang-tidy/bugprone/PosixReturnCheck.h
+include/clang-tidy/bugprone/RandomGeneratorSeedCheck.h
+include/clang-tidy/bugprone/RawMemoryCallOnNonTrivialTypeCheck.h
 include/clang-tidy/bugprone/RedundantBranchConditionCheck.h
 include/clang-tidy/bugprone/ReservedIdentifierCheck.h
 include/clang-tidy/bugprone/ReturnConstRefFromParameterCheck.h
@@ -129,6 +139,7 @@ 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/StdNamespaceModificationCheck.h
 include/clang-tidy/bugprone/StringConstructorCheck.h
 include/clang-tidy/bugprone/StringIntegerAssignmentCheck.h
 include/clang-tidy/bugprone/StringLiteralWithEmbeddedNulCheck.h
@@ -147,8 +158,10 @@ include/clang-tidy/bugprone/SwitchMissingDefaultCaseCheck.h
 include/clang-tidy/bugprone/TaggedUnionMemberCountCheck.h
 include/clang-tidy/bugprone/TerminatingContinueCheck.h
 include/clang-tidy/bugprone/ThrowKeywordMissingCheck.h
+include/clang-tidy/bugprone/ThrowingStaticInitializationCheck.h
 include/clang-tidy/bugprone/TooSmallLoopVariableCheck.h
 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/UnhandledExceptionAtNewCheck.h
@@ -161,19 +174,6 @@ include/clang-tidy/bugprone/UnusedRaiiCheck.h
 include/clang-tidy/bugprone/UnusedReturnValueCheck.h
 include/clang-tidy/bugprone/UseAfterMoveCheck.h
 include/clang-tidy/bugprone/VirtualNearMissCheck.h
-include/clang-tidy/cert/CommandProcessorCheck.h
-include/clang-tidy/cert/DefaultOperatorNewAlignmentCheck.h
-include/clang-tidy/cert/DontModifyStdNamespaceCheck.h
-include/clang-tidy/cert/FloatLoopCounter.h
-include/clang-tidy/cert/LimitedRandomnessCheck.h
-include/clang-tidy/cert/MutatingCopyCheck.h
-include/clang-tidy/cert/NonTrivialTypesLibcMemoryCallsCheck.h
-include/clang-tidy/cert/ProperlySeededRandomGeneratorCheck.h
-include/clang-tidy/cert/SetLongJmpCheck.h
-include/clang-tidy/cert/StaticObjectExceptionCheck.h
-include/clang-tidy/cert/StrToNumCheck.h
-include/clang-tidy/cert/ThrownExceptionTypeCheck.h
-include/clang-tidy/cert/VariadicFunctionDefCheck.h
 include/clang-tidy/concurrency/MtUnsafeCheck.h
 include/clang-tidy/concurrency/ThreadCanceltypeAsynchronousCheck.h
 include/clang-tidy/cppcoreguidelines/AvoidCapturingLambdaCoroutinesCheck.h
@@ -192,6 +192,7 @@ include/clang-tidy/cppcoreguidelines/NoSuspendWithLockCheck.h
 include/clang-tidy/cppcoreguidelines/OwningMemoryCheck.h
 include/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.h
 include/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.h
+include/clang-tidy/cppcoreguidelines/ProBoundsAvoidUncheckedContainerAccessCheck.h
 include/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.h
 include/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.h
 include/clang-tidy/cppcoreguidelines/ProTypeConstCastCheck.h
@@ -206,29 +207,29 @@ include/clang-tidy/cppcoreguidelines/SlicingCheck.h
 include/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h
 include/clang-tidy/cppcoreguidelines/UseEnumClassCheck.h
 include/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.h
+include/clang-tidy/custom/QueryCheck.h
 include/clang-tidy/darwin/AvoidSpinlockCheck.h
 include/clang-tidy/darwin/DispatchOnceNonstaticCheck.h
 include/clang-tidy/fuchsia/DefaultArgumentsCallsCheck.h
 include/clang-tidy/fuchsia/DefaultArgumentsDeclarationsCheck.h
-include/clang-tidy/fuchsia/MultipleInheritanceCheck.h
 include/clang-tidy/fuchsia/OverloadedOperatorCheck.h
 include/clang-tidy/fuchsia/StaticallyConstructedObjectsCheck.h
+include/clang-tidy/fuchsia/TemporaryObjectsCheck.h
 include/clang-tidy/fuchsia/TrailingReturnCheck.h
 include/clang-tidy/fuchsia/VirtualInheritanceCheck.h
-include/clang-tidy/google/AvoidCStyleCastsCheck.h
 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
 include/clang-tidy/google/GlobalNamesInHeadersCheck.h
 include/clang-tidy/google/GlobalVariableDeclarationCheck.h
 include/clang-tidy/google/IntegerTypesCheck.h
 include/clang-tidy/google/OverloadedUnaryAndCheck.h
 include/clang-tidy/google/TodoCommentCheck.h
-include/clang-tidy/google/UnnamedNamespaceInHeaderCheck.h
 include/clang-tidy/google/UpgradeGoogletestCaseCheck.h
 include/clang-tidy/google/UsingNamespaceDirectiveCheck.h
 include/clang-tidy/hicpp/ExceptionBaseclassCheck.h
@@ -243,24 +244,30 @@ include/clang-tidy/llvm/PreferIsaOrDynCastInConditionalsCheck.h
 include/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.h
 include/clang-tidy/llvm/PreferStaticOverAnonymousNamespaceCheck.h
 include/clang-tidy/llvm/TwineLocalCheck.h
+include/clang-tidy/llvm/UseNewMLIROpBuilderCheck.h
+include/clang-tidy/llvm/UseRangesCheck.h
 include/clang-tidy/llvmlibc/CalleeNamespaceCheck.h
 include/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.h
 include/clang-tidy/llvmlibc/InlineFunctionDeclCheck.h
 include/clang-tidy/llvmlibc/NamespaceConstants.h
 include/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.h
+include/clang-tidy/misc/AnonymousNamespaceInHeaderCheck.h
 include/clang-tidy/misc/ConfusableIdentifierCheck.h
 include/clang-tidy/misc/ConstCorrectnessCheck.h
 include/clang-tidy/misc/CoroutineHostileRAIICheck.h
 include/clang-tidy/misc/DefinitionsInHeadersCheck.h
 include/clang-tidy/misc/HeaderIncludeCycleCheck.h
 include/clang-tidy/misc/IncludeCleanerCheck.h
-include/clang-tidy/misc/MisleadingBidirectional.h
-include/clang-tidy/misc/MisleadingIdentifier.h
+include/clang-tidy/misc/MisleadingBidirectionalCheck.h
+include/clang-tidy/misc/MisleadingIdentifierCheck.h
 include/clang-tidy/misc/MisplacedConstCheck.h
+include/clang-tidy/misc/MultipleInheritanceCheck.h
 include/clang-tidy/misc/NewDeleteOverloadsCheck.h
 include/clang-tidy/misc/NoRecursionCheck.h
-include/clang-tidy/misc/NonCopyableObjects.h
+include/clang-tidy/misc/NonCopyableObjectsCheck.h
 include/clang-tidy/misc/NonPrivateMemberVariablesInClassesCheck.h
+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/ThrowByValueCatchByReferenceCheck.h
@@ -273,6 +280,9 @@ include/clang-tidy/misc/UseAnonymousNamespaceCheck.h
 include/clang-tidy/misc/UseInternalLinkageCheck.h
 include/clang-tidy/modernize/AvoidBindCheck.h
 include/clang-tidy/modernize/AvoidCArraysCheck.h
+include/clang-tidy/modernize/AvoidCStyleCastCheck.h
+include/clang-tidy/modernize/AvoidSetjmpLongjmpCheck.h
+include/clang-tidy/modernize/AvoidVariadicFunctionsCheck.h
 include/clang-tidy/modernize/ConcatNestedNamespacesCheck.h
 include/clang-tidy/modernize/DeprecatedHeadersCheck.h
 include/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.h
@@ -319,7 +329,7 @@ include/clang-tidy/modernize/UseUncaughtExceptionsCheck.h
 include/clang-tidy/modernize/UseUsingCheck.h
 include/clang-tidy/mpi/BufferDerefCheck.h
 include/clang-tidy/mpi/TypeMismatchCheck.h
-include/clang-tidy/objc/AssertEquals.h
+include/clang-tidy/objc/AssertEqualsCheck.h
 include/clang-tidy/objc/AvoidNSErrorInitCheck.h
 include/clang-tidy/objc/DeallocInCategoryCheck.h
 include/clang-tidy/objc/ForbiddenSubclassingCheck.h
@@ -348,7 +358,7 @@ include/clang-tidy/performance/NoexceptMoveConstructorCheck.h
 include/clang-tidy/performance/NoexceptSwapCheck.h
 include/clang-tidy/performance/TriviallyDestructibleCheck.h
 include/clang-tidy/performance/TypePromotionInMathFnCheck.h
-include/clang-tidy/performance/UnnecessaryCopyInitialization.h
+include/clang-tidy/performance/UnnecessaryCopyInitializationCheck.h
 include/clang-tidy/performance/UnnecessaryValueParamCheck.h
 @pkgdir include/clang-tidy/plugin
 include/clang-tidy/portability/AvoidPragmaOnceCheck.h
@@ -357,7 +367,7 @@ include/clang-tidy/portability/SIMDIntrinsicsCheck.h
 include/clang-tidy/portability/StdAllocatorConstCheck.h
 include/clang-tidy/portability/TemplateVirtualMemberFunctionCheck.h
 include/clang-tidy/readability/AmbiguousSmartptrResetCallCheck.h
-include/clang-tidy/readability/AvoidConstParamsInDecls.h
+include/clang-tidy/readability/AvoidConstParamsInDeclsCheck.h
 include/clang-tidy/readability/AvoidNestedConditionalOperatorCheck.h
 include/clang-tidy/readability/AvoidReturnWithVoidValueCheck.h
 include/clang-tidy/readability/AvoidUnconditionalPreprocessorIfCheck.h
@@ -366,7 +376,7 @@ include/clang-tidy/readability/ConstReturnTypeCheck.h
 include/clang-tidy/readability/ContainerContainsCheck.h
 include/clang-tidy/readability/ContainerDataPointerCheck.h
 include/clang-tidy/readability/ContainerSizeEmptyCheck.h
-include/clang-tidy/readability/ConvertMemberFunctionsToStatic.h
+include/clang-tidy/readability/ConvertMemberFunctionsToStaticCheck.h
 include/clang-tidy/readability/DeleteNullPointerCheck.h
 include/clang-tidy/readability/DuplicateIncludeCheck.h
 include/clang-tidy/readability/ElseAfterReturnCheck.h
@@ -377,6 +387,7 @@ include/clang-tidy/readability/IdentifierLengthCheck.h
 include/clang-tidy/readability/IdentifierNamingCheck.h
 include/clang-tidy/readability/ImplicitBoolConversionCheck.h
 include/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
+include/clang-tidy/readability/InconsistentIfElseBracesCheck.h
 include/clang-tidy/readability/IsolateDeclarationCheck.h
 include/clang-tidy/readability/MagicNumbersCheck.h
 include/clang-tidy/readability/MakeMemberFunctionConstCheck.h
@@ -395,10 +406,12 @@ include/clang-tidy/readability/RedundantDeclarationCheck.h
 include/clang-tidy/readability/RedundantFunctionPtrDereferenceCheck.h
 include/clang-tidy/readability/RedundantInlineSpecifierCheck.h
 include/clang-tidy/readability/RedundantMemberInitCheck.h
+include/clang-tidy/readability/RedundantParenthesesCheck.h
 include/clang-tidy/readability/RedundantPreprocessorCheck.h
 include/clang-tidy/readability/RedundantSmartptrGetCheck.h
 include/clang-tidy/readability/RedundantStringCStrCheck.h
 include/clang-tidy/readability/RedundantStringInitCheck.h
+include/clang-tidy/readability/RedundantTypenameCheck.h
 include/clang-tidy/readability/ReferenceToConstructedTemporaryCheck.h
 include/clang-tidy/readability/SimplifyBooleanExprCheck.h
 include/clang-tidy/readability/SimplifySubscriptExprCheck.h
@@ -435,7 +448,6 @@ include/clang-tidy/utils/TransformerClangTidyCheck.h
 include/clang-tidy/utils/TypeTraits.h
 include/clang-tidy/utils/UseRangesCheck.h
 include/clang-tidy/utils/UsingInserter.h
-include/clang-tidy/zircon/TemporaryObjectsCheck.h
 lib/libclangApplyReplacements.a
 lib/libclangChangeNamespace.a
 lib/libclangDaemon.a
@@ -457,6 +469,7 @@ lib/libclangTidyBugproneModule.a
 lib/libclangTidyCERTModule.a
 lib/libclangTidyConcurrencyModule.a
 lib/libclangTidyCppCoreGuidelinesModule.a
+lib/libclangTidyCustomModule.a
 lib/libclangTidyDarwinModule.a
 lib/libclangTidyFuchsiaModule.a
 lib/libclangTidyGoogleModule.a
@@ -480,15 +493,19 @@ lib/libclangdMain.a
 lib/libclangdRemoteIndex.a
 lib/libclangdSupport.a
 lib/libfindAllSymbols.a
+share/clang-doc/alias-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/enum-template.mustache
 share/clang-doc/function-template.mustache
+share/clang-doc/head-template.mustache
+share/clang-doc/index-template.mustache
 share/clang-doc/index.js
 share/clang-doc/mustache-index.js
 share/clang-doc/namespace-template.mustache
+share/clang-doc/navbar-template.mustache
 share/clang-doc/template.mustache
 share/clang/clang-include-fixer.el
 share/clang/clang-include-fixer.py
diff --git a/clang-tools-extra/distinfo b/clang-tools-extra/distinfo
index c24148f1d4..10a1e38820 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
diff --git a/clang/Makefile.common b/clang/Makefile.common
index 2f669bd340..c57cd1833a 100644
--- a/clang/Makefile.common
+++ b/clang/Makefile.common
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://clang.llvm.org/
 LICENSE=	apache-2.0
 
-USE_CXX_FEATURES=	c++14
+USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c c++
 GCC_REQD+=		7
 
diff --git a/clang/PLIST b/clang/PLIST
index 135ef7dfbd..93659a34ad 100644
--- a/clang/PLIST
+++ b/clang/PLIST
@@ -1,10 +1,9 @@
 @comment $NetBSD: PLIST,v 1.39 2024/04/22 07:03:35 adam Exp $
 bin/amdgpu-arch
 bin/analyze-build
-bin/c-index-test
 bin/clang
 bin/clang++
-bin/clang-21
+bin/clang-22
 bin/clang-check
 bin/clang-cl
 bin/clang-cpp
@@ -14,7 +13,6 @@ bin/clang-installapi
 bin/clang-linker-wrapper
 bin/clang-nvlink-wrapper
 bin/clang-offload-bundler
-bin/clang-offload-packager
 bin/clang-refactor
 bin/clang-repl
 bin/clang-scan-deps
@@ -140,7 +138,9 @@ include/clang/AST/ExternalASTMerger.h
 include/clang/AST/ExternalASTSource.h
 include/clang/AST/FormatString.h
 include/clang/AST/GlobalDecl.h
+include/clang/AST/HLSLResource.h
 include/clang/AST/IgnoreExpr.h
+include/clang/AST/InferAlloc.h
 include/clang/AST/JSONNodeDumper.h
 include/clang/AST/LambdaCapture.h
 include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
@@ -149,6 +149,7 @@ include/clang/AST/Mangle.h
 include/clang/AST/MangleNumberingContext.h
 include/clang/AST/NSAPI.h
 include/clang/AST/NestedNameSpecifier.h
+include/clang/AST/NestedNameSpecifierBase.h
 include/clang/AST/NonTrivialTypeVisitor.h
 include/clang/AST/ODRDiagsEmitter.h
 include/clang/AST/ODRHash.h
@@ -186,6 +187,7 @@ include/clang/AST/TemplateBase.h
 include/clang/AST/TemplateName.h
 include/clang/AST/TextNodeDumper.h
 include/clang/AST/Type.h
+include/clang/AST/TypeBase.h
 include/clang/AST/TypeLoc.h
 include/clang/AST/TypeLocNodes.def
 include/clang/AST/TypeLocVisitor.h
@@ -203,7 +205,6 @@ include/clang/ASTMatchers/Dynamic/Diagnostics.h
 include/clang/ASTMatchers/Dynamic/Parser.h
 include/clang/ASTMatchers/Dynamic/Registry.h
 include/clang/ASTMatchers/Dynamic/VariantValue.h
-include/clang/ASTMatchers/GtestMatchers.h
 include/clang/ASTMatchers/LowLevelHelpers.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 include/clang/Analysis/Analyses/CalledOnceCheck.h
@@ -211,7 +212,17 @@ include/clang/Analysis/Analyses/Consumed.h
 include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/ExprMutationAnalyzer.h
 include/clang/Analysis/Analyses/IntervalPartition.h
-include/clang/Analysis/Analyses/LifetimeSafety.h
+include/clang/Analysis/Analyses/LifetimeSafety/Checker.h
+include/clang/Analysis/Analyses/LifetimeSafety/Facts.h
+include/clang/Analysis/Analyses/LifetimeSafety/FactsGenerator.h
+include/clang/Analysis/Analyses/LifetimeSafety/LifetimeAnnotations.h
+include/clang/Analysis/Analyses/LifetimeSafety/LifetimeSafety.h
+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/Origins.h
+include/clang/Analysis/Analyses/LifetimeSafety/Utils.h
 include/clang/Analysis/Analyses/LiveVariables.h
 include/clang/Analysis/Analyses/PostOrderCFGView.h
 include/clang/Analysis/Analyses/ReachableCode.h
@@ -250,11 +261,13 @@ include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/FlowSensitive/DataflowWorklist.h
 include/clang/Analysis/FlowSensitive/DebugSupport.h
 include/clang/Analysis/FlowSensitive/Formula.h
+include/clang/Analysis/FlowSensitive/FormulaSerialization.h
 include/clang/Analysis/FlowSensitive/Logger.h
 include/clang/Analysis/FlowSensitive/MapLattice.h
 include/clang/Analysis/FlowSensitive/MatchSwitch.h
 include/clang/Analysis/FlowSensitive/Models/ChromiumCheckModel.h
 include/clang/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.h
+include/clang/Analysis/FlowSensitive/Models/UncheckedStatusOrAccessModel.h
 include/clang/Analysis/FlowSensitive/NoopAnalysis.h
 include/clang/Analysis/FlowSensitive/NoopLattice.h
 include/clang/Analysis/FlowSensitive/RecordOps.h
@@ -271,11 +284,18 @@ 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/ABI.h
+include/clang/Basic/ABIVersions.def
 include/clang/Basic/AMDGPUTypes.def
 include/clang/Basic/ASTSourceDescriptor.h
 include/clang/Basic/AddressSpaces.h
@@ -409,6 +429,11 @@ include/clang/Basic/DiagnosticSerializationCompatIDs.inc
 include/clang/Basic/DiagnosticSerializationEnums.inc
 include/clang/Basic/DiagnosticSerializationInterface.inc
 include/clang/Basic/DiagnosticSerializationKinds.inc
+include/clang/Basic/DiagnosticTrap.h
+include/clang/Basic/DiagnosticTrapCompatIDs.inc
+include/clang/Basic/DiagnosticTrapEnums.inc
+include/clang/Basic/DiagnosticTrapInterface.inc
+include/clang/Basic/DiagnosticTrapKinds.inc
 include/clang/Basic/DirectoryEntry.h
 include/clang/Basic/ExceptionSpecificationType.h
 include/clang/Basic/ExpressionTraits.h
@@ -555,23 +580,33 @@ include/clang/CodeGen/SwiftCallingConv.h
 include/clang/Config/config.h
 include/clang/CrossTU/CrossTUDiagnostic.h
 include/clang/CrossTU/CrossTranslationUnit.h
+include/clang/DependencyScanning/DependencyScannerImpl.h
+include/clang/DependencyScanning/DependencyScanningFilesystem.h
+include/clang/DependencyScanning/DependencyScanningService.h
+include/clang/DependencyScanning/DependencyScanningUtils.h
+include/clang/DependencyScanning/DependencyScanningWorker.h
+include/clang/DependencyScanning/InProcessModuleCache.h
+include/clang/DependencyScanning/ModuleDepCollector.h
 include/clang/DirectoryWatcher/DirectoryWatcher.h
 include/clang/Driver/Action.h
 include/clang/Driver/CommonArgs.h
 include/clang/Driver/Compilation.h
+include/clang/Driver/CreateASTUnitFromArgs.h
+include/clang/Driver/CreateInvocationFromArgs.h
+include/clang/Driver/CudaInstallationDetector.h
 include/clang/Driver/Distro.h
 include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.h
 include/clang/Driver/InputInfo.h
 include/clang/Driver/Job.h
+include/clang/Driver/LazyDetector.h
 include/clang/Driver/Multilib.h
 include/clang/Driver/MultilibBuilder.h
 include/clang/Driver/OffloadBundler.h
-include/clang/Driver/OptionUtils.h
-include/clang/Driver/Options.h
-include/clang/Driver/Options.inc
 include/clang/Driver/Phases.h
+include/clang/Driver/RocmInstallationDetector.h
 include/clang/Driver/SanitizerArgs.h
+include/clang/Driver/SyclInstallationDetector.h
 include/clang/Driver/Tool.h
 include/clang/Driver/ToolChain.h
 include/clang/Driver/Types.def
@@ -618,6 +653,7 @@ include/clang/Frontend/SARIFDiagnosticPrinter.h
 include/clang/Frontend/SerializedDiagnosticPrinter.h
 include/clang/Frontend/SerializedDiagnosticReader.h
 include/clang/Frontend/SerializedDiagnostics.h
+include/clang/Frontend/StandaloneDiagnostic.h
 include/clang/Frontend/TextDiagnostic.h
 include/clang/Frontend/TextDiagnosticBuffer.h
 include/clang/Frontend/TextDiagnosticPrinter.h
@@ -644,9 +680,9 @@ include/clang/InstallAPI/Library.h
 include/clang/InstallAPI/MachO.h
 include/clang/InstallAPI/Visitor.h
 include/clang/Interpreter/CodeCompletion.h
+include/clang/Interpreter/IncrementalExecutor.h
 include/clang/Interpreter/Interpreter.h
 include/clang/Interpreter/PartialTranslationUnit.h
-include/clang/Interpreter/RemoteJITUtils.h
 include/clang/Interpreter/Value.h
 include/clang/Lex/CodeCompletionHandler.h
 include/clang/Lex/DependencyDirectivesScanner.h
@@ -682,6 +718,9 @@ include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
 include/clang/Lex/TokenLexer.h
 include/clang/Lex/VariadicMacroSupport.h
+include/clang/Options/OptionUtils.h
+include/clang/Options/Options.h
+include/clang/Options/Options.inc
 include/clang/Parse/AttrParserStringSwitches.inc
 include/clang/Parse/AttrSubMatchRulesParserStringSwitches.inc
 include/clang/Parse/LoopHint.h
@@ -698,6 +737,7 @@ include/clang/Rewrite/Frontend/FrontendActions.h
 include/clang/Rewrite/Frontend/Rewriters.h
 include/clang/Sema/AnalysisBasedWarnings.h
 include/clang/Sema/Attr.h
+include/clang/Sema/AttrIsTypeDependent.inc
 include/clang/Sema/AttrParsedAttrImpl.inc
 include/clang/Sema/AttrParsedAttrKinds.inc
 include/clang/Sema/AttrSpellingListIndex.inc
@@ -866,12 +906,7 @@ include/clang/Tooling/CompilationDatabase.h
 include/clang/Tooling/CompilationDatabasePluginRegistry.h
 include/clang/Tooling/Core/Diagnostic.h
 include/clang/Tooling/Core/Replacement.h
-include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h
-include/clang/Tooling/DependencyScanning/DependencyScanningService.h
-include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
-include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
-include/clang/Tooling/DependencyScanning/InProcessModuleCache.h
-include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
+include/clang/Tooling/DependencyScanningTool.h
 include/clang/Tooling/DiagnosticsYaml.h
 include/clang/Tooling/Execution.h
 include/clang/Tooling/FileMatchTrie.h
@@ -927,279 +962,282 @@ 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/21/include/__clang_cuda_builtin_vars.h
-lib/clang/21/include/__clang_cuda_cmath.h
-lib/clang/21/include/__clang_cuda_complex_builtins.h
-lib/clang/21/include/__clang_cuda_device_functions.h
-lib/clang/21/include/__clang_cuda_intrinsics.h
-lib/clang/21/include/__clang_cuda_libdevice_declares.h
-lib/clang/21/include/__clang_cuda_math.h
-lib/clang/21/include/__clang_cuda_math_forward_declares.h
-lib/clang/21/include/__clang_cuda_runtime_wrapper.h
-lib/clang/21/include/__clang_cuda_texture_intrinsics.h
-lib/clang/21/include/__clang_hip_cmath.h
-lib/clang/21/include/__clang_hip_libdevice_declares.h
-lib/clang/21/include/__clang_hip_math.h
-lib/clang/21/include/__clang_hip_runtime_wrapper.h
-lib/clang/21/include/__clang_hip_stdlib.h
-lib/clang/21/include/__clang_spirv_builtins.h
-lib/clang/21/include/__stdarg___gnuc_va_list.h
-lib/clang/21/include/__stdarg___va_copy.h
-lib/clang/21/include/__stdarg_header_macro.h
-lib/clang/21/include/__stdarg_va_arg.h
-lib/clang/21/include/__stdarg_va_copy.h
-lib/clang/21/include/__stdarg_va_list.h
-lib/clang/21/include/__stddef_header_macro.h
-lib/clang/21/include/__stddef_max_align_t.h
-lib/clang/21/include/__stddef_null.h
-lib/clang/21/include/__stddef_nullptr_t.h
-lib/clang/21/include/__stddef_offsetof.h
-lib/clang/21/include/__stddef_ptrdiff_t.h
-lib/clang/21/include/__stddef_rsize_t.h
-lib/clang/21/include/__stddef_size_t.h
-lib/clang/21/include/__stddef_unreachable.h
-lib/clang/21/include/__stddef_wchar_t.h
-lib/clang/21/include/__stddef_wint_t.h
-lib/clang/21/include/__wmmintrin_aes.h
-lib/clang/21/include/__wmmintrin_pclmul.h
-lib/clang/21/include/adcintrin.h
-lib/clang/21/include/adxintrin.h
-lib/clang/21/include/altivec.h
-lib/clang/21/include/amdgpuintrin.h
-lib/clang/21/include/ammintrin.h
-lib/clang/21/include/amxavx512intrin.h
-lib/clang/21/include/amxbf16transposeintrin.h
-lib/clang/21/include/amxcomplexintrin.h
-lib/clang/21/include/amxcomplextransposeintrin.h
-lib/clang/21/include/amxfp16intrin.h
-lib/clang/21/include/amxfp16transposeintrin.h
-lib/clang/21/include/amxfp8intrin.h
-lib/clang/21/include/amxintrin.h
-lib/clang/21/include/amxmovrsintrin.h
-lib/clang/21/include/amxmovrstransposeintrin.h
-lib/clang/21/include/amxtf32intrin.h
-lib/clang/21/include/amxtf32transposeintrin.h
-lib/clang/21/include/amxtransposeintrin.h
-lib/clang/21/include/andes_vector.h
-lib/clang/21/include/arm64intr.h
-lib/clang/21/include/arm_acle.h
-lib/clang/21/include/arm_bf16.h
-lib/clang/21/include/arm_cde.h
-lib/clang/21/include/arm_cmse.h
-lib/clang/21/include/arm_fp16.h
-lib/clang/21/include/arm_mve.h
-lib/clang/21/include/arm_neon.h
-lib/clang/21/include/arm_neon_sve_bridge.h
-lib/clang/21/include/arm_sme.h
-lib/clang/21/include/arm_sve.h
-lib/clang/21/include/arm_vector_types.h
-lib/clang/21/include/armintr.h
-lib/clang/21/include/avx10_2_512bf16intrin.h
-lib/clang/21/include/avx10_2_512convertintrin.h
-lib/clang/21/include/avx10_2_512minmaxintrin.h
-lib/clang/21/include/avx10_2_512niintrin.h
-lib/clang/21/include/avx10_2_512satcvtdsintrin.h
-lib/clang/21/include/avx10_2_512satcvtintrin.h
-lib/clang/21/include/avx10_2bf16intrin.h
-lib/clang/21/include/avx10_2convertintrin.h
-lib/clang/21/include/avx10_2copyintrin.h
-lib/clang/21/include/avx10_2minmaxintrin.h
-lib/clang/21/include/avx10_2niintrin.h
-lib/clang/21/include/avx10_2satcvtdsintrin.h
-lib/clang/21/include/avx10_2satcvtintrin.h
-lib/clang/21/include/avx2intrin.h
-lib/clang/21/include/avx512bf16intrin.h
-lib/clang/21/include/avx512bitalgintrin.h
-lib/clang/21/include/avx512bwintrin.h
-lib/clang/21/include/avx512cdintrin.h
-lib/clang/21/include/avx512dqintrin.h
-lib/clang/21/include/avx512fintrin.h
-lib/clang/21/include/avx512fp16intrin.h
-lib/clang/21/include/avx512ifmaintrin.h
-lib/clang/21/include/avx512ifmavlintrin.h
-lib/clang/21/include/avx512vbmi2intrin.h
-lib/clang/21/include/avx512vbmiintrin.h
-lib/clang/21/include/avx512vbmivlintrin.h
-lib/clang/21/include/avx512vlbf16intrin.h
-lib/clang/21/include/avx512vlbitalgintrin.h
-lib/clang/21/include/avx512vlbwintrin.h
-lib/clang/21/include/avx512vlcdintrin.h
-lib/clang/21/include/avx512vldqintrin.h
-lib/clang/21/include/avx512vlfp16intrin.h
-lib/clang/21/include/avx512vlintrin.h
-lib/clang/21/include/avx512vlvbmi2intrin.h
-lib/clang/21/include/avx512vlvnniintrin.h
-lib/clang/21/include/avx512vlvp2intersectintrin.h
-lib/clang/21/include/avx512vnniintrin.h
-lib/clang/21/include/avx512vp2intersectintrin.h
-lib/clang/21/include/avx512vpopcntdqintrin.h
-lib/clang/21/include/avx512vpopcntdqvlintrin.h
-lib/clang/21/include/avxifmaintrin.h
-lib/clang/21/include/avxintrin.h
-lib/clang/21/include/avxneconvertintrin.h
-lib/clang/21/include/avxvnniint16intrin.h
-lib/clang/21/include/avxvnniint8intrin.h
-lib/clang/21/include/avxvnniintrin.h
-lib/clang/21/include/bmi2intrin.h
-lib/clang/21/include/bmiintrin.h
-lib/clang/21/include/builtins.h
-lib/clang/21/include/cet.h
-lib/clang/21/include/cetintrin.h
-lib/clang/21/include/cldemoteintrin.h
-lib/clang/21/include/clflushoptintrin.h
-lib/clang/21/include/clwbintrin.h
-lib/clang/21/include/clzerointrin.h
-lib/clang/21/include/cmpccxaddintrin.h
-lib/clang/21/include/cpuid.h
-lib/clang/21/include/crc32intrin.h
-lib/clang/21/include/cuda_wrappers/algorithm
-lib/clang/21/include/cuda_wrappers/bits/basic_string.h
-lib/clang/21/include/cuda_wrappers/bits/basic_string.tcc
-lib/clang/21/include/cuda_wrappers/bits/c++config.h
-lib/clang/21/include/cuda_wrappers/bits/shared_ptr_base.h
-lib/clang/21/include/cuda_wrappers/cmath
-lib/clang/21/include/cuda_wrappers/complex
-lib/clang/21/include/cuda_wrappers/new
-lib/clang/21/include/emmintrin.h
-lib/clang/21/include/enqcmdintrin.h
-lib/clang/21/include/f16cintrin.h
-lib/clang/21/include/float.h
-lib/clang/21/include/fma4intrin.h
-lib/clang/21/include/fmaintrin.h
-lib/clang/21/include/fxsrintrin.h
-lib/clang/21/include/gfniintrin.h
-lib/clang/21/include/gpuintrin.h
-lib/clang/21/include/hexagon_circ_brev_intrinsics.h
-lib/clang/21/include/hexagon_protos.h
-lib/clang/21/include/hexagon_types.h
-lib/clang/21/include/hresetintrin.h
-lib/clang/21/include/htmintrin.h
-lib/clang/21/include/htmxlintrin.h
-lib/clang/21/include/hvx_hexagon_protos.h
-lib/clang/21/include/ia32intrin.h
-lib/clang/21/include/immintrin.h
-lib/clang/21/include/intrin.h
-lib/clang/21/include/intrin0.h
-lib/clang/21/include/inttypes.h
-lib/clang/21/include/invpcidintrin.h
-lib/clang/21/include/iso646.h
-lib/clang/21/include/keylockerintrin.h
-lib/clang/21/include/larchintrin.h
-lib/clang/21/include/lasxintrin.h
-lib/clang/21/include/limits.h
-lib/clang/21/include/llvm_libc_wrappers/assert.h
-lib/clang/21/include/llvm_libc_wrappers/ctype.h
-lib/clang/21/include/llvm_libc_wrappers/inttypes.h
-lib/clang/21/include/llvm_libc_wrappers/stdio.h
-lib/clang/21/include/llvm_libc_wrappers/stdlib.h
-lib/clang/21/include/llvm_libc_wrappers/string.h
-lib/clang/21/include/llvm_libc_wrappers/time.h
-lib/clang/21/include/llvm_offload_wrappers/__llvm_offload.h
-lib/clang/21/include/llvm_offload_wrappers/__llvm_offload_device.h
-lib/clang/21/include/llvm_offload_wrappers/__llvm_offload_host.h
-lib/clang/21/include/lsxintrin.h
-lib/clang/21/include/lwpintrin.h
-lib/clang/21/include/lzcntintrin.h
-lib/clang/21/include/mm3dnow.h
-lib/clang/21/include/mm_malloc.h
-lib/clang/21/include/mmintrin.h
-lib/clang/21/include/module.modulemap
-lib/clang/21/include/movdirintrin.h
-lib/clang/21/include/movrs_avx10_2_512intrin.h
-lib/clang/21/include/movrs_avx10_2intrin.h
-lib/clang/21/include/movrsintrin.h
-lib/clang/21/include/msa.h
-lib/clang/21/include/mwaitxintrin.h
-lib/clang/21/include/nmmintrin.h
-lib/clang/21/include/nvptxintrin.h
-lib/clang/21/include/opencl-c-base.h
-lib/clang/21/include/opencl-c.h
-lib/clang/21/include/openmp_wrappers/__clang_openmp_device_functions.h
-lib/clang/21/include/openmp_wrappers/cmath
-lib/clang/21/include/openmp_wrappers/complex
-lib/clang/21/include/openmp_wrappers/complex.h
-lib/clang/21/include/openmp_wrappers/complex_cmath.h
-lib/clang/21/include/openmp_wrappers/math.h
-lib/clang/21/include/openmp_wrappers/new
-lib/clang/21/include/pconfigintrin.h
-lib/clang/21/include/pkuintrin.h
-lib/clang/21/include/pmmintrin.h
-lib/clang/21/include/popcntintrin.h
-lib/clang/21/include/ppc_wrappers/bmi2intrin.h
-lib/clang/21/include/ppc_wrappers/bmiintrin.h
-lib/clang/21/include/ppc_wrappers/emmintrin.h
-lib/clang/21/include/ppc_wrappers/immintrin.h
-lib/clang/21/include/ppc_wrappers/mm_malloc.h
-lib/clang/21/include/ppc_wrappers/mmintrin.h
-lib/clang/21/include/ppc_wrappers/nmmintrin.h
-lib/clang/21/include/ppc_wrappers/pmmintrin.h
-lib/clang/21/include/ppc_wrappers/smmintrin.h
-lib/clang/21/include/ppc_wrappers/tmmintrin.h
-lib/clang/21/include/ppc_wrappers/x86gprintrin.h
-lib/clang/21/include/ppc_wrappers/x86intrin.h
-lib/clang/21/include/ppc_wrappers/xmmintrin.h
-lib/clang/21/include/prfchiintrin.h
-lib/clang/21/include/prfchwintrin.h
-lib/clang/21/include/ptrauth.h
-lib/clang/21/include/ptwriteintrin.h
-lib/clang/21/include/raointintrin.h
-lib/clang/21/include/rdpruintrin.h
-lib/clang/21/include/rdseedintrin.h
-lib/clang/21/include/riscv_bitmanip.h
-lib/clang/21/include/riscv_corev_alu.h
-lib/clang/21/include/riscv_crypto.h
-lib/clang/21/include/riscv_ntlh.h
-lib/clang/21/include/riscv_vector.h
-lib/clang/21/include/rtmintrin.h
-lib/clang/21/include/s390intrin.h
-lib/clang/21/include/serializeintrin.h
-lib/clang/21/include/sgxintrin.h
-lib/clang/21/include/sha512intrin.h
-lib/clang/21/include/shaintrin.h
-lib/clang/21/include/sifive_vector.h
-lib/clang/21/include/sm3intrin.h
-lib/clang/21/include/sm4evexintrin.h
-lib/clang/21/include/sm4intrin.h
-lib/clang/21/include/smmintrin.h
-lib/clang/21/include/stdalign.h
-lib/clang/21/include/stdarg.h
-lib/clang/21/include/stdatomic.h
-lib/clang/21/include/stdbool.h
-lib/clang/21/include/stdckdint.h
-lib/clang/21/include/stdcountof.h
-lib/clang/21/include/stddef.h
-lib/clang/21/include/stdint.h
-lib/clang/21/include/stdnoreturn.h
-lib/clang/21/include/tbmintrin.h
-lib/clang/21/include/tgmath.h
-lib/clang/21/include/tmmintrin.h
-lib/clang/21/include/tsxldtrkintrin.h
-lib/clang/21/include/uintrintrin.h
-lib/clang/21/include/unwind.h
-lib/clang/21/include/usermsrintrin.h
-lib/clang/21/include/vadefs.h
-lib/clang/21/include/vaesintrin.h
-lib/clang/21/include/varargs.h
-lib/clang/21/include/vecintrin.h
-lib/clang/21/include/velintrin.h
-lib/clang/21/include/velintrin_approx.h
-lib/clang/21/include/velintrin_gen.h
-lib/clang/21/include/vpclmulqdqintrin.h
-lib/clang/21/include/waitpkgintrin.h
-lib/clang/21/include/wasm_simd128.h
-lib/clang/21/include/wbnoinvdintrin.h
-lib/clang/21/include/wmmintrin.h
-lib/clang/21/include/x86gprintrin.h
-lib/clang/21/include/x86intrin.h
-lib/clang/21/include/xmmintrin.h
-lib/clang/21/include/xopintrin.h
-lib/clang/21/include/xsavecintrin.h
-lib/clang/21/include/xsaveintrin.h
-lib/clang/21/include/xsaveoptintrin.h
-lib/clang/21/include/xsavesintrin.h
-lib/clang/21/include/xtestintrin.h
-lib/clang/21/include/yvals_core.h
-lib/clang/21/include/zos_wrappers/builtins.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
+lib/clang/22/include/arm_bf16.h
+lib/clang/22/include/arm_cde.h
+lib/clang/22/include/arm_cmse.h
+lib/clang/22/include/arm_fp16.h
+lib/clang/22/include/arm_mve.h
+lib/clang/22/include/arm_neon.h
+lib/clang/22/include/arm_neon_sve_bridge.h
+lib/clang/22/include/arm_sme.h
+lib/clang/22/include/arm_sve.h
+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
+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
 lib/cmake/clang/AddClang.cmake
 lib/cmake/clang/ClangConfig.cmake
 lib/cmake/clang/ClangConfigVersion.cmake
@@ -1216,6 +1254,8 @@ lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
 lib/libclangAnalysisFlowSensitive.a
 lib/libclangAnalysisFlowSensitiveModels.a
+lib/libclangAnalysisLifetimeSafety.a
+lib/libclangAnalysisScalable.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
 lib/libclangCrossTU.a
@@ -1235,6 +1275,7 @@ lib/libclangIndexSerialization.a
 lib/libclangInstallAPI.a
 lib/libclangInterpreter.a
 lib/libclangLex.a
+lib/libclangOptions.a
 lib/libclangParse.a
 lib/libclangRewrite.a
 lib/libclangRewriteFrontend.a
diff --git a/clang/buildlink3.mk b/clang/buildlink3.mk
index 6e97a3b4b8..39f597223d 100644
--- a/clang/buildlink3.mk
+++ b/clang/buildlink3.mk
@@ -5,16 +5,15 @@ BUILDLINK_TREE+=	clang
 .if !defined(CLANG_BUILDLINK3_MK)
 CLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clang+=	clang>=21.1.0
-BUILDLINK_ABI_DEPENDS.clang+=	clang>=21.1.0
+BUILDLINK_API_DEPENDS.clang+=	clang>=22.1.0
+BUILDLINK_ABI_DEPENDS.clang+=	clang>=22.1.0
 BUILDLINK_PKGSRCDIR.clang?=	../../wip/clang
 
 BUILDLINK_FILES.clang+=		bin/amdgpu-arch
 BUILDLINK_FILES.clang+=		bin/analyze-build
-BUILDLINK_FILES.clang+=		bin/c-index-test
 BUILDLINK_FILES.clang+=		bin/clang
 BUILDLINK_FILES.clang+=		bin/clang++
-BUILDLINK_FILES.clang+=		bin/clang-21
+BUILDLINK_FILES.clang+=		bin/clang-22
 BUILDLINK_FILES.clang+=		bin/clang-check
 BUILDLINK_FILES.clang+=		bin/clang-cl
 BUILDLINK_FILES.clang+=		bin/clang-cpp
@@ -24,7 +23,6 @@ BUILDLINK_FILES.clang+=		bin/clang-installapi
 BUILDLINK_FILES.clang+=		bin/clang-linker-wrapper
 BUILDLINK_FILES.clang+=		bin/clang-nvlink-wrapper
 BUILDLINK_FILES.clang+=		bin/clang-offload-bundler
-BUILDLINK_FILES.clang+=		bin/clang-offload-packager
 BUILDLINK_FILES.clang+=		bin/clang-refactor
 BUILDLINK_FILES.clang+=		bin/clang-repl
 BUILDLINK_FILES.clang+=		bin/clang-scan-deps
diff --git a/clang/distinfo b/clang/distinfo
index dd59c9e8db..05fbf34360 100644
--- a/clang/distinfo
+++ b/clang/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index 8b14641975..3a5c8efd9e 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.23 2023/03/03 09:53:14 wiz Exp $
 
-BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
 SHA1 (patch-cmake_config-ix.cmake) = 1a67378de34b048477ef80237ab8a76272288a55
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cpp) = bc04e2d792c8eaffb26b60fdaceef261ffe03371
diff --git a/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp b/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
new file mode 100644
index 0000000000..ae85562d6c
--- /dev/null
+++ b/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_sanitizer__common_sanitizer__linux.cpp,v 1.1 2024/07/06 15:45:06 adam Exp $
+
+Fix build for platforms other than Linux and FreeBSD.
+
+--- lib/sanitizer_common/sanitizer_linux.cpp.orig	2024-07-03 11:57:05.400879120 +0000
++++ lib/sanitizer_common/sanitizer_linux.cpp
+@@ -1886,7 +1886,7 @@ static bool Aarch64GetESR(ucontext_t *uc
+   }
+   return false;
+ }
+-#  elif SANITIZER_FREEBSD && defined(__aarch64__)
++#  elif defined(__aarch64__)
+ // FreeBSD doesn't provide ESR in the ucontext.
+ static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) { return false; }
+ #  endif
diff --git a/flang/PLIST b/flang/PLIST
index 6d568210d6..e854b07a69 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-21
+bin/flang-22
 bin/flang-new
 bin/tco
 include/flang/Common/Fortran-consts.h
@@ -55,8 +55,10 @@ include/flang/Evaluate/integer.h
 include/flang/Evaluate/intrinsics-library.h
 include/flang/Evaluate/intrinsics.h
 include/flang/Evaluate/logical.h
+include/flang/Evaluate/match.h
 include/flang/Evaluate/pgmath.h.inc
 include/flang/Evaluate/real.h
+include/flang/Evaluate/rewrite.h
 include/flang/Evaluate/rounding-bits.h
 include/flang/Evaluate/shape.h
 include/flang/Evaluate/static-data.h
@@ -86,8 +88,8 @@ include/flang/Lower/Allocatable.h
 include/flang/Lower/BoxAnalyzer.h
 include/flang/Lower/Bridge.h
 include/flang/Lower/BuiltinModules.h
+include/flang/Lower/CUDA.h
 include/flang/Lower/CallInterface.h
-include/flang/Lower/Coarray.h
 include/flang/Lower/ComponentPath.h
 include/flang/Lower/ConvertArrayConstructor.h
 include/flang/Lower/ConvertCall.h
@@ -97,7 +99,6 @@ include/flang/Lower/ConvertExprToHLFIR.h
 include/flang/Lower/ConvertProcedureDesignator.h
 include/flang/Lower/ConvertType.h
 include/flang/Lower/ConvertVariable.h
-include/flang/Lower/Cuda.h
 include/flang/Lower/CustomIntrinsicCall.h
 include/flang/Lower/DirectivesCommon.h
 include/flang/Lower/EnvironmentDefault.h
@@ -109,6 +110,7 @@ include/flang/Lower/IterationSpace.h
 include/flang/Lower/LoweringOptions.def
 include/flang/Lower/LoweringOptions.h
 include/flang/Lower/Mangler.h
+include/flang/Lower/MultiImageFortran.h
 include/flang/Lower/OpenACC.h
 include/flang/Lower/OpenMP.h
 include/flang/Lower/OpenMP/Clauses.h
@@ -125,6 +127,7 @@ include/flang/Lower/VectorSubscripts.h
 include/flang/Optimizer/Analysis/AliasAnalysis.h
 include/flang/Optimizer/Analysis/TBAAForest.h
 include/flang/Optimizer/Builder/BoxValue.h
+include/flang/Optimizer/Builder/CUDAIntrinsicCall.h
 include/flang/Optimizer/Builder/CUFCommon.h
 include/flang/Optimizer/Builder/Character.h
 include/flang/Optimizer/Builder/Complex.h
@@ -219,6 +222,14 @@ include/flang/Optimizer/Dialect/FortranVariableInterface.cpp.inc
 include/flang/Optimizer/Dialect/FortranVariableInterface.h
 include/flang/Optimizer/Dialect/FortranVariableInterface.h.inc
 include/flang/Optimizer/Dialect/FortranVariableInterface.td
+include/flang/Optimizer/Dialect/MIF/MIFDialect.cpp.inc
+include/flang/Optimizer/Dialect/MIF/MIFDialect.h
+include/flang/Optimizer/Dialect/MIF/MIFDialect.h.inc
+include/flang/Optimizer/Dialect/MIF/MIFDialect.td
+include/flang/Optimizer/Dialect/MIF/MIFOps.cpp.inc
+include/flang/Optimizer/Dialect/MIF/MIFOps.h
+include/flang/Optimizer/Dialect/MIF/MIFOps.h.inc
+include/flang/Optimizer/Dialect/MIF/MIFOps.td
 include/flang/Optimizer/Dialect/SafeTempArrayCopyAttrInterface.cpp.inc
 include/flang/Optimizer/Dialect/SafeTempArrayCopyAttrInterface.h
 include/flang/Optimizer/Dialect/SafeTempArrayCopyAttrInterface.h.inc
@@ -244,7 +255,13 @@ include/flang/Optimizer/HLFIR/HLFIRTypes.h.inc
 include/flang/Optimizer/HLFIR/Passes.h
 include/flang/Optimizer/HLFIR/Passes.h.inc
 include/flang/Optimizer/HLFIR/Passes.td
+include/flang/Optimizer/OpenACC/Analysis/FIROpenACCSupportAnalysis.h
+include/flang/Optimizer/OpenACC/Passes.h
+include/flang/Optimizer/OpenACC/Passes.h.inc
+include/flang/Optimizer/OpenACC/Passes.td
+include/flang/Optimizer/OpenACC/Support/FIROpenACCOpsInterfaces.h
 include/flang/Optimizer/OpenACC/Support/FIROpenACCTypeInterfaces.h
+include/flang/Optimizer/OpenACC/Support/FIROpenACCUtils.h
 include/flang/Optimizer/OpenACC/Support/RegisterOpenACCExtensions.h
 include/flang/Optimizer/OpenMP/Passes.h
 include/flang/Optimizer/OpenMP/Passes.h.inc
@@ -260,8 +277,10 @@ include/flang/Optimizer/Support/InternalNames.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/MIFOpConversion.h
 include/flang/Optimizer/Transforms/MemoryUtils.h
 include/flang/Optimizer/Transforms/Passes.h
 include/flang/Optimizer/Transforms/Passes.h.inc
@@ -276,6 +295,7 @@ include/flang/Parser/dump-parse-tree.h
 include/flang/Parser/format-specification.h
 include/flang/Parser/instrumented-parser.h
 include/flang/Parser/message.h
+include/flang/Parser/openmp-utils.h
 include/flang/Parser/options.h
 include/flang/Parser/parse-state.h
 include/flang/Parser/parse-tree-visitor.h
@@ -317,7 +337,6 @@ include/flang/Runtime/freestanding-tools.h
 include/flang/Runtime/inquiry.h
 include/flang/Runtime/io-api.h
 include/flang/Runtime/iostat-consts.h
-include/flang/Runtime/iostat.h
 include/flang/Runtime/magic-numbers.h
 include/flang/Runtime/main.h
 include/flang/Runtime/matmul-instances.inc
@@ -342,6 +361,7 @@ include/flang/Semantics/module-dependences.h
 include/flang/Semantics/openmp-directive-sets.h
 include/flang/Semantics/openmp-dsa.h
 include/flang/Semantics/openmp-modifiers.h
+include/flang/Semantics/openmp-utils.h
 include/flang/Semantics/program-tree.h
 include/flang/Semantics/runtime-type-info.h
 include/flang/Semantics/scope.h
@@ -368,6 +388,7 @@ include/flang/Testing/testing.h
 include/flang/Tools/CrossToolHelpers.h
 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
@@ -378,6 +399,7 @@ 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
@@ -385,7 +407,7 @@ 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/21/include/ISO_Fortran_binding.h
+lib/clang/22/include/ISO_Fortran_binding.h
 lib/cmake/flang/FlangConfig.cmake
 lib/cmake/flang/FlangConfigVersion.cmake
 lib/cmake/flang/FlangTargets-release.cmake
@@ -398,7 +420,9 @@ lib/libFIRCodeGen.so
 lib/libFIRCodeGenDialect.so
 lib/libFIRDialect.so
 lib/libFIRDialectSupport.so
+lib/libFIROpenACCAnalysis.so
 lib/libFIROpenACCSupport.so
+lib/libFIROpenACCTransforms.so
 lib/libFIROpenMPSupport.so
 lib/libFIRSupport.so
 lib/libFIRTransforms.so
@@ -411,8 +435,10 @@ lib/libFortranParser.so
 lib/libFortranRuntime.so
 lib/libFortranSemantics.so
 lib/libFortranSupport.so
+lib/libFortranUtils.so
 lib/libHLFIRDialect.so
 lib/libHLFIRTransforms.so
+lib/libMIFDialect.so
 lib/libflangFrontend.so
 lib/libflangFrontendTool.so
 lib/libflangPasses.so
diff --git a/flang/distinfo b/flang/distinfo
index 1bce846d84..ec3c064211 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
diff --git a/libcxx/Makefile b/libcxx/Makefile
index b32d13dfd9..900632c332 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -38,6 +38,6 @@ CXXFLAGS+=	-std=c++17 -D_LIBCPP_STD_VER=17
 
 .include "../../devel/cmake/build.mk"
 .include "../../lang/python/tool.mk"
-#.include "../../wip/libcxxabi/buildlink3.mk"
+.include "../../wip/libcxxabi/buildlink3.mk"
 .include "../../wip/libunwind/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libcxx/PLIST b/libcxx/PLIST
index fb77f66e66..b0f93cebad 100644
--- a/libcxx/PLIST
+++ b/libcxx/PLIST
@@ -194,6 +194,7 @@ include/c++/v1/__algorithm/sift_down.h
 include/c++/v1/__algorithm/simd_utils.h
 include/c++/v1/__algorithm/sort.h
 include/c++/v1/__algorithm/sort_heap.h
+include/c++/v1/__algorithm/specialized_algorithms.h
 include/c++/v1/__algorithm/stable_partition.h
 include/c++/v1/__algorithm/stable_sort.h
 include/c++/v1/__algorithm/swap_ranges.h
@@ -214,9 +215,12 @@ include/c++/v1/__atomic/atomic_init.h
 include/c++/v1/__atomic/atomic_lock_free.h
 include/c++/v1/__atomic/atomic_ref.h
 include/c++/v1/__atomic/atomic_sync.h
+include/c++/v1/__atomic/atomic_sync_timed.h
+include/c++/v1/__atomic/atomic_waitable_traits.h
 include/c++/v1/__atomic/check_memory_order.h
 include/c++/v1/__atomic/contention_t.h
 include/c++/v1/__atomic/fence.h
+include/c++/v1/__atomic/floating_point_helper.h
 include/c++/v1/__atomic/is_always_lock_free.h
 include/c++/v1/__atomic/kill_dependency.h
 include/c++/v1/__atomic/memory_order.h
@@ -262,6 +266,7 @@ include/c++/v1/__chrono/formatter.h
 include/c++/v1/__chrono/gps_clock.h
 include/c++/v1/__chrono/hh_mm_ss.h
 include/c++/v1/__chrono/high_resolution_clock.h
+include/c++/v1/__chrono/is_clock.h
 include/c++/v1/__chrono/leap_second.h
 include/c++/v1/__chrono/literals.h
 include/c++/v1/__chrono/local_info.h
@@ -306,6 +311,7 @@ include/c++/v1/__concepts/boolean_testable.h
 include/c++/v1/__concepts/class_or_enum.h
 include/c++/v1/__concepts/common_reference_with.h
 include/c++/v1/__concepts/common_with.h
+include/c++/v1/__concepts/comparison_common_type.h
 include/c++/v1/__concepts/constructible.h
 include/c++/v1/__concepts/convertible_to.h
 include/c++/v1/__concepts/copyable.h
@@ -328,6 +334,8 @@ include/c++/v1/__config_site
 include/c++/v1/__configuration/abi.h
 include/c++/v1/__configuration/availability.h
 include/c++/v1/__configuration/compiler.h
+include/c++/v1/__configuration/experimental.h
+include/c++/v1/__configuration/hardening.h
 include/c++/v1/__configuration/language.h
 include/c++/v1/__configuration/platform.h
 include/c++/v1/__coroutine/coroutine_handle.h
@@ -838,7 +846,6 @@ include/c++/v1/__cxx03/clocale
 include/c++/v1/__cxx03/cmath
 include/c++/v1/__cxx03/codecvt
 include/c++/v1/__cxx03/complex
-include/c++/v1/__cxx03/complex.h
 include/c++/v1/__cxx03/condition_variable
 include/c++/v1/__cxx03/csetjmp
 include/c++/v1/__cxx03/csignal
@@ -851,25 +858,20 @@ include/c++/v1/__cxx03/cstdlib
 include/c++/v1/__cxx03/cstring
 include/c++/v1/__cxx03/ctgmath
 include/c++/v1/__cxx03/ctime
-include/c++/v1/__cxx03/ctype.h
 include/c++/v1/__cxx03/cuchar
 include/c++/v1/__cxx03/cwchar
 include/c++/v1/__cxx03/cwctype
 include/c++/v1/__cxx03/deque
-include/c++/v1/__cxx03/errno.h
 include/c++/v1/__cxx03/exception
 include/c++/v1/__cxx03/experimental/__config
 include/c++/v1/__cxx03/experimental/utility
 include/c++/v1/__cxx03/ext/__hash
 include/c++/v1/__cxx03/ext/hash_map
 include/c++/v1/__cxx03/ext/hash_set
-include/c++/v1/__cxx03/fenv.h
-include/c++/v1/__cxx03/float.h
 include/c++/v1/__cxx03/forward_list
 include/c++/v1/__cxx03/fstream
 include/c++/v1/__cxx03/functional
 include/c++/v1/__cxx03/future
-include/c++/v1/__cxx03/inttypes.h
 include/c++/v1/__cxx03/iomanip
 include/c++/v1/__cxx03/ios
 include/c++/v1/__cxx03/iosfwd
@@ -896,11 +898,8 @@ include/c++/v1/__cxx03/set
 include/c++/v1/__cxx03/sstream
 include/c++/v1/__cxx03/stack
 include/c++/v1/__cxx03/stdatomic.h
-include/c++/v1/__cxx03/stdbool.h
-include/c++/v1/__cxx03/stddef.h
 include/c++/v1/__cxx03/stdexcept
 include/c++/v1/__cxx03/stdint.h
-include/c++/v1/__cxx03/stdio.h
 include/c++/v1/__cxx03/stdlib.h
 include/c++/v1/__cxx03/streambuf
 include/c++/v1/__cxx03/string
@@ -908,7 +907,6 @@ include/c++/v1/__cxx03/string.h
 include/c++/v1/__cxx03/string_view
 include/c++/v1/__cxx03/strstream
 include/c++/v1/__cxx03/system_error
-include/c++/v1/__cxx03/tgmath.h
 include/c++/v1/__cxx03/thread
 include/c++/v1/__cxx03/type_traits
 include/c++/v1/__cxx03/typeindex
@@ -921,7 +919,6 @@ include/c++/v1/__cxx03/valarray
 include/c++/v1/__cxx03/vector
 include/c++/v1/__cxx03/version
 include/c++/v1/__cxx03/wchar.h
-include/c++/v1/__cxx03/wctype.h
 include/c++/v1/__debug_utils/randomize_range.h
 include/c++/v1/__debug_utils/sanitizers.h
 include/c++/v1/__debug_utils/strict_weak_ordering_check.h
@@ -966,6 +963,7 @@ include/c++/v1/__format/container_adaptor.h
 include/c++/v1/__format/enable_insertable.h
 include/c++/v1/__format/escaped_output_table.h
 include/c++/v1/__format/extended_grapheme_cluster_table.h
+include/c++/v1/__format/fmt_pair_like.h
 include/c++/v1/__format/format_arg.h
 include/c++/v1/__format/format_arg_store.h
 include/c++/v1/__format/format_args.h
@@ -988,6 +986,7 @@ include/c++/v1/__format/formatter_tuple.h
 include/c++/v1/__format/indic_conjunct_break_table.h
 include/c++/v1/__format/parser_std_format_spec.h
 include/c++/v1/__format/range_default_formatter.h
+include/c++/v1/__format/range_format.h
 include/c++/v1/__format/range_formatter.h
 include/c++/v1/__format/unicode.h
 include/c++/v1/__format/width_estimation_table.h
@@ -1030,14 +1029,12 @@ include/c++/v1/__fwd/functional.h
 include/c++/v1/__fwd/get.h
 include/c++/v1/__fwd/ios.h
 include/c++/v1/__fwd/istream.h
-include/c++/v1/__fwd/map.h
 include/c++/v1/__fwd/mdspan.h
 include/c++/v1/__fwd/memory.h
 include/c++/v1/__fwd/memory_resource.h
 include/c++/v1/__fwd/ostream.h
 include/c++/v1/__fwd/pair.h
 include/c++/v1/__fwd/queue.h
-include/c++/v1/__fwd/set.h
 include/c++/v1/__fwd/span.h
 include/c++/v1/__fwd/sstream.h
 include/c++/v1/__fwd/stack.h
@@ -1099,21 +1096,22 @@ include/c++/v1/__locale
 include/c++/v1/__locale_dir/check_grouping.h
 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/android.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/musl.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
 include/c++/v1/__locale_dir/pad_and_output.h
 include/c++/v1/__locale_dir/scan_keyword.h
+include/c++/v1/__locale_dir/support/aix.h
 include/c++/v1/__locale_dir/support/apple.h
 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/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/strtonum.h
 include/c++/v1/__locale_dir/support/windows.h
@@ -1151,7 +1149,6 @@ include/c++/v1/__mdspan/layout_stride.h
 include/c++/v1/__mdspan/mdspan.h
 include/c++/v1/__memory/addressof.h
 include/c++/v1/__memory/align.h
-include/c++/v1/__memory/aligned_alloc.h
 include/c++/v1/__memory/allocate_at_least.h
 include/c++/v1/__memory/allocation_guard.h
 include/c++/v1/__memory/allocator.h
@@ -1281,6 +1278,8 @@ include/c++/v1/__random/uniform_random_bit_generator.h
 include/c++/v1/__random/uniform_real_distribution.h
 include/c++/v1/__random/weibull_distribution.h
 include/c++/v1/__ranges/access.h
+include/c++/v1/__ranges/adjacent_transform_view.h
+include/c++/v1/__ranges/adjacent_view.h
 include/c++/v1/__ranges/all.h
 include/c++/v1/__ranges/as_rvalue_view.h
 include/c++/v1/__ranges/chunk_by_view.h
@@ -1292,6 +1291,7 @@ include/c++/v1/__ranges/dangling.h
 include/c++/v1/__ranges/data.h
 include/c++/v1/__ranges/drop_view.h
 include/c++/v1/__ranges/drop_while_view.h
+include/c++/v1/__ranges/elements_of.h
 include/c++/v1/__ranges/elements_view.h
 include/c++/v1/__ranges/empty.h
 include/c++/v1/__ranges/empty_view.h
@@ -1323,6 +1323,7 @@ include/c++/v1/__ranges/to.h
 include/c++/v1/__ranges/transform_view.h
 include/c++/v1/__ranges/view_interface.h
 include/c++/v1/__ranges/views.h
+include/c++/v1/__ranges/zip_transform_view.h
 include/c++/v1/__ranges/zip_view.h
 include/c++/v1/__split_buffer
 include/c++/v1/__std_mbstate_t.h
@@ -1363,22 +1364,18 @@ include/c++/v1/__thread/timed_backoff_policy.h
 include/c++/v1/__tree
 include/c++/v1/__tuple/find_index.h
 include/c++/v1/__tuple/ignore.h
-include/c++/v1/__tuple/make_tuple_types.h
 include/c++/v1/__tuple/sfinae_helpers.h
 include/c++/v1/__tuple/tuple_element.h
-include/c++/v1/__tuple/tuple_indices.h
 include/c++/v1/__tuple/tuple_like.h
-include/c++/v1/__tuple/tuple_like_ext.h
 include/c++/v1/__tuple/tuple_like_no_subrange.h
 include/c++/v1/__tuple/tuple_size.h
-include/c++/v1/__tuple/tuple_types.h
+include/c++/v1/__tuple/tuple_transform.h
 include/c++/v1/__type_traits/add_cv_quals.h
 include/c++/v1/__type_traits/add_pointer.h
 include/c++/v1/__type_traits/add_reference.h
 include/c++/v1/__type_traits/aligned_storage.h
 include/c++/v1/__type_traits/aligned_union.h
 include/c++/v1/__type_traits/alignment_of.h
-include/c++/v1/__type_traits/can_extract_key.h
 include/c++/v1/__type_traits/common_reference.h
 include/c++/v1/__type_traits/common_type.h
 include/c++/v1/__type_traits/conditional.h
@@ -1407,7 +1404,6 @@ include/c++/v1/__type_traits/is_arithmetic.h
 include/c++/v1/__type_traits/is_array.h
 include/c++/v1/__type_traits/is_assignable.h
 include/c++/v1/__type_traits/is_base_of.h
-include/c++/v1/__type_traits/is_bounded_array.h
 include/c++/v1/__type_traits/is_callable.h
 include/c++/v1/__type_traits/is_char_like_type.h
 include/c++/v1/__type_traits/is_class.h
@@ -1426,6 +1422,7 @@ include/c++/v1/__type_traits/is_final.h
 include/c++/v1/__type_traits/is_floating_point.h
 include/c++/v1/__type_traits/is_function.h
 include/c++/v1/__type_traits/is_fundamental.h
+include/c++/v1/__type_traits/is_generic_transparent_comparator.h
 include/c++/v1/__type_traits/is_implicit_lifetime.h
 include/c++/v1/__type_traits/is_implicitly_default_constructible.h
 include/c++/v1/__type_traits/is_integral.h
@@ -1443,7 +1440,6 @@ 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_replaceable.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
@@ -1457,17 +1453,18 @@ include/c++/v1/__type_traits/is_trivially_copyable.h
 include/c++/v1/__type_traits/is_trivially_destructible.h
 include/c++/v1/__type_traits/is_trivially_lexicographically_comparable.h
 include/c++/v1/__type_traits/is_trivially_relocatable.h
-include/c++/v1/__type_traits/is_unbounded_array.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
+include/c++/v1/__type_traits/make_transparent.h
 include/c++/v1/__type_traits/make_unsigned.h
 include/c++/v1/__type_traits/maybe_const.h
 include/c++/v1/__type_traits/nat.h
@@ -1499,6 +1496,7 @@ include/c++/v1/__utility/auto_cast.h
 include/c++/v1/__utility/cmp.h
 include/c++/v1/__utility/convert_to_integral.h
 include/c++/v1/__utility/declval.h
+include/c++/v1/__utility/default_three_way_comparator.h
 include/c++/v1/__utility/element_count.h
 include/c++/v1/__utility/empty.h
 include/c++/v1/__utility/exception_guard.h
@@ -1509,6 +1507,7 @@ 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
 include/c++/v1/__utility/pair.h
@@ -1520,6 +1519,7 @@ include/c++/v1/__utility/scope_guard.h
 include/c++/v1/__utility/small_buffer.h
 include/c++/v1/__utility/swap.h
 include/c++/v1/__utility/to_underlying.h
+include/c++/v1/__utility/try_key_extraction.h
 include/c++/v1/__utility/unreachable.h
 include/c++/v1/__variant/monostate.h
 include/c++/v1/__vector/comparison.h
@@ -1648,7 +1648,6 @@ include/c++/v1/span
 include/c++/v1/sstream
 include/c++/v1/stack
 include/c++/v1/stdatomic.h
-include/c++/v1/stdbool.h
 include/c++/v1/stddef.h
 include/c++/v1/stdexcept
 include/c++/v1/stdio.h
diff --git a/libcxx/distinfo b/libcxx/distinfo
index 9ea55b358d..d54e8f5f3a 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.25 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-src_CMakeLists.txt) = 4554c675b778d8d631f2fc664364f0d3ffc3ed5e
 SHA1 (patch-src_charconv.cpp) = 658a0727c6e2ddc051fbd22a536033bae19a22ba
 SHA1 (patch-src_filesystem_file__descriptor.h) = 44a64cb3eac4e94abb54170c355639642b8246c2
diff --git a/libcxxabi/Makefile b/libcxxabi/Makefile
index e2483f60a5..e4c7afb4db 100644
--- a/libcxxabi/Makefile
+++ b/libcxxabi/Makefile
@@ -14,7 +14,7 @@ HOMEPAGE=	https://libcxxabi.llvm.org/
 COMMENT=	C++ Standard Library
 LICENSE=	apache-2.0
 
-USE_CXX_FEATURES=	c++17
+USE_CXX_FEATURES=	c++20
 USE_LANGUAGES=		c c++
 SSP_SUPPORTED=		no
 GCC_REQD+=		14 # must be in sync with libcxx
@@ -33,17 +33,12 @@ CXXFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
 CXXFLAGS+=	-std=c++17 -D_LIBCPP_STD_VER=17
 .endif
 
-pre-configure:
-	${CP} ${BUILDLINK_DIR}/include/c++/v1/__assertion_handler \
-	${CP} ${BUILDLINK_DIR}/include/c++/v1/__config_site \
-		${WRKSRC}/../libcxx/include/
 # IMPORTANT: copy __assertion_handler and __config_site from partial build of libcxx.
-zz-pre-configure:
+pre-configure:
 	${CP} ${FILESDIR}/__assertion_handler ${FILESDIR}/__config_site \
 		${WRKSRC}/../libcxx/include/
 
 .include "../../devel/cmake/build.mk"
-.include "../../wip/libcxx/buildlink3.mk"
 .include "../../wip/libunwind/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libcxxabi/buildlink3.mk b/libcxxabi/buildlink3.mk
index 10e0cc1517..5f2af75917 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>=21.1.0
+BUILDLINK_API_DEPENDS.libcxxabi+=	libcxxabi>=22.1.0
 BUILDLINK_PKGSRCDIR.libcxxabi?=		../../wip/libcxxabi
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
index 13235533ff..545704bf2d 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-src_CMakeLists.txt) = 4824994ca6f2f4f0ebc154fff7a17418660e5959
 SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95
diff --git a/libcxxabi/files/__assertion_handler b/libcxxabi/files/__assertion_handler
index 1d6b21fc6b..d352405e90 100644
--- a/libcxxabi/files/__assertion_handler
+++ b/libcxxabi/files/__assertion_handler
@@ -13,34 +13,52 @@
 #if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 #  include <__cxx03/__config>
 #  include <__cxx03/__verbose_abort>
+#  include <__cxx03/__verbose_trap>
 #else
 #  include <__config>
+#  include <__log_hardening_failure>
 #  include <__verbose_abort>
+#  include <__verbose_trap>
 #endif
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 
-#if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
+#if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 
-#  define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message)
+// Keep the old implementation that doesn't support assertion semantics for backward compatibility with the frozen C++03
+// mode.
+#  if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
+#    define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message)
+#  else
+#    define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_TRAP(message)
+#  endif // _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
 
 #else
 
-#  if __has_builtin(__builtin_verbose_trap)
-// AppleClang shipped a slightly different version of __builtin_verbose_trap from the upstream
-// version before upstream Clang actually got the builtin.
-// TODO: Remove once AppleClang supports the two-arguments version of the builtin.
-#    if defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER < 1700
-#      define _LIBCPP_ASSERTION_HANDLER(message) __builtin_verbose_trap(message)
-#    else
-#      define _LIBCPP_ASSERTION_HANDLER(message) __builtin_verbose_trap("libc++", message)
-#    endif
+#  if _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_IGNORE
+#    define _LIBCPP_ASSERTION_HANDLER(message) ((void)0)
+
+#  elif _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_OBSERVE
+#    define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_LOG_HARDENING_FAILURE(message)
+
+#  elif _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_QUICK_ENFORCE
+#    define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_TRAP(message)
+
+#  elif _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_ENFORCE
+#    define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message)
+
 #  else
-#    define _LIBCPP_ASSERTION_HANDLER(message) ((void)message, __builtin_trap())
-#  endif
 
-#endif // _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
+#    error _LIBCPP_ASSERTION_SEMANTIC must be set to one of the following values: \
+_LIBCPP_ASSERTION_SEMANTIC_IGNORE, \
+_LIBCPP_ASSERTION_SEMANTIC_OBSERVE, \
+_LIBCPP_ASSERTION_SEMANTIC_QUICK_ENFORCE, \
+_LIBCPP_ASSERTION_SEMANTIC_ENFORCE
+
+#  endif // _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_IGNORE
+
+#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 
 #endif // _LIBCPP___ASSERTION_HANDLER
diff --git a/libcxxabi/files/__config_site b/libcxxabi/files/__config_site
index e504264e2a..393b6ddd2c 100644
--- a/libcxxabi/files/__config_site
+++ b/libcxxabi/files/__config_site
@@ -30,7 +30,6 @@
 #define _LIBCPP_HAS_LOCALIZATION 1
 #define _LIBCPP_HAS_UNICODE 1
 #define _LIBCPP_HAS_WIDE_CHARACTERS 1
-/* #undef _LIBCPP_HAS_NO_STD_MODULES */
 #define _LIBCPP_HAS_TIME_ZONE_DATABASE 0
 #define _LIBCPP_INSTRUMENTED_WITH_ASAN 0
 
@@ -41,6 +40,11 @@
 
 // Hardening.
 #define _LIBCPP_HARDENING_MODE_DEFAULT 2
+#define _LIBCPP_ASSERTION_SEMANTIC_DEFAULT 2
+
+// C libraries
+#define _LIBCPP_LIBC_PICOLIBC 0
+#define _LIBCPP_LIBC_NEWLIB 0
 
 // __USE_MINGW_ANSI_STDIO gets redefined on MinGW
 #ifdef __clang__
diff --git a/libunwind/buildlink3.mk b/libunwind/buildlink3.mk
index cb6b6aa3a0..835485e00a 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>=21.1.0
+BUILDLINK_API_DEPENDS.libunwind+=	libunwind>=22.1.0
 BUILDLINK_PKGSRCDIR.libunwind?=		../../wip/libunwind
 
 .endif	# LIBUNWIND_BUILDLINK3_MK
diff --git a/libunwind/distinfo b/libunwind/distinfo
index 3d8a5ecab0..2604cffce1 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
diff --git a/lld/Makefile b/lld/Makefile
index bc97f31daf..4a17ed0cd6 100644
--- a/lld/Makefile
+++ b/lld/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://lld.llvm.org/
 COMMENT=	The LLVM Linker
 LICENSE=	apache-2.0
 
-USE_CXX_FEATURES=	c++14
+USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c c++
 GCC_REQD+=		7
 
diff --git a/lld/buildlink3.mk b/lld/buildlink3.mk
index dadad04e4e..aedaa93ee0 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>=21.1.0
+BUILDLINK_API_DEPENDS.lld+=	lld>=22.1.0
 BUILDLINK_PKGSRCDIR.lld?=	../../wip/lld
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/lld/distinfo b/lld/distinfo
index e8925e8681..ed21aeeade 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-ELF_Config.h) = 484d0818bd4a92f2faafa1337d3f2f08cab4c0fc
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lldb/Makefile b/lldb/Makefile
index c1007e2c9a..64b9e4be7a 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -24,8 +24,8 @@ PY_PATCHPLIST=		yes
 CMAKE_CONFIGURE_ARGS+=	-DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
 #CMAKE_CONFIGURE_ARGS+=	-DLLVM_ENABLE_LIBCXX=ON
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_COMPILER=${PREFIX}/bin/clang
-CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_COMPILER=${PREFIX}/bin/clang++
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
 CMAKE_CONFIGURE_ARGS+=	-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
 CMAKE_CONFIGURE_ARGS+=	-DLLDB_CODESIGN_IDENTITY=""
 CMAKE_CONFIGURE_ARGS+=	-DPYTHON_HOME=${PREFIX}
diff --git a/lldb/PLIST b/lldb/PLIST
index e183c325ab..d69386ff33 100644
--- a/lldb/PLIST
+++ b/lldb/PLIST
@@ -3,7 +3,9 @@ bin/lldb
 bin/lldb-argdumper
 bin/lldb-dap
 bin/lldb-instr
+bin/lldb-mcp
 bin/lldb-server
+bin/yaml2macho-core
 include/lldb/API/LLDB.h
 include/lldb/API/SBAddress.h
 include/lldb/API/SBAddressRange.h
@@ -33,6 +35,7 @@ include/lldb/API/SBFileSpec.h
 include/lldb/API/SBFileSpecList.h
 include/lldb/API/SBFormat.h
 include/lldb/API/SBFrame.h
+include/lldb/API/SBFrameList.h
 include/lldb/API/SBFunction.h
 include/lldb/API/SBHostOS.h
 include/lldb/API/SBInstruction.h
@@ -247,6 +250,7 @@ include/lldb/Host/XML.h
 include/lldb/Host/aix/HostInfoAIX.h
 include/lldb/Host/aix/Support.h
 include/lldb/Host/android/HostInfoAndroid.h
+include/lldb/Host/common/DiagnosticsRendering.h
 include/lldb/Host/common/GetOptInc.h
 include/lldb/Host/common/NativeBreakpointList.h
 include/lldb/Host/common/NativeProcessProtocol.h
@@ -287,6 +291,7 @@ include/lldb/Host/windows/MainLoopWindows.h
 include/lldb/Host/windows/PipeWindows.h
 include/lldb/Host/windows/PosixApi.h
 include/lldb/Host/windows/ProcessLauncherWindows.h
+include/lldb/Host/windows/PseudoConsole.h
 include/lldb/Host/windows/windows.h
 include/lldb/Initialization/SystemInitializer.h
 include/lldb/Initialization/SystemInitializerCommon.h
@@ -301,6 +306,9 @@ include/lldb/Interpreter/CommandOptionArgumentTable.h
 include/lldb/Interpreter/CommandOptionValidators.h
 include/lldb/Interpreter/CommandReturnObject.h
 include/lldb/Interpreter/Interfaces/OperatingSystemInterface.h
+include/lldb/Interpreter/Interfaces/ScriptedBreakpointInterface.h
+include/lldb/Interpreter/Interfaces/ScriptedFrameInterface.h
+include/lldb/Interpreter/Interfaces/ScriptedFrameProviderInterface.h
 include/lldb/Interpreter/Interfaces/ScriptedInterface.h
 include/lldb/Interpreter/Interfaces/ScriptedInterfaceUsages.h
 include/lldb/Interpreter/Interfaces/ScriptedPlatformInterface.h
@@ -350,6 +358,12 @@ include/lldb/Interpreter/Property.h
 include/lldb/Interpreter/ScriptInterpreter.h
 include/lldb/Interpreter/ScriptObject.h
 include/lldb/LLDB.h
+include/lldb/Protocol/MCP/MCPError.h
+include/lldb/Protocol/MCP/Protocol.h
+include/lldb/Protocol/MCP/Resource.h
+include/lldb/Protocol/MCP/Server.h
+include/lldb/Protocol/MCP/Tool.h
+include/lldb/Protocol/MCP/Transport.h
 include/lldb/SBAddress.h
 include/lldb/SBAddressRange.h
 include/lldb/SBAddressRangeList.h
@@ -378,11 +392,13 @@ include/lldb/SBFileSpec.h
 include/lldb/SBFileSpecList.h
 include/lldb/SBFormat.h
 include/lldb/SBFrame.h
+include/lldb/SBFrameList.h
 include/lldb/SBFunction.h
 include/lldb/SBHostOS.h
 include/lldb/SBInstruction.h
 include/lldb/SBInstructionList.h
 include/lldb/SBLanguageRuntime.h
+include/lldb/SBLanguages.h
 include/lldb/SBLaunchInfo.h
 include/lldb/SBLineEntry.h
 include/lldb/SBListener.h
@@ -472,6 +488,7 @@ include/lldb/Symbol/VariableList.h
 include/lldb/Target/ABI.h
 include/lldb/Target/AppleArm64ExceptionClass.h
 include/lldb/Target/AssertFrameRecognizer.h
+include/lldb/Target/BorrowedStackFrame.h
 include/lldb/Target/CoreFileMemoryRanges.h
 include/lldb/Target/DynamicLoader.h
 include/lldb/Target/DynamicRegisterInfo.h
@@ -517,6 +534,7 @@ include/lldb/Target/StackID.h
 include/lldb/Target/Statistics.h
 include/lldb/Target/StopInfo.h
 include/lldb/Target/StructuredDataPlugin.h
+include/lldb/Target/SyntheticFrameProvider.h
 include/lldb/Target/SystemRuntime.h
 include/lldb/Target/Target.h
 include/lldb/Target/TargetList.h
@@ -552,7 +570,6 @@ include/lldb/Target/UnixSignals.h
 include/lldb/Target/Unwind.h
 include/lldb/Target/UnwindAssembly.h
 include/lldb/Target/UnwindLLDB.h
-include/lldb/Target/VerboseTrapFrameRecognizer.h
 include/lldb/Utility/AddressableBits.h
 include/lldb/Utility/AnsiTerminal.h
 include/lldb/Utility/AppleUuidCompatibility.h
@@ -571,7 +588,6 @@ include/lldb/Utility/DataBufferLLVM.h
 include/lldb/Utility/DataEncoder.h
 include/lldb/Utility/DataExtractor.h
 include/lldb/Utility/Diagnostics.h
-include/lldb/Utility/DiagnosticsRendering.h
 include/lldb/Utility/Endian.h
 include/lldb/Utility/Environment.h
 include/lldb/Utility/ErrorMessages.h
@@ -588,6 +604,7 @@ include/lldb/Utility/LLDBLog.h
 include/lldb/Utility/Listener.h
 include/lldb/Utility/Log.h
 include/lldb/Utility/NameMatches.h
+include/lldb/Utility/NonNullSharedPtr.h
 include/lldb/Utility/OptionDefinition.h
 include/lldb/Utility/Predicate.h
 include/lldb/Utility/ProcessInfo.h
@@ -607,7 +624,6 @@ include/lldb/Utility/StreamString.h
 include/lldb/Utility/StreamTee.h
 include/lldb/Utility/StringExtractor.h
 include/lldb/Utility/StringExtractorGDBRemote.h
-include/lldb/Utility/StringLexer.h
 include/lldb/Utility/StringList.h
 include/lldb/Utility/StructuredData.h
 include/lldb/Utility/SupportFile.h
@@ -624,6 +640,7 @@ include/lldb/Utility/UserID.h
 include/lldb/Utility/UserIDResolver.h
 include/lldb/Utility/VASPrintf.h
 include/lldb/Utility/VMRange.h
+include/lldb/Utility/VirtualDataExtractor.h
 include/lldb/Utility/XcodeSDK.h
 include/lldb/Utility/ZipFile.h
 include/lldb/ValueObject/DILAST.h
@@ -662,7 +679,6 @@ lib/liblldb.so.${PKGVERSION}
 lib/liblldb.so.20
 lib/lua/${LUA_VERSION}/lldb.so
 ${PYSITELIB}/lldb/__init__.py
-${PYSITELIB}/lldb/_lldb.so
 ${PYSITELIB}/lldb/embedded_interpreter.py
 ${PYSITELIB}/lldb/formatters/Logger.py
 ${PYSITELIB}/lldb/formatters/__init__.py
@@ -674,9 +690,12 @@ ${PYSITELIB}/lldb/formatters/cpp/libcxx.py
 ${PYSITELIB}/lldb/formatters/metrics.py
 ${PYSITELIB}/lldb/formatters/synth.py
 ${PYSITELIB}/lldb/lldb-argdumper
+${PYSITELIB}/lldb/native/__init__.py
+${PYSITELIB}/lldb/native/_lldb.abi3.so
 ${PYSITELIB}/lldb/plugins/__init__.py
 ${PYSITELIB}/lldb/plugins/operating_system.py
 ${PYSITELIB}/lldb/plugins/parsed_cmd.py
+${PYSITELIB}/lldb/plugins/scripted_frame_provider.py
 ${PYSITELIB}/lldb/plugins/scripted_platform.py
 ${PYSITELIB}/lldb/plugins/scripted_process.py
 ${PYSITELIB}/lldb/plugins/scripted_thread_plan.py
diff --git a/lldb/buildlink3.mk b/lldb/buildlink3.mk
index 9fa35891f7..5e4b6af830 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>=21.1.0
-BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=21.1.0
+BUILDLINK_API_DEPENDS.lldb+=	lldb>=22.1.0
+BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=22.1.0
 BUILDLINK_PKGSRCDIR.lldb?=	../../wip/lldb
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/lldb/distinfo b/lldb/distinfo
index ffbec3219c..f04f997b68 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.35 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-source_API_CMakeLists.txt) = 32840580507b3a7d05e76485da5830e92a76bb06
diff --git a/llvm/PLIST b/llvm/PLIST
index 48bf24732e..8ae7ae96e1 100644
--- a/llvm/PLIST
+++ b/llvm/PLIST
@@ -2,6 +2,7 @@
 bin/FileCheck
 bin/UnicodeNameMappingGenerator
 bin/bugpoint
+bin/clang-offload-packager
 bin/count
 bin/dsymutil
 bin/llc
@@ -14,6 +15,7 @@ bin/llvm-as
 bin/llvm-bcanalyzer
 bin/llvm-bitcode-strip
 bin/llvm-c-test
+bin/llvm-cas
 bin/llvm-cat
 bin/llvm-cfi-verify
 bin/llvm-cgdata
@@ -38,6 +40,7 @@ bin/llvm-extract
 bin/llvm-gsymutil
 bin/llvm-ifs
 bin/llvm-install-name-tool
+bin/llvm-ir2vec
 bin/llvm-jitlink
 bin/llvm-jitlink-executor
 bin/llvm-lib
@@ -56,6 +59,8 @@ bin/llvm-mt
 bin/llvm-nm
 bin/llvm-objcopy
 bin/llvm-objdump
+bin/llvm-offload-binary
+bin/llvm-offload-wrapper
 bin/llvm-opt-report
 bin/llvm-otool
 bin/llvm-pdbutil
@@ -122,6 +127,7 @@ include/llvm-c/Types.h
 include/llvm-c/Visibility.h
 include/llvm-c/blake3.h
 include/llvm-c/lto.h
+include/llvm/ABI/Types.h
 include/llvm/ADT/ADL.h
 include/llvm/ADT/APFixedPoint.h
 include/llvm/ADT/APFloat.h
@@ -183,6 +189,7 @@ include/llvm/ADT/PointerUnion.h
 include/llvm/ADT/PostOrderIterator.h
 include/llvm/ADT/PriorityQueue.h
 include/llvm/ADT/PriorityWorklist.h
+include/llvm/ADT/RadixTree.h
 include/llvm/ADT/RewriteBuffer.h
 include/llvm/ADT/RewriteRope.h
 include/llvm/ADT/SCCIterator.h
@@ -223,7 +230,6 @@ include/llvm/ADT/UniqueVector.h
 include/llvm/ADT/bit.h
 include/llvm/ADT/edit_distance.h
 include/llvm/ADT/fallible_iterator.h
-include/llvm/ADT/identity.h
 include/llvm/ADT/ilist.h
 include/llvm/ADT/ilist_base.h
 include/llvm/ADT/ilist_iterator.h
@@ -291,12 +297,12 @@ include/llvm/Analysis/InlineAdvisor.h
 include/llvm/Analysis/InlineCost.h
 include/llvm/Analysis/InlineModelFeatureMaps.h
 include/llvm/Analysis/InlineOrder.h
-include/llvm/Analysis/InlineSizeEstimatorAnalysis.h
 include/llvm/Analysis/InstCount.h
 include/llvm/Analysis/InstSimplifyFolder.h
 include/llvm/Analysis/InstructionPrecedenceTracking.h
 include/llvm/Analysis/InstructionSimplify.h
 include/llvm/Analysis/InteractiveModelRunner.h
+include/llvm/Analysis/InterestingMemoryOperand.h
 include/llvm/Analysis/IteratedDominanceFrontier.h
 include/llvm/Analysis/KernelInfo.h
 include/llvm/Analysis/LastRunTrackingAnalysis.h
@@ -347,6 +353,7 @@ include/llvm/Analysis/RegionPass.h
 include/llvm/Analysis/RegionPrinter.h
 include/llvm/Analysis/ReleaseModeModelRunner.h
 include/llvm/Analysis/ReplayInlineAdvisor.h
+include/llvm/Analysis/RuntimeLibcallInfo.h
 include/llvm/Analysis/ScalarEvolution.h
 include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h
 include/llvm/Analysis/ScalarEvolutionDivision.h
@@ -363,8 +370,10 @@ include/llvm/Analysis/StaticDataProfileInfo.h
 include/llvm/Analysis/StructuralHash.h
 include/llvm/Analysis/SyntheticCountsUtils.h
 include/llvm/Analysis/TargetFolder.h
-include/llvm/Analysis/TargetLibraryInfo.def
 include/llvm/Analysis/TargetLibraryInfo.h
+include/llvm/Analysis/TargetLibraryInfo.inc
+include/llvm/Analysis/TargetLibraryInfo.td
+include/llvm/Analysis/TargetLibraryInfoImpl.td
 include/llvm/Analysis/TargetTransformInfo.h
 include/llvm/Analysis/TargetTransformInfoImpl.h
 include/llvm/Analysis/TensorSpec.h
@@ -382,6 +391,8 @@ include/llvm/Analysis/ValueTracking.h
 include/llvm/Analysis/VecFuncs.def
 include/llvm/Analysis/VectorUtils.h
 include/llvm/Analysis/WithCache.h
+include/llvm/AsmParser/AsmParserContext.h
+include/llvm/AsmParser/FileLoc.h
 include/llvm/AsmParser/LLLexer.h
 include/llvm/AsmParser/LLParser.h
 include/llvm/AsmParser/LLToken.h
@@ -431,6 +442,7 @@ include/llvm/BinaryFormat/MsgPackDocument.h
 include/llvm/BinaryFormat/MsgPackReader.h
 include/llvm/BinaryFormat/MsgPackWriter.h
 include/llvm/BinaryFormat/SFrame.h
+include/llvm/BinaryFormat/SFrameConstants.def
 include/llvm/BinaryFormat/Swift.def
 include/llvm/BinaryFormat/Swift.h
 include/llvm/BinaryFormat/Wasm.h
@@ -448,6 +460,20 @@ include/llvm/Bitstream/BitCodeEnums.h
 include/llvm/Bitstream/BitCodes.h
 include/llvm/Bitstream/BitstreamReader.h
 include/llvm/Bitstream/BitstreamWriter.h
+include/llvm/CAS/ActionCache.h
+include/llvm/CAS/BuiltinCASContext.h
+include/llvm/CAS/BuiltinObjectHasher.h
+include/llvm/CAS/BuiltinUnifiedCASDatabases.h
+include/llvm/CAS/CASID.h
+include/llvm/CAS/CASReference.h
+include/llvm/CAS/FileOffset.h
+include/llvm/CAS/MappedFileRegionArena.h
+include/llvm/CAS/ObjectStore.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/CGData/CGDataPatchItem.h
 include/llvm/CGData/CodeGenData.h
 include/llvm/CGData/CodeGenData.inc
@@ -465,6 +491,7 @@ 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
@@ -497,8 +524,7 @@ include/llvm/CodeGen/DwarfStringPoolEntry.h
 include/llvm/CodeGen/EarlyIfConversion.h
 include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/ExecutionDomainFix.h
-include/llvm/CodeGen/ExpandFp.h
-include/llvm/CodeGen/ExpandLargeDivRem.h
+include/llvm/CodeGen/ExpandIRInsts.h
 include/llvm/CodeGen/ExpandMemCmp.h
 include/llvm/CodeGen/ExpandPostRAPseudos.h
 include/llvm/CodeGen/ExpandReductions.h
@@ -509,6 +535,7 @@ include/llvm/CodeGen/FaultMaps.h
 include/llvm/CodeGen/FinalizeISel.h
 include/llvm/CodeGen/FixupStatepointCallerSaved.h
 include/llvm/CodeGen/FunctionLoweringInfo.h
+include/llvm/CodeGen/GCEmptyBasicBlocks.h
 include/llvm/CodeGen/GCMetadata.h
 include/llvm/CodeGen/GCMetadataPrinter.h
 include/llvm/CodeGen/GenVT.inc
@@ -555,6 +582,7 @@ include/llvm/CodeGen/JMCInstrumenter.h
 include/llvm/CodeGen/LatencyPriorityQueue.h
 include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
 include/llvm/CodeGen/LexicalScopes.h
+include/llvm/CodeGen/LibcallLoweringInfo.h
 include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveDebugValuesPass.h
@@ -575,7 +603,9 @@ include/llvm/CodeGen/LoopTraversal.h
 include/llvm/CodeGen/LowLevelTypeUtils.h
 include/llvm/CodeGen/LowerEmuTLS.h
 include/llvm/CodeGen/MBFIWrapper.h
+include/llvm/CodeGen/MIR2Vec.h
 include/llvm/CodeGen/MIRFSDiscriminator.h
+include/llvm/CodeGen/MIRFSDiscriminatorOptions.h
 include/llvm/CodeGen/MIRFormatter.h
 include/llvm/CodeGen/MIRParser/MIParser.h
 include/llvm/CodeGen/MIRParser/MIRParser.h
@@ -585,6 +615,7 @@ include/llvm/CodeGen/MIRYamlMapping.h
 include/llvm/CodeGen/MachORelocation.h
 include/llvm/CodeGen/MachineBasicBlock.h
 include/llvm/CodeGen/MachineBlockFrequencyInfo.h
+include/llvm/CodeGen/MachineBlockHashInfo.h
 include/llvm/CodeGen/MachineBlockPlacement.h
 include/llvm/CodeGen/MachineBranchProbabilityInfo.h
 include/llvm/CodeGen/MachineCFGPrinter.h
@@ -653,6 +684,7 @@ include/llvm/CodeGen/PostRAHazardRecognizer.h
 include/llvm/CodeGen/PostRAMachineSink.h
 include/llvm/CodeGen/PostRASchedulerList.h
 include/llvm/CodeGen/PreISelIntrinsicLowering.h
+include/llvm/CodeGen/ProcessImplicitDefs.h
 include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/PseudoSourceValueManager.h
 include/llvm/CodeGen/RDFGraph.h
@@ -750,6 +782,7 @@ include/llvm/Config/Targets.def
 include/llvm/Config/Targets.h
 include/llvm/Config/abi-breaking.h
 include/llvm/Config/llvm-config.h
+include/llvm/DTLTO/DTLTO.h
 include/llvm/DWARFCFIChecker/DWARFCFIAnalysis.h
 include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameAnalyzer.h
 include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameReceiver.h
@@ -1075,6 +1108,7 @@ include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h
 include/llvm/ExecutionEngine/JITLink/ELF_loongarch.h
 include/llvm/ExecutionEngine/JITLink/ELF_ppc64.h
 include/llvm/ExecutionEngine/JITLink/ELF_riscv.h
+include/llvm/ExecutionEngine/JITLink/ELF_systemz.h
 include/llvm/ExecutionEngine/JITLink/ELF_x86.h
 include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h
 include/llvm/ExecutionEngine/JITLink/JITLink.h
@@ -1091,6 +1125,7 @@ include/llvm/ExecutionEngine/JITLink/aarch64.h
 include/llvm/ExecutionEngine/JITLink/loongarch.h
 include/llvm/ExecutionEngine/JITLink/ppc64.h
 include/llvm/ExecutionEngine/JITLink/riscv.h
+include/llvm/ExecutionEngine/JITLink/systemz.h
 include/llvm/ExecutionEngine/JITLink/x86.h
 include/llvm/ExecutionEngine/JITLink/x86_64.h
 include/llvm/ExecutionEngine/JITSymbol.h
@@ -1098,24 +1133,27 @@ include/llvm/ExecutionEngine/MCJIT.h
 include/llvm/ExecutionEngine/OProfileWrapper.h
 include/llvm/ExecutionEngine/ObjectCache.h
 include/llvm/ExecutionEngine/Orc/AbsoluteSymbols.h
+include/llvm/ExecutionEngine/Orc/BacktraceTools.h
 include/llvm/ExecutionEngine/Orc/COFF.h
 include/llvm/ExecutionEngine/Orc/COFFPlatform.h
 include/llvm/ExecutionEngine/Orc/COFFVCRuntimeSupport.h
+include/llvm/ExecutionEngine/Orc/CallSPSViaEPC.h
+include/llvm/ExecutionEngine/Orc/CallViaEPC.h
+include/llvm/ExecutionEngine/Orc/CallableTraitsHelper.h
 include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
 include/llvm/ExecutionEngine/Orc/CompileUtils.h
 include/llvm/ExecutionEngine/Orc/Core.h
 include/llvm/ExecutionEngine/Orc/CoreContainers.h
-include/llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h
 include/llvm/ExecutionEngine/Orc/DebugUtils.h
 include/llvm/ExecutionEngine/Orc/Debugging/DebugInfoSupport.h
 include/llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h
 include/llvm/ExecutionEngine/Orc/Debugging/DebuggerSupportPlugin.h
+include/llvm/ExecutionEngine/Orc/Debugging/ELFDebugObjectPlugin.h
 include/llvm/ExecutionEngine/Orc/Debugging/PerfSupportPlugin.h
 include/llvm/ExecutionEngine/Orc/Debugging/VTuneSupportPlugin.h
 include/llvm/ExecutionEngine/Orc/DylibManager.h
 include/llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h
 include/llvm/ExecutionEngine/Orc/ELFNixPlatform.h
-include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h
 include/llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h
 include/llvm/ExecutionEngine/Orc/EPCGenericDylibManager.h
 include/llvm/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManager.h
@@ -1124,7 +1162,7 @@ include/llvm/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.h
 include/llvm/ExecutionEngine/Orc/EPCIndirectionUtils.h
 include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
 include/llvm/ExecutionEngine/Orc/ExecutorProcessControl.h
-include/llvm/ExecutionEngine/Orc/GetDylibInterface.h
+include/llvm/ExecutionEngine/Orc/ExecutorResolutionGenerator.h
 include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
 include/llvm/ExecutionEngine/Orc/IRPartitionLayer.h
 include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
@@ -1169,19 +1207,24 @@ include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
 include/llvm/ExecutionEngine/Orc/Shared/PerfSharedStructs.h
 include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h
 include/llvm/ExecutionEngine/Orc/Shared/SimpleRemoteEPCUtils.h
+include/llvm/ExecutionEngine/Orc/Shared/SymbolFilter.h
 include/llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h
 include/llvm/ExecutionEngine/Orc/Shared/VTuneSharedStructs.h
 include/llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h
 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/SymbolStringPool.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/DefaultHostBootstrapValues.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorBootstrapService.h
+include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorResolver.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.h
+include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryResolver.h
+include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryScanner.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorDylibManager.h
 include/llvm/ExecutionEngine/Orc/TargetProcess/SimpleExecutorMemoryManager.h
@@ -1191,6 +1234,7 @@ include/llvm/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.h
 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/RTDyldMemoryManager.h
 include/llvm/ExecutionEngine/RuntimeDyld.h
 include/llvm/ExecutionEngine/RuntimeDyldChecker.h
@@ -1202,11 +1246,13 @@ include/llvm/Frontend/Directive/DirectiveBase.td
 include/llvm/Frontend/Directive/Spelling.h
 include/llvm/Frontend/Driver/CodeGenOptions.h
 include/llvm/Frontend/HLSL/CBuffer.h
+include/llvm/Frontend/HLSL/HLSLBinding.h
 include/llvm/Frontend/HLSL/HLSLResource.h
 include/llvm/Frontend/HLSL/HLSLRootSignature.h
 include/llvm/Frontend/HLSL/RootSignatureMetadata.h
 include/llvm/Frontend/HLSL/RootSignatureValidations.h
 include/llvm/Frontend/Offloading/OffloadWrapper.h
+include/llvm/Frontend/Offloading/PropertySet.h
 include/llvm/Frontend/Offloading/Utility.h
 include/llvm/Frontend/OpenACC/ACC.h.inc
 include/llvm/Frontend/OpenACC/ACC.inc
@@ -1279,6 +1325,7 @@ include/llvm/IR/FPEnv.h
 include/llvm/IR/FixedMetadataKinds.def
 include/llvm/IR/FixedPointBuilder.h
 include/llvm/IR/Function.h
+include/llvm/IR/FunctionProperties.def
 include/llvm/IR/GCStrategy.h
 include/llvm/IR/GEPNoWrapFlags.h
 include/llvm/IR/GVMaterializer.h
@@ -1331,6 +1378,7 @@ include/llvm/IR/IntrinsicsRISCV.h
 include/llvm/IR/IntrinsicsRISCV.td
 include/llvm/IR/IntrinsicsRISCVXAndes.td
 include/llvm/IR/IntrinsicsRISCVXCV.td
+include/llvm/IR/IntrinsicsRISCVXMIPS.td
 include/llvm/IR/IntrinsicsRISCVXTHead.td
 include/llvm/IR/IntrinsicsRISCVXsf.td
 include/llvm/IR/IntrinsicsS390.h
@@ -1387,6 +1435,7 @@ include/llvm/IR/SafepointIRVerifier.h
 include/llvm/IR/Statepoint.h
 include/llvm/IR/StructuralHash.h
 include/llvm/IR/SymbolTableListTraits.h
+include/llvm/IR/SystemLibraries.h
 include/llvm/IR/TrackingMDRef.h
 include/llvm/IR/Type.h
 include/llvm/IR/TypeFinder.h
@@ -1440,6 +1489,7 @@ include/llvm/MC/MCCodeView.h
 include/llvm/MC/MCContext.h
 include/llvm/MC/MCDXContainerStreamer.h
 include/llvm/MC/MCDXContainerWriter.h
+include/llvm/MC/MCDecoder.h
 include/llvm/MC/MCDecoderOps.h
 include/llvm/MC/MCDirectives.h
 include/llvm/MC/MCDisassembler/MCDisassembler.h
@@ -1478,6 +1528,7 @@ include/llvm/MC/MCParser/MCTargetAsmParser.h
 include/llvm/MC/MCPseudoProbe.h
 include/llvm/MC/MCRegister.h
 include/llvm/MC/MCRegisterInfo.h
+include/llvm/MC/MCSFrame.h
 include/llvm/MC/MCSPIRVObjectWriter.h
 include/llvm/MC/MCSPIRVStreamer.h
 include/llvm/MC/MCSchedule.h
@@ -1544,6 +1595,8 @@ include/llvm/ObjCopy/COFF/COFFConfig.h
 include/llvm/ObjCopy/COFF/COFFObjcopy.h
 include/llvm/ObjCopy/CommonConfig.h
 include/llvm/ObjCopy/ConfigManager.h
+include/llvm/ObjCopy/DXContainer/DXContainerConfig.h
+include/llvm/ObjCopy/DXContainer/DXContainerObjcopy.h
 include/llvm/ObjCopy/ELF/ELFConfig.h
 include/llvm/ObjCopy/ELF/ELFObjcopy.h
 include/llvm/ObjCopy/MachO/MachOConfig.h
@@ -1582,6 +1635,7 @@ include/llvm/Object/ObjectFile.h
 include/llvm/Object/OffloadBinary.h
 include/llvm/Object/OffloadBundle.h
 include/llvm/Object/RelocationResolver.h
+include/llvm/Object/SFrameParser.h
 include/llvm/Object/StackMapParser.h
 include/llvm/Object/SymbolSize.h
 include/llvm/Object/SymbolicFile.h
@@ -1625,9 +1679,9 @@ include/llvm/Passes/CodeGenPassBuilder.h
 include/llvm/Passes/MachinePassRegistry.def
 include/llvm/Passes/OptimizationLevel.h
 include/llvm/Passes/PassBuilder.h
-include/llvm/Passes/PassPlugin.h
 include/llvm/Passes/StandardInstrumentations.h
 include/llvm/Passes/TargetPassRegistry.inc
+include/llvm/Plugins/PassPlugin.h
 include/llvm/ProfileData/Coverage/CoverageMapping.h
 include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
@@ -1661,7 +1715,6 @@ include/llvm/ProfileData/SampleProfReader.h
 include/llvm/ProfileData/SampleProfWriter.h
 include/llvm/ProfileData/SymbolRemappingReader.h
 include/llvm/Remarks/BitstreamRemarkContainer.h
-include/llvm/Remarks/BitstreamRemarkParser.h
 include/llvm/Remarks/BitstreamRemarkSerializer.h
 include/llvm/Remarks/HotnessThresholdParser.h
 include/llvm/Remarks/Remark.h
@@ -1703,8 +1756,10 @@ include/llvm/Support/ARMWinEH.h
 include/llvm/Support/AdvisoryLock.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Alignment.h
+include/llvm/Support/AllocToken.h
 include/llvm/Support/Allocator.h
 include/llvm/Support/AllocatorBase.h
+include/llvm/Support/AlwaysTrue.h
 include/llvm/Support/ArrayRecycler.h
 include/llvm/Support/Atomic.h
 include/llvm/Support/AtomicOrdering.h
@@ -1753,6 +1808,7 @@ include/llvm/Support/DataExtractor.h
 include/llvm/Support/DataTypes.h
 include/llvm/Support/Debug.h
 include/llvm/Support/DebugCounter.h
+include/llvm/Support/DebugLog.h
 include/llvm/Support/Discriminator.h
 include/llvm/Support/DivisionByConstantInfo.h
 include/llvm/Support/Duration.h
@@ -1791,18 +1847,26 @@ 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
 include/llvm/Support/HexagonAttributes.h
+include/llvm/Support/IOSandbox.h
 include/llvm/Support/InitLLVM.h
 include/llvm/Support/InstructionCost.h
+include/llvm/Support/IntegerInclusiveInterval.h
 include/llvm/Support/InterleavedRange.h
 include/llvm/Support/JSON.h
+include/llvm/Support/Jobserver.h
 include/llvm/Support/KnownBits.h
 include/llvm/Support/KnownFPClass.h
 include/llvm/Support/LEB128.h
 include/llvm/Support/LICENSE.TXT
 include/llvm/Support/LLVMDriver.h
+include/llvm/Support/LSP/Logging.h
+include/llvm/Support/LSP/Protocol.h
+include/llvm/Support/LSP/Transport.h
 include/llvm/Support/LineIterator.h
 include/llvm/Support/Locale.h
 include/llvm/Support/LockFileManager.h
@@ -1866,7 +1930,7 @@ include/llvm/Support/SuffixTree.h
 include/llvm/Support/SuffixTreeNode.h
 include/llvm/Support/SwapByteOrder.h
 include/llvm/Support/SystemUtils.h
-include/llvm/Support/SystemZ/zOSSupport.h
+include/llvm/Support/SystemZ/zos_wrappers/string.h
 include/llvm/Support/TarWriter.h
 include/llvm/Support/TargetOpcodes.def
 include/llvm/Support/TargetSelect.h
@@ -1887,6 +1951,12 @@ include/llvm/Support/VCSRevision.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/VersionTuple.h
 include/llvm/Support/VirtualFileSystem.h
+include/llvm/Support/VirtualOutputBackend.h
+include/llvm/Support/VirtualOutputBackends.h
+include/llvm/Support/VirtualOutputConfig.def
+include/llvm/Support/VirtualOutputConfig.h
+include/llvm/Support/VirtualOutputError.h
+include/llvm/Support/VirtualOutputFile.h
 include/llvm/Support/Watchdog.h
 include/llvm/Support/Win64EH.h
 include/llvm/Support/Windows/WindowsSupport.h
@@ -1900,6 +1970,7 @@ include/llvm/Support/circular_raw_ostream.h
 include/llvm/Support/float128.h
 include/llvm/Support/raw_os_ostream.h
 include/llvm/Support/raw_ostream.h
+include/llvm/Support/raw_ostream_proxy.h
 include/llvm/Support/raw_sha1_ostream.h
 include/llvm/Support/raw_socket_stream.h
 include/llvm/Support/thread.h
@@ -1907,6 +1978,7 @@ include/llvm/Support/type_traits.h
 include/llvm/Support/xxhash.h
 include/llvm/TableGen/AArch64ImmCheck.h
 include/llvm/TableGen/Automaton.td
+include/llvm/TableGen/CodeGenHelpers.h
 include/llvm/TableGen/DirectiveEmitter.h
 include/llvm/TableGen/Error.h
 include/llvm/TableGen/Main.h
@@ -1962,6 +2034,8 @@ include/llvm/TargetParser/TargetParser.h
 include/llvm/TargetParser/Triple.h
 include/llvm/TargetParser/X86TargetParser.def
 include/llvm/TargetParser/X86TargetParser.h
+include/llvm/TargetParser/XtensaTargetParser.def
+include/llvm/TargetParser/XtensaTargetParser.h
 include/llvm/Telemetry/Telemetry.h
 include/llvm/Testing/ADT/StringMap.h
 include/llvm/Testing/ADT/StringMapEntry.h
@@ -2053,6 +2127,7 @@ include/llvm/Transforms/InstCombine/InstCombiner.h
 include/llvm/Transforms/Instrumentation/AddressSanitizer.h
 include/llvm/Transforms/Instrumentation/AddressSanitizerCommon.h
 include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h
+include/llvm/Transforms/Instrumentation/AllocToken.h
 include/llvm/Transforms/Instrumentation/BlockCoverageInference.h
 include/llvm/Transforms/Instrumentation/BoundsChecking.h
 include/llvm/Transforms/Instrumentation/CFGMST.h
@@ -2091,6 +2166,7 @@ include/llvm/Transforms/Scalar/DCE.h
 include/llvm/Transforms/Scalar/DFAJumpThreading.h
 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/FlattenCFG.h
 include/llvm/Transforms/Scalar/Float2Int.h
@@ -2178,6 +2254,7 @@ include/llvm/Transforms/Utils/ControlFlowUtils.h
 include/llvm/Transforms/Utils/CountVisits.h
 include/llvm/Transforms/Utils/CtorUtils.h
 include/llvm/Transforms/Utils/DXILUpgrade.h
+include/llvm/Transforms/Utils/DebugSSAUpdater.h
 include/llvm/Transforms/Utils/Debugify.h
 include/llvm/Transforms/Utils/DeclareRuntimeLibcalls.h
 include/llvm/Transforms/Utils/EntryExitInstrumenter.h
@@ -2224,6 +2301,7 @@ include/llvm/Transforms/Utils/ModuleUtils.h
 include/llvm/Transforms/Utils/MoveAutoInit.h
 include/llvm/Transforms/Utils/NameAnonGlobals.h
 include/llvm/Transforms/Utils/PredicateInfo.h
+include/llvm/Transforms/Utils/ProfileVerify.h
 include/llvm/Transforms/Utils/PromoteMemToReg.h
 include/llvm/Transforms/Utils/RelLookupTableConverter.h
 include/llvm/Transforms/Utils/SCCPSolver.h
@@ -2240,6 +2318,7 @@ include/llvm/Transforms/Utils/SimplifyIndVar.h
 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/StripGCRelocates.h
 include/llvm/Transforms/Utils/StripNonLineTableDebugInfo.h
 include/llvm/Transforms/Utils/SymbolRewriter.h
@@ -2248,7 +2327,6 @@ include/llvm/Transforms/Utils/UnifyLoopExits.h
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/VNCoercion.h
 include/llvm/Transforms/Utils/ValueMapper.h
-include/llvm/Transforms/Vectorize/EVLIndVarSimplify.h
 include/llvm/Transforms/Vectorize/LoadStoreVectorizer.h
 include/llvm/Transforms/Vectorize/LoopIdiomVectorize.h
 include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h
@@ -2338,15 +2416,16 @@ 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-21.${SHLIB_EXT}
+lib/libLLVM-22.${SHLIB_EXT}
 lib/libLLVM.${SHLIB_EXT}
-${PLIST.notdylib}lib/libLLVM.${SHLIB_EXT}.21.1
+${PLIST.notdylib}lib/libLLVM.${SHLIB_EXT}.22.1
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a
 ${PLIST.AArch64}lib/libLLVMAArch64Desc.a
 ${PLIST.AArch64}lib/libLLVMAArch64Disassembler.a
 ${PLIST.AArch64}lib/libLLVMAArch64Info.a
 ${PLIST.AArch64}lib/libLLVMAArch64Utils.a
+lib/libLLVMABI.a
 ${PLIST.AMDGPU}lib/libLLVMAMDGPUAsmParser.a
 ${PLIST.AMDGPU}lib/libLLVMAMDGPUCodeGen.a
 ${PLIST.AMDGPU}lib/libLLVMAMDGPUDesc.a
@@ -2382,6 +2461,7 @@ lib/libLLVMBinaryFormat.a
 lib/libLLVMBitReader.a
 lib/libLLVMBitWriter.a
 lib/libLLVMBitstreamReader.a
+lib/libLLVMCAS.a
 lib/libLLVMCFGuard.a
 lib/libLLVMCFIVerify.a
 lib/libLLVMCGData.a
@@ -2395,6 +2475,7 @@ lib/libLLVMCodeGenTypes.a
 lib/libLLVMCore.a
 lib/libLLVMCoroutines.a
 lib/libLLVMCoverage.a
+lib/libLLVMDTLTO.a
 lib/libLLVMDWARFCFIChecker.a
 lib/libLLVMDWARFLinker.a
 lib/libLLVMDWARFLinkerClassic.a
@@ -2498,6 +2579,7 @@ lib/libLLVMOrcJIT.a
 lib/libLLVMOrcShared.a
 lib/libLLVMOrcTargetProcess.a
 lib/libLLVMPasses.a
+lib/libLLVMPlugins.a
 ${PLIST.PowerPC}lib/libLLVMPowerPCAsmParser.a
 ${PLIST.PowerPC}lib/libLLVMPowerPCCodeGen.a
 ${PLIST.PowerPC}lib/libLLVMPowerPCDesc.a
@@ -2525,6 +2607,7 @@ ${PLIST.Sparc}lib/libLLVMSparcDesc.a
 ${PLIST.Sparc}lib/libLLVMSparcDisassembler.a
 ${PLIST.Sparc}lib/libLLVMSparcInfo.a
 lib/libLLVMSupport.a
+lib/libLLVMSupportLSP.a
 lib/libLLVMSymbolize.a
 ${PLIST.SystemZ}lib/libLLVMSystemZAsmParser.a
 ${PLIST.SystemZ}lib/libLLVMSystemZCodeGen.a
@@ -2572,9 +2655,9 @@ ${PLIST.Xtensa}lib/libLLVMXtensaDisassembler.a
 ${PLIST.Xtensa}lib/libLLVMXtensaInfo.a
 lib/libLLVMipo.a
 lib/libLTO.${SHLIB_EXT}
-${PLIST.notdylib}lib/libLTO.${SHLIB_EXT}.21.1
+${PLIST.notdylib}lib/libLTO.${SHLIB_EXT}.22.1
 lib/libRemarks.${SHLIB_EXT}
-${PLIST.notdylib}lib/libRemarks.${SHLIB_EXT}.21.1
+${PLIST.notdylib}lib/libRemarks.${SHLIB_EXT}.22.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 15b017f75a..91bc6dd566 100644
--- a/llvm/buildlink3.mk
+++ b/llvm/buildlink3.mk
@@ -13,6 +13,7 @@ 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
diff --git a/llvm/distinfo b/llvm/distinfo
index e41117e843..72c3dd672b 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.41 2023/03/05 17:26:09 he Exp $
 
-BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
-SHA1 (patch-CMakeLists.txt) = c53cef61bdaeaf5216b78330992357a632a2b0b2
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
+SHA1 (patch-CMakeLists.txt) = e7ed5046d2f6f2f6338bc842e83666ed109bd2b0
 SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
-SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4e6668e0c3e13423ce3e19304f4ad60f66d41562
+SHA1 (patch-cmake_modules_AddLLVM.cmake) = a1a1ef44dfb5a3298587b40e0e56704fd5bbe3b8
 SHA1 (patch-include_llvm-c_DataTypes.h) = ff547cae5bdf90c5a1371b9eb196e7537a03b18d
 SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 92558f2d7d87b7a26f7f3a2b3b3dc539ae13e672
-SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = 8b18659fe7189c9077b0409e123d41c01e8c8610
+SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = e6f223e68b8ef03175282af1afbfcd7e0b30c6ca
diff --git a/llvm/patches/patch-CMakeLists.txt b/llvm/patches/patch-CMakeLists.txt
index fcb6a9fda9..26e19cfd11 100644
--- a/llvm/patches/patch-CMakeLists.txt
+++ b/llvm/patches/patch-CMakeLists.txt
@@ -2,14 +2,13 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2022/11/14 18:44:05 adam Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
---- CMakeLists.txt.orig	2022-09-20 06:05:50.000000000 +0000
+--- CMakeLists.txt.orig	2026-03-23 18:46:22.000000000 +0000
 +++ CMakeLists.txt
-@@ -1074,7 +1074,7 @@ endif()
+@@ -1290,7 +1290,6 @@ endif()
  
- if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
+ if( "${CMAKE_SYSTEM_NAME}" MATCHES SunOS )
     # special hack for Solaris to handle crazy system sys/regset.h
 -   include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")
-+   # include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")
- endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
+ endif( "${CMAKE_SYSTEM_NAME}" MATCHES SunOS )
  
  # Make sure we don't get -rdynamic in every binary. For those that need it,
diff --git a/llvm/patches/patch-cmake_modules_AddLLVM.cmake b/llvm/patches/patch-cmake_modules_AddLLVM.cmake
index d85757f2a5..b04672c217 100644
--- a/llvm/patches/patch-cmake_modules_AddLLVM.cmake
+++ b/llvm/patches/patch-cmake_modules_AddLLVM.cmake
@@ -3,9 +3,9 @@ $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	2022-09-20 06:05:50.000000000 +0000
+--- cmake/modules/AddLLVM.cmake.orig	2026-03-23 18:46:22.000000000 +0000
 +++ cmake/modules/AddLLVM.cmake
-@@ -627,7 +627,7 @@ function(llvm_add_library name)
+@@ -723,7 +723,7 @@ function(llvm_add_library name)
    endif()
  
    if(ARG_SHARED)
@@ -14,12 +14,12 @@ On Darwin, use correct install-name for shared libraries.
        get_target_property(output_name ${name} OUTPUT_NAME)
        if(${output_name} STREQUAL "output_name-NOTFOUND")
          set(output_name ${name})
-@@ -2270,7 +2270,7 @@ function(llvm_setup_rpath name)
+@@ -2554,7 +2554,7 @@ function(llvm_setup_rpath name)
    endif()
  
    if (APPLE)
 -    set(_install_name_dir INSTALL_NAME_DIR "@rpath")
 +    set(_install_name_dir INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
      set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
+   elseif("${CMAKE_SYSTEM_NAME}" MATCHES "AIX" AND BUILD_SHARED_LIBS)
      # $ORIGIN is not interpreted at link time by aix ld.
diff --git a/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt b/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt
index 640e1d3056..5ca92e4597 100644
--- a/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt
+++ b/llvm/patches/patch-utils_llvm-lit_CMakeLists.txt
@@ -2,10 +2,10 @@ $NetBSD$
 
 Install llvm-lit; needed for flang.
 
---- utils/llvm-lit/CMakeLists.txt.orig	2023-06-04 19:54:04.000000000 +0000
+--- utils/llvm-lit/CMakeLists.txt.orig	2026-03-23 18:46:22.000000000 +0000
 +++ utils/llvm-lit/CMakeLists.txt
-@@ -43,3 +43,4 @@ else()
-     ${LIT_BASE_DIR}/${LIT_FILE_NAME}
-     )
+@@ -58,3 +58,4 @@ else()
+       NEWLINE_STYLE DOS)
+   endif()  
  endif()
 +install(PROGRAMS ${LIT_BASE_DIR}/${LIT_FILE_NAME} DESTINATION bin)
diff --git a/llvm/version.mk b/llvm/version.mk
index 7425e7a576..44e29df284 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -14,7 +14,7 @@
 # used by lang/wasi-libcxx
 # used by parallel/openmp
 
-LLVM_VERSION=	21.1.8
+LLVM_VERSION=	22.1.2
 
 DISTNAME=	llvm-project-${LLVM_VERSION}.src
 MASTER_SITES=	${MASTER_SITE_GITHUB:=llvm/}
diff --git a/mlir/Makefile b/mlir/Makefile
index 415dea10fa..e3d16c60e0 100644
--- a/mlir/Makefile
+++ b/mlir/Makefile
@@ -6,7 +6,7 @@ PKGNAME=	mlir-${LLVM_VERSION}
 CATEGORIES=	lang devel
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://mlir.llvm.org/
+HOMEPAGE=	https://mlir.llvm.org/
 COMMENT=	Multi-Level Intermediate Representation
 LICENSE=	apache-2.0
 
@@ -19,7 +19,7 @@ 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.
-CMAKE_CONFIGURE_ARGS+=  -DMLIR_LINK_MLIR_DYLIB=OFF
+CMAKE_CONFIGURE_ARGS+=	-DMLIR_LINK_MLIR_DYLIB=OFF
 
 .include "../../devel/cmake/build.mk"
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/mlir/PLIST b/mlir/PLIST
index 6cf1a8f2e5..840c365656 100644
--- a/mlir/PLIST
+++ b/mlir/PLIST
@@ -9,9 +9,17 @@ 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
+include/mlir-c/Dialect/ArmSME.h
+include/mlir-c/Dialect/ArmSVE.h
 include/mlir-c/Dialect/Async.h
+include/mlir-c/Dialect/Bufferization.h
+include/mlir-c/Dialect/Complex.h
 include/mlir-c/Dialect/ControlFlow.h
+include/mlir-c/Dialect/DLTI.h
 include/mlir-c/Dialect/EmitC.h
 include/mlir-c/Dialect/Func.h
 include/mlir-c/Dialect/GPU.h
@@ -20,23 +28,35 @@ include/mlir-c/Dialect/Index.h
 include/mlir-c/Dialect/LLVM.h
 include/mlir-c/Dialect/Linalg.h
 include/mlir-c/Dialect/MLProgram.h
+include/mlir-c/Dialect/MPI.h
 include/mlir-c/Dialect/Math.h
 include/mlir-c/Dialect/MemRef.h
 include/mlir-c/Dialect/NVGPU.h
 include/mlir-c/Dialect/NVVM.h
+include/mlir-c/Dialect/OpenACC.h
 include/mlir-c/Dialect/OpenMP.h
 include/mlir-c/Dialect/PDL.h
+include/mlir-c/Dialect/PDLInterp.h
+include/mlir-c/Dialect/Ptr.h
 include/mlir-c/Dialect/Quant.h
 include/mlir-c/Dialect/ROCDL.h
 include/mlir-c/Dialect/SCF.h
 include/mlir-c/Dialect/SMT.h
 include/mlir-c/Dialect/SPIRV.h
 include/mlir-c/Dialect/Shape.h
+include/mlir-c/Dialect/Shard.h
 include/mlir-c/Dialect/SparseTensor.h
 include/mlir-c/Dialect/Tensor.h
+include/mlir-c/Dialect/Tosa.h
 include/mlir-c/Dialect/Transform.h
 include/mlir-c/Dialect/Transform/Interpreter.h
+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/XeGPU.h
+include/mlir-c/Dialect/XeVM.h
 include/mlir-c/ExecutionEngine.h
 include/mlir-c/IR.h
 include/mlir-c/IntegerSet.h
@@ -58,6 +78,7 @@ include/mlir/Analysis/DataFlow/DenseAnalysis.h
 include/mlir/Analysis/DataFlow/IntegerRangeAnalysis.h
 include/mlir/Analysis/DataFlow/LivenessAnalysis.h
 include/mlir/Analysis/DataFlow/SparseAnalysis.h
+include/mlir/Analysis/DataFlow/StridedMetadataRangeAnalysis.h
 include/mlir/Analysis/DataFlow/Utils.h
 include/mlir/Analysis/DataFlowFramework.h
 include/mlir/Analysis/DataLayoutAnalysis.h
@@ -83,10 +104,13 @@ include/mlir/AsmParser/AsmParser.h
 include/mlir/AsmParser/AsmParserState.h
 include/mlir/AsmParser/CodeComplete.h
 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/IRTypes.h
 include/mlir/Bindings/Python/Nanobind.h
 include/mlir/Bindings/Python/NanobindAdaptors.h
-include/mlir/Bindings/Python/PybindAdaptors.h
+include/mlir/Bindings/Python/NanobindUtils.h
 include/mlir/Bytecode/BytecodeImplementation.h
 include/mlir/Bytecode/BytecodeOpInterface.cpp.inc
 include/mlir/Bytecode/BytecodeOpInterface.h
@@ -112,6 +136,8 @@ include/mlir/CAPI/Wrap.h
 include/mlir/Config/mlir-config.h
 include/mlir/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.h
 include/mlir/Conversion/AffineToStandard/AffineToStandard.h
+include/mlir/Conversion/ArithAndMathToAPFloat/ArithToAPFloat.h
+include/mlir/Conversion/ArithAndMathToAPFloat/MathToAPFloat.h
 include/mlir/Conversion/ArithCommon/AttrToLLVMConverter.h
 include/mlir/Conversion/ArithToAMDGPU/ArithToAMDGPU.h
 include/mlir/Conversion/ArithToArmSME/ArithToArmSME.h
@@ -127,6 +153,7 @@ include/mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h
 include/mlir/Conversion/ComplexCommon/DivisionConverter.h
 include/mlir/Conversion/ComplexToLLVM/ComplexToLLVM.h
 include/mlir/Conversion/ComplexToLibm/ComplexToLibm.h
+include/mlir/Conversion/ComplexToROCDLLibraryCalls/ComplexToROCDLLibraryCalls.h
 include/mlir/Conversion/ComplexToSPIRV/ComplexToSPIRV.h
 include/mlir/Conversion/ComplexToSPIRV/ComplexToSPIRVPass.h
 include/mlir/Conversion/ComplexToStandard/ComplexToStandard.h
@@ -179,12 +206,12 @@ include/mlir/Conversion/MathToLibm/MathToLibm.h
 include/mlir/Conversion/MathToROCDL/MathToROCDL.h
 include/mlir/Conversion/MathToSPIRV/MathToSPIRV.h
 include/mlir/Conversion/MathToSPIRV/MathToSPIRVPass.h
+include/mlir/Conversion/MathToXeVM/MathToXeVM.h
 include/mlir/Conversion/MemRefToEmitC/MemRefToEmitC.h
 include/mlir/Conversion/MemRefToEmitC/MemRefToEmitCPass.h
 include/mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h
 include/mlir/Conversion/MemRefToSPIRV/MemRefToSPIRV.h
 include/mlir/Conversion/MemRefToSPIRV/MemRefToSPIRVPass.h
-include/mlir/Conversion/MeshToMPI/MeshToMPI.h
 include/mlir/Conversion/NVGPUToNVVM/NVGPUToNVVM.h
 include/mlir/Conversion/NVVMToLLVM/NVVMToLLVM.h
 include/mlir/Conversion/OpenACCToSCF/ConvertOpenACCToSCF.h
@@ -195,6 +222,7 @@ include/mlir/Conversion/Passes.capi.h.inc
 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/ReconcileUnrealizedCasts/ReconcileUnrealizedCasts.h
 include/mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h
 include/mlir/Conversion/SCFToEmitC/SCFToEmitC.h
@@ -207,6 +235,7 @@ include/mlir/Conversion/SPIRVCommon/AttrToLLVMConverter.h
 include/mlir/Conversion/SPIRVToLLVM/SPIRVToLLVM.h
 include/mlir/Conversion/SPIRVToLLVM/SPIRVToLLVMPass.h
 include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
+include/mlir/Conversion/ShardToMPI/ShardToMPI.h
 include/mlir/Conversion/TensorToLinalg/TensorToLinalg.h
 include/mlir/Conversion/TensorToLinalg/TensorToLinalgPass.h
 include/mlir/Conversion/TensorToSPIRV/TensorToSPIRV.h
@@ -218,6 +247,7 @@ include/mlir/Conversion/TosaToSCF/TosaToSCF.h
 include/mlir/Conversion/TosaToTensor/TosaToTensor.h
 include/mlir/Conversion/UBToLLVM/UBToLLVM.h
 include/mlir/Conversion/UBToSPIRV/UBToSPIRV.h
+include/mlir/Conversion/VectorToAMX/VectorToAMX.h
 include/mlir/Conversion/VectorToArmSME/VectorToArmSME.h
 include/mlir/Conversion/VectorToGPU/VectorToGPU.h
 include/mlir/Conversion/VectorToLLVM/ConvertVectorToLLVM.h
@@ -226,6 +256,7 @@ include/mlir/Conversion/VectorToSCF/VectorToSCF.h
 include/mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h
 include/mlir/Conversion/VectorToSPIRV/VectorToSPIRVPass.h
 include/mlir/Conversion/VectorToXeGPU/VectorToXeGPU.h
+include/mlir/Conversion/XeGPUToXeVM/XeGPUToXeVM.h
 include/mlir/Conversion/XeVMToLLVM/XeVMToLLVM.h
 include/mlir/Debug/BreakpointManager.h
 include/mlir/Debug/BreakpointManagers/FileLineColLocBreakpointManager.h
@@ -248,6 +279,8 @@ include/mlir/Dialect/AMDGPU/IR/AMDGPUEnums.cpp.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPUEnums.h.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPUTypes.cpp.inc
 include/mlir/Dialect/AMDGPU/IR/AMDGPUTypes.h.inc
+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
@@ -285,13 +318,15 @@ include/mlir/Dialect/Affine/IR/AffineValueMap.h
 include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h
 include/mlir/Dialect/Affine/LoopFusionUtils.h
 include/mlir/Dialect/Affine/LoopUtils.h
-include/mlir/Dialect/Affine/Passes.h
-include/mlir/Dialect/Affine/Passes.h.inc
-include/mlir/Dialect/Affine/Passes.td
 include/mlir/Dialect/Affine/TransformOps/AffineTransformOps.cpp.inc
 include/mlir/Dialect/Affine/TransformOps/AffineTransformOps.h
 include/mlir/Dialect/Affine/TransformOps/AffineTransformOps.h.inc
 include/mlir/Dialect/Affine/TransformOps/AffineTransformOps.td
+include/mlir/Dialect/Affine/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Affine/Transforms/Passes.capi.h.inc
+include/mlir/Dialect/Affine/Transforms/Passes.h
+include/mlir/Dialect/Affine/Transforms/Passes.h.inc
+include/mlir/Dialect/Affine/Transforms/Passes.td
 include/mlir/Dialect/Affine/Transforms/Transforms.h
 include/mlir/Dialect/Affine/Utils.h
 include/mlir/Dialect/Affine/ViewLikeInterfaceUtils.h
@@ -316,6 +351,8 @@ include/mlir/Dialect/Arith/Transforms/BufferDeallocationOpInterfaceImpl.h
 include/mlir/Dialect/Arith/Transforms/BufferViewFlowOpInterfaceImpl.h
 include/mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h
 include/mlir/Dialect/Arith/Transforms/NarrowTypeEmulationConverter.h
+include/mlir/Dialect/Arith/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Arith/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Arith/Transforms/Passes.h
 include/mlir/Dialect/Arith/Transforms/Passes.h.inc
 include/mlir/Dialect/Arith/Transforms/Passes.td
@@ -361,6 +398,8 @@ include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td
 include/mlir/Dialect/ArmSME/IR/ArmSMEOpsConversions.inc
 include/mlir/Dialect/ArmSME/IR/ArmSMETypes.cpp.inc
 include/mlir/Dialect/ArmSME/IR/ArmSMETypes.h.inc
+include/mlir/Dialect/ArmSME/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/ArmSME/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/ArmSME/Transforms/Passes.h
 include/mlir/Dialect/ArmSME/Transforms/Passes.h.inc
 include/mlir/Dialect/ArmSME/Transforms/Passes.td
@@ -381,6 +420,8 @@ include/mlir/Dialect/ArmSVE/TransformOps/ArmSVEVectorTransformOps.cpp.inc
 include/mlir/Dialect/ArmSVE/TransformOps/ArmSVEVectorTransformOps.h
 include/mlir/Dialect/ArmSVE/TransformOps/ArmSVEVectorTransformOps.h.inc
 include/mlir/Dialect/ArmSVE/TransformOps/ArmSVEVectorTransformOps.td
+include/mlir/Dialect/ArmSVE/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/ArmSVE/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/ArmSVE/Transforms/Passes.h
 include/mlir/Dialect/ArmSVE/Transforms/Passes.h.inc
 include/mlir/Dialect/ArmSVE/Transforms/Passes.td
@@ -447,6 +488,8 @@ include/mlir/Dialect/Bufferization/Transforms/Bufferize.h
 include/mlir/Dialect/Bufferization/Transforms/FuncBufferizableOpInterfaceImpl.h
 include/mlir/Dialect/Bufferization/Transforms/OneShotAnalysis.h
 include/mlir/Dialect/Bufferization/Transforms/OneShotModuleBufferize.h
+include/mlir/Dialect/Bufferization/Transforms/Passes.capi.cpp.inc
+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
@@ -477,6 +520,7 @@ include/mlir/Dialect/ControlFlow/IR/ControlFlowOpsTypes.cpp.inc
 include/mlir/Dialect/ControlFlow/IR/ControlFlowOpsTypes.h.inc
 include/mlir/Dialect/ControlFlow/Transforms/BufferDeallocationOpInterfaceImpl.h
 include/mlir/Dialect/ControlFlow/Transforms/BufferizableOpInterfaceImpl.h
+include/mlir/Dialect/ControlFlow/Transforms/StructuralTypeConversions.h
 include/mlir/Dialect/DLTI/DLTI.cpp.inc
 include/mlir/Dialect/DLTI/DLTI.h
 include/mlir/Dialect/DLTI/DLTI.h.inc
@@ -513,6 +557,8 @@ include/mlir/Dialect/EmitC/IR/EmitCInterfaces.td
 include/mlir/Dialect/EmitC/IR/EmitCTypes.cpp.inc
 include/mlir/Dialect/EmitC/IR/EmitCTypes.h.inc
 include/mlir/Dialect/EmitC/IR/EmitCTypes.td
+include/mlir/Dialect/EmitC/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/EmitC/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/EmitC/Transforms/Passes.h
 include/mlir/Dialect/EmitC/Transforms/Passes.h.inc
 include/mlir/Dialect/EmitC/Transforms/Passes.td
@@ -520,7 +566,7 @@ include/mlir/Dialect/EmitC/Transforms/Transforms.h
 include/mlir/Dialect/EmitC/Transforms/TypeConversions.h
 include/mlir/Dialect/Func/Extensions/AllExtensions.h
 include/mlir/Dialect/Func/Extensions/InlinerExtension.h
-include/mlir/Dialect/Func/Extensions/MeshShardingExtensions.h
+include/mlir/Dialect/Func/Extensions/ShardingExtensions.h
 include/mlir/Dialect/Func/IR/FuncOps.cpp.inc
 include/mlir/Dialect/Func/IR/FuncOps.h
 include/mlir/Dialect/Func/IR/FuncOps.h.inc
@@ -532,6 +578,8 @@ include/mlir/Dialect/Func/TransformOps/FuncTransformOps.h
 include/mlir/Dialect/Func/TransformOps/FuncTransformOps.h.inc
 include/mlir/Dialect/Func/TransformOps/FuncTransformOps.td
 include/mlir/Dialect/Func/Transforms/FuncConversions.h
+include/mlir/Dialect/Func/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Func/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Func/Transforms/Passes.h
 include/mlir/Dialect/Func/Transforms/Passes.h.inc
 include/mlir/Dialect/Func/Transforms/Passes.td
@@ -637,6 +685,8 @@ include/mlir/Dialect/LLVMIR/LLVMConversions.inc
 include/mlir/Dialect/LLVMIR/LLVMConvertibleLLVMIRIntrinsics.inc
 include/mlir/Dialect/LLVMIR/LLVMDialect.h
 include/mlir/Dialect/LLVMIR/LLVMDialect.td
+include/mlir/Dialect/LLVMIR/LLVMDialectBytecode.cpp.inc
+include/mlir/Dialect/LLVMIR/LLVMDialectBytecode.td
 include/mlir/Dialect/LLVMIR/LLVMEnums.td
 include/mlir/Dialect/LLVMIR/LLVMInterfaces.cpp.inc
 include/mlir/Dialect/LLVMIR/LLVMInterfaces.h
@@ -700,10 +750,13 @@ 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
 include/mlir/Dialect/LLVMIR/Transforms/Passes.h.inc
 include/mlir/Dialect/LLVMIR/Transforms/Passes.td
 include/mlir/Dialect/LLVMIR/Transforms/RequestCWrappers.h
+include/mlir/Dialect/LLVMIR/Transforms/UseDefaultVisibilityPass.h
 include/mlir/Dialect/LLVMIR/VCIXConversions.inc
 include/mlir/Dialect/LLVMIR/VCIXDialect.h
 include/mlir/Dialect/LLVMIR/VCIXOps.cpp.inc
@@ -782,8 +835,8 @@ include/mlir/Dialect/Linalg/TransformOps/Syntax.h
 include/mlir/Dialect/Linalg/Transforms/AllInterfaces.h
 include/mlir/Dialect/Linalg/Transforms/BufferizableOpInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/Hoisting.h
-include/mlir/Dialect/Linalg/Transforms/MeshShardingInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/RuntimeOpVerification.h
+include/mlir/Dialect/Linalg/Transforms/ShardingInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/SubsetInsertionOpInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/TilingInterfaceImpl.h
 include/mlir/Dialect/Linalg/Transforms/Transforms.h
@@ -806,6 +859,8 @@ include/mlir/Dialect/MLProgram/IR/MLProgramTypes.h
 include/mlir/Dialect/MLProgram/IR/MLProgramTypes.h.inc
 include/mlir/Dialect/MLProgram/IR/MLProgramTypes.td
 include/mlir/Dialect/MLProgram/Transforms/BufferizableOpInterfaceImpl.h
+include/mlir/Dialect/MLProgram/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/MLProgram/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/MLProgram/Transforms/Passes.h
 include/mlir/Dialect/MLProgram/Transforms/Passes.h.inc
 include/mlir/Dialect/MLProgram/Transforms/Passes.td
@@ -837,6 +892,8 @@ include/mlir/Dialect/Math/IR/MathOpsDialect.h.inc
 include/mlir/Dialect/Math/IR/MathOpsTypes.cpp.inc
 include/mlir/Dialect/Math/IR/MathOpsTypes.h.inc
 include/mlir/Dialect/Math/Transforms/Approximation.h
+include/mlir/Dialect/Math/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Math/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Math/Transforms/Passes.h
 include/mlir/Dialect/Math/Transforms/Passes.h.inc
 include/mlir/Dialect/Math/Transforms/Passes.td
@@ -858,37 +915,14 @@ include/mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.td
 include/mlir/Dialect/MemRef/Transforms/AllocationOpInterfaceImpl.h
 include/mlir/Dialect/MemRef/Transforms/BufferViewFlowOpInterfaceImpl.h
 include/mlir/Dialect/MemRef/Transforms/ComposeSubView.h
+include/mlir/Dialect/MemRef/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/MemRef/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/MemRef/Transforms/Passes.h
 include/mlir/Dialect/MemRef/Transforms/Passes.h.inc
 include/mlir/Dialect/MemRef/Transforms/Passes.td
 include/mlir/Dialect/MemRef/Transforms/RuntimeOpVerification.h
 include/mlir/Dialect/MemRef/Transforms/Transforms.h
 include/mlir/Dialect/MemRef/Utils/MemRefUtils.h
-include/mlir/Dialect/Mesh/IR/MeshAttributes.cpp.inc
-include/mlir/Dialect/Mesh/IR/MeshAttributes.h.inc
-include/mlir/Dialect/Mesh/IR/MeshBase.td
-include/mlir/Dialect/Mesh/IR/MeshDialect.cpp.inc
-include/mlir/Dialect/Mesh/IR/MeshDialect.h
-include/mlir/Dialect/Mesh/IR/MeshDialect.h.inc
-include/mlir/Dialect/Mesh/IR/MeshEnums.cpp.inc
-include/mlir/Dialect/Mesh/IR/MeshEnums.h.inc
-include/mlir/Dialect/Mesh/IR/MeshOps.cpp.inc
-include/mlir/Dialect/Mesh/IR/MeshOps.h
-include/mlir/Dialect/Mesh/IR/MeshOps.h.inc
-include/mlir/Dialect/Mesh/IR/MeshOps.td
-include/mlir/Dialect/Mesh/IR/MeshTypes.cpp.inc
-include/mlir/Dialect/Mesh/IR/MeshTypes.h.inc
-include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.cpp.inc
-include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.h
-include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.h.inc
-include/mlir/Dialect/Mesh/Interfaces/ShardingInterface.td
-include/mlir/Dialect/Mesh/Interfaces/ShardingInterfaceImpl.h
-include/mlir/Dialect/Mesh/Transforms/Passes.h
-include/mlir/Dialect/Mesh/Transforms/Passes.h.inc
-include/mlir/Dialect/Mesh/Transforms/Passes.td
-include/mlir/Dialect/Mesh/Transforms/Simplifications.h
-include/mlir/Dialect/Mesh/Transforms/Spmdization.h
-include/mlir/Dialect/Mesh/Transforms/Transforms.h
 include/mlir/Dialect/NVGPU/IR/NVGPU.cpp.inc
 include/mlir/Dialect/NVGPU/IR/NVGPU.h.inc
 include/mlir/Dialect/NVGPU/IR/NVGPU.td
@@ -920,6 +954,7 @@ include/mlir/Dialect/NVGPU/Transforms/Transforms.h
 include/mlir/Dialect/NVGPU/Transforms/Utils.h
 include/mlir/Dialect/NVGPU/Utils/MMAUtils.h
 include/mlir/Dialect/OpenACC/AccCommon.td
+include/mlir/Dialect/OpenACC/Analysis/OpenACCSupport.h
 include/mlir/Dialect/OpenACC/OpenACC.h
 include/mlir/Dialect/OpenACC/OpenACCBase.td
 include/mlir/Dialect/OpenACC/OpenACCOps.cpp.inc
@@ -940,6 +975,12 @@ include/mlir/Dialect/OpenACC/OpenACCOpsTypes.td
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.cpp.inc
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.h.inc
 include/mlir/Dialect/OpenACC/OpenACCTypeInterfaces.td
+include/mlir/Dialect/OpenACC/OpenACCUtils.h
+include/mlir/Dialect/OpenACC/OpenACCUtilsLoop.h
+include/mlir/Dialect/OpenACC/OpenACCUtilsTiling.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
 include/mlir/Dialect/OpenACC/Transforms/Passes.h
 include/mlir/Dialect/OpenACC/Transforms/Passes.h.inc
 include/mlir/Dialect/OpenACC/Transforms/Passes.td
@@ -980,6 +1021,11 @@ include/mlir/Dialect/OpenMP/OpenMPOpsTypes.h.inc
 include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.cpp.inc
 include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.h.inc
 include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.td
+include/mlir/Dialect/OpenMP/Transforms/Passes.capi.cpp.inc
+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/PDL/IR/PDL.h
 include/mlir/Dialect/PDL/IR/PDLDialect.td
 include/mlir/Dialect/PDL/IR/PDLOps.cpp.inc
@@ -1002,14 +1048,13 @@ include/mlir/Dialect/PDLInterp/IR/PDLInterpOpsTypes.cpp.inc
 include/mlir/Dialect/PDLInterp/IR/PDLInterpOpsTypes.h.inc
 include/mlir/Dialect/Ptr/IR/MemorySpaceAttrInterfaces.cpp.inc
 include/mlir/Dialect/Ptr/IR/MemorySpaceAttrInterfaces.h.inc
-include/mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.cpp.inc
 include/mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.h
-include/mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.h.inc
 include/mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.td
 include/mlir/Dialect/Ptr/IR/PtrAttrDefs.td
 include/mlir/Dialect/Ptr/IR/PtrAttrs.h
 include/mlir/Dialect/Ptr/IR/PtrDialect.h
 include/mlir/Dialect/Ptr/IR/PtrDialect.td
+include/mlir/Dialect/Ptr/IR/PtrEnums.h
 include/mlir/Dialect/Ptr/IR/PtrEnums.td
 include/mlir/Dialect/Ptr/IR/PtrOps.cpp.inc
 include/mlir/Dialect/Ptr/IR/PtrOps.h
@@ -1036,6 +1081,8 @@ include/mlir/Dialect/Quant/IR/QuantOpsDialect.h.inc
 include/mlir/Dialect/Quant/IR/QuantOpsTypes.cpp.inc
 include/mlir/Dialect/Quant/IR/QuantOpsTypes.h.inc
 include/mlir/Dialect/Quant/IR/QuantTypes.h
+include/mlir/Dialect/Quant/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Quant/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Quant/Transforms/Passes.h
 include/mlir/Dialect/Quant/Transforms/Passes.h.inc
 include/mlir/Dialect/Quant/Transforms/Passes.td
@@ -1062,6 +1109,8 @@ include/mlir/Dialect/SCF/TransformOps/SCFTransformOps.h.inc
 include/mlir/Dialect/SCF/TransformOps/SCFTransformOps.td
 include/mlir/Dialect/SCF/Transforms/BufferDeallocationOpInterfaceImpl.h
 include/mlir/Dialect/SCF/Transforms/BufferizableOpInterfaceImpl.h
+include/mlir/Dialect/SCF/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/SCF/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/SCF/Transforms/Passes.h
 include/mlir/Dialect/SCF/Transforms/Passes.h.inc
 include/mlir/Dialect/SCF/Transforms/Passes.td
@@ -1120,6 +1169,7 @@ include/mlir/Dialect/SPIRV/IR/SPIRVEnums.h
 include/mlir/Dialect/SPIRV/IR/SPIRVEnums.h.inc
 include/mlir/Dialect/SPIRV/IR/SPIRVGLCanonicalization.h
 include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td
+include/mlir/Dialect/SPIRV/IR/SPIRVGraphOps.td
 include/mlir/Dialect/SPIRV/IR/SPIRVGroupOps.td
 include/mlir/Dialect/SPIRV/IR/SPIRVImageOps.td
 include/mlir/Dialect/SPIRV/IR/SPIRVIntegerDotProductOps.td
@@ -1150,6 +1200,8 @@ include/mlir/Dialect/SPIRV/Interfaces/SPIRVImageInterfaces.h
 include/mlir/Dialect/SPIRV/Interfaces/SPIRVImageInterfaces.h.inc
 include/mlir/Dialect/SPIRV/Interfaces/SPIRVImageInterfaces.td
 include/mlir/Dialect/SPIRV/Linking/ModuleCombiner.h
+include/mlir/Dialect/SPIRV/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/SPIRV/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/SPIRV/Transforms/Passes.h
 include/mlir/Dialect/SPIRV/Transforms/Passes.h.inc
 include/mlir/Dialect/SPIRV/Transforms/Passes.td
@@ -1167,9 +1219,38 @@ include/mlir/Dialect/Shape/IR/ShapeOpsDialect.h.inc
 include/mlir/Dialect/Shape/IR/ShapeOpsTypes.cpp.inc
 include/mlir/Dialect/Shape/IR/ShapeOpsTypes.h.inc
 include/mlir/Dialect/Shape/Transforms/BufferizableOpInterfaceImpl.h
+include/mlir/Dialect/Shape/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Shape/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Shape/Transforms/Passes.h
 include/mlir/Dialect/Shape/Transforms/Passes.h.inc
 include/mlir/Dialect/Shape/Transforms/Passes.td
+include/mlir/Dialect/Shard/IR/ShardAttributes.cpp.inc
+include/mlir/Dialect/Shard/IR/ShardAttributes.h.inc
+include/mlir/Dialect/Shard/IR/ShardBase.td
+include/mlir/Dialect/Shard/IR/ShardDialect.cpp.inc
+include/mlir/Dialect/Shard/IR/ShardDialect.h
+include/mlir/Dialect/Shard/IR/ShardDialect.h.inc
+include/mlir/Dialect/Shard/IR/ShardEnums.cpp.inc
+include/mlir/Dialect/Shard/IR/ShardEnums.h.inc
+include/mlir/Dialect/Shard/IR/ShardOps.cpp.inc
+include/mlir/Dialect/Shard/IR/ShardOps.h
+include/mlir/Dialect/Shard/IR/ShardOps.h.inc
+include/mlir/Dialect/Shard/IR/ShardOps.td
+include/mlir/Dialect/Shard/IR/ShardTypes.cpp.inc
+include/mlir/Dialect/Shard/IR/ShardTypes.h.inc
+include/mlir/Dialect/Shard/Interfaces/ShardingInterface.cpp.inc
+include/mlir/Dialect/Shard/Interfaces/ShardingInterface.h
+include/mlir/Dialect/Shard/Interfaces/ShardingInterface.h.inc
+include/mlir/Dialect/Shard/Interfaces/ShardingInterface.td
+include/mlir/Dialect/Shard/Interfaces/ShardingInterfaceImpl.h
+include/mlir/Dialect/Shard/Transforms/Partition.h
+include/mlir/Dialect/Shard/Transforms/Passes.capi.cpp.inc
+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/Transforms.h
 include/mlir/Dialect/SparseTensor/IR/Enums.h
 include/mlir/Dialect/SparseTensor/IR/SparseTensor.h
 include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.cpp.inc
@@ -1207,7 +1288,7 @@ include/mlir/Dialect/SparseTensor/Transforms/Passes.h.inc
 include/mlir/Dialect/SparseTensor/Transforms/Passes.td
 include/mlir/Dialect/SparseTensor/Utils/Merger.h
 include/mlir/Dialect/Tensor/Extensions/AllExtensions.h
-include/mlir/Dialect/Tensor/Extensions/MeshShardingExtensions.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
@@ -1226,6 +1307,8 @@ include/mlir/Dialect/Tensor/TransformOps/TensorTransformOps.h
 include/mlir/Dialect/Tensor/TransformOps/TensorTransformOps.h.inc
 include/mlir/Dialect/Tensor/TransformOps/TensorTransformOps.td
 include/mlir/Dialect/Tensor/Transforms/BufferizableOpInterfaceImpl.h
+include/mlir/Dialect/Tensor/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Tensor/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Tensor/Transforms/Passes.h
 include/mlir/Dialect/Tensor/Transforms/Passes.h.inc
 include/mlir/Dialect/Tensor/Transforms/Passes.td
@@ -1264,6 +1347,8 @@ include/mlir/Dialect/Tosa/IR/TosaProfileCompliance.h
 include/mlir/Dialect/Tosa/IR/TosaShapeOps.td
 include/mlir/Dialect/Tosa/IR/TosaTypesBase.td
 include/mlir/Dialect/Tosa/IR/TosaUtilOps.td
+include/mlir/Dialect/Tosa/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Tosa/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Tosa/Transforms/Passes.h
 include/mlir/Dialect/Tosa/Transforms/Passes.h.inc
 include/mlir/Dialect/Tosa/Transforms/Passes.td
@@ -1326,6 +1411,13 @@ include/mlir/Dialect/Transform/PDLExtension/PDLExtensionOps.cpp.inc
 include/mlir/Dialect/Transform/PDLExtension/PDLExtensionOps.h
 include/mlir/Dialect/Transform/PDLExtension/PDLExtensionOps.h.inc
 include/mlir/Dialect/Transform/PDLExtension/PDLExtensionOps.td
+include/mlir/Dialect/Transform/SMTExtension/SMTExtension.h
+include/mlir/Dialect/Transform/SMTExtension/SMTExtensionOps.cpp.inc
+include/mlir/Dialect/Transform/SMTExtension/SMTExtensionOps.h
+include/mlir/Dialect/Transform/SMTExtension/SMTExtensionOps.h.inc
+include/mlir/Dialect/Transform/SMTExtension/SMTExtensionOps.td
+include/mlir/Dialect/Transform/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Transform/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Transform/Transforms/Passes.h
 include/mlir/Dialect/Transform/Transforms/Passes.h.inc
 include/mlir/Dialect/Transform/Transforms/Passes.td
@@ -1356,6 +1448,7 @@ include/mlir/Dialect/Utils/ReshapeOpsUtils.h
 include/mlir/Dialect/Utils/StaticValueUtils.h
 include/mlir/Dialect/Utils/StructuredOpsUtils.h
 include/mlir/Dialect/Utils/StructuredOpsUtils.td
+include/mlir/Dialect/Utils/VerificationUtils.h
 include/mlir/Dialect/Vector/IR/ScalableValueBoundsConstraintSet.h
 include/mlir/Dialect/Vector/IR/ValueBoundsOpInterfaceImpl.h
 include/mlir/Dialect/Vector/IR/Vector.cpp.inc
@@ -1388,6 +1481,8 @@ 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/LoweringPatterns.h
+include/mlir/Dialect/Vector/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/Vector/Transforms/Passes.capi.h.inc
 include/mlir/Dialect/Vector/Transforms/Passes.h
 include/mlir/Dialect/Vector/Transforms/Passes.h.inc
 include/mlir/Dialect/Vector/Transforms/Passes.td
@@ -1399,7 +1494,28 @@ include/mlir/Dialect/Vector/Transforms/VectorTransformsBase.td
 include/mlir/Dialect/Vector/Transforms/VectorTransformsEnums.cpp.inc
 include/mlir/Dialect/Vector/Transforms/VectorTransformsEnums.h.inc
 include/mlir/Dialect/Vector/Utils/VectorUtils.h
+include/mlir/Dialect/WasmSSA/IR/WasmSSA.h
+include/mlir/Dialect/WasmSSA/IR/WasmSSABase.td
+include/mlir/Dialect/WasmSSA/IR/WasmSSAInterfaces.cpp.inc
+include/mlir/Dialect/WasmSSA/IR/WasmSSAInterfaces.h
+include/mlir/Dialect/WasmSSA/IR/WasmSSAInterfaces.h.inc
+include/mlir/Dialect/WasmSSA/IR/WasmSSAInterfaces.td
+include/mlir/Dialect/WasmSSA/IR/WasmSSAOps.cpp.inc
+include/mlir/Dialect/WasmSSA/IR/WasmSSAOps.h.inc
+include/mlir/Dialect/WasmSSA/IR/WasmSSAOps.td
+include/mlir/Dialect/WasmSSA/IR/WasmSSAOpsDialect.cpp.inc
+include/mlir/Dialect/WasmSSA/IR/WasmSSAOpsDialect.h.inc
+include/mlir/Dialect/WasmSSA/IR/WasmSSAOpsTypes.cpp.inc
+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
@@ -1415,6 +1531,8 @@ include/mlir/Dialect/XeGPU/IR/XeGPU.cpp.inc
 include/mlir/Dialect/XeGPU/IR/XeGPU.h
 include/mlir/Dialect/XeGPU/IR/XeGPU.h.inc
 include/mlir/Dialect/XeGPU/IR/XeGPU.td
+include/mlir/Dialect/XeGPU/IR/XeGPUAttrInterface.cpp.inc
+include/mlir/Dialect/XeGPU/IR/XeGPUAttrInterface.h.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUAttrs.cpp.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUAttrs.h.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUAttrs.td
@@ -1423,16 +1541,25 @@ include/mlir/Dialect/XeGPU/IR/XeGPUDialect.h.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUDialect.td
 include/mlir/Dialect/XeGPU/IR/XeGPUEnums.cpp.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUEnums.h.inc
+include/mlir/Dialect/XeGPU/IR/XeGPUOpInterface.cpp.inc
+include/mlir/Dialect/XeGPU/IR/XeGPUOpInterface.h.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUOps.td
-include/mlir/Dialect/XeGPU/IR/XeGPUTargetInfo.h
 include/mlir/Dialect/XeGPU/IR/XeGPUTypes.cpp.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUTypes.h.inc
 include/mlir/Dialect/XeGPU/IR/XeGPUTypes.td
+include/mlir/Dialect/XeGPU/TransformOps/XeGPUTransformOps.cpp.inc
+include/mlir/Dialect/XeGPU/TransformOps/XeGPUTransformOps.h
+include/mlir/Dialect/XeGPU/TransformOps/XeGPUTransformOps.h.inc
+include/mlir/Dialect/XeGPU/TransformOps/XeGPUTransformOps.td
+include/mlir/Dialect/XeGPU/Transforms/Passes.capi.cpp.inc
+include/mlir/Dialect/XeGPU/Transforms/Passes.capi.h.inc
 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/Utils/XeGPUUtils.h
+include/mlir/Dialect/XeGPU/uArch/IntelGpuXe2.h
+include/mlir/Dialect/XeGPU/uArch/uArchBase.h
 include/mlir/ExecutionEngine/AsyncRuntime.h
 include/mlir/ExecutionEngine/CRunnerUtils.h
 include/mlir/ExecutionEngine/ExecutionEngine.h
@@ -1538,10 +1665,13 @@ include/mlir/IR/RegionKindInterface.cpp.inc
 include/mlir/IR/RegionKindInterface.h
 include/mlir/IR/RegionKindInterface.h.inc
 include/mlir/IR/RegionKindInterface.td
+include/mlir/IR/Remarks.h
 include/mlir/IR/StorageUniquerSupport.h
 include/mlir/IR/SymbolInterfaces.cpp.inc
 include/mlir/IR/SymbolInterfaces.h.inc
 include/mlir/IR/SymbolInterfaces.td
+include/mlir/IR/SymbolInterfacesAttrInterface.cpp.inc
+include/mlir/IR/SymbolInterfacesAttrInterface.h.inc
 include/mlir/IR/SymbolTable.h
 include/mlir/IR/TensorEncInterfaces.cpp.inc
 include/mlir/IR/TensorEncInterfaces.h.inc
@@ -1565,6 +1695,10 @@ include/mlir/InitAllDialects.h
 include/mlir/InitAllExtensions.h
 include/mlir/InitAllPasses.h
 include/mlir/InitAllTranslations.h
+include/mlir/Interfaces/AlignmentAttrInterface.cpp.inc
+include/mlir/Interfaces/AlignmentAttrInterface.h
+include/mlir/Interfaces/AlignmentAttrInterface.h.inc
+include/mlir/Interfaces/AlignmentAttrInterface.td
 include/mlir/Interfaces/CallInterfaces.cpp.inc
 include/mlir/Interfaces/CallInterfaces.h
 include/mlir/Interfaces/CallInterfaces.h.inc
@@ -1577,10 +1711,6 @@ include/mlir/Interfaces/ControlFlowInterfaces.cpp.inc
 include/mlir/Interfaces/ControlFlowInterfaces.h
 include/mlir/Interfaces/ControlFlowInterfaces.h.inc
 include/mlir/Interfaces/ControlFlowInterfaces.td
-include/mlir/Interfaces/CopyOpInterface.cpp.inc
-include/mlir/Interfaces/CopyOpInterface.h
-include/mlir/Interfaces/CopyOpInterface.h.inc
-include/mlir/Interfaces/CopyOpInterface.td
 include/mlir/Interfaces/DataLayoutAttrInterface.cpp.inc
 include/mlir/Interfaces/DataLayoutAttrInterface.h.inc
 include/mlir/Interfaces/DataLayoutInterfaces.h
@@ -1611,6 +1741,10 @@ include/mlir/Interfaces/InferIntRangeInterface.cpp.inc
 include/mlir/Interfaces/InferIntRangeInterface.h
 include/mlir/Interfaces/InferIntRangeInterface.h.inc
 include/mlir/Interfaces/InferIntRangeInterface.td
+include/mlir/Interfaces/InferStridedMetadataInterface.cpp.inc
+include/mlir/Interfaces/InferStridedMetadataInterface.h
+include/mlir/Interfaces/InferStridedMetadataInterface.h.inc
+include/mlir/Interfaces/InferStridedMetadataInterface.td
 include/mlir/Interfaces/InferTypeOpInterface.cpp.inc
 include/mlir/Interfaces/InferTypeOpInterface.h
 include/mlir/Interfaces/InferTypeOpInterface.h.inc
@@ -1619,6 +1753,10 @@ include/mlir/Interfaces/LoopLikeInterface.cpp.inc
 include/mlir/Interfaces/LoopLikeInterface.h
 include/mlir/Interfaces/LoopLikeInterface.h.inc
 include/mlir/Interfaces/LoopLikeInterface.td
+include/mlir/Interfaces/MemOpInterfaces.cpp.inc
+include/mlir/Interfaces/MemOpInterfaces.h
+include/mlir/Interfaces/MemOpInterfaces.h.inc
+include/mlir/Interfaces/MemOpInterfaces.td
 include/mlir/Interfaces/MemorySlotInterfaces.h
 include/mlir/Interfaces/MemorySlotInterfaces.td
 include/mlir/Interfaces/MemorySlotOpInterfaces.cpp.inc
@@ -1686,6 +1824,7 @@ include/mlir/Reducer/Passes.td
 include/mlir/Reducer/ReductionNode.h
 include/mlir/Reducer/ReductionPatternInterface.h
 include/mlir/Reducer/Tester.h
+include/mlir/Remark/RemarkStreamer.h
 include/mlir/Rewrite/FrozenRewritePatternSet.h
 include/mlir/Rewrite/PassUtil.td
 include/mlir/Rewrite/PatternApplicator.h
@@ -1736,6 +1875,9 @@ include/mlir/Target/LLVM/NVVM/Target.h
 include/mlir/Target/LLVM/NVVM/Utils.h
 include/mlir/Target/LLVM/ROCDL/Target.h
 include/mlir/Target/LLVM/ROCDL/Utils.h
+include/mlir/Target/LLVM/XeVM/Target.h
+include/mlir/Target/LLVM/XeVM/Utils.h
+include/mlir/Target/LLVMIR/DataLayoutImporter.h
 include/mlir/Target/LLVMIR/Dialect/All.h
 include/mlir/Target/LLVMIR/Dialect/ArmNeon/ArmNeonToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/ArmSME/ArmSMEToLLVMIRTranslation.h
@@ -1749,15 +1891,21 @@ include/mlir/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/OpenMPCommon.h
+include/mlir/Target/LLVMIR/Dialect/Ptr/PtrToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/ROCDL/ROCDLToLLVMIRTranslation.h
 include/mlir/Target/LLVMIR/Dialect/SPIRV/SPIRVToLLVMIRTranslation.h
 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/LLVMImportInterface.h
 include/mlir/Target/LLVMIR/LLVMTranslationInterface.h
 include/mlir/Target/LLVMIR/ModuleImport.h
 include/mlir/Target/LLVMIR/ModuleTranslation.h
+include/mlir/Target/LLVMIR/Transforms/Passes.h
+include/mlir/Target/LLVMIR/Transforms/Passes.h.inc
+include/mlir/Target/LLVMIR/Transforms/Passes.td
+include/mlir/Target/LLVMIR/Transforms/TargetUtils.h
 include/mlir/Target/LLVMIR/TypeFromLLVM.h
 include/mlir/Target/LLVMIR/TypeToLLVM.h
 include/mlir/Target/SMTLIB/ExportSMTLIB.h
@@ -1767,6 +1915,8 @@ include/mlir/Target/SPIRV/Deserialization.h
 include/mlir/Target/SPIRV/SPIRVBinaryUtils.h
 include/mlir/Target/SPIRV/Serialization.h
 include/mlir/Target/SPIRV/Target.h
+include/mlir/Target/Wasm/WasmBinaryEncoding.h
+include/mlir/Target/Wasm/WasmImporter.h
 include/mlir/Tools/PDLL/AST/Context.h
 include/mlir/Tools/PDLL/AST/Diagnostic.h
 include/mlir/Tools/PDLL/AST/Nodes.h
@@ -1783,10 +1933,7 @@ include/mlir/Tools/ParseUtilities.h
 include/mlir/Tools/Plugins/DialectPlugin.h
 include/mlir/Tools/Plugins/PassPlugin.h
 include/mlir/Tools/lsp-server-support/CompilationDatabase.h
-include/mlir/Tools/lsp-server-support/Logging.h
-include/mlir/Tools/lsp-server-support/Protocol.h
 include/mlir/Tools/lsp-server-support/SourceMgrUtils.h
-include/mlir/Tools/lsp-server-support/Transport.h
 include/mlir/Tools/mlir-lsp-server/MlirLspRegistryFunction.h
 include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h
 include/mlir/Tools/mlir-opt/MlirOptMain.h
@@ -1797,11 +1944,14 @@ include/mlir/Tools/mlir-tblgen/MlirTblgenMain.h
 include/mlir/Tools/mlir-translate/MlirTranslateMain.h
 include/mlir/Tools/mlir-translate/Translation.h
 include/mlir/Tools/tblgen-lsp-server/TableGenLspServerMain.h
+include/mlir/Transforms/BubbleDownMemorySpaceCasts.h
 include/mlir/Transforms/CFGToSCF.h
 include/mlir/Transforms/CSE.h
 include/mlir/Transforms/CommutativityUtils.h
 include/mlir/Transforms/ControlFlowSinkUtils.h
 include/mlir/Transforms/DialectConversion.h
+include/mlir/Transforms/DialectInlinerInterface.h.inc
+include/mlir/Transforms/DialectInlinerInterface.td
 include/mlir/Transforms/EndomorphismSimplification.h
 include/mlir/Transforms/FoldUtils.h
 include/mlir/Transforms/GreedyPatternRewriteDriver.h
@@ -1841,10 +1991,13 @@ lib/libMLIRAffineToStandard.a
 lib/libMLIRAffineTransformOps.a
 lib/libMLIRAffineTransforms.a
 lib/libMLIRAffineUtils.a
+lib/libMLIRAlignmentAttrInterface.a
 lib/libMLIRAnalysis.a
+lib/libMLIRArithAndMathToAPFloatUtils.a
 lib/libMLIRArithAttrToLLVMConversion.a
 lib/libMLIRArithDialect.a
 lib/libMLIRArithToAMDGPU.a
+lib/libMLIRArithToAPFloat.a
 lib/libMLIRArithToArmSME.a
 lib/libMLIRArithToEmitC.a
 lib/libMLIRArithToLLVM.a
@@ -1880,10 +2033,18 @@ lib/libMLIRBytecodeOpInterface.a
 lib/libMLIRBytecodeReader.a
 lib/libMLIRBytecodeWriter.a
 lib/libMLIRCAPIAMDGPU.a
+lib/libMLIRCAPIAMX.a
+lib/libMLIRCAPIAffine.a
 lib/libMLIRCAPIArith.a
+lib/libMLIRCAPIArmNeon.a
+lib/libMLIRCAPIArmSME.a
+lib/libMLIRCAPIArmSVE.a
 lib/libMLIRCAPIAsync.a
+lib/libMLIRCAPIBufferization.a
+lib/libMLIRCAPIComplex.a
 lib/libMLIRCAPIControlFlow.a
 lib/libMLIRCAPIConversion.a
+lib/libMLIRCAPIDLTI.a
 lib/libMLIRCAPIDebug.a
 lib/libMLIRCAPIEmitC.a
 lib/libMLIRCAPIExecutionEngine.a
@@ -1897,12 +2058,16 @@ lib/libMLIRCAPIInterfaces.a
 lib/libMLIRCAPILLVM.a
 lib/libMLIRCAPILinalg.a
 lib/libMLIRCAPIMLProgram.a
+lib/libMLIRCAPIMPI.a
 lib/libMLIRCAPIMath.a
 lib/libMLIRCAPIMemRef.a
 lib/libMLIRCAPINVGPU.a
 lib/libMLIRCAPINVVM.a
+lib/libMLIRCAPIOpenACC.a
 lib/libMLIRCAPIOpenMP.a
 lib/libMLIRCAPIPDL.a
+lib/libMLIRCAPIPDLInterp.a
+lib/libMLIRCAPIPtr.a
 lib/libMLIRCAPIQuant.a
 lib/libMLIRCAPIROCDL.a
 lib/libMLIRCAPIRegisterEverything.a
@@ -1910,19 +2075,28 @@ lib/libMLIRCAPISCF.a
 lib/libMLIRCAPISMT.a
 lib/libMLIRCAPISPIRV.a
 lib/libMLIRCAPIShape.a
+lib/libMLIRCAPIShard.a
 lib/libMLIRCAPISparseTensor.a
 lib/libMLIRCAPITarget.a
 lib/libMLIRCAPITensor.a
+lib/libMLIRCAPITosa.a
 lib/libMLIRCAPITransformDialect.a
 lib/libMLIRCAPITransformDialectTransforms.a
 lib/libMLIRCAPITransforms.a
+lib/libMLIRCAPIUB.a
+lib/libMLIRCAPIVCIX.a
 lib/libMLIRCAPIVector.a
+lib/libMLIRCAPIWasmSSA.a
+lib/libMLIRCAPIX86Vector.a
+lib/libMLIRCAPIXeGPU.a
+lib/libMLIRCAPIXeVM.a
 lib/libMLIRCallInterfaces.a
 lib/libMLIRCastInterfaces.a
 lib/libMLIRComplexDialect.a
 lib/libMLIRComplexDivisionConversion.a
 lib/libMLIRComplexToLLVM.a
 lib/libMLIRComplexToLibm.a
+lib/libMLIRComplexToROCDLLibraryCalls.a
 lib/libMLIRComplexToSPIRV.a
 lib/libMLIRComplexToStandard.a
 lib/libMLIRControlFlowDialect.a
@@ -1934,7 +2108,6 @@ lib/libMLIRControlFlowTransforms.a
 lib/libMLIRConvertToEmitC.a
 lib/libMLIRConvertToLLVMInterface.a
 lib/libMLIRConvertToLLVMPass.a
-lib/libMLIRCopyOpInterface.a
 lib/libMLIRDLTIDialect.a
 lib/libMLIRDLTITransformOps.a
 lib/libMLIRDataLayoutInterfaces.a
@@ -1952,7 +2125,7 @@ lib/libMLIRFromLLVMIRTranslationRegistration.a
 lib/libMLIRFuncAllExtensions.a
 lib/libMLIRFuncDialect.a
 lib/libMLIRFuncInlinerExtension.a
-lib/libMLIRFuncMeshShardingExtensions.a
+lib/libMLIRFuncShardingExtensions.a
 lib/libMLIRFuncToEmitC.a
 lib/libMLIRFuncToLLVM.a
 lib/libMLIRFuncToSPIRV.a
@@ -1979,6 +2152,7 @@ lib/libMLIRIndexToSPIRV.a
 lib/libMLIRIndexingMapOpInterface.a
 lib/libMLIRInferIntRangeCommon.a
 lib/libMLIRInferIntRangeInterface.a
+lib/libMLIRInferStridedMetadataInterface.a
 lib/libMLIRInferTypeOpInterface.a
 lib/libMLIRJitRunner.a
 lib/libMLIRLLVMCommonConversion.a
@@ -2002,13 +2176,16 @@ lib/libMLIRMPIToLLVM.a
 lib/libMLIRMaskableOpInterface.a
 lib/libMLIRMaskingOpInterface.a
 lib/libMLIRMathDialect.a
+lib/libMLIRMathToAPFloat.a
 lib/libMLIRMathToEmitC.a
 lib/libMLIRMathToFuncs.a
 lib/libMLIRMathToLLVM.a
 lib/libMLIRMathToLibm.a
 lib/libMLIRMathToROCDL.a
 lib/libMLIRMathToSPIRV.a
+lib/libMLIRMathToXeVM.a
 lib/libMLIRMathTransforms.a
+lib/libMLIRMemOpInterfaces.a
 lib/libMLIRMemRefDialect.a
 lib/libMLIRMemRefToEmitC.a
 lib/libMLIRMemRefToLLVM.a
@@ -2017,9 +2194,6 @@ lib/libMLIRMemRefTransformOps.a
 lib/libMLIRMemRefTransforms.a
 lib/libMLIRMemRefUtils.a
 lib/libMLIRMemorySlotInterfaces.a
-lib/libMLIRMeshDialect.a
-lib/libMLIRMeshToMPI.a
-lib/libMLIRMeshTransforms.a
 lib/libMLIRMlirOptMain.a
 lib/libMLIRNVGPUDialect.a
 lib/libMLIRNVGPUToNVVM.a
@@ -2031,14 +2205,17 @@ lib/libMLIRNVVMTarget.a
 lib/libMLIRNVVMToLLVM.a
 lib/libMLIRNVVMToLLVMIRTranslation.a
 lib/libMLIRObservers.a
+lib/libMLIROpenACCAnalysis.a
 lib/libMLIROpenACCDialect.a
 lib/libMLIROpenACCMPCommon.a
 lib/libMLIROpenACCToLLVMIRTranslation.a
 lib/libMLIROpenACCToSCF.a
 lib/libMLIROpenACCTransforms.a
+lib/libMLIROpenACCUtils.a
 lib/libMLIROpenMPDialect.a
 lib/libMLIROpenMPToLLVM.a
 lib/libMLIROpenMPToLLVMIRTranslation.a
+lib/libMLIROpenMPTransforms.a
 lib/libMLIROptLib.a
 lib/libMLIRPDLDialect.a
 lib/libMLIRPDLInterpDialect.a
@@ -2052,6 +2229,9 @@ lib/libMLIRPass.a
 lib/libMLIRPluginsLib.a
 lib/libMLIRPresburger.a
 lib/libMLIRPtrDialect.a
+lib/libMLIRPtrMemorySpaceInterfaces.a
+lib/libMLIRPtrToLLVM.a
+lib/libMLIRPtrToLLVMIRTranslation.a
 lib/libMLIRQuantDialect.a
 lib/libMLIRQuantTransforms.a
 lib/libMLIRQuantUtils.a
@@ -2064,6 +2244,10 @@ lib/libMLIRROCDLToLLVMIRTranslation.a
 lib/libMLIRReconcileUnrealizedCasts.a
 lib/libMLIRReduce.a
 lib/libMLIRReduceLib.a
+lib/libMLIRRegisterAllDialects.a
+lib/libMLIRRegisterAllExtensions.a
+lib/libMLIRRegisterAllPasses.a
+lib/libMLIRRemarkStreamer.a
 lib/libMLIRRewrite.a
 lib/libMLIRRewritePDL.a
 lib/libMLIRRuntimeVerifiableOpInterface.a
@@ -2095,6 +2279,9 @@ lib/libMLIRShapeDialect.a
 lib/libMLIRShapeOpsTransforms.a
 lib/libMLIRShapeToStandard.a
 lib/libMLIRShapedOpInterfaces.a
+lib/libMLIRShardDialect.a
+lib/libMLIRShardToMPI.a
+lib/libMLIRShardTransforms.a
 lib/libMLIRShardingInterface.a
 lib/libMLIRSideEffectInterfaces.a
 lib/libMLIRSparseTensorDialect.a
@@ -2111,11 +2298,13 @@ lib/libMLIRTargetIRDLToCpp.a
 lib/libMLIRTargetLLVM.a
 lib/libMLIRTargetLLVMIRExport.a
 lib/libMLIRTargetLLVMIRImport.a
+lib/libMLIRTargetLLVMIRTransforms.a
+lib/libMLIRTargetWasmImport.a
 lib/libMLIRTblgenLib.a
 lib/libMLIRTensorAllExtensions.a
 lib/libMLIRTensorDialect.a
 lib/libMLIRTensorInferTypeOpInterfaceImpl.a
-lib/libMLIRTensorMeshShardingExtensions.a
+lib/libMLIRTensorShardingExtensions.a
 lib/libMLIRTensorTilingInterfaceImpl.a
 lib/libMLIRTensorToLinalg.a
 lib/libMLIRTensorToSPIRV.a
@@ -2140,6 +2329,7 @@ lib/libMLIRTransformDialectTransforms.a
 lib/libMLIRTransformDialectUtils.a
 lib/libMLIRTransformLoopExtension.a
 lib/libMLIRTransformPDLExtension.a
+lib/libMLIRTransformSMTExtension.a
 lib/libMLIRTransformTuneExtension.a
 lib/libMLIRTransformUtils.a
 lib/libMLIRTransforms.a
@@ -2152,6 +2342,7 @@ lib/libMLIRVCIXToLLVMIRTranslation.a
 lib/libMLIRValueBoundsOpInterface.a
 lib/libMLIRVectorDialect.a
 lib/libMLIRVectorInterfaces.a
+lib/libMLIRVectorToAMX.a
 lib/libMLIRVectorToArmSME.a
 lib/libMLIRVectorToGPU.a
 lib/libMLIRVectorToLLVM.a
@@ -2163,13 +2354,21 @@ lib/libMLIRVectorTransformOps.a
 lib/libMLIRVectorTransforms.a
 lib/libMLIRVectorUtils.a
 lib/libMLIRViewLikeInterface.a
+lib/libMLIRWasmSSADialect.a
 lib/libMLIRX86VectorDialect.a
+lib/libMLIRX86VectorTransformOps.a
 lib/libMLIRX86VectorTransforms.a
+lib/libMLIRX86VectorUtils.a
 lib/libMLIRXeGPUDialect.a
+lib/libMLIRXeGPUToXeVM.a
+lib/libMLIRXeGPUTransformOps.a
 lib/libMLIRXeGPUTransforms.a
 lib/libMLIRXeGPUUtils.a
 lib/libMLIRXeVMDialect.a
+lib/libMLIRXeVMTarget.a
 lib/libMLIRXeVMToLLVM.a
+lib/libMLIRXeVMToLLVMIRTranslation.a
+lib/libmlir_apfloat_wrappers.so
 lib/libmlir_arm_runner_utils.so
 lib/libmlir_arm_sme_abi_stubs.so
 lib/libmlir_async_runtime.so
diff --git a/mlir/buildlink3.mk b/mlir/buildlink3.mk
index e995ed6f73..d9f824b7f5 100644
--- a/mlir/buildlink3.mk
+++ b/mlir/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	mlir
 .if !defined(MLIR_BUILDLINK3_MK)
 MLIR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mlir+=	mlir>=21.1.0
+BUILDLINK_API_DEPENDS.mlir+=	mlir>=22.1.0
 BUILDLINK_PKGSRCDIR.mlir?=	../../wip/mlir
 
 BUILDLINK_FILES.mlir+=		bin/mlir-tblgen
diff --git a/mlir/distinfo b/mlir/distinfo
index 50e880f708..738b5899a2 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
 SHA1 (patch-cmake_modules_MLIRConfig.cmake.in) = ec96152743be4c33231899399f9e7cde5655b321
 SHA1 (patch-tools_mlir-tblgen_CMakeLists.txt) = 7b78acbf8a85443f2cc3f13786bbbda25b0b8d74
diff --git a/openmp/distinfo b/openmp/distinfo
index 502d9690f4..7a9359c51e 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
diff --git a/polly/PLIST b/polly/PLIST
index bb077795ea..e50fd5493d 100644
--- a/polly/PLIST
+++ b/polly/PLIST
@@ -21,12 +21,13 @@ include/polly/FlattenAlgo.h
 include/polly/FlattenSchedule.h
 include/polly/ForwardOpTree.h
 include/polly/JSONExporter.h
-include/polly/LinkAllPasses.h
 include/polly/ManualOptimizer.h
 include/polly/MatmulOptimizer.h
 include/polly/MaximalStaticExpansion.h
 include/polly/Options.h
-include/polly/PolyhedralInfo.h
+include/polly/Pass/PhaseManager.h
+include/polly/Pass/PollyFunctionPass.h
+include/polly/Pass/PollyModulePass.h
 include/polly/PruneUnprofitable.h
 include/polly/RegisterPasses.h
 include/polly/ScheduleOptimizer.h
@@ -36,7 +37,7 @@ include/polly/ScopDetection.h
 include/polly/ScopDetectionDiagnostic.h
 include/polly/ScopGraphPrinter.h
 include/polly/ScopInfo.h
-include/polly/ScopPass.h
+include/polly/ScopInliner.h
 include/polly/Simplify.h
 include/polly/Support/DumpFunctionPass.h
 include/polly/Support/DumpModulePass.h
diff --git a/polly/distinfo b/polly/distinfo
index 9a7156e7ec..09c55c21f5 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
diff --git a/wasi-libcxx/Makefile b/wasi-libcxx/Makefile
index 199502bc9a..66160af8ae 100644
--- a/wasi-libcxx/Makefile
+++ b/wasi-libcxx/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	lang devel
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://libcxxabi.llvm.org/
-COMMENT=	C++ Standard Librares (libc++/libc++abi) for WASI/WebAssembly
+COMMENT=	C++ Standard Libraries (libc++/libc++abi) for WASI/WebAssembly
 LICENSE=	apache-2.0
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -22,8 +22,8 @@ TOOL_DEPENDS+=	lld-[0-9]*:../../wip/lld
 BUILDLINK_TRANSFORM+=	rm:-I/usr/include
 BUILDLINK_TRANSFORM+=	rm:-I${PREFIX}/include
 
-BUILD_DIRS+=		build_libcxx
-BUILD_DIRS+=		build_libcxxabi
+BUILD_DIRS+=		${WRKDIR}/build_libcxx
+BUILD_DIRS+=		${WRKDIR}/build_libcxxabi
 INSTALL_DIRS+=		${BUILD_DIRS}
 
 USE_LANGUAGES=	c c++
@@ -141,16 +141,16 @@ CMAKE_INSTALL_PREFIX=	${PREFIX}/wasi
 CPPFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
 
 post-extract:
-	${MKDIR} ${WRKSRC}/build_libcxx
-	${MKDIR} ${WRKSRC}/build_libcxxabi
+	${MKDIR} ${WRKDIR}/build_libcxx
+	${MKDIR} ${WRKDIR}/build_libcxxabi
 
 do-configure:
-	cd ${WRKSRC}/build_libcxx && \
+	cd ${WRKDIR}/build_libcxx && \
 	${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
-		cmake ${CMAKE_CONFIGURE_ARGS} ../libcxx
-	cd ${WRKSRC}/build_libcxxabi && \
+		cmake ${CMAKE_CONFIGURE_ARGS} ${WRKSRC}/libcxx
+	cd ${WRKDIR}/build_libcxxabi && \
 	${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
-		cmake ${CMAKE_CONFIGURE_ARGS} ../libcxxabi
+		cmake ${CMAKE_CONFIGURE_ARGS} ${WRKSRC}/libcxxabi
 
 # Run llvm-ranlib again on the archives. Fixes mystery build failure
 # in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
diff --git a/wasi-libcxx/PLIST b/wasi-libcxx/PLIST
index 3cd86a1464..ca3aa427ab 100644
--- a/wasi-libcxx/PLIST
+++ b/wasi-libcxx/PLIST
@@ -194,6 +194,7 @@ wasi/include/c++/v1/__algorithm/sift_down.h
 wasi/include/c++/v1/__algorithm/simd_utils.h
 wasi/include/c++/v1/__algorithm/sort.h
 wasi/include/c++/v1/__algorithm/sort_heap.h
+wasi/include/c++/v1/__algorithm/specialized_algorithms.h
 wasi/include/c++/v1/__algorithm/stable_partition.h
 wasi/include/c++/v1/__algorithm/stable_sort.h
 wasi/include/c++/v1/__algorithm/swap_ranges.h
@@ -214,9 +215,12 @@ wasi/include/c++/v1/__atomic/atomic_init.h
 wasi/include/c++/v1/__atomic/atomic_lock_free.h
 wasi/include/c++/v1/__atomic/atomic_ref.h
 wasi/include/c++/v1/__atomic/atomic_sync.h
+wasi/include/c++/v1/__atomic/atomic_sync_timed.h
+wasi/include/c++/v1/__atomic/atomic_waitable_traits.h
 wasi/include/c++/v1/__atomic/check_memory_order.h
 wasi/include/c++/v1/__atomic/contention_t.h
 wasi/include/c++/v1/__atomic/fence.h
+wasi/include/c++/v1/__atomic/floating_point_helper.h
 wasi/include/c++/v1/__atomic/is_always_lock_free.h
 wasi/include/c++/v1/__atomic/kill_dependency.h
 wasi/include/c++/v1/__atomic/memory_order.h
@@ -262,6 +266,7 @@ wasi/include/c++/v1/__chrono/formatter.h
 wasi/include/c++/v1/__chrono/gps_clock.h
 wasi/include/c++/v1/__chrono/hh_mm_ss.h
 wasi/include/c++/v1/__chrono/high_resolution_clock.h
+wasi/include/c++/v1/__chrono/is_clock.h
 wasi/include/c++/v1/__chrono/leap_second.h
 wasi/include/c++/v1/__chrono/literals.h
 wasi/include/c++/v1/__chrono/local_info.h
@@ -306,6 +311,7 @@ wasi/include/c++/v1/__concepts/boolean_testable.h
 wasi/include/c++/v1/__concepts/class_or_enum.h
 wasi/include/c++/v1/__concepts/common_reference_with.h
 wasi/include/c++/v1/__concepts/common_with.h
+wasi/include/c++/v1/__concepts/comparison_common_type.h
 wasi/include/c++/v1/__concepts/constructible.h
 wasi/include/c++/v1/__concepts/convertible_to.h
 wasi/include/c++/v1/__concepts/copyable.h
@@ -328,6 +334,8 @@ wasi/include/c++/v1/__config_site
 wasi/include/c++/v1/__configuration/abi.h
 wasi/include/c++/v1/__configuration/availability.h
 wasi/include/c++/v1/__configuration/compiler.h
+wasi/include/c++/v1/__configuration/experimental.h
+wasi/include/c++/v1/__configuration/hardening.h
 wasi/include/c++/v1/__configuration/language.h
 wasi/include/c++/v1/__configuration/platform.h
 wasi/include/c++/v1/__coroutine/coroutine_handle.h
@@ -838,7 +846,6 @@ wasi/include/c++/v1/__cxx03/clocale
 wasi/include/c++/v1/__cxx03/cmath
 wasi/include/c++/v1/__cxx03/codecvt
 wasi/include/c++/v1/__cxx03/complex
-wasi/include/c++/v1/__cxx03/complex.h
 wasi/include/c++/v1/__cxx03/condition_variable
 wasi/include/c++/v1/__cxx03/csetjmp
 wasi/include/c++/v1/__cxx03/csignal
@@ -851,25 +858,20 @@ wasi/include/c++/v1/__cxx03/cstdlib
 wasi/include/c++/v1/__cxx03/cstring
 wasi/include/c++/v1/__cxx03/ctgmath
 wasi/include/c++/v1/__cxx03/ctime
-wasi/include/c++/v1/__cxx03/ctype.h
 wasi/include/c++/v1/__cxx03/cuchar
 wasi/include/c++/v1/__cxx03/cwchar
 wasi/include/c++/v1/__cxx03/cwctype
 wasi/include/c++/v1/__cxx03/deque
-wasi/include/c++/v1/__cxx03/errno.h
 wasi/include/c++/v1/__cxx03/exception
 wasi/include/c++/v1/__cxx03/experimental/__config
 wasi/include/c++/v1/__cxx03/experimental/utility
 wasi/include/c++/v1/__cxx03/ext/__hash
 wasi/include/c++/v1/__cxx03/ext/hash_map
 wasi/include/c++/v1/__cxx03/ext/hash_set
-wasi/include/c++/v1/__cxx03/fenv.h
-wasi/include/c++/v1/__cxx03/float.h
 wasi/include/c++/v1/__cxx03/forward_list
 wasi/include/c++/v1/__cxx03/fstream
 wasi/include/c++/v1/__cxx03/functional
 wasi/include/c++/v1/__cxx03/future
-wasi/include/c++/v1/__cxx03/inttypes.h
 wasi/include/c++/v1/__cxx03/iomanip
 wasi/include/c++/v1/__cxx03/ios
 wasi/include/c++/v1/__cxx03/iosfwd
@@ -896,11 +898,8 @@ wasi/include/c++/v1/__cxx03/set
 wasi/include/c++/v1/__cxx03/sstream
 wasi/include/c++/v1/__cxx03/stack
 wasi/include/c++/v1/__cxx03/stdatomic.h
-wasi/include/c++/v1/__cxx03/stdbool.h
-wasi/include/c++/v1/__cxx03/stddef.h
 wasi/include/c++/v1/__cxx03/stdexcept
 wasi/include/c++/v1/__cxx03/stdint.h
-wasi/include/c++/v1/__cxx03/stdio.h
 wasi/include/c++/v1/__cxx03/stdlib.h
 wasi/include/c++/v1/__cxx03/streambuf
 wasi/include/c++/v1/__cxx03/string
@@ -908,7 +907,6 @@ wasi/include/c++/v1/__cxx03/string.h
 wasi/include/c++/v1/__cxx03/string_view
 wasi/include/c++/v1/__cxx03/strstream
 wasi/include/c++/v1/__cxx03/system_error
-wasi/include/c++/v1/__cxx03/tgmath.h
 wasi/include/c++/v1/__cxx03/thread
 wasi/include/c++/v1/__cxx03/type_traits
 wasi/include/c++/v1/__cxx03/typeindex
@@ -921,7 +919,6 @@ wasi/include/c++/v1/__cxx03/valarray
 wasi/include/c++/v1/__cxx03/vector
 wasi/include/c++/v1/__cxx03/version
 wasi/include/c++/v1/__cxx03/wchar.h
-wasi/include/c++/v1/__cxx03/wctype.h
 wasi/include/c++/v1/__cxxabi_config.h
 wasi/include/c++/v1/__debug_utils/randomize_range.h
 wasi/include/c++/v1/__debug_utils/sanitizers.h
@@ -967,6 +964,7 @@ wasi/include/c++/v1/__format/container_adaptor.h
 wasi/include/c++/v1/__format/enable_insertable.h
 wasi/include/c++/v1/__format/escaped_output_table.h
 wasi/include/c++/v1/__format/extended_grapheme_cluster_table.h
+wasi/include/c++/v1/__format/fmt_pair_like.h
 wasi/include/c++/v1/__format/format_arg.h
 wasi/include/c++/v1/__format/format_arg_store.h
 wasi/include/c++/v1/__format/format_args.h
@@ -989,6 +987,7 @@ wasi/include/c++/v1/__format/formatter_tuple.h
 wasi/include/c++/v1/__format/indic_conjunct_break_table.h
 wasi/include/c++/v1/__format/parser_std_format_spec.h
 wasi/include/c++/v1/__format/range_default_formatter.h
+wasi/include/c++/v1/__format/range_format.h
 wasi/include/c++/v1/__format/range_formatter.h
 wasi/include/c++/v1/__format/unicode.h
 wasi/include/c++/v1/__format/width_estimation_table.h
@@ -1031,14 +1030,12 @@ wasi/include/c++/v1/__fwd/functional.h
 wasi/include/c++/v1/__fwd/get.h
 wasi/include/c++/v1/__fwd/ios.h
 wasi/include/c++/v1/__fwd/istream.h
-wasi/include/c++/v1/__fwd/map.h
 wasi/include/c++/v1/__fwd/mdspan.h
 wasi/include/c++/v1/__fwd/memory.h
 wasi/include/c++/v1/__fwd/memory_resource.h
 wasi/include/c++/v1/__fwd/ostream.h
 wasi/include/c++/v1/__fwd/pair.h
 wasi/include/c++/v1/__fwd/queue.h
-wasi/include/c++/v1/__fwd/set.h
 wasi/include/c++/v1/__fwd/span.h
 wasi/include/c++/v1/__fwd/sstream.h
 wasi/include/c++/v1/__fwd/stack.h
@@ -1100,21 +1097,22 @@ wasi/include/c++/v1/__locale
 wasi/include/c++/v1/__locale_dir/check_grouping.h
 wasi/include/c++/v1/__locale_dir/get_c_locale.h
 wasi/include/c++/v1/__locale_dir/locale_base_api.h
-wasi/include/c++/v1/__locale_dir/locale_base_api/android.h
 wasi/include/c++/v1/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
 wasi/include/c++/v1/__locale_dir/locale_base_api/ibm.h
-wasi/include/c++/v1/__locale_dir/locale_base_api/musl.h
 wasi/include/c++/v1/__locale_dir/locale_base_api/openbsd.h
 wasi/include/c++/v1/__locale_dir/messages.h
 wasi/include/c++/v1/__locale_dir/money.h
 wasi/include/c++/v1/__locale_dir/num.h
 wasi/include/c++/v1/__locale_dir/pad_and_output.h
 wasi/include/c++/v1/__locale_dir/scan_keyword.h
+wasi/include/c++/v1/__locale_dir/support/aix.h
 wasi/include/c++/v1/__locale_dir/support/apple.h
 wasi/include/c++/v1/__locale_dir/support/bsd_like.h
 wasi/include/c++/v1/__locale_dir/support/freebsd.h
 wasi/include/c++/v1/__locale_dir/support/fuchsia.h
 wasi/include/c++/v1/__locale_dir/support/linux.h
+wasi/include/c++/v1/__locale_dir/support/netbsd.h
+wasi/include/c++/v1/__locale_dir/support/newlib.h
 wasi/include/c++/v1/__locale_dir/support/no_locale/characters.h
 wasi/include/c++/v1/__locale_dir/support/no_locale/strtonum.h
 wasi/include/c++/v1/__locale_dir/support/windows.h
@@ -1152,7 +1150,6 @@ wasi/include/c++/v1/__mdspan/layout_stride.h
 wasi/include/c++/v1/__mdspan/mdspan.h
 wasi/include/c++/v1/__memory/addressof.h
 wasi/include/c++/v1/__memory/align.h
-wasi/include/c++/v1/__memory/aligned_alloc.h
 wasi/include/c++/v1/__memory/allocate_at_least.h
 wasi/include/c++/v1/__memory/allocation_guard.h
 wasi/include/c++/v1/__memory/allocator.h
@@ -1282,6 +1279,8 @@ wasi/include/c++/v1/__random/uniform_random_bit_generator.h
 wasi/include/c++/v1/__random/uniform_real_distribution.h
 wasi/include/c++/v1/__random/weibull_distribution.h
 wasi/include/c++/v1/__ranges/access.h
+wasi/include/c++/v1/__ranges/adjacent_transform_view.h
+wasi/include/c++/v1/__ranges/adjacent_view.h
 wasi/include/c++/v1/__ranges/all.h
 wasi/include/c++/v1/__ranges/as_rvalue_view.h
 wasi/include/c++/v1/__ranges/chunk_by_view.h
@@ -1293,6 +1292,7 @@ wasi/include/c++/v1/__ranges/dangling.h
 wasi/include/c++/v1/__ranges/data.h
 wasi/include/c++/v1/__ranges/drop_view.h
 wasi/include/c++/v1/__ranges/drop_while_view.h
+wasi/include/c++/v1/__ranges/elements_of.h
 wasi/include/c++/v1/__ranges/elements_view.h
 wasi/include/c++/v1/__ranges/empty.h
 wasi/include/c++/v1/__ranges/empty_view.h
@@ -1324,6 +1324,7 @@ wasi/include/c++/v1/__ranges/to.h
 wasi/include/c++/v1/__ranges/transform_view.h
 wasi/include/c++/v1/__ranges/view_interface.h
 wasi/include/c++/v1/__ranges/views.h
+wasi/include/c++/v1/__ranges/zip_transform_view.h
 wasi/include/c++/v1/__ranges/zip_view.h
 wasi/include/c++/v1/__split_buffer
 wasi/include/c++/v1/__std_mbstate_t.h
@@ -1364,22 +1365,18 @@ wasi/include/c++/v1/__thread/timed_backoff_policy.h
 wasi/include/c++/v1/__tree
 wasi/include/c++/v1/__tuple/find_index.h
 wasi/include/c++/v1/__tuple/ignore.h
-wasi/include/c++/v1/__tuple/make_tuple_types.h
 wasi/include/c++/v1/__tuple/sfinae_helpers.h
 wasi/include/c++/v1/__tuple/tuple_element.h
-wasi/include/c++/v1/__tuple/tuple_indices.h
 wasi/include/c++/v1/__tuple/tuple_like.h
-wasi/include/c++/v1/__tuple/tuple_like_ext.h
 wasi/include/c++/v1/__tuple/tuple_like_no_subrange.h
 wasi/include/c++/v1/__tuple/tuple_size.h
-wasi/include/c++/v1/__tuple/tuple_types.h
+wasi/include/c++/v1/__tuple/tuple_transform.h
 wasi/include/c++/v1/__type_traits/add_cv_quals.h
 wasi/include/c++/v1/__type_traits/add_pointer.h
 wasi/include/c++/v1/__type_traits/add_reference.h
 wasi/include/c++/v1/__type_traits/aligned_storage.h
 wasi/include/c++/v1/__type_traits/aligned_union.h
 wasi/include/c++/v1/__type_traits/alignment_of.h
-wasi/include/c++/v1/__type_traits/can_extract_key.h
 wasi/include/c++/v1/__type_traits/common_reference.h
 wasi/include/c++/v1/__type_traits/common_type.h
 wasi/include/c++/v1/__type_traits/conditional.h
@@ -1408,7 +1405,6 @@ wasi/include/c++/v1/__type_traits/is_arithmetic.h
 wasi/include/c++/v1/__type_traits/is_array.h
 wasi/include/c++/v1/__type_traits/is_assignable.h
 wasi/include/c++/v1/__type_traits/is_base_of.h
-wasi/include/c++/v1/__type_traits/is_bounded_array.h
 wasi/include/c++/v1/__type_traits/is_callable.h
 wasi/include/c++/v1/__type_traits/is_char_like_type.h
 wasi/include/c++/v1/__type_traits/is_class.h
@@ -1427,6 +1423,7 @@ wasi/include/c++/v1/__type_traits/is_final.h
 wasi/include/c++/v1/__type_traits/is_floating_point.h
 wasi/include/c++/v1/__type_traits/is_function.h
 wasi/include/c++/v1/__type_traits/is_fundamental.h
+wasi/include/c++/v1/__type_traits/is_generic_transparent_comparator.h
 wasi/include/c++/v1/__type_traits/is_implicit_lifetime.h
 wasi/include/c++/v1/__type_traits/is_implicitly_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_integral.h
@@ -1444,7 +1441,6 @@ wasi/include/c++/v1/__type_traits/is_primary_template.h
 wasi/include/c++/v1/__type_traits/is_reference.h
 wasi/include/c++/v1/__type_traits/is_reference_wrapper.h
 wasi/include/c++/v1/__type_traits/is_referenceable.h
-wasi/include/c++/v1/__type_traits/is_replaceable.h
 wasi/include/c++/v1/__type_traits/is_same.h
 wasi/include/c++/v1/__type_traits/is_scalar.h
 wasi/include/c++/v1/__type_traits/is_signed.h
@@ -1458,17 +1454,18 @@ wasi/include/c++/v1/__type_traits/is_trivially_copyable.h
 wasi/include/c++/v1/__type_traits/is_trivially_destructible.h
 wasi/include/c++/v1/__type_traits/is_trivially_lexicographically_comparable.h
 wasi/include/c++/v1/__type_traits/is_trivially_relocatable.h
-wasi/include/c++/v1/__type_traits/is_unbounded_array.h
 wasi/include/c++/v1/__type_traits/is_union.h
 wasi/include/c++/v1/__type_traits/is_unqualified.h
 wasi/include/c++/v1/__type_traits/is_unsigned.h
 wasi/include/c++/v1/__type_traits/is_valid_expansion.h
 wasi/include/c++/v1/__type_traits/is_void.h
 wasi/include/c++/v1/__type_traits/is_volatile.h
+wasi/include/c++/v1/__type_traits/is_within_lifetime.h
 wasi/include/c++/v1/__type_traits/lazy.h
 wasi/include/c++/v1/__type_traits/make_32_64_or_128_bit.h
 wasi/include/c++/v1/__type_traits/make_const_lvalue_ref.h
 wasi/include/c++/v1/__type_traits/make_signed.h
+wasi/include/c++/v1/__type_traits/make_transparent.h
 wasi/include/c++/v1/__type_traits/make_unsigned.h
 wasi/include/c++/v1/__type_traits/maybe_const.h
 wasi/include/c++/v1/__type_traits/nat.h
@@ -1500,6 +1497,7 @@ wasi/include/c++/v1/__utility/auto_cast.h
 wasi/include/c++/v1/__utility/cmp.h
 wasi/include/c++/v1/__utility/convert_to_integral.h
 wasi/include/c++/v1/__utility/declval.h
+wasi/include/c++/v1/__utility/default_three_way_comparator.h
 wasi/include/c++/v1/__utility/element_count.h
 wasi/include/c++/v1/__utility/empty.h
 wasi/include/c++/v1/__utility/exception_guard.h
@@ -1510,6 +1508,7 @@ wasi/include/c++/v1/__utility/in_place.h
 wasi/include/c++/v1/__utility/integer_sequence.h
 wasi/include/c++/v1/__utility/is_pointer_in_range.h
 wasi/include/c++/v1/__utility/is_valid_range.h
+wasi/include/c++/v1/__utility/lazy_synth_three_way_comparator.h
 wasi/include/c++/v1/__utility/move.h
 wasi/include/c++/v1/__utility/no_destroy.h
 wasi/include/c++/v1/__utility/pair.h
@@ -1521,6 +1520,7 @@ wasi/include/c++/v1/__utility/scope_guard.h
 wasi/include/c++/v1/__utility/small_buffer.h
 wasi/include/c++/v1/__utility/swap.h
 wasi/include/c++/v1/__utility/to_underlying.h
+wasi/include/c++/v1/__utility/try_key_extraction.h
 wasi/include/c++/v1/__utility/unreachable.h
 wasi/include/c++/v1/__variant/monostate.h
 wasi/include/c++/v1/__vector/comparison.h
@@ -1650,7 +1650,6 @@ wasi/include/c++/v1/span
 wasi/include/c++/v1/sstream
 wasi/include/c++/v1/stack
 wasi/include/c++/v1/stdatomic.h
-wasi/include/c++/v1/stdbool.h
 wasi/include/c++/v1/stddef.h
 wasi/include/c++/v1/stdexcept
 wasi/include/c++/v1/stdio.h
diff --git a/wasi-libcxx/distinfo b/wasi-libcxx/distinfo
index 8e487e798b..38a42086c2 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-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
-SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
-Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
-SHA1 (patch-libcxx_include_CMakeLists.txt) = 4dde52af9fa23367e6d4a19ab70a06d1ce5f28f7
+BLAKE2s (llvm-project-22.1.2.src.tar.xz) = b27c89d1cd0491af4e474737f6ef43dabbb94ffb2a855d5c9f87d9e0bbd2bdc0
+SHA512 (llvm-project-22.1.2.src.tar.xz) = d5adfbb8e5026b845f8251f5f490b4646ccd2ecaf81a2b80091d1c71044f5c7726f2df6680a95589f2dedc614bdd9cdd88febcce6d5fc92f638f616d503b8066
+Size (llvm-project-22.1.2.src.tar.xz) = 167026580 bytes
+SHA1 (patch-libcxx_include_CMakeLists.txt) = 6f6a65619f7d283a40e3511a309199d0c28e02d8
 SHA1 (patch-libcxx_src_CMakeLists.txt) = c4707f5b0b5eacc0ab02f25dfc7281a484507cc5
 SHA1 (patch-libcxxabi_src_CMakeLists.txt) = deaa2a57f409ac215eb6b9d219086cc3f72b0d7d
diff --git a/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt b/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
index a62c1d7028..db284b3f95 100644
--- a/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
+++ b/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.2 2022/11/14 18:44:07 adam Exp $
+$NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.5 2026/03/25 22:56:28 wiz Exp $
 
 * Generate __config_site and __assertion_handler under source directory. This is wrong.
   This fixes non-pthreads wasi-libcxx-14.0.6 build.
 
---- libcxx/include/CMakeLists.txt.orig	2025-12-12 10:35:47.000000000 +0000
+--- libcxx/include/CMakeLists.txt.orig	2026-03-23 18:46:22.000000000 +0000
 +++ libcxx/include/CMakeLists.txt
-@@ -1677,7 +1677,9 @@ set(files
-   __cxx03/wctype.h
+@@ -1676,7 +1676,9 @@ set(files
+   __cxx03/wchar.h
    )
  
 +configure_file("__config_site.in" "${CMAKE_CURRENT_SOURCE_DIR}/__config_site" @ONLY)
@@ -15,8 +15,11 @@ $NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.2 2022/11/14 18:44:07 adam Exp
  configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler" COPYONLY)
  
  # We generate the modulemap file so that we can include __config_site in it. For now, we don't know how to
-@@ -1687,6 +1689,9 @@ if (NOT LLVM_ENABLE_PER_TARGET_RUNTIME_D
+@@ -1684,8 +1686,12 @@ configure_file("${LIBCXX_ASSERTION_HANDL
+ if (NOT LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
+   set(LIBCXX_CONFIG_SITE_MODULE_ENTRY "textual header \"__config_site\"")
  endif()
++configure_file("module.modulemap.in" "${CMAKE_CURRENT_SOURCE_DIR}/module.modulemap" @ONLY)
  configure_file("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
  
 +set(_all_includes "${CMAKE_CURRENT_SOURCE_DIR}/__config_site"



Home | Main Index | Thread Index | Old Index