pkgsrc-WIP-changes archive

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

llvm: updated to 21.1.5



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Fri Nov 14 12:18:41 2025 +0100
Changeset:	4d872c79946c72914636b7cab23de3fa372921da

Modified Files:
	clang-tools-extra/Makefile
	clang-tools-extra/PLIST
	clang-tools-extra/distinfo
	clang/PLIST
	clang/buildlink3.mk
	clang/distinfo
	compiler-rt/buildlink3.mk
	compiler-rt/distinfo
	compiler-rt/patches/patch-cmake_config-ix.cmake
	flang/distinfo
	libcxx/Makefile
	libcxx/PLIST
	libcxx/buildlink3.mk
	libcxx/distinfo
	libcxxabi/Makefile
	libcxxabi/buildlink3.mk
	libcxxabi/distinfo
	libcxxabi/patches/patch-src_CMakeLists.txt
	libunwind/buildlink3.mk
	libunwind/distinfo
	lld/PLIST
	lld/buildlink3.mk
	lld/distinfo
	lldb/Makefile
	lldb/PLIST
	lldb/buildlink3.mk
	lldb/distinfo
	llvm/PLIST
	llvm/buildlink3.mk
	llvm/distinfo
	llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
	llvm/version.mk
	mlir/Makefile
	mlir/buildlink3.mk
	mlir/distinfo
	openmp/buildlink3.mk
	openmp/distinfo
	polly/buildlink3.mk
	polly/distinfo
	wasi-compiler-rt/buildlink3.mk
	wasi-libcxx/buildlink3.mk
	wasi-libcxx/distinfo
Added Files:
	mlir/patch-cmake_modules_MLIRConfig.cmake.in
Removed Files:
	llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h
	mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in

Log Message:
llvm: updated to 21.1.5

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

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

diffstat:
 clang-tools-extra/Makefile                         |   5 +-
 clang-tools-extra/PLIST                            |  18 +
 clang-tools-extra/distinfo                         |   6 +-
 clang/PLIST                                        | 633 ++++++++++++---------
 clang/buildlink3.mk                                |   7 +-
 clang/distinfo                                     |   6 +-
 compiler-rt/buildlink3.mk                          |   2 +-
 compiler-rt/distinfo                               |   8 +-
 compiler-rt/patches/patch-cmake_config-ix.cmake    |  10 +-
 flang/distinfo                                     |   6 +-
 libcxx/Makefile                                    |   2 +-
 libcxx/PLIST                                       | 478 ++--------------
 libcxx/buildlink3.mk                               |   2 +-
 libcxx/distinfo                                    |   6 +-
 libcxxabi/Makefile                                 |   7 +-
 libcxxabi/buildlink3.mk                            |   2 +-
 libcxxabi/distinfo                                 |   8 +-
 libcxxabi/patches/patch-src_CMakeLists.txt         |  22 +-
 libunwind/buildlink3.mk                            |   2 +-
 libunwind/distinfo                                 |   6 +-
 lld/PLIST                                          |   2 +
 lld/buildlink3.mk                                  |   2 +-
 lld/distinfo                                       |   6 +-
 lldb/Makefile                                      |   2 +
 lldb/PLIST                                         |  98 +++-
 lldb/buildlink3.mk                                 |   4 +-
 lldb/distinfo                                      |   6 +-
 llvm/PLIST                                         | 150 ++++-
 llvm/buildlink3.mk                                 |   2 +-
 llvm/distinfo                                      |   9 +-
 .../patch-include_llvm_Analysis_ConstantFolding.h  |  17 -
 llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt |   8 +-
 llvm/version.mk                                    |   3 +-
 mlir/Makefile                                      |  10 +-
 mlir/buildlink3.mk                                 |   2 +-
 mlir/distinfo                                      |   7 +-
 mlir/patch-cmake_modules_MLIRConfig.cmake.in       |  15 +
 .../patch-cmake_modules_MLIRConfig.cmake.in        |  15 -
 openmp/buildlink3.mk                               |   4 +-
 openmp/distinfo                                    |   6 +-
 polly/buildlink3.mk                                |   2 +-
 polly/distinfo                                     |   6 +-
 wasi-compiler-rt/buildlink3.mk                     |   2 +-
 wasi-libcxx/buildlink3.mk                          |   2 +-
 wasi-libcxx/distinfo                               |   6 +-
 45 files changed, 752 insertions(+), 870 deletions(-)

diffs:
diff --git a/clang-tools-extra/Makefile b/clang-tools-extra/Makefile
index bd37f3f59c..7988d75578 100644
--- a/clang-tools-extra/Makefile
+++ b/clang-tools-extra/Makefile
@@ -10,6 +10,9 @@ PKGNAME=	clang-tools-extra-${LLVM_VERSION}
 
 COMMENT=	Extra Clang tools
 
+EXTRACT_ELEMENTS+=	${DISTNAME}/clang
+WRKSRC=			${WRKDIR}/${DISTNAME}/clang
+
 DEPENDS+=	clang>=${LLVM_VERSION}:../../wip/clang
 
 BUILD_TARGET=	clang-change-namespace clang-apply-replacements clang-doc
@@ -25,6 +28,6 @@ BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-Bsymbolic-functions
 .PHONY: inject-clang-tools
 post-extract: inject-clang-tools
 inject-clang-tools:
-	${LN} -s ${WRKSRC} ${WRKSRC}/../clang/tools/extra
+	${LN} -s ${WRKDIR}/${DISTNAME}/clang-tools-extra ${WRKDIR}/${DISTNAME}/clang/tools/extra
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/clang-tools-extra/PLIST b/clang-tools-extra/PLIST
index 5869889fdb..42e848a9b2 100644
--- a/clang-tools-extra/PLIST
+++ b/clang-tools-extra/PLIST
@@ -76,6 +76,7 @@ include/clang-tidy/bugprone/BadSignalToKillThreadCheck.h
 include/clang-tidy/bugprone/BitwisePointerCastCheck.h
 include/clang-tidy/bugprone/BoolPointerImplicitConversionCheck.h
 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/ComparePointerToMemberVirtualFunctionCheck.h
@@ -100,6 +101,7 @@ include/clang-tidy/bugprone/IntegerDivisionCheck.h
 include/clang-tidy/bugprone/LambdaFunctionNameCheck.h
 include/clang-tidy/bugprone/MacroParenthesesCheck.h
 include/clang-tidy/bugprone/MacroRepeatedSideEffectsCheck.h
+include/clang-tidy/bugprone/MisleadingSetterOfReferenceCheck.h
 include/clang-tidy/bugprone/MisplacedOperatorInStrlenInAllocCheck.h
 include/clang-tidy/bugprone/MisplacedPointerArithmeticInAllocCheck.h
 include/clang-tidy/bugprone/MisplacedWideningCastCheck.h
@@ -151,6 +153,7 @@ include/clang-tidy/bugprone/UndefinedMemoryManipulationCheck.h
 include/clang-tidy/bugprone/UndelegatedConstructorCheck.h
 include/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.h
 include/clang-tidy/bugprone/UnhandledSelfAssignmentCheck.h
+include/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.h
 include/clang-tidy/bugprone/UniquePtrArrayMismatchCheck.h
 include/clang-tidy/bugprone/UnsafeFunctionsCheck.h
 include/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.h
@@ -201,6 +204,7 @@ include/clang-tidy/cppcoreguidelines/ProTypeVarargCheck.h
 include/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.h
 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/darwin/AvoidSpinlockCheck.h
 include/clang-tidy/darwin/DispatchOnceNonstaticCheck.h
@@ -237,6 +241,7 @@ include/clang-tidy/llvm/HeaderGuardCheck.h
 include/clang-tidy/llvm/IncludeOrderCheck.h
 include/clang-tidy/llvm/PreferIsaOrDynCastInConditionalsCheck.h
 include/clang-tidy/llvm/PreferRegisterOverUnsignedCheck.h
+include/clang-tidy/llvm/PreferStaticOverAnonymousNamespaceCheck.h
 include/clang-tidy/llvm/TwineLocalCheck.h
 include/clang-tidy/llvmlibc/CalleeNamespaceCheck.h
 include/clang-tidy/llvmlibc/ImplementationInNamespaceCheck.h
@@ -303,6 +308,7 @@ include/clang-tidy/modernize/UseNoexceptCheck.h
 include/clang-tidy/modernize/UseNullptrCheck.h
 include/clang-tidy/modernize/UseOverrideCheck.h
 include/clang-tidy/modernize/UseRangesCheck.h
+include/clang-tidy/modernize/UseScopedLockCheck.h
 include/clang-tidy/modernize/UseStartsEndsWithCheck.h
 include/clang-tidy/modernize/UseStdFormatCheck.h
 include/clang-tidy/modernize/UseStdNumbersCheck.h
@@ -345,10 +351,12 @@ include/clang-tidy/performance/TypePromotionInMathFnCheck.h
 include/clang-tidy/performance/UnnecessaryCopyInitialization.h
 include/clang-tidy/performance/UnnecessaryValueParamCheck.h
 @pkgdir include/clang-tidy/plugin
+include/clang-tidy/portability/AvoidPragmaOnceCheck.h
 include/clang-tidy/portability/RestrictSystemIncludesCheck.h
 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/AvoidNestedConditionalOperatorCheck.h
 include/clang-tidy/readability/AvoidReturnWithVoidValueCheck.h
@@ -401,6 +409,7 @@ include/clang-tidy/readability/SuspiciousCallArgumentCheck.h
 include/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h
 include/clang-tidy/readability/UppercaseLiteralSuffixCheck.h
 include/clang-tidy/readability/UseAnyOfAllOfCheck.h
+include/clang-tidy/readability/UseConcisePreprocessorDirectivesCheck.h
 include/clang-tidy/readability/UseStdMinMaxCheck.h
 include/clang-tidy/tool/ClangTidyMain.h
 include/clang-tidy/utils/ASTUtils.h
@@ -432,6 +441,7 @@ lib/libclangChangeNamespace.a
 lib/libclangDaemon.a
 lib/libclangDaemonTweaks.a
 lib/libclangDoc.a
+lib/libclangDocSupport.a
 lib/libclangIncludeCleaner.a
 lib/libclangIncludeFixer.a
 lib/libclangIncludeFixerPlugin.a
@@ -471,7 +481,15 @@ lib/libclangdRemoteIndex.a
 lib/libclangdSupport.a
 lib/libfindAllSymbols.a
 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/index.js
+share/clang-doc/mustache-index.js
+share/clang-doc/namespace-template.mustache
+share/clang-doc/template.mustache
 share/clang/clang-include-fixer.el
 share/clang/clang-include-fixer.py
 share/clang/clang-tidy-diff.py
diff --git a/clang-tools-extra/distinfo b/clang-tools-extra/distinfo
index db8f0e7fb0..d8d64cbb9f 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
diff --git a/clang/PLIST b/clang/PLIST
index 83ad1c7960..135ef7dfbd 100644
--- a/clang/PLIST
+++ b/clang/PLIST
@@ -4,7 +4,7 @@ bin/analyze-build
 bin/c-index-test
 bin/clang
 bin/clang++
-bin/clang-20
+bin/clang-21
 bin/clang-check
 bin/clang-cl
 bin/clang-cpp
@@ -24,6 +24,7 @@ bin/git-clang-format
 bin/hmaptool
 bin/intercept-build
 bin/nvptx-arch
+bin/offload-arch
 bin/scan-build
 bin/scan-build-py
 bin/scan-view
@@ -46,9 +47,6 @@ include/clang/APINotes/APINotesReader.h
 include/clang/APINotes/APINotesWriter.h
 include/clang/APINotes/APINotesYAMLCompiler.h
 include/clang/APINotes/Types.h
-include/clang/ARCMigrate/ARCMT.h
-include/clang/ARCMigrate/ARCMTActions.h
-include/clang/ARCMigrate/FileRemapper.h
 include/clang/AST/APNumericStorage.h
 include/clang/AST/APValue.h
 include/clang/AST/AST.h
@@ -124,6 +122,7 @@ include/clang/AST/DeclLookups.h
 include/clang/AST/DeclNodes.inc
 include/clang/AST/DeclObjC.h
 include/clang/AST/DeclObjCCommon.h
+include/clang/AST/DeclOpenACC.h
 include/clang/AST/DeclOpenMP.h
 include/clang/AST/DeclTemplate.h
 include/clang/AST/DeclVisitor.h
@@ -205,12 +204,14 @@ 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
 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/LiveVariables.h
 include/clang/Analysis/Analyses/PostOrderCFGView.h
 include/clang/Analysis/Analyses/ReachableCode.h
@@ -272,7 +273,8 @@ include/clang/Analysis/ProgramPoint.h
 include/clang/Analysis/RetainSummaryManager.h
 include/clang/Analysis/SelectorExtras.h
 include/clang/Analysis/Support/BumpVector.h
-include/clang/Basic/AArch64SVEACLETypes.def
+include/clang/Analysis/Support/FixitUtil.h
+include/clang/Basic/AArch64ACLETypes.def
 include/clang/Basic/ABI.h
 include/clang/Basic/AMDGPUTypes.def
 include/clang/Basic/ASTSourceDescriptor.h
@@ -286,9 +288,12 @@ include/clang/Basic/AttrParsedAttrList.inc
 include/clang/Basic/AttrSubMatchRulesList.inc
 include/clang/Basic/AttrSubjectMatchRules.h
 include/clang/Basic/AttributeCommonInfo.h
+include/clang/Basic/AttributeScopeInfo.h
+include/clang/Basic/AttributeSpellingList.inc
 include/clang/Basic/Attributes.h
 include/clang/Basic/BitmaskEnum.h
 include/clang/Basic/BuiltinHeaders.def
+include/clang/Basic/BuiltinTemplates.inc
 include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/Builtins.inc
@@ -298,21 +303,19 @@ include/clang/Basic/BuiltinsAArch64NeonSVEBridge_cg.def
 include/clang/Basic/BuiltinsAMDGPU.def
 include/clang/Basic/BuiltinsARM.def
 include/clang/Basic/BuiltinsBPF.inc
+include/clang/Basic/BuiltinsDirectX.inc
 include/clang/Basic/BuiltinsHexagon.inc
 include/clang/Basic/BuiltinsHexagonMapCustomDep.def
-include/clang/Basic/BuiltinsLoongArch.def
 include/clang/Basic/BuiltinsLoongArchBase.def
 include/clang/Basic/BuiltinsLoongArchLASX.def
 include/clang/Basic/BuiltinsLoongArchLSX.def
 include/clang/Basic/BuiltinsMips.def
-include/clang/Basic/BuiltinsNEON.def
 include/clang/Basic/BuiltinsNVPTX.inc
 include/clang/Basic/BuiltinsPPC.def
 include/clang/Basic/BuiltinsRISCV.inc
-include/clang/Basic/BuiltinsRISCVVector.def
-include/clang/Basic/BuiltinsSME.def
-include/clang/Basic/BuiltinsSPIRV.inc
-include/clang/Basic/BuiltinsSVE.def
+include/clang/Basic/BuiltinsSPIRVCL.inc
+include/clang/Basic/BuiltinsSPIRVCommon.inc
+include/clang/Basic/BuiltinsSPIRVVK.inc
 include/clang/Basic/BuiltinsSystemZ.def
 include/clang/Basic/BuiltinsVE.def
 include/clang/Basic/BuiltinsVEVL.gen.def
@@ -335,49 +338,76 @@ include/clang/Basic/DarwinSDKInfo.h
 include/clang/Basic/DebugOptions.def
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticAST.h
+include/clang/Basic/DiagnosticASTCompatIDs.inc
 include/clang/Basic/DiagnosticASTEnums.inc
+include/clang/Basic/DiagnosticASTInterface.inc
 include/clang/Basic/DiagnosticASTKinds.inc
+include/clang/Basic/DiagnosticAllCompatIDs.inc
 include/clang/Basic/DiagnosticAnalysis.h
+include/clang/Basic/DiagnosticAnalysisCompatIDs.inc
 include/clang/Basic/DiagnosticAnalysisEnums.inc
+include/clang/Basic/DiagnosticAnalysisInterface.inc
 include/clang/Basic/DiagnosticAnalysisKinds.inc
 include/clang/Basic/DiagnosticCategories.h
 include/clang/Basic/DiagnosticComment.h
+include/clang/Basic/DiagnosticCommentCompatIDs.inc
 include/clang/Basic/DiagnosticCommentEnums.inc
+include/clang/Basic/DiagnosticCommentInterface.inc
 include/clang/Basic/DiagnosticCommentKinds.inc
+include/clang/Basic/DiagnosticCommonCompatIDs.inc
 include/clang/Basic/DiagnosticCommonEnums.inc
+include/clang/Basic/DiagnosticCommonInterface.inc
 include/clang/Basic/DiagnosticCommonKinds.inc
 include/clang/Basic/DiagnosticCrossTU.h
+include/clang/Basic/DiagnosticCrossTUCompatIDs.inc
 include/clang/Basic/DiagnosticCrossTUEnums.inc
+include/clang/Basic/DiagnosticCrossTUInterface.inc
 include/clang/Basic/DiagnosticCrossTUKinds.inc
 include/clang/Basic/DiagnosticDriver.h
+include/clang/Basic/DiagnosticDriverCompatIDs.inc
 include/clang/Basic/DiagnosticDriverEnums.inc
+include/clang/Basic/DiagnosticDriverInterface.inc
 include/clang/Basic/DiagnosticDriverKinds.inc
 include/clang/Basic/DiagnosticError.h
 include/clang/Basic/DiagnosticFrontend.h
+include/clang/Basic/DiagnosticFrontendCompatIDs.inc
 include/clang/Basic/DiagnosticFrontendEnums.inc
+include/clang/Basic/DiagnosticFrontendInterface.inc
 include/clang/Basic/DiagnosticFrontendKinds.inc
 include/clang/Basic/DiagnosticGroups.inc
 include/clang/Basic/DiagnosticIDs.h
 include/clang/Basic/DiagnosticIndexName.inc
 include/clang/Basic/DiagnosticInstallAPI.h
+include/clang/Basic/DiagnosticInstallAPICompatIDs.inc
 include/clang/Basic/DiagnosticInstallAPIEnums.inc
+include/clang/Basic/DiagnosticInstallAPIInterface.inc
 include/clang/Basic/DiagnosticInstallAPIKinds.inc
 include/clang/Basic/DiagnosticLex.h
+include/clang/Basic/DiagnosticLexCompatIDs.inc
 include/clang/Basic/DiagnosticLexEnums.inc
+include/clang/Basic/DiagnosticLexInterface.inc
 include/clang/Basic/DiagnosticLexKinds.inc
 include/clang/Basic/DiagnosticOptions.def
 include/clang/Basic/DiagnosticOptions.h
 include/clang/Basic/DiagnosticParse.h
+include/clang/Basic/DiagnosticParseCompatIDs.inc
 include/clang/Basic/DiagnosticParseEnums.inc
+include/clang/Basic/DiagnosticParseInterface.inc
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticRefactoring.h
+include/clang/Basic/DiagnosticRefactoringCompatIDs.inc
 include/clang/Basic/DiagnosticRefactoringEnums.inc
+include/clang/Basic/DiagnosticRefactoringInterface.inc
 include/clang/Basic/DiagnosticRefactoringKinds.inc
 include/clang/Basic/DiagnosticSema.h
+include/clang/Basic/DiagnosticSemaCompatIDs.inc
 include/clang/Basic/DiagnosticSemaEnums.inc
+include/clang/Basic/DiagnosticSemaInterface.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
 include/clang/Basic/DiagnosticSerialization.h
+include/clang/Basic/DiagnosticSerializationCompatIDs.inc
 include/clang/Basic/DiagnosticSerializationEnums.inc
+include/clang/Basic/DiagnosticSerializationInterface.inc
 include/clang/Basic/DiagnosticSerializationKinds.inc
 include/clang/Basic/DirectoryEntry.h
 include/clang/Basic/ExceptionSpecificationType.h
@@ -406,6 +436,7 @@ include/clang/Basic/MakeSupport.h
 include/clang/Basic/Module.h
 include/clang/Basic/NoSanitizeList.h
 include/clang/Basic/ObjCRuntime.h
+include/clang/Basic/OffloadArch.h
 include/clang/Basic/OpenACCClauses.def
 include/clang/Basic/OpenACCKinds.h
 include/clang/Basic/OpenCLExtensionTypes.def
@@ -431,6 +462,7 @@ include/clang/Basic/SanitizerSpecialCaseList.h
 include/clang/Basic/Sanitizers.def
 include/clang/Basic/Sanitizers.h
 include/clang/Basic/Sarif.h
+include/clang/Basic/SimpleTypoCorrection.h
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
@@ -452,6 +484,7 @@ include/clang/Basic/TokenKinds.def
 include/clang/Basic/TokenKinds.h
 include/clang/Basic/TransformTypeTraits.def
 include/clang/Basic/TypeTraits.h
+include/clang/Basic/UnsignedOrNone.h
 include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
 include/clang/Basic/Visibility.h
@@ -479,19 +512,37 @@ include/clang/Basic/arm_sve_builtins.inc
 include/clang/Basic/arm_sve_sema_rangechecks.inc
 include/clang/Basic/arm_sve_streaming_attrs.inc
 include/clang/Basic/arm_sve_typeflags.inc
+include/clang/Basic/riscv_andes_vector_builtin_cg.inc
+include/clang/Basic/riscv_andes_vector_builtin_sema.inc
+include/clang/Basic/riscv_andes_vector_builtins.inc
 include/clang/Basic/riscv_sifive_vector_builtin_cg.inc
 include/clang/Basic/riscv_sifive_vector_builtin_sema.inc
 include/clang/Basic/riscv_sifive_vector_builtins.inc
 include/clang/Basic/riscv_vector_builtin_cg.inc
 include/clang/Basic/riscv_vector_builtin_sema.inc
 include/clang/Basic/riscv_vector_builtins.inc
+include/clang/CIR/ABIArgInfo.h
 include/clang/CIR/CIRGenerator.h
+include/clang/CIR/CIRToCIRPasses.h
 include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
 include/clang/CIR/Dialect/IR/CIRAttrs.h
+include/clang/CIR/Dialect/IR/CIRDataLayout.h
 include/clang/CIR/Dialect/IR/CIRDialect.h
+include/clang/CIR/Dialect/IR/CIROpsEnums.h
 include/clang/CIR/Dialect/IR/CIRTypes.h
+include/clang/CIR/Dialect/IR/CIRTypesDetails.h
+include/clang/CIR/Dialect/OpenACC/CIROpenACCTypeInterfaces.h
+include/clang/CIR/Dialect/OpenACC/RegisterOpenACCExtensions.h
+include/clang/CIR/Dialect/Passes.h
 include/clang/CIR/FrontendAction/CIRGenAction.h
-include/clang/CIR/Interfaces/CIRFPTypeInterface.h
+include/clang/CIR/Interfaces/CIRLoopOpInterface.h
+include/clang/CIR/Interfaces/CIROpInterfaces.h
+include/clang/CIR/Interfaces/CIRTypeInterfaces.h
+include/clang/CIR/LowerToLLVM.h
+include/clang/CIR/LoweringHelpers.h
+include/clang/CIR/MissingFeatures.h
+include/clang/CIR/Passes.h
+include/clang/CIR/TypeEvaluationKind.h
 include/clang/CodeGen/BackendUtil.h
 include/clang/CodeGen/CGFunctionInfo.h
 include/clang/CodeGen/CodeGenABITypes.h
@@ -506,6 +557,7 @@ include/clang/CrossTU/CrossTUDiagnostic.h
 include/clang/CrossTU/CrossTranslationUnit.h
 include/clang/DirectoryWatcher/DirectoryWatcher.h
 include/clang/Driver/Action.h
+include/clang/Driver/CommonArgs.h
 include/clang/Driver/Compilation.h
 include/clang/Driver/Distro.h
 include/clang/Driver/Driver.h
@@ -594,23 +646,28 @@ include/clang/InstallAPI/Visitor.h
 include/clang/Interpreter/CodeCompletion.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
 include/clang/Lex/DirectoryLookup.h
 include/clang/Lex/ExternalPreprocessorSource.h
+include/clang/Lex/HLSLRootSignatureTokenKinds.def
 include/clang/Lex/HeaderMap.h
 include/clang/Lex/HeaderMapTypes.h
 include/clang/Lex/HeaderSearch.h
 include/clang/Lex/HeaderSearchOptions.h
 include/clang/Lex/LexDiagnostic.h
+include/clang/Lex/LexHLSLRootSignature.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
 include/clang/Lex/MacroArgs.h
 include/clang/Lex/MacroInfo.h
 include/clang/Lex/ModuleLoader.h
 include/clang/Lex/ModuleMap.h
+include/clang/Lex/ModuleMapFile.h
 include/clang/Lex/MultipleIncludeOpt.h
+include/clang/Lex/NoTrivialPPDirectiveTracer.h
 include/clang/Lex/PPCallbacks.h
 include/clang/Lex/PPConditionalDirectiveRecord.h
 include/clang/Lex/PPDirectiveParameter.h
@@ -629,6 +686,7 @@ include/clang/Parse/AttrParserStringSwitches.inc
 include/clang/Parse/AttrSubMatchRulesParserStringSwitches.inc
 include/clang/Parse/LoopHint.h
 include/clang/Parse/ParseAST.h
+include/clang/Parse/ParseHLSLRootSignature.h
 include/clang/Parse/Parser.h
 include/clang/Parse/RAIIObjectsForParser.h
 include/clang/Rewrite/Core/HTMLRewrite.h
@@ -679,6 +737,7 @@ include/clang/Sema/SemaCodeCompletion.h
 include/clang/Sema/SemaConcept.h
 include/clang/Sema/SemaConsumer.h
 include/clang/Sema/SemaDiagnostic.h
+include/clang/Sema/SemaDirectX.h
 include/clang/Sema/SemaFixItUtils.h
 include/clang/Sema/SemaHLSL.h
 include/clang/Sema/SemaHexagon.h
@@ -718,6 +777,7 @@ include/clang/Serialization/AttrPCHWrite.inc
 include/clang/Serialization/ContinuousRangeMap.h
 include/clang/Serialization/GlobalModuleIndex.h
 include/clang/Serialization/InMemoryModuleCache.h
+include/clang/Serialization/ModuleCache.h
 include/clang/Serialization/ModuleFile.h
 include/clang/Serialization/ModuleFileExtension.h
 include/clang/Serialization/ModuleManager.h
@@ -759,6 +819,7 @@ include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h
 include/clang/StaticAnalyzer/Core/PathSensitive/DynamicExtent.h
 include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h
 include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
+include/clang/StaticAnalyzer/Core/PathSensitive/EntryPointStats.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
@@ -809,6 +870,7 @@ 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/DiagnosticsYaml.h
 include/clang/Tooling/Execution.h
@@ -865,287 +927,290 @@ 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/20/include/__clang_cuda_builtin_vars.h
-lib/clang/20/include/__clang_cuda_cmath.h
-lib/clang/20/include/__clang_cuda_complex_builtins.h
-lib/clang/20/include/__clang_cuda_device_functions.h
-lib/clang/20/include/__clang_cuda_intrinsics.h
-lib/clang/20/include/__clang_cuda_libdevice_declares.h
-lib/clang/20/include/__clang_cuda_math.h
-lib/clang/20/include/__clang_cuda_math_forward_declares.h
-lib/clang/20/include/__clang_cuda_runtime_wrapper.h
-lib/clang/20/include/__clang_cuda_texture_intrinsics.h
-lib/clang/20/include/__clang_hip_cmath.h
-lib/clang/20/include/__clang_hip_libdevice_declares.h
-lib/clang/20/include/__clang_hip_math.h
-lib/clang/20/include/__clang_hip_runtime_wrapper.h
-lib/clang/20/include/__clang_hip_stdlib.h
-lib/clang/20/include/__stdarg___gnuc_va_list.h
-lib/clang/20/include/__stdarg___va_copy.h
-lib/clang/20/include/__stdarg_header_macro.h
-lib/clang/20/include/__stdarg_va_arg.h
-lib/clang/20/include/__stdarg_va_copy.h
-lib/clang/20/include/__stdarg_va_list.h
-lib/clang/20/include/__stddef_header_macro.h
-lib/clang/20/include/__stddef_max_align_t.h
-lib/clang/20/include/__stddef_null.h
-lib/clang/20/include/__stddef_nullptr_t.h
-lib/clang/20/include/__stddef_offsetof.h
-lib/clang/20/include/__stddef_ptrdiff_t.h
-lib/clang/20/include/__stddef_rsize_t.h
-lib/clang/20/include/__stddef_size_t.h
-lib/clang/20/include/__stddef_unreachable.h
-lib/clang/20/include/__stddef_wchar_t.h
-lib/clang/20/include/__stddef_wint_t.h
-lib/clang/20/include/__wmmintrin_aes.h
-lib/clang/20/include/__wmmintrin_pclmul.h
-lib/clang/20/include/adcintrin.h
-lib/clang/20/include/adxintrin.h
-lib/clang/20/include/altivec.h
-lib/clang/20/include/amdgpuintrin.h
-lib/clang/20/include/ammintrin.h
-lib/clang/20/include/amxavx512intrin.h
-lib/clang/20/include/amxbf16transposeintrin.h
-lib/clang/20/include/amxcomplexintrin.h
-lib/clang/20/include/amxcomplextransposeintrin.h
-lib/clang/20/include/amxfp16intrin.h
-lib/clang/20/include/amxfp16transposeintrin.h
-lib/clang/20/include/amxfp8intrin.h
-lib/clang/20/include/amxintrin.h
-lib/clang/20/include/amxmovrsintrin.h
-lib/clang/20/include/amxmovrstransposeintrin.h
-lib/clang/20/include/amxtf32intrin.h
-lib/clang/20/include/amxtf32transposeintrin.h
-lib/clang/20/include/amxtransposeintrin.h
-lib/clang/20/include/arm64intr.h
-lib/clang/20/include/arm_acle.h
-lib/clang/20/include/arm_bf16.h
-lib/clang/20/include/arm_cde.h
-lib/clang/20/include/arm_cmse.h
-lib/clang/20/include/arm_fp16.h
-lib/clang/20/include/arm_mve.h
-lib/clang/20/include/arm_neon.h
-lib/clang/20/include/arm_neon_sve_bridge.h
-lib/clang/20/include/arm_sme.h
-lib/clang/20/include/arm_sve.h
-lib/clang/20/include/arm_vector_types.h
-lib/clang/20/include/armintr.h
-lib/clang/20/include/avx10_2_512bf16intrin.h
-lib/clang/20/include/avx10_2_512convertintrin.h
-lib/clang/20/include/avx10_2_512minmaxintrin.h
-lib/clang/20/include/avx10_2_512niintrin.h
-lib/clang/20/include/avx10_2_512satcvtdsintrin.h
-lib/clang/20/include/avx10_2_512satcvtintrin.h
-lib/clang/20/include/avx10_2bf16intrin.h
-lib/clang/20/include/avx10_2convertintrin.h
-lib/clang/20/include/avx10_2copyintrin.h
-lib/clang/20/include/avx10_2minmaxintrin.h
-lib/clang/20/include/avx10_2niintrin.h
-lib/clang/20/include/avx10_2satcvtdsintrin.h
-lib/clang/20/include/avx10_2satcvtintrin.h
-lib/clang/20/include/avx2intrin.h
-lib/clang/20/include/avx512bf16intrin.h
-lib/clang/20/include/avx512bitalgintrin.h
-lib/clang/20/include/avx512bwintrin.h
-lib/clang/20/include/avx512cdintrin.h
-lib/clang/20/include/avx512dqintrin.h
-lib/clang/20/include/avx512fintrin.h
-lib/clang/20/include/avx512fp16intrin.h
-lib/clang/20/include/avx512ifmaintrin.h
-lib/clang/20/include/avx512ifmavlintrin.h
-lib/clang/20/include/avx512vbmi2intrin.h
-lib/clang/20/include/avx512vbmiintrin.h
-lib/clang/20/include/avx512vbmivlintrin.h
-lib/clang/20/include/avx512vlbf16intrin.h
-lib/clang/20/include/avx512vlbitalgintrin.h
-lib/clang/20/include/avx512vlbwintrin.h
-lib/clang/20/include/avx512vlcdintrin.h
-lib/clang/20/include/avx512vldqintrin.h
-lib/clang/20/include/avx512vlfp16intrin.h
-lib/clang/20/include/avx512vlintrin.h
-lib/clang/20/include/avx512vlvbmi2intrin.h
-lib/clang/20/include/avx512vlvnniintrin.h
-lib/clang/20/include/avx512vlvp2intersectintrin.h
-lib/clang/20/include/avx512vnniintrin.h
-lib/clang/20/include/avx512vp2intersectintrin.h
-lib/clang/20/include/avx512vpopcntdqintrin.h
-lib/clang/20/include/avx512vpopcntdqvlintrin.h
-lib/clang/20/include/avxifmaintrin.h
-lib/clang/20/include/avxintrin.h
-lib/clang/20/include/avxneconvertintrin.h
-lib/clang/20/include/avxvnniint16intrin.h
-lib/clang/20/include/avxvnniint8intrin.h
-lib/clang/20/include/avxvnniintrin.h
-lib/clang/20/include/bmi2intrin.h
-lib/clang/20/include/bmiintrin.h
-lib/clang/20/include/builtins.h
-lib/clang/20/include/cet.h
-lib/clang/20/include/cetintrin.h
-lib/clang/20/include/cldemoteintrin.h
-lib/clang/20/include/clflushoptintrin.h
-lib/clang/20/include/clwbintrin.h
-lib/clang/20/include/clzerointrin.h
-lib/clang/20/include/cmpccxaddintrin.h
-lib/clang/20/include/cpuid.h
-lib/clang/20/include/crc32intrin.h
-lib/clang/20/include/cuda_wrappers/algorithm
-lib/clang/20/include/cuda_wrappers/bits/basic_string.h
-lib/clang/20/include/cuda_wrappers/bits/basic_string.tcc
-lib/clang/20/include/cuda_wrappers/bits/shared_ptr_base.h
-lib/clang/20/include/cuda_wrappers/cmath
-lib/clang/20/include/cuda_wrappers/complex
-lib/clang/20/include/cuda_wrappers/new
-lib/clang/20/include/emmintrin.h
-lib/clang/20/include/enqcmdintrin.h
-lib/clang/20/include/f16cintrin.h
-lib/clang/20/include/float.h
-lib/clang/20/include/fma4intrin.h
-lib/clang/20/include/fmaintrin.h
-lib/clang/20/include/fxsrintrin.h
-lib/clang/20/include/gfniintrin.h
-lib/clang/20/include/gpuintrin.h
-lib/clang/20/include/hexagon_circ_brev_intrinsics.h
-lib/clang/20/include/hexagon_protos.h
-lib/clang/20/include/hexagon_types.h
-lib/clang/20/include/hresetintrin.h
-lib/clang/20/include/htmintrin.h
-lib/clang/20/include/htmxlintrin.h
-lib/clang/20/include/hvx_hexagon_protos.h
-lib/clang/20/include/ia32intrin.h
-lib/clang/20/include/immintrin.h
-lib/clang/20/include/intrin.h
-lib/clang/20/include/intrin0.h
-lib/clang/20/include/inttypes.h
-lib/clang/20/include/invpcidintrin.h
-lib/clang/20/include/iso646.h
-lib/clang/20/include/keylockerintrin.h
-lib/clang/20/include/larchintrin.h
-lib/clang/20/include/lasxintrin.h
-lib/clang/20/include/limits.h
-lib/clang/20/include/llvm_libc_wrappers/assert.h
-lib/clang/20/include/llvm_libc_wrappers/ctype.h
-lib/clang/20/include/llvm_libc_wrappers/inttypes.h
-lib/clang/20/include/llvm_libc_wrappers/stdio.h
-lib/clang/20/include/llvm_libc_wrappers/stdlib.h
-lib/clang/20/include/llvm_libc_wrappers/string.h
-lib/clang/20/include/llvm_libc_wrappers/time.h
-lib/clang/20/include/llvm_offload_wrappers/__llvm_offload.h
-lib/clang/20/include/llvm_offload_wrappers/__llvm_offload_device.h
-lib/clang/20/include/llvm_offload_wrappers/__llvm_offload_host.h
-lib/clang/20/include/lsxintrin.h
-lib/clang/20/include/lwpintrin.h
-lib/clang/20/include/lzcntintrin.h
-lib/clang/20/include/mm3dnow.h
-lib/clang/20/include/mm_malloc.h
-lib/clang/20/include/mmintrin.h
-lib/clang/20/include/module.modulemap
-lib/clang/20/include/movdirintrin.h
-lib/clang/20/include/movrs_avx10_2_512intrin.h
-lib/clang/20/include/movrs_avx10_2intrin.h
-lib/clang/20/include/movrsintrin.h
-lib/clang/20/include/msa.h
-lib/clang/20/include/mwaitxintrin.h
-lib/clang/20/include/nmmintrin.h
-lib/clang/20/include/nvptxintrin.h
-lib/clang/20/include/opencl-c-base.h
-lib/clang/20/include/opencl-c.h
-lib/clang/20/include/openmp_wrappers/__clang_openmp_device_functions.h
-lib/clang/20/include/openmp_wrappers/cmath
-lib/clang/20/include/openmp_wrappers/complex
-lib/clang/20/include/openmp_wrappers/complex.h
-lib/clang/20/include/openmp_wrappers/complex_cmath.h
-lib/clang/20/include/openmp_wrappers/math.h
-lib/clang/20/include/openmp_wrappers/new
-lib/clang/20/include/pconfigintrin.h
-lib/clang/20/include/pkuintrin.h
-lib/clang/20/include/pmmintrin.h
-lib/clang/20/include/popcntintrin.h
-lib/clang/20/include/ppc_wrappers/bmi2intrin.h
-lib/clang/20/include/ppc_wrappers/bmiintrin.h
-lib/clang/20/include/ppc_wrappers/emmintrin.h
-lib/clang/20/include/ppc_wrappers/immintrin.h
-lib/clang/20/include/ppc_wrappers/mm_malloc.h
-lib/clang/20/include/ppc_wrappers/mmintrin.h
-lib/clang/20/include/ppc_wrappers/nmmintrin.h
-lib/clang/20/include/ppc_wrappers/pmmintrin.h
-lib/clang/20/include/ppc_wrappers/smmintrin.h
-lib/clang/20/include/ppc_wrappers/tmmintrin.h
-lib/clang/20/include/ppc_wrappers/x86gprintrin.h
-lib/clang/20/include/ppc_wrappers/x86intrin.h
-lib/clang/20/include/ppc_wrappers/xmmintrin.h
-lib/clang/20/include/prfchiintrin.h
-lib/clang/20/include/prfchwintrin.h
-lib/clang/20/include/ptrauth.h
-lib/clang/20/include/ptwriteintrin.h
-lib/clang/20/include/raointintrin.h
-lib/clang/20/include/rdpruintrin.h
-lib/clang/20/include/rdseedintrin.h
-lib/clang/20/include/riscv_bitmanip.h
-lib/clang/20/include/riscv_corev_alu.h
-lib/clang/20/include/riscv_crypto.h
-lib/clang/20/include/riscv_ntlh.h
-lib/clang/20/include/riscv_vector.h
-lib/clang/20/include/rtmintrin.h
-lib/clang/20/include/s390intrin.h
-lib/clang/20/include/serializeintrin.h
-lib/clang/20/include/sgxintrin.h
-lib/clang/20/include/sha512intrin.h
-lib/clang/20/include/shaintrin.h
-lib/clang/20/include/sifive_vector.h
-lib/clang/20/include/sm3intrin.h
-lib/clang/20/include/sm4evexintrin.h
-lib/clang/20/include/sm4intrin.h
-lib/clang/20/include/smmintrin.h
-lib/clang/20/include/stdalign.h
-lib/clang/20/include/stdarg.h
-lib/clang/20/include/stdatomic.h
-lib/clang/20/include/stdbool.h
-lib/clang/20/include/stdckdint.h
-lib/clang/20/include/stddef.h
-lib/clang/20/include/stdint.h
-lib/clang/20/include/stdnoreturn.h
-lib/clang/20/include/tbmintrin.h
-lib/clang/20/include/tgmath.h
-lib/clang/20/include/tmmintrin.h
-lib/clang/20/include/tsxldtrkintrin.h
-lib/clang/20/include/uintrintrin.h
-lib/clang/20/include/unwind.h
-lib/clang/20/include/usermsrintrin.h
-lib/clang/20/include/vadefs.h
-lib/clang/20/include/vaesintrin.h
-lib/clang/20/include/varargs.h
-lib/clang/20/include/vecintrin.h
-lib/clang/20/include/velintrin.h
-lib/clang/20/include/velintrin_approx.h
-lib/clang/20/include/velintrin_gen.h
-lib/clang/20/include/vpclmulqdqintrin.h
-lib/clang/20/include/waitpkgintrin.h
-lib/clang/20/include/wasm_simd128.h
-lib/clang/20/include/wbnoinvdintrin.h
-lib/clang/20/include/wmmintrin.h
-lib/clang/20/include/x86gprintrin.h
-lib/clang/20/include/x86intrin.h
-lib/clang/20/include/xmmintrin.h
-lib/clang/20/include/xopintrin.h
-lib/clang/20/include/xsavecintrin.h
-lib/clang/20/include/xsaveintrin.h
-lib/clang/20/include/xsaveoptintrin.h
-lib/clang/20/include/xsavesintrin.h
-lib/clang/20/include/xtestintrin.h
-lib/clang/20/include/yvals_core.h
-lib/clang/20/include/zos_wrappers/builtins.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/cmake/clang/AddClang.cmake
 lib/cmake/clang/ClangConfig.cmake
 lib/cmake/clang/ClangConfigVersion.cmake
 lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
 lib/libclang-cpp.${SHLIB_EXT}
-${PLIST.notdylib}lib/libclang-cpp.so.20.1
+${PLIST.notdylib}lib/libclang-cpp.so.21.1
 lib/libclang.${SHLIB_EXT}
 ${PLIST.notdylib}lib/libclang.${SHLIB_EXT}.${PKGVERSION}
-${PLIST.notdylib}lib/libclang.${SHLIB_EXT}.20.1
+${PLIST.notdylib}lib/libclang.${SHLIB_EXT}.21.1
 lib/libclangAPINotes.a
-lib/libclangARCMigrate.a
 lib/libclangAST.a
 lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
diff --git a/clang/buildlink3.mk b/clang/buildlink3.mk
index 508b94fe60..6e97a3b4b8 100644
--- a/clang/buildlink3.mk
+++ b/clang/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	clang
 .if !defined(CLANG_BUILDLINK3_MK)
 CLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clang+=	clang>=20.0.0
-BUILDLINK_ABI_DEPENDS.clang+=	clang>=20.0.0
+BUILDLINK_API_DEPENDS.clang+=	clang>=21.1.0
+BUILDLINK_ABI_DEPENDS.clang+=	clang>=21.1.0
 BUILDLINK_PKGSRCDIR.clang?=	../../wip/clang
 
 BUILDLINK_FILES.clang+=		bin/amdgpu-arch
@@ -14,7 +14,7 @@ BUILDLINK_FILES.clang+=		bin/analyze-build
 BUILDLINK_FILES.clang+=		bin/c-index-test
 BUILDLINK_FILES.clang+=		bin/clang
 BUILDLINK_FILES.clang+=		bin/clang++
-BUILDLINK_FILES.clang+=		bin/clang-20
+BUILDLINK_FILES.clang+=		bin/clang-21
 BUILDLINK_FILES.clang+=		bin/clang-check
 BUILDLINK_FILES.clang+=		bin/clang-cl
 BUILDLINK_FILES.clang+=		bin/clang-cpp
@@ -34,6 +34,7 @@ BUILDLINK_FILES.clang+=		bin/git-clang-format
 BUILDLINK_FILES.clang+=		bin/hmaptool
 BUILDLINK_FILES.clang+=		bin/intercept-build
 BUILDLINK_FILES.clang+=		bin/nvptx-arch
+BUILDLINK_FILES.clang+=		bin/offload-arch
 BUILDLINK_FILES.clang+=		bin/scan-build
 BUILDLINK_FILES.clang+=		bin/scan-build-py
 BUILDLINK_FILES.clang+=		bin/scan-view
diff --git a/clang/distinfo b/clang/distinfo
index 8560a644ad..6e6cdb865f 100644
--- a/clang/distinfo
+++ b/clang/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
diff --git a/compiler-rt/buildlink3.mk b/compiler-rt/buildlink3.mk
index bd3f0e9515..f034ebee49 100644
--- a/compiler-rt/buildlink3.mk
+++ b/compiler-rt/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	compiler-rt
 .if !defined(COMPILER_RT_BUILDLINK3_MK)
 COMPILER_RT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.compiler-rt+=	compiler-rt>=20.1.0
+BUILDLINK_API_DEPENDS.compiler-rt+=	compiler-rt>=21.1.0
 BUILDLINK_PKGSRCDIR.compiler-rt?=	../../wip/compiler-rt
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index cdfd1f3909..33bd077e66 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.23 2023/03/03 09:53:14 wiz Exp $
 
-BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
-SHA1 (patch-cmake_config-ix.cmake) = e3d2fef7542eda42a0c716b31c0d9b0a729d92e0
+SHA1 (patch-cmake_config-ix.cmake) = 1a67378de34b048477ef80237ab8a76272288a55
diff --git a/compiler-rt/patches/patch-cmake_config-ix.cmake b/compiler-rt/patches/patch-cmake_config-ix.cmake
index ff19f10409..7085d801b8 100644
--- a/compiler-rt/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt/patches/patch-cmake_config-ix.cmake
@@ -2,14 +2,14 @@ $NetBSD: patch-cmake_config-ix.cmake,v 1.5 2022/08/12 08:58:41 pin Exp $
 
 Disable components that aren't ready for SunOS yet.
 
---- cmake/config-ix.cmake.orig	2025-04-29 23:05:17.000000000 +0000
+--- cmake/config-ix.cmake.orig	2025-10-21 08:14:55.000000000 +0000
 +++ cmake/config-ix.cmake
 @@ -760,7 +760,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD all
  list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
  
  if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS" OR
-+    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR
+-    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS|Haiku" OR
++    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|Haiku" OR
      (OS_NAME MATCHES "Windows" AND NOT CYGWIN AND
          (NOT MINGW OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"))))
    set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
@@ -26,8 +26,8 @@ Disable components that aren't ready for SunOS yet.
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS|Haiku")
++    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|Haiku")
    set(COMPILER_RT_HAS_UBSAN TRUE)
  else()
    set(COMPILER_RT_HAS_UBSAN FALSE)
diff --git a/flang/distinfo b/flang/distinfo
index f7d1d36e0c..6e4067cf6b 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
diff --git a/libcxx/Makefile b/libcxx/Makefile
index 900632c332..b32d13dfd9 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 2a7a76e05f..fb77f66e66 100644
--- a/libcxx/PLIST
+++ b/libcxx/PLIST
@@ -25,6 +25,7 @@ include/c++/v1/__algorithm/find_if_not.h
 include/c++/v1/__algorithm/find_segment_if.h
 include/c++/v1/__algorithm/for_each.h
 include/c++/v1/__algorithm/for_each_n.h
+include/c++/v1/__algorithm/for_each_n_segment.h
 include/c++/v1/__algorithm/for_each_segment.h
 include/c++/v1/__algorithm/generate.h
 include/c++/v1/__algorithm/generate_n.h
@@ -64,6 +65,7 @@ include/c++/v1/__algorithm/move_backward.h
 include/c++/v1/__algorithm/next_permutation.h
 include/c++/v1/__algorithm/none_of.h
 include/c++/v1/__algorithm/nth_element.h
+include/c++/v1/__algorithm/out_value_result.h
 include/c++/v1/__algorithm/partial_sort.h
 include/c++/v1/__algorithm/partial_sort_copy.h
 include/c++/v1/__algorithm/partition.h
@@ -257,6 +259,7 @@ include/c++/v1/__chrono/duration.h
 include/c++/v1/__chrono/exception.h
 include/c++/v1/__chrono/file_clock.h
 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/leap_second.h
@@ -271,6 +274,7 @@ include/c++/v1/__chrono/statically_widen.h
 include/c++/v1/__chrono/steady_clock.h
 include/c++/v1/__chrono/sys_info.h
 include/c++/v1/__chrono/system_clock.h
+include/c++/v1/__chrono/tai_clock.h
 include/c++/v1/__chrono/time_point.h
 include/c++/v1/__chrono/time_zone.h
 include/c++/v1/__chrono/time_zone_link.h
@@ -339,7 +343,6 @@ include/c++/v1/__cxx03/__algorithm/adjacent_find.h
 include/c++/v1/__cxx03/__algorithm/all_of.h
 include/c++/v1/__cxx03/__algorithm/any_of.h
 include/c++/v1/__cxx03/__algorithm/binary_search.h
-include/c++/v1/__cxx03/__algorithm/clamp.h
 include/c++/v1/__cxx03/__algorithm/comp.h
 include/c++/v1/__cxx03/__algorithm/comp_ref_type.h
 include/c++/v1/__cxx03/__algorithm/copy.h
@@ -359,19 +362,11 @@ include/c++/v1/__cxx03/__algorithm/find_first_of.h
 include/c++/v1/__cxx03/__algorithm/find_if.h
 include/c++/v1/__cxx03/__algorithm/find_if_not.h
 include/c++/v1/__cxx03/__algorithm/find_segment_if.h
-include/c++/v1/__cxx03/__algorithm/fold.h
 include/c++/v1/__cxx03/__algorithm/for_each.h
-include/c++/v1/__cxx03/__algorithm/for_each_n.h
 include/c++/v1/__cxx03/__algorithm/for_each_segment.h
 include/c++/v1/__cxx03/__algorithm/generate.h
 include/c++/v1/__cxx03/__algorithm/generate_n.h
 include/c++/v1/__cxx03/__algorithm/half_positive.h
-include/c++/v1/__cxx03/__algorithm/in_found_result.h
-include/c++/v1/__cxx03/__algorithm/in_fun_result.h
-include/c++/v1/__cxx03/__algorithm/in_in_out_result.h
-include/c++/v1/__cxx03/__algorithm/in_in_result.h
-include/c++/v1/__cxx03/__algorithm/in_out_out_result.h
-include/c++/v1/__cxx03/__algorithm/in_out_result.h
 include/c++/v1/__cxx03/__algorithm/includes.h
 include/c++/v1/__cxx03/__algorithm/inplace_merge.h
 include/c++/v1/__cxx03/__algorithm/is_heap.h
@@ -383,7 +378,6 @@ include/c++/v1/__cxx03/__algorithm/is_sorted_until.h
 include/c++/v1/__cxx03/__algorithm/iter_swap.h
 include/c++/v1/__cxx03/__algorithm/iterator_operations.h
 include/c++/v1/__cxx03/__algorithm/lexicographical_compare.h
-include/c++/v1/__cxx03/__algorithm/lexicographical_compare_three_way.h
 include/c++/v1/__cxx03/__algorithm/lower_bound.h
 include/c++/v1/__cxx03/__algorithm/make_heap.h
 include/c++/v1/__cxx03/__algorithm/make_projected.h
@@ -392,7 +386,6 @@ include/c++/v1/__cxx03/__algorithm/max_element.h
 include/c++/v1/__cxx03/__algorithm/merge.h
 include/c++/v1/__cxx03/__algorithm/min.h
 include/c++/v1/__cxx03/__algorithm/min_element.h
-include/c++/v1/__cxx03/__algorithm/min_max_result.h
 include/c++/v1/__cxx03/__algorithm/minmax.h
 include/c++/v1/__cxx03/__algorithm/minmax_element.h
 include/c++/v1/__cxx03/__algorithm/mismatch.h
@@ -408,99 +401,7 @@ include/c++/v1/__cxx03/__algorithm/partition_copy.h
 include/c++/v1/__cxx03/__algorithm/partition_point.h
 include/c++/v1/__cxx03/__algorithm/pop_heap.h
 include/c++/v1/__cxx03/__algorithm/prev_permutation.h
-include/c++/v1/__cxx03/__algorithm/pstl.h
 include/c++/v1/__cxx03/__algorithm/push_heap.h
-include/c++/v1/__cxx03/__algorithm/ranges_adjacent_find.h
-include/c++/v1/__cxx03/__algorithm/ranges_all_of.h
-include/c++/v1/__cxx03/__algorithm/ranges_any_of.h
-include/c++/v1/__cxx03/__algorithm/ranges_binary_search.h
-include/c++/v1/__cxx03/__algorithm/ranges_clamp.h
-include/c++/v1/__cxx03/__algorithm/ranges_contains.h
-include/c++/v1/__cxx03/__algorithm/ranges_contains_subrange.h
-include/c++/v1/__cxx03/__algorithm/ranges_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_copy_backward.h
-include/c++/v1/__cxx03/__algorithm/ranges_copy_if.h
-include/c++/v1/__cxx03/__algorithm/ranges_copy_n.h
-include/c++/v1/__cxx03/__algorithm/ranges_count.h
-include/c++/v1/__cxx03/__algorithm/ranges_count_if.h
-include/c++/v1/__cxx03/__algorithm/ranges_ends_with.h
-include/c++/v1/__cxx03/__algorithm/ranges_equal.h
-include/c++/v1/__cxx03/__algorithm/ranges_equal_range.h
-include/c++/v1/__cxx03/__algorithm/ranges_fill.h
-include/c++/v1/__cxx03/__algorithm/ranges_fill_n.h
-include/c++/v1/__cxx03/__algorithm/ranges_find.h
-include/c++/v1/__cxx03/__algorithm/ranges_find_end.h
-include/c++/v1/__cxx03/__algorithm/ranges_find_first_of.h
-include/c++/v1/__cxx03/__algorithm/ranges_find_if.h
-include/c++/v1/__cxx03/__algorithm/ranges_find_if_not.h
-include/c++/v1/__cxx03/__algorithm/ranges_find_last.h
-include/c++/v1/__cxx03/__algorithm/ranges_for_each.h
-include/c++/v1/__cxx03/__algorithm/ranges_for_each_n.h
-include/c++/v1/__cxx03/__algorithm/ranges_generate.h
-include/c++/v1/__cxx03/__algorithm/ranges_generate_n.h
-include/c++/v1/__cxx03/__algorithm/ranges_includes.h
-include/c++/v1/__cxx03/__algorithm/ranges_inplace_merge.h
-include/c++/v1/__cxx03/__algorithm/ranges_is_heap.h
-include/c++/v1/__cxx03/__algorithm/ranges_is_heap_until.h
-include/c++/v1/__cxx03/__algorithm/ranges_is_partitioned.h
-include/c++/v1/__cxx03/__algorithm/ranges_is_permutation.h
-include/c++/v1/__cxx03/__algorithm/ranges_is_sorted.h
-include/c++/v1/__cxx03/__algorithm/ranges_is_sorted_until.h
-include/c++/v1/__cxx03/__algorithm/ranges_iterator_concept.h
-include/c++/v1/__cxx03/__algorithm/ranges_lexicographical_compare.h
-include/c++/v1/__cxx03/__algorithm/ranges_lower_bound.h
-include/c++/v1/__cxx03/__algorithm/ranges_make_heap.h
-include/c++/v1/__cxx03/__algorithm/ranges_max.h
-include/c++/v1/__cxx03/__algorithm/ranges_max_element.h
-include/c++/v1/__cxx03/__algorithm/ranges_merge.h
-include/c++/v1/__cxx03/__algorithm/ranges_min.h
-include/c++/v1/__cxx03/__algorithm/ranges_min_element.h
-include/c++/v1/__cxx03/__algorithm/ranges_minmax.h
-include/c++/v1/__cxx03/__algorithm/ranges_minmax_element.h
-include/c++/v1/__cxx03/__algorithm/ranges_mismatch.h
-include/c++/v1/__cxx03/__algorithm/ranges_move.h
-include/c++/v1/__cxx03/__algorithm/ranges_move_backward.h
-include/c++/v1/__cxx03/__algorithm/ranges_next_permutation.h
-include/c++/v1/__cxx03/__algorithm/ranges_none_of.h
-include/c++/v1/__cxx03/__algorithm/ranges_nth_element.h
-include/c++/v1/__cxx03/__algorithm/ranges_partial_sort.h
-include/c++/v1/__cxx03/__algorithm/ranges_partial_sort_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_partition.h
-include/c++/v1/__cxx03/__algorithm/ranges_partition_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_partition_point.h
-include/c++/v1/__cxx03/__algorithm/ranges_pop_heap.h
-include/c++/v1/__cxx03/__algorithm/ranges_prev_permutation.h
-include/c++/v1/__cxx03/__algorithm/ranges_push_heap.h
-include/c++/v1/__cxx03/__algorithm/ranges_remove.h
-include/c++/v1/__cxx03/__algorithm/ranges_remove_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_remove_copy_if.h
-include/c++/v1/__cxx03/__algorithm/ranges_remove_if.h
-include/c++/v1/__cxx03/__algorithm/ranges_replace.h
-include/c++/v1/__cxx03/__algorithm/ranges_replace_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_replace_copy_if.h
-include/c++/v1/__cxx03/__algorithm/ranges_replace_if.h
-include/c++/v1/__cxx03/__algorithm/ranges_reverse.h
-include/c++/v1/__cxx03/__algorithm/ranges_reverse_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_rotate.h
-include/c++/v1/__cxx03/__algorithm/ranges_rotate_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_sample.h
-include/c++/v1/__cxx03/__algorithm/ranges_search.h
-include/c++/v1/__cxx03/__algorithm/ranges_search_n.h
-include/c++/v1/__cxx03/__algorithm/ranges_set_difference.h
-include/c++/v1/__cxx03/__algorithm/ranges_set_intersection.h
-include/c++/v1/__cxx03/__algorithm/ranges_set_symmetric_difference.h
-include/c++/v1/__cxx03/__algorithm/ranges_set_union.h
-include/c++/v1/__cxx03/__algorithm/ranges_shuffle.h
-include/c++/v1/__cxx03/__algorithm/ranges_sort.h
-include/c++/v1/__cxx03/__algorithm/ranges_sort_heap.h
-include/c++/v1/__cxx03/__algorithm/ranges_stable_partition.h
-include/c++/v1/__cxx03/__algorithm/ranges_stable_sort.h
-include/c++/v1/__cxx03/__algorithm/ranges_starts_with.h
-include/c++/v1/__cxx03/__algorithm/ranges_swap_ranges.h
-include/c++/v1/__cxx03/__algorithm/ranges_transform.h
-include/c++/v1/__cxx03/__algorithm/ranges_unique.h
-include/c++/v1/__cxx03/__algorithm/ranges_unique_copy.h
-include/c++/v1/__cxx03/__algorithm/ranges_upper_bound.h
 include/c++/v1/__cxx03/__algorithm/remove.h
 include/c++/v1/__cxx03/__algorithm/remove_copy.h
 include/c++/v1/__cxx03/__algorithm/remove_copy_if.h
@@ -513,15 +414,12 @@ include/c++/v1/__cxx03/__algorithm/reverse.h
 include/c++/v1/__cxx03/__algorithm/reverse_copy.h
 include/c++/v1/__cxx03/__algorithm/rotate.h
 include/c++/v1/__cxx03/__algorithm/rotate_copy.h
-include/c++/v1/__cxx03/__algorithm/sample.h
 include/c++/v1/__cxx03/__algorithm/search.h
 include/c++/v1/__cxx03/__algorithm/search_n.h
 include/c++/v1/__cxx03/__algorithm/set_difference.h
 include/c++/v1/__cxx03/__algorithm/set_intersection.h
 include/c++/v1/__cxx03/__algorithm/set_symmetric_difference.h
 include/c++/v1/__cxx03/__algorithm/set_union.h
-include/c++/v1/__cxx03/__algorithm/shift_left.h
-include/c++/v1/__cxx03/__algorithm/shift_right.h
 include/c++/v1/__cxx03/__algorithm/shuffle.h
 include/c++/v1/__cxx03/__algorithm/sift_down.h
 include/c++/v1/__cxx03/__algorithm/simd_utils.h
@@ -545,7 +443,6 @@ include/c++/v1/__cxx03/__atomic/atomic_base.h
 include/c++/v1/__cxx03/__atomic/atomic_flag.h
 include/c++/v1/__cxx03/__atomic/atomic_init.h
 include/c++/v1/__cxx03/__atomic/atomic_lock_free.h
-include/c++/v1/__cxx03/__atomic/atomic_ref.h
 include/c++/v1/__cxx03/__atomic/atomic_sync.h
 include/c++/v1/__cxx03/__atomic/check_memory_order.h
 include/c++/v1/__cxx03/__atomic/contention_t.h
@@ -555,100 +452,19 @@ include/c++/v1/__cxx03/__atomic/is_always_lock_free.h
 include/c++/v1/__cxx03/__atomic/kill_dependency.h
 include/c++/v1/__cxx03/__atomic/memory_order.h
 include/c++/v1/__cxx03/__atomic/to_gcc_order.h
-include/c++/v1/__cxx03/__bit/bit_cast.h
-include/c++/v1/__cxx03/__bit/bit_ceil.h
-include/c++/v1/__cxx03/__bit/bit_floor.h
-include/c++/v1/__cxx03/__bit/bit_log2.h
-include/c++/v1/__cxx03/__bit/bit_width.h
 include/c++/v1/__cxx03/__bit/blsr.h
-include/c++/v1/__cxx03/__bit/byteswap.h
 include/c++/v1/__cxx03/__bit/countl.h
 include/c++/v1/__cxx03/__bit/countr.h
-include/c++/v1/__cxx03/__bit/endian.h
-include/c++/v1/__cxx03/__bit/has_single_bit.h
 include/c++/v1/__cxx03/__bit/invert_if.h
 include/c++/v1/__cxx03/__bit/popcount.h
 include/c++/v1/__cxx03/__bit/rotate.h
 include/c++/v1/__cxx03/__bit_reference
-include/c++/v1/__cxx03/__charconv/chars_format.h
-include/c++/v1/__cxx03/__charconv/from_chars_integral.h
-include/c++/v1/__cxx03/__charconv/from_chars_result.h
-include/c++/v1/__cxx03/__charconv/tables.h
-include/c++/v1/__cxx03/__charconv/to_chars.h
-include/c++/v1/__cxx03/__charconv/to_chars_base_10.h
-include/c++/v1/__cxx03/__charconv/to_chars_floating_point.h
-include/c++/v1/__cxx03/__charconv/to_chars_integral.h
-include/c++/v1/__cxx03/__charconv/to_chars_result.h
-include/c++/v1/__cxx03/__charconv/traits.h
-include/c++/v1/__cxx03/__chrono/calendar.h
-include/c++/v1/__cxx03/__chrono/concepts.h
 include/c++/v1/__cxx03/__chrono/convert_to_timespec.h
-include/c++/v1/__cxx03/__chrono/convert_to_tm.h
-include/c++/v1/__cxx03/__chrono/day.h
 include/c++/v1/__cxx03/__chrono/duration.h
-include/c++/v1/__cxx03/__chrono/exception.h
-include/c++/v1/__cxx03/__chrono/file_clock.h
-include/c++/v1/__cxx03/__chrono/formatter.h
-include/c++/v1/__cxx03/__chrono/hh_mm_ss.h
 include/c++/v1/__cxx03/__chrono/high_resolution_clock.h
-include/c++/v1/__cxx03/__chrono/leap_second.h
-include/c++/v1/__cxx03/__chrono/literals.h
-include/c++/v1/__cxx03/__chrono/local_info.h
-include/c++/v1/__cxx03/__chrono/month.h
-include/c++/v1/__cxx03/__chrono/month_weekday.h
-include/c++/v1/__cxx03/__chrono/monthday.h
-include/c++/v1/__cxx03/__chrono/ostream.h
-include/c++/v1/__cxx03/__chrono/parser_std_format_spec.h
-include/c++/v1/__cxx03/__chrono/statically_widen.h
 include/c++/v1/__cxx03/__chrono/steady_clock.h
-include/c++/v1/__cxx03/__chrono/sys_info.h
 include/c++/v1/__cxx03/__chrono/system_clock.h
 include/c++/v1/__cxx03/__chrono/time_point.h
-include/c++/v1/__cxx03/__chrono/time_zone.h
-include/c++/v1/__cxx03/__chrono/time_zone_link.h
-include/c++/v1/__cxx03/__chrono/tzdb.h
-include/c++/v1/__cxx03/__chrono/tzdb_list.h
-include/c++/v1/__cxx03/__chrono/weekday.h
-include/c++/v1/__cxx03/__chrono/year.h
-include/c++/v1/__cxx03/__chrono/year_month.h
-include/c++/v1/__cxx03/__chrono/year_month_day.h
-include/c++/v1/__cxx03/__chrono/year_month_weekday.h
-include/c++/v1/__cxx03/__chrono/zoned_time.h
-include/c++/v1/__cxx03/__compare/common_comparison_category.h
-include/c++/v1/__cxx03/__compare/compare_partial_order_fallback.h
-include/c++/v1/__cxx03/__compare/compare_strong_order_fallback.h
-include/c++/v1/__cxx03/__compare/compare_three_way.h
-include/c++/v1/__cxx03/__compare/compare_three_way_result.h
-include/c++/v1/__cxx03/__compare/compare_weak_order_fallback.h
-include/c++/v1/__cxx03/__compare/is_eq.h
-include/c++/v1/__cxx03/__compare/ordering.h
-include/c++/v1/__cxx03/__compare/partial_order.h
-include/c++/v1/__cxx03/__compare/strong_order.h
-include/c++/v1/__cxx03/__compare/synth_three_way.h
-include/c++/v1/__cxx03/__compare/three_way_comparable.h
-include/c++/v1/__cxx03/__compare/weak_order.h
-include/c++/v1/__cxx03/__concepts/arithmetic.h
-include/c++/v1/__cxx03/__concepts/assignable.h
-include/c++/v1/__cxx03/__concepts/boolean_testable.h
-include/c++/v1/__cxx03/__concepts/class_or_enum.h
-include/c++/v1/__cxx03/__concepts/common_reference_with.h
-include/c++/v1/__cxx03/__concepts/common_with.h
-include/c++/v1/__cxx03/__concepts/constructible.h
-include/c++/v1/__cxx03/__concepts/convertible_to.h
-include/c++/v1/__cxx03/__concepts/copyable.h
-include/c++/v1/__cxx03/__concepts/derived_from.h
-include/c++/v1/__cxx03/__concepts/destructible.h
-include/c++/v1/__cxx03/__concepts/different_from.h
-include/c++/v1/__cxx03/__concepts/equality_comparable.h
-include/c++/v1/__cxx03/__concepts/invocable.h
-include/c++/v1/__cxx03/__concepts/movable.h
-include/c++/v1/__cxx03/__concepts/predicate.h
-include/c++/v1/__cxx03/__concepts/regular.h
-include/c++/v1/__cxx03/__concepts/relation.h
-include/c++/v1/__cxx03/__concepts/same_as.h
-include/c++/v1/__cxx03/__concepts/semiregular.h
-include/c++/v1/__cxx03/__concepts/swappable.h
-include/c++/v1/__cxx03/__concepts/totally_ordered.h
 include/c++/v1/__cxx03/__condition_variable/condition_variable.h
 include/c++/v1/__cxx03/__config
 include/c++/v1/__cxx03/__configuration/abi.h
@@ -657,10 +473,6 @@ include/c++/v1/__cxx03/__configuration/compiler.h
 include/c++/v1/__cxx03/__configuration/config_site_shim.h
 include/c++/v1/__cxx03/__configuration/language.h
 include/c++/v1/__cxx03/__configuration/platform.h
-include/c++/v1/__cxx03/__coroutine/coroutine_handle.h
-include/c++/v1/__cxx03/__coroutine/coroutine_traits.h
-include/c++/v1/__cxx03/__coroutine/noop_coroutine_handle.h
-include/c++/v1/__cxx03/__coroutine/trivial_awaitables.h
 include/c++/v1/__cxx03/__debug_utils/randomize_range.h
 include/c++/v1/__cxx03/__debug_utils/sanitizers.h
 include/c++/v1/__cxx03/__debug_utils/strict_weak_ordering_check.h
@@ -669,81 +481,18 @@ include/c++/v1/__cxx03/__exception/exception_ptr.h
 include/c++/v1/__cxx03/__exception/nested_exception.h
 include/c++/v1/__cxx03/__exception/operations.h
 include/c++/v1/__cxx03/__exception/terminate.h
-include/c++/v1/__cxx03/__expected/bad_expected_access.h
-include/c++/v1/__cxx03/__expected/expected.h
-include/c++/v1/__cxx03/__expected/unexpect.h
-include/c++/v1/__cxx03/__expected/unexpected.h
-include/c++/v1/__cxx03/__filesystem/copy_options.h
-include/c++/v1/__cxx03/__filesystem/directory_entry.h
-include/c++/v1/__cxx03/__filesystem/directory_iterator.h
-include/c++/v1/__cxx03/__filesystem/directory_options.h
-include/c++/v1/__cxx03/__filesystem/file_status.h
-include/c++/v1/__cxx03/__filesystem/file_time_type.h
-include/c++/v1/__cxx03/__filesystem/file_type.h
-include/c++/v1/__cxx03/__filesystem/filesystem_error.h
-include/c++/v1/__cxx03/__filesystem/operations.h
-include/c++/v1/__cxx03/__filesystem/path.h
-include/c++/v1/__cxx03/__filesystem/path_iterator.h
-include/c++/v1/__cxx03/__filesystem/perm_options.h
-include/c++/v1/__cxx03/__filesystem/perms.h
-include/c++/v1/__cxx03/__filesystem/recursive_directory_iterator.h
-include/c++/v1/__cxx03/__filesystem/space_info.h
-include/c++/v1/__cxx03/__filesystem/u8path.h
-include/c++/v1/__cxx03/__format/buffer.h
-include/c++/v1/__cxx03/__format/concepts.h
-include/c++/v1/__cxx03/__format/container_adaptor.h
-include/c++/v1/__cxx03/__format/enable_insertable.h
-include/c++/v1/__cxx03/__format/escaped_output_table.h
-include/c++/v1/__cxx03/__format/extended_grapheme_cluster_table.h
-include/c++/v1/__cxx03/__format/format_arg.h
-include/c++/v1/__cxx03/__format/format_arg_store.h
-include/c++/v1/__cxx03/__format/format_args.h
-include/c++/v1/__cxx03/__format/format_context.h
-include/c++/v1/__cxx03/__format/format_error.h
-include/c++/v1/__cxx03/__format/format_functions.h
-include/c++/v1/__cxx03/__format/format_parse_context.h
-include/c++/v1/__cxx03/__format/format_string.h
-include/c++/v1/__cxx03/__format/format_to_n_result.h
-include/c++/v1/__cxx03/__format/formatter.h
-include/c++/v1/__cxx03/__format/formatter_bool.h
-include/c++/v1/__cxx03/__format/formatter_char.h
-include/c++/v1/__cxx03/__format/formatter_floating_point.h
-include/c++/v1/__cxx03/__format/formatter_integer.h
-include/c++/v1/__cxx03/__format/formatter_integral.h
-include/c++/v1/__cxx03/__format/formatter_output.h
-include/c++/v1/__cxx03/__format/formatter_pointer.h
-include/c++/v1/__cxx03/__format/formatter_string.h
-include/c++/v1/__cxx03/__format/formatter_tuple.h
-include/c++/v1/__cxx03/__format/indic_conjunct_break_table.h
-include/c++/v1/__cxx03/__format/parser_std_format_spec.h
-include/c++/v1/__cxx03/__format/range_default_formatter.h
-include/c++/v1/__cxx03/__format/range_formatter.h
-include/c++/v1/__cxx03/__format/unicode.h
-include/c++/v1/__cxx03/__format/width_estimation_table.h
-include/c++/v1/__cxx03/__format/write_escaped.h
 include/c++/v1/__cxx03/__functional/binary_function.h
 include/c++/v1/__cxx03/__functional/binary_negate.h
 include/c++/v1/__cxx03/__functional/bind.h
-include/c++/v1/__cxx03/__functional/bind_back.h
-include/c++/v1/__cxx03/__functional/bind_front.h
 include/c++/v1/__cxx03/__functional/binder1st.h
 include/c++/v1/__cxx03/__functional/binder2nd.h
-include/c++/v1/__cxx03/__functional/boyer_moore_searcher.h
-include/c++/v1/__cxx03/__functional/compose.h
-include/c++/v1/__cxx03/__functional/default_searcher.h
-include/c++/v1/__cxx03/__functional/function.h
 include/c++/v1/__cxx03/__functional/hash.h
 include/c++/v1/__cxx03/__functional/identity.h
-include/c++/v1/__cxx03/__functional/invoke.h
-include/c++/v1/__cxx03/__functional/is_transparent.h
 include/c++/v1/__cxx03/__functional/mem_fn.h
 include/c++/v1/__cxx03/__functional/mem_fun_ref.h
-include/c++/v1/__cxx03/__functional/not_fn.h
 include/c++/v1/__cxx03/__functional/operations.h
-include/c++/v1/__cxx03/__functional/perfect_forward.h
 include/c++/v1/__cxx03/__functional/pointer_to_binary_function.h
 include/c++/v1/__cxx03/__functional/pointer_to_unary_function.h
-include/c++/v1/__cxx03/__functional/ranges_operations.h
 include/c++/v1/__cxx03/__functional/reference_wrapper.h
 include/c++/v1/__cxx03/__functional/unary_function.h
 include/c++/v1/__cxx03/__functional/unary_negate.h
@@ -752,24 +501,19 @@ include/c++/v1/__cxx03/__fwd/array.h
 include/c++/v1/__cxx03/__fwd/bit_reference.h
 include/c++/v1/__cxx03/__fwd/complex.h
 include/c++/v1/__cxx03/__fwd/deque.h
-include/c++/v1/__cxx03/__fwd/format.h
 include/c++/v1/__cxx03/__fwd/fstream.h
 include/c++/v1/__cxx03/__fwd/functional.h
 include/c++/v1/__cxx03/__fwd/ios.h
 include/c++/v1/__cxx03/__fwd/istream.h
-include/c++/v1/__cxx03/__fwd/mdspan.h
 include/c++/v1/__cxx03/__fwd/memory.h
-include/c++/v1/__cxx03/__fwd/memory_resource.h
 include/c++/v1/__cxx03/__fwd/ostream.h
 include/c++/v1/__cxx03/__fwd/pair.h
 include/c++/v1/__cxx03/__fwd/queue.h
-include/c++/v1/__cxx03/__fwd/span.h
 include/c++/v1/__cxx03/__fwd/sstream.h
 include/c++/v1/__cxx03/__fwd/stack.h
 include/c++/v1/__cxx03/__fwd/streambuf.h
 include/c++/v1/__cxx03/__fwd/string.h
 include/c++/v1/__cxx03/__fwd/string_view.h
-include/c++/v1/__cxx03/__fwd/subrange.h
 include/c++/v1/__cxx03/__fwd/tuple.h
 include/c++/v1/__cxx03/__fwd/vector.h
 include/c++/v1/__cxx03/__hash_table
@@ -779,43 +523,21 @@ include/c++/v1/__cxx03/__iterator/advance.h
 include/c++/v1/__cxx03/__iterator/aliasing_iterator.h
 include/c++/v1/__cxx03/__iterator/back_insert_iterator.h
 include/c++/v1/__cxx03/__iterator/bounded_iter.h
-include/c++/v1/__cxx03/__iterator/common_iterator.h
-include/c++/v1/__cxx03/__iterator/concepts.h
-include/c++/v1/__cxx03/__iterator/counted_iterator.h
-include/c++/v1/__cxx03/__iterator/cpp17_iterator_concepts.h
-include/c++/v1/__cxx03/__iterator/data.h
-include/c++/v1/__cxx03/__iterator/default_sentinel.h
 include/c++/v1/__cxx03/__iterator/distance.h
-include/c++/v1/__cxx03/__iterator/empty.h
 include/c++/v1/__cxx03/__iterator/erase_if_container.h
 include/c++/v1/__cxx03/__iterator/front_insert_iterator.h
-include/c++/v1/__cxx03/__iterator/incrementable_traits.h
-include/c++/v1/__cxx03/__iterator/indirectly_comparable.h
 include/c++/v1/__cxx03/__iterator/insert_iterator.h
 include/c++/v1/__cxx03/__iterator/istream_iterator.h
 include/c++/v1/__cxx03/__iterator/istreambuf_iterator.h
-include/c++/v1/__cxx03/__iterator/iter_move.h
-include/c++/v1/__cxx03/__iterator/iter_swap.h
 include/c++/v1/__cxx03/__iterator/iterator.h
 include/c++/v1/__cxx03/__iterator/iterator_traits.h
-include/c++/v1/__cxx03/__iterator/iterator_with_data.h
-include/c++/v1/__cxx03/__iterator/mergeable.h
 include/c++/v1/__cxx03/__iterator/move_iterator.h
-include/c++/v1/__cxx03/__iterator/move_sentinel.h
 include/c++/v1/__cxx03/__iterator/next.h
 include/c++/v1/__cxx03/__iterator/ostream_iterator.h
 include/c++/v1/__cxx03/__iterator/ostreambuf_iterator.h
-include/c++/v1/__cxx03/__iterator/permutable.h
 include/c++/v1/__cxx03/__iterator/prev.h
-include/c++/v1/__cxx03/__iterator/projected.h
-include/c++/v1/__cxx03/__iterator/ranges_iterator_traits.h
-include/c++/v1/__cxx03/__iterator/readable_traits.h
-include/c++/v1/__cxx03/__iterator/reverse_access.h
 include/c++/v1/__cxx03/__iterator/reverse_iterator.h
 include/c++/v1/__cxx03/__iterator/segmented_iterator.h
-include/c++/v1/__cxx03/__iterator/size.h
-include/c++/v1/__cxx03/__iterator/sortable.h
-include/c++/v1/__cxx03/__iterator/unreachable_sentinel.h
 include/c++/v1/__cxx03/__iterator/wrap_iter.h
 include/c++/v1/__cxx03/__locale
 include/c++/v1/__cxx03/__locale_dir/locale_base_api.h
@@ -846,16 +568,9 @@ include/c++/v1/__cxx03/__math/modulo.h
 include/c++/v1/__cxx03/__math/remainder.h
 include/c++/v1/__cxx03/__math/roots.h
 include/c++/v1/__cxx03/__math/rounding_functions.h
-include/c++/v1/__cxx03/__math/special_functions.h
 include/c++/v1/__cxx03/__math/traits.h
 include/c++/v1/__cxx03/__math/trigonometric_functions.h
 include/c++/v1/__cxx03/__mbstate_t.h
-include/c++/v1/__cxx03/__mdspan/default_accessor.h
-include/c++/v1/__cxx03/__mdspan/extents.h
-include/c++/v1/__cxx03/__mdspan/layout_left.h
-include/c++/v1/__cxx03/__mdspan/layout_right.h
-include/c++/v1/__cxx03/__mdspan/layout_stride.h
-include/c++/v1/__cxx03/__mdspan/mdspan.h
 include/c++/v1/__cxx03/__memory/addressof.h
 include/c++/v1/__cxx03/__memory/align.h
 include/c++/v1/__cxx03/__memory/aligned_alloc.h
@@ -869,14 +584,9 @@ include/c++/v1/__cxx03/__memory/assume_aligned.h
 include/c++/v1/__cxx03/__memory/auto_ptr.h
 include/c++/v1/__cxx03/__memory/builtin_new_allocator.h
 include/c++/v1/__cxx03/__memory/compressed_pair.h
-include/c++/v1/__cxx03/__memory/concepts.h
 include/c++/v1/__cxx03/__memory/construct_at.h
 include/c++/v1/__cxx03/__memory/destruct_n.h
-include/c++/v1/__cxx03/__memory/inout_ptr.h
-include/c++/v1/__cxx03/__memory/out_ptr.h
 include/c++/v1/__cxx03/__memory/pointer_traits.h
-include/c++/v1/__cxx03/__memory/ranges_construct_at.h
-include/c++/v1/__cxx03/__memory/ranges_uninitialized_algorithms.h
 include/c++/v1/__cxx03/__memory/raw_storage_iterator.h
 include/c++/v1/__cxx03/__memory/shared_ptr.h
 include/c++/v1/__cxx03/__memory/swap_allocator.h
@@ -885,54 +595,18 @@ include/c++/v1/__cxx03/__memory/temporary_buffer.h
 include/c++/v1/__cxx03/__memory/uninitialized_algorithms.h
 include/c++/v1/__cxx03/__memory/unique_ptr.h
 include/c++/v1/__cxx03/__memory/uses_allocator.h
-include/c++/v1/__cxx03/__memory/uses_allocator_construction.h
 include/c++/v1/__cxx03/__memory/voidify.h
-include/c++/v1/__cxx03/__memory_resource/memory_resource.h
-include/c++/v1/__cxx03/__memory_resource/monotonic_buffer_resource.h
-include/c++/v1/__cxx03/__memory_resource/polymorphic_allocator.h
-include/c++/v1/__cxx03/__memory_resource/pool_options.h
-include/c++/v1/__cxx03/__memory_resource/synchronized_pool_resource.h
-include/c++/v1/__cxx03/__memory_resource/unsynchronized_pool_resource.h
 include/c++/v1/__cxx03/__mutex/lock_guard.h
 include/c++/v1/__cxx03/__mutex/mutex.h
 include/c++/v1/__cxx03/__mutex/once_flag.h
 include/c++/v1/__cxx03/__mutex/tag_types.h
 include/c++/v1/__cxx03/__mutex/unique_lock.h
-include/c++/v1/__cxx03/__node_handle
 include/c++/v1/__cxx03/__numeric/accumulate.h
 include/c++/v1/__cxx03/__numeric/adjacent_difference.h
-include/c++/v1/__cxx03/__numeric/exclusive_scan.h
-include/c++/v1/__cxx03/__numeric/gcd_lcm.h
-include/c++/v1/__cxx03/__numeric/inclusive_scan.h
 include/c++/v1/__cxx03/__numeric/inner_product.h
 include/c++/v1/__cxx03/__numeric/iota.h
-include/c++/v1/__cxx03/__numeric/midpoint.h
 include/c++/v1/__cxx03/__numeric/partial_sum.h
-include/c++/v1/__cxx03/__numeric/pstl.h
-include/c++/v1/__cxx03/__numeric/reduce.h
-include/c++/v1/__cxx03/__numeric/saturation_arithmetic.h
-include/c++/v1/__cxx03/__numeric/transform_exclusive_scan.h
-include/c++/v1/__cxx03/__numeric/transform_inclusive_scan.h
-include/c++/v1/__cxx03/__numeric/transform_reduce.h
 include/c++/v1/__cxx03/__ostream/basic_ostream.h
-include/c++/v1/__cxx03/__ostream/print.h
-include/c++/v1/__cxx03/__pstl/backend.h
-include/c++/v1/__cxx03/__pstl/backend_fwd.h
-include/c++/v1/__cxx03/__pstl/backends/default.h
-include/c++/v1/__cxx03/__pstl/backends/libdispatch.h
-include/c++/v1/__cxx03/__pstl/backends/serial.h
-include/c++/v1/__cxx03/__pstl/backends/std_thread.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/any_of.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/cpu_traits.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/fill.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/find_if.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/for_each.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/merge.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/stable_sort.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/transform.h
-include/c++/v1/__cxx03/__pstl/cpu_algos/transform_reduce.h
-include/c++/v1/__cxx03/__pstl/dispatch.h
-include/c++/v1/__cxx03/__pstl/handle_exception.h
 include/c++/v1/__cxx03/__random/bernoulli_distribution.h
 include/c++/v1/__cxx03/__random/binomial_distribution.h
 include/c++/v1/__cxx03/__random/cauchy_distribution.h
@@ -967,62 +641,11 @@ include/c++/v1/__cxx03/__random/shuffle_order_engine.h
 include/c++/v1/__cxx03/__random/student_t_distribution.h
 include/c++/v1/__cxx03/__random/subtract_with_carry_engine.h
 include/c++/v1/__cxx03/__random/uniform_int_distribution.h
-include/c++/v1/__cxx03/__random/uniform_random_bit_generator.h
 include/c++/v1/__cxx03/__random/uniform_real_distribution.h
 include/c++/v1/__cxx03/__random/weibull_distribution.h
-include/c++/v1/__cxx03/__ranges/access.h
-include/c++/v1/__cxx03/__ranges/all.h
-include/c++/v1/__cxx03/__ranges/as_rvalue_view.h
-include/c++/v1/__cxx03/__ranges/chunk_by_view.h
-include/c++/v1/__cxx03/__ranges/common_view.h
-include/c++/v1/__cxx03/__ranges/concepts.h
-include/c++/v1/__cxx03/__ranges/container_compatible_range.h
-include/c++/v1/__cxx03/__ranges/counted.h
-include/c++/v1/__cxx03/__ranges/dangling.h
-include/c++/v1/__cxx03/__ranges/data.h
-include/c++/v1/__cxx03/__ranges/drop_view.h
-include/c++/v1/__cxx03/__ranges/drop_while_view.h
-include/c++/v1/__cxx03/__ranges/elements_view.h
-include/c++/v1/__cxx03/__ranges/empty.h
-include/c++/v1/__cxx03/__ranges/empty_view.h
-include/c++/v1/__cxx03/__ranges/enable_borrowed_range.h
-include/c++/v1/__cxx03/__ranges/enable_view.h
-include/c++/v1/__cxx03/__ranges/filter_view.h
-include/c++/v1/__cxx03/__ranges/from_range.h
-include/c++/v1/__cxx03/__ranges/iota_view.h
-include/c++/v1/__cxx03/__ranges/istream_view.h
-include/c++/v1/__cxx03/__ranges/join_view.h
-include/c++/v1/__cxx03/__ranges/lazy_split_view.h
-include/c++/v1/__cxx03/__ranges/movable_box.h
-include/c++/v1/__cxx03/__ranges/non_propagating_cache.h
-include/c++/v1/__cxx03/__ranges/owning_view.h
-include/c++/v1/__cxx03/__ranges/range_adaptor.h
-include/c++/v1/__cxx03/__ranges/rbegin.h
-include/c++/v1/__cxx03/__ranges/ref_view.h
-include/c++/v1/__cxx03/__ranges/rend.h
-include/c++/v1/__cxx03/__ranges/repeat_view.h
-include/c++/v1/__cxx03/__ranges/reverse_view.h
-include/c++/v1/__cxx03/__ranges/single_view.h
-include/c++/v1/__cxx03/__ranges/size.h
-include/c++/v1/__cxx03/__ranges/split_view.h
-include/c++/v1/__cxx03/__ranges/subrange.h
-include/c++/v1/__cxx03/__ranges/take_view.h
-include/c++/v1/__cxx03/__ranges/take_while_view.h
-include/c++/v1/__cxx03/__ranges/to.h
-include/c++/v1/__cxx03/__ranges/transform_view.h
-include/c++/v1/__cxx03/__ranges/view_interface.h
-include/c++/v1/__cxx03/__ranges/views.h
-include/c++/v1/__cxx03/__ranges/zip_view.h
 include/c++/v1/__cxx03/__split_buffer
 include/c++/v1/__cxx03/__std_clang_module
 include/c++/v1/__cxx03/__std_mbstate_t.h
-include/c++/v1/__cxx03/__stop_token/atomic_unique_lock.h
-include/c++/v1/__cxx03/__stop_token/intrusive_list_view.h
-include/c++/v1/__cxx03/__stop_token/intrusive_shared_ptr.h
-include/c++/v1/__cxx03/__stop_token/stop_callback.h
-include/c++/v1/__cxx03/__stop_token/stop_source.h
-include/c++/v1/__cxx03/__stop_token/stop_state.h
-include/c++/v1/__cxx03/__stop_token/stop_token.h
 include/c++/v1/__cxx03/__string/char_traits.h
 include/c++/v1/__cxx03/__string/constexpr_c_functions.h
 include/c++/v1/__cxx03/__string/extern_template_lists.h
@@ -1037,9 +660,7 @@ include/c++/v1/__cxx03/__system_error/error_category.h
 include/c++/v1/__cxx03/__system_error/error_code.h
 include/c++/v1/__cxx03/__system_error/error_condition.h
 include/c++/v1/__cxx03/__system_error/system_error.h
-include/c++/v1/__cxx03/__thread/formatter.h
 include/c++/v1/__cxx03/__thread/id.h
-include/c++/v1/__cxx03/__thread/jthread.h
 include/c++/v1/__cxx03/__thread/poll_with_backoff.h
 include/c++/v1/__cxx03/__thread/support.h
 include/c++/v1/__cxx03/__thread/support/c11.h
@@ -1051,7 +672,6 @@ include/c++/v1/__cxx03/__thread/thread.h
 include/c++/v1/__cxx03/__thread/timed_backoff_policy.h
 include/c++/v1/__cxx03/__tree
 include/c++/v1/__cxx03/__tuple/find_index.h
-include/c++/v1/__cxx03/__tuple/ignore.h
 include/c++/v1/__cxx03/__tuple/make_tuple_types.h
 include/c++/v1/__cxx03/__tuple/sfinae_helpers.h
 include/c++/v1/__cxx03/__tuple/tuple_element.h
@@ -1071,7 +691,6 @@ include/c++/v1/__cxx03/__type_traits/aligned_storage.h
 include/c++/v1/__cxx03/__type_traits/aligned_union.h
 include/c++/v1/__cxx03/__type_traits/alignment_of.h
 include/c++/v1/__cxx03/__type_traits/can_extract_key.h
-include/c++/v1/__cxx03/__type_traits/common_reference.h
 include/c++/v1/__cxx03/__type_traits/common_type.h
 include/c++/v1/__cxx03/__type_traits/conditional.h
 include/c++/v1/__cxx03/__type_traits/conjunction.h
@@ -1084,12 +703,10 @@ include/c++/v1/__cxx03/__type_traits/desugars_to.h
 include/c++/v1/__cxx03/__type_traits/disjunction.h
 include/c++/v1/__cxx03/__type_traits/enable_if.h
 include/c++/v1/__cxx03/__type_traits/extent.h
-include/c++/v1/__cxx03/__type_traits/has_unique_object_representation.h
 include/c++/v1/__cxx03/__type_traits/has_virtual_destructor.h
 include/c++/v1/__cxx03/__type_traits/integral_constant.h
 include/c++/v1/__cxx03/__type_traits/invoke.h
 include/c++/v1/__cxx03/__type_traits/is_abstract.h
-include/c++/v1/__cxx03/__type_traits/is_aggregate.h
 include/c++/v1/__cxx03/__type_traits/is_allocator.h
 include/c++/v1/__cxx03/__type_traits/is_always_bitcastable.h
 include/c++/v1/__cxx03/__type_traits/is_arithmetic.h
@@ -1121,7 +738,6 @@ include/c++/v1/__cxx03/__type_traits/is_literal_type.h
 include/c++/v1/__cxx03/__type_traits/is_member_pointer.h
 include/c++/v1/__cxx03/__type_traits/is_nothrow_assignable.h
 include/c++/v1/__cxx03/__type_traits/is_nothrow_constructible.h
-include/c++/v1/__cxx03/__type_traits/is_nothrow_convertible.h
 include/c++/v1/__cxx03/__type_traits/is_nothrow_destructible.h
 include/c++/v1/__cxx03/__type_traits/is_null_pointer.h
 include/c++/v1/__cxx03/__type_traits/is_object.h
@@ -1181,18 +797,13 @@ include/c++/v1/__cxx03/__type_traits/underlying_type.h
 include/c++/v1/__cxx03/__type_traits/unwrap_ref.h
 include/c++/v1/__cxx03/__type_traits/void_t.h
 include/c++/v1/__cxx03/__undef_macros
-include/c++/v1/__cxx03/__utility/as_const.h
 include/c++/v1/__cxx03/__utility/as_lvalue.h
 include/c++/v1/__cxx03/__utility/auto_cast.h
-include/c++/v1/__cxx03/__utility/cmp.h
 include/c++/v1/__cxx03/__utility/convert_to_integral.h
 include/c++/v1/__cxx03/__utility/declval.h
 include/c++/v1/__cxx03/__utility/empty.h
 include/c++/v1/__cxx03/__utility/exception_guard.h
-include/c++/v1/__cxx03/__utility/exchange.h
 include/c++/v1/__cxx03/__utility/forward.h
-include/c++/v1/__cxx03/__utility/forward_like.h
-include/c++/v1/__cxx03/__utility/in_place.h
 include/c++/v1/__cxx03/__utility/integer_sequence.h
 include/c++/v1/__cxx03/__utility/is_pointer_in_range.h
 include/c++/v1/__cxx03/__utility/is_valid_range.h
@@ -1205,16 +816,13 @@ include/c++/v1/__cxx03/__utility/private_constructor_tag.h
 include/c++/v1/__cxx03/__utility/rel_ops.h
 include/c++/v1/__cxx03/__utility/small_buffer.h
 include/c++/v1/__cxx03/__utility/swap.h
-include/c++/v1/__cxx03/__utility/to_underlying.h
 include/c++/v1/__cxx03/__utility/unreachable.h
 include/c++/v1/__cxx03/__variant/monostate.h
 include/c++/v1/__cxx03/__verbose_abort
+include/c++/v1/__cxx03/__verbose_trap
 include/c++/v1/__cxx03/algorithm
-include/c++/v1/__cxx03/any
 include/c++/v1/__cxx03/array
 include/c++/v1/__cxx03/atomic
-include/c++/v1/__cxx03/barrier
-include/c++/v1/__cxx03/bit
 include/c++/v1/__cxx03/bitset
 include/c++/v1/__cxx03/cassert
 include/c++/v1/__cxx03/ccomplex
@@ -1222,7 +830,6 @@ include/c++/v1/__cxx03/cctype
 include/c++/v1/__cxx03/cerrno
 include/c++/v1/__cxx03/cfenv
 include/c++/v1/__cxx03/cfloat
-include/c++/v1/__cxx03/charconv
 include/c++/v1/__cxx03/chrono
 include/c++/v1/__cxx03/cinttypes
 include/c++/v1/__cxx03/ciso646
@@ -1230,12 +837,9 @@ include/c++/v1/__cxx03/climits
 include/c++/v1/__cxx03/clocale
 include/c++/v1/__cxx03/cmath
 include/c++/v1/__cxx03/codecvt
-include/c++/v1/__cxx03/compare
 include/c++/v1/__cxx03/complex
 include/c++/v1/__cxx03/complex.h
-include/c++/v1/__cxx03/concepts
 include/c++/v1/__cxx03/condition_variable
-include/c++/v1/__cxx03/coroutine
 include/c++/v1/__cxx03/csetjmp
 include/c++/v1/__cxx03/csignal
 include/c++/v1/__cxx03/cstdarg
@@ -1254,36 +858,17 @@ 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/execution
-include/c++/v1/__cxx03/expected
 include/c++/v1/__cxx03/experimental/__config
-include/c++/v1/__cxx03/experimental/__simd/aligned_tag.h
-include/c++/v1/__cxx03/experimental/__simd/declaration.h
-include/c++/v1/__cxx03/experimental/__simd/reference.h
-include/c++/v1/__cxx03/experimental/__simd/scalar.h
-include/c++/v1/__cxx03/experimental/__simd/simd.h
-include/c++/v1/__cxx03/experimental/__simd/simd_mask.h
-include/c++/v1/__cxx03/experimental/__simd/traits.h
-include/c++/v1/__cxx03/experimental/__simd/utility.h
-include/c++/v1/__cxx03/experimental/__simd/vec_ext.h
-include/c++/v1/__cxx03/experimental/iterator
-include/c++/v1/__cxx03/experimental/memory
-include/c++/v1/__cxx03/experimental/propagate_const
-include/c++/v1/__cxx03/experimental/simd
-include/c++/v1/__cxx03/experimental/type_traits
 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/filesystem
 include/c++/v1/__cxx03/float.h
-include/c++/v1/__cxx03/format
 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/initializer_list
 include/c++/v1/__cxx03/inttypes.h
 include/c++/v1/__cxx03/iomanip
 include/c++/v1/__cxx03/ios
@@ -1291,35 +876,23 @@ include/c++/v1/__cxx03/iosfwd
 include/c++/v1/__cxx03/iostream
 include/c++/v1/__cxx03/istream
 include/c++/v1/__cxx03/iterator
-include/c++/v1/__cxx03/latch
 include/c++/v1/__cxx03/limits
 include/c++/v1/__cxx03/list
 include/c++/v1/__cxx03/locale
 include/c++/v1/__cxx03/locale.h
 include/c++/v1/__cxx03/map
 include/c++/v1/__cxx03/math.h
-include/c++/v1/__cxx03/mdspan
 include/c++/v1/__cxx03/memory
-include/c++/v1/__cxx03/memory_resource
 include/c++/v1/__cxx03/module.modulemap
 include/c++/v1/__cxx03/mutex
 include/c++/v1/__cxx03/new
-include/c++/v1/__cxx03/numbers
 include/c++/v1/__cxx03/numeric
-include/c++/v1/__cxx03/optional
 include/c++/v1/__cxx03/ostream
-include/c++/v1/__cxx03/print
 include/c++/v1/__cxx03/queue
 include/c++/v1/__cxx03/random
-include/c++/v1/__cxx03/ranges
 include/c++/v1/__cxx03/ratio
 include/c++/v1/__cxx03/regex
-include/c++/v1/__cxx03/scoped_allocator
-include/c++/v1/__cxx03/semaphore
 include/c++/v1/__cxx03/set
-include/c++/v1/__cxx03/shared_mutex
-include/c++/v1/__cxx03/source_location
-include/c++/v1/__cxx03/span
 include/c++/v1/__cxx03/sstream
 include/c++/v1/__cxx03/stack
 include/c++/v1/__cxx03/stdatomic.h
@@ -1329,17 +902,14 @@ 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/stop_token
 include/c++/v1/__cxx03/streambuf
 include/c++/v1/__cxx03/string
 include/c++/v1/__cxx03/string.h
 include/c++/v1/__cxx03/string_view
 include/c++/v1/__cxx03/strstream
-include/c++/v1/__cxx03/syncstream
 include/c++/v1/__cxx03/system_error
 include/c++/v1/__cxx03/tgmath.h
 include/c++/v1/__cxx03/thread
-include/c++/v1/__cxx03/tuple
 include/c++/v1/__cxx03/type_traits
 include/c++/v1/__cxx03/typeindex
 include/c++/v1/__cxx03/typeinfo
@@ -1348,7 +918,6 @@ include/c++/v1/__cxx03/unordered_map
 include/c++/v1/__cxx03/unordered_set
 include/c++/v1/__cxx03/utility
 include/c++/v1/__cxx03/valarray
-include/c++/v1/__cxx03/variant
 include/c++/v1/__cxx03/vector
 include/c++/v1/__cxx03/version
 include/c++/v1/__cxx03/wchar.h
@@ -1387,6 +956,10 @@ include/c++/v1/__flat_map/key_value_iterator.h
 include/c++/v1/__flat_map/sorted_equivalent.h
 include/c++/v1/__flat_map/sorted_unique.h
 include/c++/v1/__flat_map/utils.h
+include/c++/v1/__flat_set/flat_multiset.h
+include/c++/v1/__flat_set/flat_set.h
+include/c++/v1/__flat_set/ra_iterator.h
+include/c++/v1/__flat_set/utils.h
 include/c++/v1/__format/buffer.h
 include/c++/v1/__format/concepts.h
 include/c++/v1/__format/container_adaptor.h
@@ -1457,12 +1030,14 @@ 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
@@ -1508,6 +1083,7 @@ include/c++/v1/__iterator/ostream_iterator.h
 include/c++/v1/__iterator/ostreambuf_iterator.h
 include/c++/v1/__iterator/permutable.h
 include/c++/v1/__iterator/prev.h
+include/c++/v1/__iterator/product_iterator.h
 include/c++/v1/__iterator/projected.h
 include/c++/v1/__iterator/ranges_iterator_traits.h
 include/c++/v1/__iterator/readable_traits.h
@@ -1520,20 +1096,31 @@ include/c++/v1/__iterator/static_bounded_iter.h
 include/c++/v1/__iterator/unreachable_sentinel.h
 include/c++/v1/__iterator/wrap_iter.h
 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/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/no_locale/characters.h
 include/c++/v1/__locale_dir/support/no_locale/strtonum.h
 include/c++/v1/__locale_dir/support/windows.h
+include/c++/v1/__locale_dir/time.h
+include/c++/v1/__locale_dir/wbuffer_convert.h
+include/c++/v1/__locale_dir/wstring_convert.h
+include/c++/v1/__log_hardening_failure
 include/c++/v1/__math/abs.h
 include/c++/v1/__math/copysign.h
 include/c++/v1/__math/error_functions.h
@@ -1555,6 +1142,7 @@ include/c++/v1/__math/special_functions.h
 include/c++/v1/__math/traits.h
 include/c++/v1/__math/trigonometric_functions.h
 include/c++/v1/__mbstate_t.h
+include/c++/v1/__mdspan/aligned_accessor.h
 include/c++/v1/__mdspan/default_accessor.h
 include/c++/v1/__mdspan/extents.h
 include/c++/v1/__mdspan/layout_left.h
@@ -1576,12 +1164,15 @@ include/c++/v1/__memory/auto_ptr.h
 include/c++/v1/__memory/compressed_pair.h
 include/c++/v1/__memory/concepts.h
 include/c++/v1/__memory/construct_at.h
+include/c++/v1/__memory/destroy.h
 include/c++/v1/__memory/destruct_n.h
 include/c++/v1/__memory/inout_ptr.h
+include/c++/v1/__memory/is_sufficiently_aligned.h
 include/c++/v1/__memory/noexcept_move_assign_container.h
 include/c++/v1/__memory/out_ptr.h
 include/c++/v1/__memory/pointer_traits.h
 include/c++/v1/__memory/ranges_construct_at.h
+include/c++/v1/__memory/ranges_destroy.h
 include/c++/v1/__memory/ranges_uninitialized_algorithms.h
 include/c++/v1/__memory/raw_storage_iterator.h
 include/c++/v1/__memory/shared_count.h
@@ -1626,6 +1217,7 @@ include/c++/v1/__numeric/iota.h
 include/c++/v1/__numeric/midpoint.h
 include/c++/v1/__numeric/partial_sum.h
 include/c++/v1/__numeric/pstl.h
+include/c++/v1/__numeric/ranges_iota.h
 include/c++/v1/__numeric/reduce.h
 include/c++/v1/__numeric/saturation_arithmetic.h
 include/c++/v1/__numeric/transform_exclusive_scan.h
@@ -1710,6 +1302,7 @@ include/c++/v1/__ranges/from_range.h
 include/c++/v1/__ranges/iota_view.h
 include/c++/v1/__ranges/istream_view.h
 include/c++/v1/__ranges/join_view.h
+include/c++/v1/__ranges/join_with_view.h
 include/c++/v1/__ranges/lazy_split_view.h
 include/c++/v1/__ranges/movable_box.h
 include/c++/v1/__ranges/non_propagating_cache.h
@@ -1780,9 +1373,8 @@ 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/__type_traits/add_cv_quals.h
-include/c++/v1/__type_traits/add_lvalue_reference.h
 include/c++/v1/__type_traits/add_pointer.h
-include/c++/v1/__type_traits/add_rvalue_reference.h
+include/c++/v1/__type_traits/add_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
@@ -1804,6 +1396,7 @@ include/c++/v1/__type_traits/enable_if.h
 include/c++/v1/__type_traits/extent.h
 include/c++/v1/__type_traits/has_unique_object_representation.h
 include/c++/v1/__type_traits/has_virtual_destructor.h
+include/c++/v1/__type_traits/integer_traits.h
 include/c++/v1/__type_traits/integral_constant.h
 include/c++/v1/__type_traits/invoke.h
 include/c++/v1/__type_traits/is_abstract.h
@@ -1840,7 +1433,6 @@ include/c++/v1/__type_traits/is_literal_type.h
 include/c++/v1/__type_traits/is_member_pointer.h
 include/c++/v1/__type_traits/is_nothrow_assignable.h
 include/c++/v1/__type_traits/is_nothrow_constructible.h
-include/c++/v1/__type_traits/is_nothrow_convertible.h
 include/c++/v1/__type_traits/is_nothrow_destructible.h
 include/c++/v1/__type_traits/is_null_pointer.h
 include/c++/v1/__type_traits/is_object.h
@@ -1851,10 +1443,10 @@ 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
-include/c++/v1/__type_traits/is_signed_integer.h
 include/c++/v1/__type_traits/is_specialization.h
 include/c++/v1/__type_traits/is_standard_layout.h
 include/c++/v1/__type_traits/is_swappable.h
@@ -1867,8 +1459,8 @@ 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_unsigned_integer.h
 include/c++/v1/__type_traits/is_valid_expansion.h
 include/c++/v1/__type_traits/is_void.h
 include/c++/v1/__type_traits/is_volatile.h
@@ -1882,6 +1474,8 @@ include/c++/v1/__type_traits/nat.h
 include/c++/v1/__type_traits/negation.h
 include/c++/v1/__type_traits/promote.h
 include/c++/v1/__type_traits/rank.h
+include/c++/v1/__type_traits/reference_constructs_from_temporary.h
+include/c++/v1/__type_traits/reference_converts_from_temporary.h
 include/c++/v1/__type_traits/remove_all_extents.h
 include/c++/v1/__type_traits/remove_const.h
 include/c++/v1/__type_traits/remove_const_ref.h
@@ -1937,6 +1531,7 @@ include/c++/v1/__vector/vector.h
 include/c++/v1/__vector/vector_bool.h
 include/c++/v1/__vector/vector_bool_formatter.h
 include/c++/v1/__verbose_abort
+include/c++/v1/__verbose_trap
 include/c++/v1/algorithm
 include/c++/v1/any
 include/c++/v1/array
@@ -2006,6 +1601,7 @@ include/c++/v1/ext/hash_set
 include/c++/v1/fenv.h
 include/c++/v1/filesystem
 include/c++/v1/flat_map
+include/c++/v1/flat_set
 include/c++/v1/float.h
 include/c++/v1/format
 include/c++/v1/forward_list
diff --git a/libcxx/buildlink3.mk b/libcxx/buildlink3.mk
index 7cdf819259..2d5f41cac2 100644
--- a/libcxx/buildlink3.mk
+++ b/libcxx/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libcxx
 .if !defined(LIBCXX_BUILDLINK3_MK)
 LIBCXX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libcxx+=	libcxx>=20.1.0
+BUILDLINK_API_DEPENDS.libcxx+=	libcxx>=21.1.0
 BUILDLINK_PKGSRCDIR.libcxx?=	../../wip/libcxx
 
 .endif	# LIBCXX_BUILDLINK3_MK
diff --git a/libcxx/distinfo b/libcxx/distinfo
index 8acd2dd4f4..3b5ed34f6f 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 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 62cf911391..e2483f60a5 100644
--- a/libcxxabi/Makefile
+++ b/libcxxabi/Makefile
@@ -33,12 +33,17 @@ CXXFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
 CXXFLAGS+=	-std=c++17 -D_LIBCPP_STD_VER=17
 .endif
 
-# IMPORTANT: copy __assertion_handler and __config_site from partial build of libcxx.
 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:
 	${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 4f20bc28c8..10e0cc1517 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>=20.1.0
+BUILDLINK_API_DEPENDS.libcxxabi+=	libcxxabi>=21.1.0
 BUILDLINK_PKGSRCDIR.libcxxabi?=		../../wip/libcxxabi
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
index 6df58cc2e1..76ba2e777b 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
-SHA1 (patch-src_CMakeLists.txt) = fcfadc20db2c0c9095b8ae9b25a5988384209115
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
+SHA1 (patch-src_CMakeLists.txt) = 4824994ca6f2f4f0ebc154fff7a17418660e5959
 SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95
diff --git a/libcxxabi/patches/patch-src_CMakeLists.txt b/libcxxabi/patches/patch-src_CMakeLists.txt
index ea4335ab2f..775f470e87 100644
--- a/libcxxabi/patches/patch-src_CMakeLists.txt
+++ b/libcxxabi/patches/patch-src_CMakeLists.txt
@@ -2,7 +2,7 @@ $NetBSD: patch-src_CMakeLists.txt,v 1.1 2022/11/14 18:44:06 adam Exp $
 
 Fix build.
 
---- src/CMakeLists.txt.orig	2025-04-16 00:23:49.000000000 +0000
+--- src/CMakeLists.txt.orig	2025-10-21 08:14:55.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -57,6 +57,7 @@ if (MSVC_IDE OR XCODE)
  endif()
@@ -12,19 +12,21 @@ Fix build.
  include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
  
  if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
-@@ -172,7 +173,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
-     target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared)
-   endif()
+@@ -174,7 +175,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
  endif()
--target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_LIBRARIES})
+ target_link_libraries(cxxabi_shared_objects
+   PUBLIC cxxabi-headers
+-  PRIVATE cxx-headers runtimes-libc-headers ${LIBCXXABI_LIBRARIES})
++  PRIVATE runtimes-libc-headers ${LIBCXXABI_LIBRARIES})
  if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG)
    target_link_libraries(cxxabi_shared_objects PRIVATE ${LIBCXXABI_BUILTINS_LIBRARY})
  endif()
-@@ -274,7 +274,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBC
-   target_link_libraries(cxxabi_static_objects PUBLIC unwind_static_objects) # propagate usage requirements
-   target_sources(cxxabi_static_objects PUBLIC $<TARGET_OBJECTS:unwind_static_objects>)
+@@ -277,7 +278,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER AND LIBC
  endif()
--target_link_libraries(cxxabi_static_objects PRIVATE cxx-headers ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
- target_link_libraries(cxxabi_static_objects PUBLIC cxxabi-headers)
+ target_link_libraries(cxxabi_static_objects
+   PUBLIC cxxabi-headers
+-  PRIVATE cxx-headers runtimes-libc-headers ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
++  PRIVATE runtimes-libc-headers ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
  set_target_properties(cxxabi_static_objects
    PROPERTIES
+     CXX_EXTENSIONS OFF
diff --git a/libunwind/buildlink3.mk b/libunwind/buildlink3.mk
index 54b774b3a4..cb6b6aa3a0 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>=20.1.0
+BUILDLINK_API_DEPENDS.libunwind+=	libunwind>=21.1.0
 BUILDLINK_PKGSRCDIR.libunwind?=		../../wip/libunwind
 
 .endif	# LIBUNWIND_BUILDLINK3_MK
diff --git a/libunwind/distinfo b/libunwind/distinfo
index aa042a6e84..583cdf2cfb 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
diff --git a/lld/PLIST b/lld/PLIST
index fd08339349..38b72091fc 100644
--- a/lld/PLIST
+++ b/lld/PLIST
@@ -6,6 +6,7 @@ bin/lld-link
 bin/wasm-ld
 include/lld/Common/Args.h
 include/lld/Common/Arrays.h
+include/lld/Common/BPSectionOrdererBase.inc
 include/lld/Common/CommonLinkerContext.h
 include/lld/Common/DWARF.h
 include/lld/Common/Driver.h
@@ -17,6 +18,7 @@ include/lld/Common/Reproduce.h
 include/lld/Common/Strings.h
 include/lld/Common/TargetOptionsCommandFlags.h
 include/lld/Common/Timer.h
+include/lld/Common/Utils.h
 include/lld/Common/Version.h
 lib/cmake/lld/LLDConfig.cmake
 lib/cmake/lld/LLDConfigVersion.cmake
diff --git a/lld/buildlink3.mk b/lld/buildlink3.mk
index 11a77333af..dadad04e4e 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>=20.1.0
+BUILDLINK_API_DEPENDS.lld+=	lld>=21.1.0
 BUILDLINK_PKGSRCDIR.lld?=	../../wip/lld
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/lld/distinfo b/lld/distinfo
index 4fa00401eb..b65afad4dd 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-ELF_Config.h) = 484d0818bd4a92f2faafa1337d3f2f08cab4c0fc
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lldb/Makefile b/lldb/Makefile
index f1fe63284b..dc9dda1c23 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -20,6 +20,8 @@ USE_LANGUAGES=		c c++
 GCC_REQD+=		7
 PY_PATCHPLIST=		yes
 
+# FIXME: currenly build fails when libcxx is also installed.
+
 CMAKE_CONFIGURE_ARGS+=	-DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
 #CMAKE_CONFIGURE_ARGS+=	-DLLVM_ENABLE_LIBCXX=ON
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
diff --git a/lldb/PLIST b/lldb/PLIST
index ba3775d051..e183c325ab 100644
--- a/lldb/PLIST
+++ b/lldb/PLIST
@@ -46,6 +46,7 @@ include/lldb/API/SBMemoryRegionInfo.h
 include/lldb/API/SBMemoryRegionInfoList.h
 include/lldb/API/SBModule.h
 include/lldb/API/SBModuleSpec.h
+include/lldb/API/SBMutex.h
 include/lldb/API/SBPlatform.h
 include/lldb/API/SBProcess.h
 include/lldb/API/SBProcessInfo.h
@@ -102,6 +103,7 @@ include/lldb/Breakpoint/BreakpointResolverFileRegex.h
 include/lldb/Breakpoint/BreakpointResolverName.h
 include/lldb/Breakpoint/BreakpointResolverScripted.h
 include/lldb/Breakpoint/BreakpointSite.h
+include/lldb/Breakpoint/StopCondition.h
 include/lldb/Breakpoint/StopPointSiteList.h
 include/lldb/Breakpoint/Stoppoint.h
 include/lldb/Breakpoint/StoppointCallbackContext.h
@@ -123,6 +125,7 @@ include/lldb/Core/DataFileCache.h
 include/lldb/Core/Debugger.h
 include/lldb/Core/DebuggerEvents.h
 include/lldb/Core/Declaration.h
+include/lldb/Core/DemangledNameInfo.h
 include/lldb/Core/Disassembler.h
 include/lldb/Core/DumpDataExtractor.h
 include/lldb/Core/DumpRegisterInfo.h
@@ -143,13 +146,16 @@ include/lldb/Core/Opcode.h
 include/lldb/Core/PluginInterface.h
 include/lldb/Core/PluginManager.h
 include/lldb/Core/Progress.h
+include/lldb/Core/ProtocolServer.h
 include/lldb/Core/RichManglingContext.h
 include/lldb/Core/SearchFilter.h
 include/lldb/Core/Section.h
 include/lldb/Core/SourceLocationSpec.h
 include/lldb/Core/SourceManager.h
+include/lldb/Core/Statusline.h
 include/lldb/Core/StreamAsynchronousIO.h
 include/lldb/Core/StructuredDataImpl.h
+include/lldb/Core/Telemetry.h
 include/lldb/Core/ThreadSafeDenseSet.h
 include/lldb/Core/ThreadSafeValue.h
 include/lldb/Core/ThreadedCommunication.h
@@ -195,7 +201,6 @@ include/lldb/Expression/ObjectFileJIT.h
 include/lldb/Expression/REPL.h
 include/lldb/Expression/UserExpression.h
 include/lldb/Expression/UtilityFunction.h
-include/lldb/Host/Alarm.h
 include/lldb/Host/Config.h
 include/lldb/Host/ConnectionFileDescriptor.h
 include/lldb/Host/Debug.h
@@ -215,11 +220,13 @@ include/lldb/Host/HostNativeThreadBase.h
 include/lldb/Host/HostNativeThreadForward.h
 include/lldb/Host/HostProcess.h
 include/lldb/Host/HostThread.h
+include/lldb/Host/JSONTransport.h
 include/lldb/Host/LZMA.h
 include/lldb/Host/LockFile.h
 include/lldb/Host/LockFileBase.h
 include/lldb/Host/MainLoop.h
 include/lldb/Host/MainLoopBase.h
+include/lldb/Host/MemoryMonitor.h
 include/lldb/Host/MonitoringProcessLauncher.h
 include/lldb/Host/OptionParser.h
 include/lldb/Host/Pipe.h
@@ -238,6 +245,7 @@ include/lldb/Host/ThreadLauncher.h
 include/lldb/Host/Time.h
 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/GetOptInc.h
 include/lldb/Host/common/NativeBreakpointList.h
@@ -268,6 +276,7 @@ include/lldb/Host/posix/LockFilePosix.h
 include/lldb/Host/posix/MainLoopPosix.h
 include/lldb/Host/posix/PipePosix.h
 include/lldb/Host/posix/ProcessLauncherPosixFork.h
+include/lldb/Host/posix/Support.h
 include/lldb/Host/windows/AutoHandle.h
 include/lldb/Host/windows/ConnectionGenericFileWindows.h
 include/lldb/Host/windows/HostInfoWindows.h
@@ -340,6 +349,87 @@ include/lldb/Interpreter/Options.h
 include/lldb/Interpreter/Property.h
 include/lldb/Interpreter/ScriptInterpreter.h
 include/lldb/Interpreter/ScriptObject.h
+include/lldb/LLDB.h
+include/lldb/SBAddress.h
+include/lldb/SBAddressRange.h
+include/lldb/SBAddressRangeList.h
+include/lldb/SBAttachInfo.h
+include/lldb/SBBlock.h
+include/lldb/SBBreakpoint.h
+include/lldb/SBBreakpointLocation.h
+include/lldb/SBBreakpointName.h
+include/lldb/SBBroadcaster.h
+include/lldb/SBCommandInterpreter.h
+include/lldb/SBCommandInterpreterRunOptions.h
+include/lldb/SBCommandReturnObject.h
+include/lldb/SBCommunication.h
+include/lldb/SBCompileUnit.h
+include/lldb/SBData.h
+include/lldb/SBDebugger.h
+include/lldb/SBDeclaration.h
+include/lldb/SBDefines.h
+include/lldb/SBEnvironment.h
+include/lldb/SBError.h
+include/lldb/SBEvent.h
+include/lldb/SBExecutionContext.h
+include/lldb/SBExpressionOptions.h
+include/lldb/SBFile.h
+include/lldb/SBFileSpec.h
+include/lldb/SBFileSpecList.h
+include/lldb/SBFormat.h
+include/lldb/SBFrame.h
+include/lldb/SBFunction.h
+include/lldb/SBHostOS.h
+include/lldb/SBInstruction.h
+include/lldb/SBInstructionList.h
+include/lldb/SBLanguageRuntime.h
+include/lldb/SBLaunchInfo.h
+include/lldb/SBLineEntry.h
+include/lldb/SBListener.h
+include/lldb/SBMemoryRegionInfo.h
+include/lldb/SBMemoryRegionInfoList.h
+include/lldb/SBModule.h
+include/lldb/SBModuleSpec.h
+include/lldb/SBMutex.h
+include/lldb/SBPlatform.h
+include/lldb/SBProcess.h
+include/lldb/SBProcessInfo.h
+include/lldb/SBProcessInfoList.h
+include/lldb/SBProgress.h
+include/lldb/SBQueue.h
+include/lldb/SBQueueItem.h
+include/lldb/SBReproducer.h
+include/lldb/SBSaveCoreOptions.h
+include/lldb/SBScriptObject.h
+include/lldb/SBSection.h
+include/lldb/SBSourceManager.h
+include/lldb/SBStatisticsOptions.h
+include/lldb/SBStream.h
+include/lldb/SBStringList.h
+include/lldb/SBStructuredData.h
+include/lldb/SBSymbol.h
+include/lldb/SBSymbolContext.h
+include/lldb/SBSymbolContextList.h
+include/lldb/SBTarget.h
+include/lldb/SBThread.h
+include/lldb/SBThreadCollection.h
+include/lldb/SBThreadPlan.h
+include/lldb/SBTrace.h
+include/lldb/SBTraceCursor.h
+include/lldb/SBType.h
+include/lldb/SBTypeCategory.h
+include/lldb/SBTypeEnumMember.h
+include/lldb/SBTypeFilter.h
+include/lldb/SBTypeFormat.h
+include/lldb/SBTypeNameSpecifier.h
+include/lldb/SBTypeSummary.h
+include/lldb/SBTypeSynthetic.h
+include/lldb/SBUnixSignals.h
+include/lldb/SBValue.h
+include/lldb/SBValueList.h
+include/lldb/SBVariablesOptions.h
+include/lldb/SBWatchpoint.h
+include/lldb/SBWatchpointOptions.h
 include/lldb/Symbol/ArmUnwindInfo.h
 include/lldb/Symbol/Block.h
 include/lldb/Symbol/CallFrameInfo.h
@@ -536,6 +626,10 @@ include/lldb/Utility/VASPrintf.h
 include/lldb/Utility/VMRange.h
 include/lldb/Utility/XcodeSDK.h
 include/lldb/Utility/ZipFile.h
+include/lldb/ValueObject/DILAST.h
+include/lldb/ValueObject/DILEval.h
+include/lldb/ValueObject/DILLexer.h
+include/lldb/ValueObject/DILParser.h
 include/lldb/ValueObject/ValueObject.h
 include/lldb/ValueObject/ValueObjectCast.h
 include/lldb/ValueObject/ValueObjectChild.h
@@ -547,7 +641,7 @@ include/lldb/ValueObject/ValueObjectDynamicValue.h
 include/lldb/ValueObject/ValueObjectList.h
 include/lldb/ValueObject/ValueObjectMemory.h
 include/lldb/ValueObject/ValueObjectRegister.h
-include/lldb/ValueObject/ValueObjectSyntheticFilter.h
+include/lldb/ValueObject/ValueObjectSynthetic.h
 include/lldb/ValueObject/ValueObjectUpdater.h
 include/lldb/ValueObject/ValueObjectVTable.h
 include/lldb/ValueObject/ValueObjectVariable.h
diff --git a/lldb/buildlink3.mk b/lldb/buildlink3.mk
index e775965af5..9fa35891f7 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>=20.1.0
-BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=20.1.0
+BUILDLINK_API_DEPENDS.lldb+=	lldb>=21.1.0
+BUILDLINK_ABI_DEPENDS.lldb+=	lldb>=21.1.0
 BUILDLINK_PKGSRCDIR.lldb?=	../../wip/lldb
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/lldb/distinfo b/lldb/distinfo
index 72db1a92f3..93bf96bd5e 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-source_API_CMakeLists.txt) = 32840580507b3a7d05e76485da5830e92a76bb06
diff --git a/llvm/PLIST b/llvm/PLIST
index f03941ba30..48bf24732e 100644
--- a/llvm/PLIST
+++ b/llvm/PLIST
@@ -50,6 +50,7 @@ bin/llvm-lto2
 bin/llvm-mc
 bin/llvm-mca
 bin/llvm-ml
+bin/llvm-ml64
 bin/llvm-modextract
 bin/llvm-mt
 bin/llvm-nm
@@ -76,6 +77,7 @@ bin/llvm-strings
 bin/llvm-strip
 bin/llvm-symbolizer
 bin/llvm-tblgen
+bin/llvm-test-mustache-spec
 bin/llvm-tli-checker
 bin/llvm-undname
 bin/llvm-windres
@@ -117,6 +119,7 @@ include/llvm-c/Target.h
 include/llvm-c/TargetMachine.h
 include/llvm-c/Transforms/PassBuilder.h
 include/llvm-c/Types.h
+include/llvm-c/Visibility.h
 include/llvm-c/blake3.h
 include/llvm-c/lto.h
 include/llvm/ADT/ADL.h
@@ -269,12 +272,16 @@ include/llvm/Analysis/DomTreeUpdater.h
 include/llvm/Analysis/DominanceFrontier.h
 include/llvm/Analysis/DominanceFrontierImpl.h
 include/llvm/Analysis/EHUtils.h
+include/llvm/Analysis/EphemeralValuesCache.h
+include/llvm/Analysis/FloatingPointPredicateUtils.h
 include/llvm/Analysis/FunctionPropertiesAnalysis.h
 include/llvm/Analysis/GenericDomTreeUpdater.h
 include/llvm/Analysis/GenericDomTreeUpdaterImpl.h
 include/llvm/Analysis/GlobalsModRef.h
 include/llvm/Analysis/GuardUtils.h
+include/llvm/Analysis/HashRecognize.h
 include/llvm/Analysis/HeatUtils.h
+include/llvm/Analysis/IR2Vec.h
 include/llvm/Analysis/IRSimilarityIdentifier.h
 include/llvm/Analysis/IVDescriptors.h
 include/llvm/Analysis/IVUsers.h
@@ -291,6 +298,7 @@ include/llvm/Analysis/InstructionPrecedenceTracking.h
 include/llvm/Analysis/InstructionSimplify.h
 include/llvm/Analysis/InteractiveModelRunner.h
 include/llvm/Analysis/IteratedDominanceFrontier.h
+include/llvm/Analysis/KernelInfo.h
 include/llvm/Analysis/LastRunTrackingAnalysis.h
 include/llvm/Analysis/LazyBlockFrequencyInfo.h
 include/llvm/Analysis/LazyBranchProbabilityInfo.h
@@ -351,6 +359,7 @@ include/llvm/Analysis/SimplifyQuery.h
 include/llvm/Analysis/SparsePropagation.h
 include/llvm/Analysis/StackLifetime.h
 include/llvm/Analysis/StackSafetyAnalysis.h
+include/llvm/Analysis/StaticDataProfileInfo.h
 include/llvm/Analysis/StructuralHash.h
 include/llvm/Analysis/SyntheticCountsUtils.h
 include/llvm/Analysis/TargetFolder.h
@@ -421,6 +430,7 @@ include/llvm/BinaryFormat/MsgPack.h
 include/llvm/BinaryFormat/MsgPackDocument.h
 include/llvm/BinaryFormat/MsgPackReader.h
 include/llvm/BinaryFormat/MsgPackWriter.h
+include/llvm/BinaryFormat/SFrame.h
 include/llvm/BinaryFormat/Swift.def
 include/llvm/BinaryFormat/Swift.h
 include/llvm/BinaryFormat/Wasm.h
@@ -438,6 +448,7 @@ include/llvm/Bitstream/BitCodeEnums.h
 include/llvm/Bitstream/BitCodes.h
 include/llvm/Bitstream/BitstreamReader.h
 include/llvm/Bitstream/BitstreamWriter.h
+include/llvm/CGData/CGDataPatchItem.h
 include/llvm/CGData/CodeGenData.h
 include/llvm/CGData/CodeGenData.inc
 include/llvm/CGData/CodeGenDataReader.h
@@ -457,8 +468,11 @@ include/llvm/CodeGen/AtomicExpandUtils.h
 include/llvm/CodeGen/BasicBlockSectionUtils.h
 include/llvm/CodeGen/BasicBlockSectionsProfileReader.h
 include/llvm/CodeGen/BasicTTIImpl.h
+include/llvm/CodeGen/BranchFoldingPass.h
+include/llvm/CodeGen/BranchRelaxation.h
 include/llvm/CodeGen/ByteProvider.h
 include/llvm/CodeGen/CFIFixup.h
+include/llvm/CodeGen/CFIInstBuilder.h
 include/llvm/CodeGen/CSEConfigBase.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallBrPrepare.h
@@ -477,19 +491,23 @@ include/llvm/CodeGen/DbgEntityHistoryCalculator.h
 include/llvm/CodeGen/DeadMachineInstructionElim.h
 include/llvm/CodeGen/DebugHandlerBase.h
 include/llvm/CodeGen/DetectDeadLanes.h
+include/llvm/CodeGen/DroppedVariableStatsMIR.h
 include/llvm/CodeGen/DwarfEHPrepare.h
 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/ExpandLargeFpConvert.h
 include/llvm/CodeGen/ExpandMemCmp.h
+include/llvm/CodeGen/ExpandPostRAPseudos.h
 include/llvm/CodeGen/ExpandReductions.h
 include/llvm/CodeGen/ExpandVectorPredication.h
+include/llvm/CodeGen/FEntryInserter.h
 include/llvm/CodeGen/FastISel.h
 include/llvm/CodeGen/FaultMaps.h
 include/llvm/CodeGen/FinalizeISel.h
+include/llvm/CodeGen/FixupStatepointCallerSaved.h
 include/llvm/CodeGen/FunctionLoweringInfo.h
 include/llvm/CodeGen/GCMetadata.h
 include/llvm/CodeGen/GCMetadataPrinter.h
@@ -503,7 +521,7 @@ include/llvm/CodeGen/GlobalISel/CombinerInfo.h
 include/llvm/CodeGen/GlobalISel/GIMatchTableExecutor.h
 include/llvm/CodeGen/GlobalISel/GIMatchTableExecutorImpl.h
 include/llvm/CodeGen/GlobalISel/GISelChangeObserver.h
-include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
+include/llvm/CodeGen/GlobalISel/GISelValueTracking.h
 include/llvm/CodeGen/GlobalISel/GISelWorkList.h
 include/llvm/CodeGen/GlobalISel/GenericMachineInstrs.h
 include/llvm/CodeGen/GlobalISel/IRTranslator.h
@@ -519,6 +537,7 @@ include/llvm/CodeGen/GlobalISel/LoadStoreOpt.h
 include/llvm/CodeGen/GlobalISel/Localizer.h
 include/llvm/CodeGen/GlobalISel/LostDebugLocObserver.h
 include/llvm/CodeGen/GlobalISel/MIPatternMatch.h
+include/llvm/CodeGen/GlobalISel/MachineFloatingPointPredicateUtils.h
 include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h
 include/llvm/CodeGen/GlobalISel/RegBankSelect.h
 include/llvm/CodeGen/GlobalISel/Utils.h
@@ -528,6 +547,7 @@ include/llvm/CodeGen/HardwareLoops.h
 include/llvm/CodeGen/ISDOpcodes.h
 include/llvm/CodeGen/IndirectBrExpand.h
 include/llvm/CodeGen/IndirectThunks.h
+include/llvm/CodeGen/InitUndef.h
 include/llvm/CodeGen/InterleavedAccess.h
 include/llvm/CodeGen/InterleavedLoadCombine.h
 include/llvm/CodeGen/IntrinsicLowering.h
@@ -537,6 +557,7 @@ include/llvm/CodeGen/LazyMachineBlockFrequencyInfo.h
 include/llvm/CodeGen/LexicalScopes.h
 include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
+include/llvm/CodeGen/LiveDebugValuesPass.h
 include/llvm/CodeGen/LiveDebugVariables.h
 include/llvm/CodeGen/LiveInterval.h
 include/llvm/CodeGen/LiveIntervalCalc.h
@@ -564,12 +585,14 @@ include/llvm/CodeGen/MIRYamlMapping.h
 include/llvm/CodeGen/MachORelocation.h
 include/llvm/CodeGen/MachineBasicBlock.h
 include/llvm/CodeGen/MachineBlockFrequencyInfo.h
+include/llvm/CodeGen/MachineBlockPlacement.h
 include/llvm/CodeGen/MachineBranchProbabilityInfo.h
 include/llvm/CodeGen/MachineCFGPrinter.h
 include/llvm/CodeGen/MachineCSE.h
 include/llvm/CodeGen/MachineCombinerPattern.h
 include/llvm/CodeGen/MachineConstantPool.h
 include/llvm/CodeGen/MachineConvergenceVerifier.h
+include/llvm/CodeGen/MachineCopyPropagation.h
 include/llvm/CodeGen/MachineCycleAnalysis.h
 include/llvm/CodeGen/MachineDomTreeUpdater.h
 include/llvm/CodeGen/MachineDominanceFrontier.h
@@ -577,6 +600,7 @@ include/llvm/CodeGen/MachineDominators.h
 include/llvm/CodeGen/MachineFrameInfo.h
 include/llvm/CodeGen/MachineFunction.h
 include/llvm/CodeGen/MachineFunctionAnalysis.h
+include/llvm/CodeGen/MachineFunctionAnalysisManager.h
 include/llvm/CodeGen/MachineFunctionPass.h
 include/llvm/CodeGen/MachineInstr.h
 include/llvm/CodeGen/MachineInstrBuilder.h
@@ -584,6 +608,7 @@ include/llvm/CodeGen/MachineInstrBundle.h
 include/llvm/CodeGen/MachineInstrBundleIterator.h
 include/llvm/CodeGen/MachineJumpTableInfo.h
 include/llvm/CodeGen/MachineLICM.h
+include/llvm/CodeGen/MachineLateInstrsCleanup.h
 include/llvm/CodeGen/MachineLoopInfo.h
 include/llvm/CodeGen/MachineLoopUtils.h
 include/llvm/CodeGen/MachineMemOperand.h
@@ -602,6 +627,7 @@ include/llvm/CodeGen/MachineRegisterInfo.h
 include/llvm/CodeGen/MachineSSAContext.h
 include/llvm/CodeGen/MachineSSAUpdater.h
 include/llvm/CodeGen/MachineScheduler.h
+include/llvm/CodeGen/MachineSink.h
 include/llvm/CodeGen/MachineSizeOpts.h
 include/llvm/CodeGen/MachineStableHash.h
 include/llvm/CodeGen/MachineTraceMetrics.h
@@ -618,9 +644,14 @@ include/llvm/CodeGen/PBQP/Math.h
 include/llvm/CodeGen/PBQP/ReductionRules.h
 include/llvm/CodeGen/PBQP/Solution.h
 include/llvm/CodeGen/PBQPRAConstraint.h
+include/llvm/CodeGen/PEI.h
 include/llvm/CodeGen/PHIElimination.h
 include/llvm/CodeGen/Passes.h
+include/llvm/CodeGen/PatchableFunction.h
 include/llvm/CodeGen/PeepholeOptimizer.h
+include/llvm/CodeGen/PostRAHazardRecognizer.h
+include/llvm/CodeGen/PostRAMachineSink.h
+include/llvm/CodeGen/PostRASchedulerList.h
 include/llvm/CodeGen/PreISelIntrinsicLowering.h
 include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/PseudoSourceValueManager.h
@@ -629,8 +660,11 @@ include/llvm/CodeGen/RDFLiveness.h
 include/llvm/CodeGen/RDFRegisters.h
 include/llvm/CodeGen/ReachingDefAnalysis.h
 include/llvm/CodeGen/RegAllocCommon.h
+include/llvm/CodeGen/RegAllocEvictionAdvisor.h
 include/llvm/CodeGen/RegAllocFast.h
+include/llvm/CodeGen/RegAllocGreedyPass.h
 include/llvm/CodeGen/RegAllocPBQP.h
+include/llvm/CodeGen/RegAllocPriorityAdvisor.h
 include/llvm/CodeGen/RegAllocRegistry.h
 include/llvm/CodeGen/RegUsageInfoCollector.h
 include/llvm/CodeGen/RegUsageInfoPropagate.h
@@ -638,15 +672,21 @@ include/llvm/CodeGen/Register.h
 include/llvm/CodeGen/RegisterBank.h
 include/llvm/CodeGen/RegisterBankInfo.h
 include/llvm/CodeGen/RegisterClassInfo.h
+include/llvm/CodeGen/RegisterCoalescerPass.h
 include/llvm/CodeGen/RegisterPressure.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/RegisterUsageInfo.h
+include/llvm/CodeGen/RemoveLoadsIntoFakeUses.h
+include/llvm/CodeGen/RemoveRedundantDebugValues.h
+include/llvm/CodeGen/RenameIndependentSubregs.h
 include/llvm/CodeGen/ReplaceWithVeclib.h
 include/llvm/CodeGen/ResourcePriorityQueue.h
 include/llvm/CodeGen/RuntimeLibcallUtil.h
+include/llvm/CodeGen/SDNodeInfo.h
 include/llvm/CodeGen/SDNodeProperties.td
 include/llvm/CodeGen/SDPatternMatch.h
 include/llvm/CodeGen/SafeStack.h
+include/llvm/CodeGen/SanitizerBinaryMetadata.h
 include/llvm/CodeGen/ScheduleDAG.h
 include/llvm/CodeGen/ScheduleDAGInstrs.h
 include/llvm/CodeGen/ScheduleDAGMutation.h
@@ -661,13 +701,16 @@ include/llvm/CodeGen/SelectionDAGISel.h
 include/llvm/CodeGen/SelectionDAGNodes.h
 include/llvm/CodeGen/SelectionDAGTargetInfo.h
 include/llvm/CodeGen/ShadowStackGCLowering.h
+include/llvm/CodeGen/ShrinkWrap.h
 include/llvm/CodeGen/SjLjEHPrepare.h
 include/llvm/CodeGen/SlotIndexes.h
 include/llvm/CodeGen/SpillPlacement.h
 include/llvm/CodeGen/Spiller.h
 include/llvm/CodeGen/StackColoring.h
+include/llvm/CodeGen/StackFrameLayoutAnalysisPass.h
 include/llvm/CodeGen/StackMaps.h
 include/llvm/CodeGen/StackProtector.h
+include/llvm/CodeGen/StackSlotColoring.h
 include/llvm/CodeGen/SwiftErrorValueTracking.h
 include/llvm/CodeGen/SwitchLoweringUtils.h
 include/llvm/CodeGen/TailDuplication.h
@@ -695,6 +738,7 @@ include/llvm/CodeGen/WasmEHPrepare.h
 include/llvm/CodeGen/WinEHFuncInfo.h
 include/llvm/CodeGen/WinEHPrepare.h
 include/llvm/CodeGen/WindowScheduler.h
+include/llvm/CodeGen/XRayInstrumentation.h
 include/llvm/CodeGenTypes/LowLevelType.h
 include/llvm/CodeGenTypes/MachineValueType.h
 include/llvm/Config/AsmParsers.def
@@ -703,8 +747,14 @@ include/llvm/Config/Disassemblers.def
 include/llvm/Config/TargetExegesis.def
 include/llvm/Config/TargetMCAs.def
 include/llvm/Config/Targets.def
+include/llvm/Config/Targets.h
 include/llvm/Config/abi-breaking.h
 include/llvm/Config/llvm-config.h
+include/llvm/DWARFCFIChecker/DWARFCFIAnalysis.h
+include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameAnalyzer.h
+include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameReceiver.h
+include/llvm/DWARFCFIChecker/DWARFCFIFunctionFrameStreamer.h
+include/llvm/DWARFCFIChecker/DWARFCFIState.h
 include/llvm/DWARFLinker/AddressesMap.h
 include/llvm/DWARFLinker/Classic/DWARFLinker.h
 include/llvm/DWARFLinker/Classic/DWARFLinkerCompileUnit.h
@@ -729,6 +779,7 @@ include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
 include/llvm/DebugInfo/CodeView/CVTypeVisitor.h
 include/llvm/DebugInfo/CodeView/CodeView.h
 include/llvm/DebugInfo/CodeView/CodeViewError.h
+include/llvm/DebugInfo/CodeView/CodeViewLanguages.def
 include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
 include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
 include/llvm/DebugInfo/CodeView/CodeViewSymbols.def
@@ -788,6 +839,7 @@ include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
 include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
 include/llvm/DebugInfo/DWARF/DWARFAddressRange.h
 include/llvm/DebugInfo/DWARF/DWARFAttribute.h
+include/llvm/DebugInfo/DWARF/DWARFCFIPrinter.h
 include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
 include/llvm/DebugInfo/DWARF/DWARFContext.h
 include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
@@ -804,7 +856,7 @@ include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h
 include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h
 include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
 include/llvm/DebugInfo/DWARF/DWARFDie.h
-include/llvm/DebugInfo/DWARF/DWARFExpression.h
+include/llvm/DebugInfo/DWARF/DWARFExpressionPrinter.h
 include/llvm/DebugInfo/DWARF/DWARFFormValue.h
 include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h
 include/llvm/DebugInfo/DWARF/DWARFListTable.h
@@ -816,13 +868,19 @@ include/llvm/DebugInfo/DWARF/DWARFTypePrinter.h
 include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
 include/llvm/DebugInfo/DWARF/DWARFUnit.h
 include/llvm/DebugInfo/DWARF/DWARFUnitIndex.h
+include/llvm/DebugInfo/DWARF/DWARFUnwindTablePrinter.h
 include/llvm/DebugInfo/DWARF/DWARFVerifier.h
+include/llvm/DebugInfo/DWARF/LowLevel/DWARFCFIProgram.h
+include/llvm/DebugInfo/DWARF/LowLevel/DWARFDataExtractorSimple.h
+include/llvm/DebugInfo/DWARF/LowLevel/DWARFExpression.h
+include/llvm/DebugInfo/DWARF/LowLevel/DWARFUnwindTable.h
 include/llvm/DebugInfo/GSYM/CallSiteInfo.h
 include/llvm/DebugInfo/GSYM/DwarfTransformer.h
 include/llvm/DebugInfo/GSYM/ExtractRanges.h
 include/llvm/DebugInfo/GSYM/FileEntry.h
 include/llvm/DebugInfo/GSYM/FileWriter.h
 include/llvm/DebugInfo/GSYM/FunctionInfo.h
+include/llvm/DebugInfo/GSYM/GsymContext.h
 include/llvm/DebugInfo/GSYM/GsymCreator.h
 include/llvm/DebugInfo/GSYM/GsymReader.h
 include/llvm/DebugInfo/GSYM/Header.h
@@ -844,6 +902,7 @@ include/llvm/DebugInfo/LogicalView/Core/LVRange.h
 include/llvm/DebugInfo/LogicalView/Core/LVReader.h
 include/llvm/DebugInfo/LogicalView/Core/LVScope.h
 include/llvm/DebugInfo/LogicalView/Core/LVSort.h
+include/llvm/DebugInfo/LogicalView/Core/LVSourceLanguage.h
 include/llvm/DebugInfo/LogicalView/Core/LVStringPool.h
 include/llvm/DebugInfo/LogicalView/Core/LVSupport.h
 include/llvm/DebugInfo/LogicalView/Core/LVSymbol.h
@@ -1013,10 +1072,10 @@ include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
 include/llvm/ExecutionEngine/JITLink/ELF.h
 include/llvm/ExecutionEngine/JITLink/ELF_aarch32.h
 include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h
-include/llvm/ExecutionEngine/JITLink/ELF_i386.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_x86.h
 include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h
 include/llvm/ExecutionEngine/JITLink/JITLink.h
 include/llvm/ExecutionEngine/JITLink/JITLinkDylib.h
@@ -1025,18 +1084,21 @@ include/llvm/ExecutionEngine/JITLink/MachO.h
 include/llvm/ExecutionEngine/JITLink/MachO_arm64.h
 include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
 include/llvm/ExecutionEngine/JITLink/TableManager.h
+include/llvm/ExecutionEngine/JITLink/XCOFF.h
+include/llvm/ExecutionEngine/JITLink/XCOFF_ppc64.h
 include/llvm/ExecutionEngine/JITLink/aarch32.h
 include/llvm/ExecutionEngine/JITLink/aarch64.h
-include/llvm/ExecutionEngine/JITLink/i386.h
 include/llvm/ExecutionEngine/JITLink/loongarch.h
 include/llvm/ExecutionEngine/JITLink/ppc64.h
 include/llvm/ExecutionEngine/JITLink/riscv.h
+include/llvm/ExecutionEngine/JITLink/x86.h
 include/llvm/ExecutionEngine/JITLink/x86_64.h
 include/llvm/ExecutionEngine/JITSymbol.h
 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/COFF.h
 include/llvm/ExecutionEngine/Orc/COFFPlatform.h
 include/llvm/ExecutionEngine/Orc/COFFVCRuntimeSupport.h
 include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
@@ -1055,7 +1117,6 @@ 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/EPCEHFrameRegistrar.h
 include/llvm/ExecutionEngine/Orc/EPCGenericDylibManager.h
 include/llvm/ExecutionEngine/Orc/EPCGenericJITLinkMemoryManager.h
 include/llvm/ExecutionEngine/Orc/EPCGenericMemoryAccess.h
@@ -1063,11 +1124,12 @@ 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/IRCompileLayer.h
 include/llvm/ExecutionEngine/Orc/IRPartitionLayer.h
 include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
+include/llvm/ExecutionEngine/Orc/InProcessMemoryAccess.h
 include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
-include/llvm/ExecutionEngine/Orc/JITLinkLazyCallThroughManager.h
 include/llvm/ExecutionEngine/Orc/JITLinkRedirectableSymbolManager.h
 include/llvm/ExecutionEngine/Orc/JITLinkReentryTrampolines.h
 include/llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h
@@ -1085,6 +1147,7 @@ include/llvm/ExecutionEngine/Orc/MachOPlatform.h
 include/llvm/ExecutionEngine/Orc/Mangling.h
 include/llvm/ExecutionEngine/Orc/MapperJITLinkMemoryManager.h
 include/llvm/ExecutionEngine/Orc/MaterializationUnit.h
+include/llvm/ExecutionEngine/Orc/MemoryAccess.h
 include/llvm/ExecutionEngine/Orc/MemoryMapper.h
 include/llvm/ExecutionEngine/Orc/ObjectFileInterface.h
 include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
@@ -1094,6 +1157,7 @@ include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
 include/llvm/ExecutionEngine/Orc/ReOptimizeLayer.h
 include/llvm/ExecutionEngine/Orc/RedirectionManager.h
 include/llvm/ExecutionEngine/Orc/SectCreate.h
+include/llvm/ExecutionEngine/Orc/SelfExecutorProcessControl.h
 include/llvm/ExecutionEngine/Orc/Shared/AllocationActions.h
 include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h
 include/llvm/ExecutionEngine/Orc/Shared/ExecutorSymbolDef.h
@@ -1135,8 +1199,13 @@ include/llvm/FileCheck/FileCheck.h
 include/llvm/Frontend/Atomic/Atomic.h
 include/llvm/Frontend/Debug/Options.h
 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/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/Utility.h
 include/llvm/Frontend/OpenACC/ACC.h.inc
@@ -1144,6 +1213,7 @@ include/llvm/Frontend/OpenACC/ACC.inc
 include/llvm/Frontend/OpenACC/ACC.td
 include/llvm/Frontend/OpenMP/ClauseT.h
 include/llvm/Frontend/OpenMP/ConstructDecompositionT.h
+include/llvm/Frontend/OpenMP/DirectiveNameParser.h
 include/llvm/Frontend/OpenMP/OMP.h
 include/llvm/Frontend/OpenMP/OMP.h.inc
 include/llvm/Frontend/OpenMP/OMP.inc
@@ -1201,6 +1271,8 @@ include/llvm/IR/DiagnosticHandler.h
 include/llvm/IR/DiagnosticInfo.h
 include/llvm/IR/DiagnosticPrinter.h
 include/llvm/IR/Dominators.h
+include/llvm/IR/DroppedVariableStats.h
+include/llvm/IR/DroppedVariableStatsIR.h
 include/llvm/IR/EHPersonalities.h
 include/llvm/IR/FMF.h
 include/llvm/IR/FPEnv.h
@@ -1211,6 +1283,7 @@ include/llvm/IR/GCStrategy.h
 include/llvm/IR/GEPNoWrapFlags.h
 include/llvm/IR/GVMaterializer.h
 include/llvm/IR/GenericConvergenceVerifierImpl.h
+include/llvm/IR/GenericFloatingPointPredicateUtils.h
 include/llvm/IR/GetElementPtrTypeIterator.h
 include/llvm/IR/GlobalAlias.h
 include/llvm/IR/GlobalIFunc.h
@@ -1256,6 +1329,7 @@ include/llvm/IR/IntrinsicsPowerPC.td
 include/llvm/IR/IntrinsicsR600.h
 include/llvm/IR/IntrinsicsRISCV.h
 include/llvm/IR/IntrinsicsRISCV.td
+include/llvm/IR/IntrinsicsRISCVXAndes.td
 include/llvm/IR/IntrinsicsRISCVXCV.td
 include/llvm/IR/IntrinsicsRISCVXTHead.td
 include/llvm/IR/IntrinsicsRISCVXsf.td
@@ -1304,8 +1378,10 @@ include/llvm/IR/ProfDataUtils.h
 include/llvm/IR/ProfileSummary.h
 include/llvm/IR/PseudoProbe.h
 include/llvm/IR/ReplaceConstant.h
-include/llvm/IR/RuntimeLibcalls.def
 include/llvm/IR/RuntimeLibcalls.h
+include/llvm/IR/RuntimeLibcalls.inc
+include/llvm/IR/RuntimeLibcalls.td
+include/llvm/IR/RuntimeLibcallsImpl.td
 include/llvm/IR/SSAContext.h
 include/llvm/IR/SafepointIRVerifier.h
 include/llvm/IR/Statepoint.h
@@ -1325,7 +1401,6 @@ include/llvm/IR/Value.h
 include/llvm/IR/ValueHandle.h
 include/llvm/IR/ValueMap.h
 include/llvm/IR/ValueSymbolTable.h
-include/llvm/IR/VectorBuilder.h
 include/llvm/IR/VectorTypeUtils.h
 include/llvm/IR/Verifier.h
 include/llvm/IRPrinter/IRPrintingPasses.h
@@ -1348,6 +1423,7 @@ include/llvm/Linker/IRMover.h
 include/llvm/Linker/Linker.h
 include/llvm/MC/ConstantPools.h
 include/llvm/MC/DXContainerPSVInfo.h
+include/llvm/MC/DXContainerRootSignature.h
 include/llvm/MC/LaneBitmask.h
 include/llvm/MC/MCAsmBackend.h
 include/llvm/MC/MCAsmInfo.h
@@ -1376,8 +1452,7 @@ include/llvm/MC/MCELFObjectWriter.h
 include/llvm/MC/MCELFStreamer.h
 include/llvm/MC/MCExpr.h
 include/llvm/MC/MCFixup.h
-include/llvm/MC/MCFixupKindInfo.h
-include/llvm/MC/MCFragment.h
+include/llvm/MC/MCGOFFAttributes.h
 include/llvm/MC/MCGOFFObjectWriter.h
 include/llvm/MC/MCGOFFStreamer.h
 include/llvm/MC/MCInst.h
@@ -1395,7 +1470,6 @@ include/llvm/MC/MCObjectStreamer.h
 include/llvm/MC/MCObjectWriter.h
 include/llvm/MC/MCParser/AsmCond.h
 include/llvm/MC/MCParser/AsmLexer.h
-include/llvm/MC/MCParser/MCAsmLexer.h
 include/llvm/MC/MCParser/MCAsmParser.h
 include/llvm/MC/MCParser/MCAsmParserExtension.h
 include/llvm/MC/MCParser/MCAsmParserUtils.h
@@ -1506,6 +1580,7 @@ include/llvm/Object/Minidump.h
 include/llvm/Object/ModuleSymbolTable.h
 include/llvm/Object/ObjectFile.h
 include/llvm/Object/OffloadBinary.h
+include/llvm/Object/OffloadBundle.h
 include/llvm/Object/RelocationResolver.h
 include/llvm/Object/StackMapParser.h
 include/llvm/Object/SymbolSize.h
@@ -1547,8 +1622,6 @@ include/llvm/PassInfo.h
 include/llvm/PassRegistry.h
 include/llvm/PassSupport.h
 include/llvm/Passes/CodeGenPassBuilder.h
-include/llvm/Passes/DroppedVariableStats.h
-include/llvm/Passes/DroppedVariableStatsIR.h
 include/llvm/Passes/MachinePassRegistry.def
 include/llvm/Passes/OptimizationLevel.h
 include/llvm/Passes/PassBuilder.h
@@ -1560,9 +1633,11 @@ include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
 include/llvm/ProfileData/Coverage/MCDCTypes.h
 include/llvm/ProfileData/CtxInstrContextNode.h
+include/llvm/ProfileData/DataAccessProf.h
 include/llvm/ProfileData/FunctionId.h
 include/llvm/ProfileData/GCOV.h
 include/llvm/ProfileData/HashKeyMap.h
+include/llvm/ProfileData/IndexedMemProfData.h
 include/llvm/ProfileData/InstrProf.h
 include/llvm/ProfileData/InstrProfCorrelator.h
 include/llvm/ProfileData/InstrProfData.inc
@@ -1571,8 +1646,12 @@ include/llvm/ProfileData/InstrProfWriter.h
 include/llvm/ProfileData/ItaniumManglingCanonicalizer.h
 include/llvm/ProfileData/MIBEntryDef.inc
 include/llvm/ProfileData/MemProf.h
+include/llvm/ProfileData/MemProfCommon.h
 include/llvm/ProfileData/MemProfData.inc
+include/llvm/ProfileData/MemProfRadixTree.h
 include/llvm/ProfileData/MemProfReader.h
+include/llvm/ProfileData/MemProfSummary.h
+include/llvm/ProfileData/MemProfSummaryBuilder.h
 include/llvm/ProfileData/MemProfYAML.h
 include/llvm/ProfileData/PGOCtxProfReader.h
 include/llvm/ProfileData/PGOCtxProfWriter.h
@@ -1612,6 +1691,7 @@ include/llvm/SandboxIR/User.h
 include/llvm/SandboxIR/Utils.h
 include/llvm/SandboxIR/Value.h
 include/llvm/SandboxIR/Values.def
+include/llvm/Support/AArch64AttributeParser.h
 include/llvm/Support/AArch64BuildAttributes.h
 include/llvm/Support/AMDGPUAddrSpace.h
 include/llvm/Support/AMDGPUMetadata.h
@@ -1620,6 +1700,7 @@ include/llvm/Support/ARMAttributeParser.h
 include/llvm/Support/ARMBuildAttributes.h
 include/llvm/Support/ARMEHABI.h
 include/llvm/Support/ARMWinEH.h
+include/llvm/Support/AdvisoryLock.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Alignment.h
 include/llvm/Support/Allocator.h
@@ -1676,6 +1757,8 @@ include/llvm/Support/Discriminator.h
 include/llvm/Support/DivisionByConstantInfo.h
 include/llvm/Support/Duration.h
 include/llvm/Support/DynamicLibrary.h
+include/llvm/Support/ELFAttrParserCompact.h
+include/llvm/Support/ELFAttrParserExtended.h
 include/llvm/Support/ELFAttributeParser.h
 include/llvm/Support/ELFAttributes.h
 include/llvm/Support/Endian.h
@@ -1713,8 +1796,10 @@ include/llvm/Support/HexagonAttributeParser.h
 include/llvm/Support/HexagonAttributes.h
 include/llvm/Support/InitLLVM.h
 include/llvm/Support/InstructionCost.h
+include/llvm/Support/InterleavedRange.h
 include/llvm/Support/JSON.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
@@ -1734,6 +1819,7 @@ include/llvm/Support/MemoryBuffer.h
 include/llvm/Support/MemoryBufferRef.h
 include/llvm/Support/MipsABIFlags.h
 include/llvm/Support/ModRef.h
+include/llvm/Support/Mustache.h
 include/llvm/Support/Mutex.h
 include/llvm/Support/NVPTXAddrSpace.h
 include/llvm/Support/NativeFormatting.h
@@ -1750,6 +1836,7 @@ include/llvm/Support/PrettyStackTrace.h
 include/llvm/Support/Printable.h
 include/llvm/Support/Process.h
 include/llvm/Support/Program.h
+include/llvm/Support/ProgramStack.h
 include/llvm/Support/RISCVAttributeParser.h
 include/llvm/Support/RISCVAttributes.h
 include/llvm/Support/RISCVISAUtils.h
@@ -1783,6 +1870,7 @@ include/llvm/Support/SystemZ/zOSSupport.h
 include/llvm/Support/TarWriter.h
 include/llvm/Support/TargetOpcodes.def
 include/llvm/Support/TargetSelect.h
+include/llvm/Support/TextEncoding.h
 include/llvm/Support/ThreadPool.h
 include/llvm/Support/ThreadSafeAllocator.h
 include/llvm/Support/Threading.h
@@ -1794,6 +1882,7 @@ include/llvm/Support/TypeName.h
 include/llvm/Support/TypeSize.h
 include/llvm/Support/Unicode.h
 include/llvm/Support/UnicodeCharRanges.h
+include/llvm/Support/UniqueBBID.h
 include/llvm/Support/VCSRevision.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/VersionTuple.h
@@ -1825,6 +1914,7 @@ include/llvm/TableGen/Parser.h
 include/llvm/TableGen/Record.h
 include/llvm/TableGen/SearchableTable.td
 include/llvm/TableGen/SetTheory.h
+include/llvm/TableGen/SetTheory.td
 include/llvm/TableGen/StringMatcher.h
 include/llvm/TableGen/StringToOffsetTable.h
 include/llvm/TableGen/TGTimer.h
@@ -1836,10 +1926,10 @@ include/llvm/Target/GlobalISel/Combine.td
 include/llvm/Target/GlobalISel/RegisterBank.td
 include/llvm/Target/GlobalISel/SelectionDAGCompat.td
 include/llvm/Target/GlobalISel/Target.td
+include/llvm/Target/RegisterTargetPassConfigCallback.h
 include/llvm/Target/Target.td
 include/llvm/Target/TargetCallingConv.td
 include/llvm/Target/TargetInstrPredicate.td
-include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetItinerary.td
 include/llvm/Target/TargetLoweringObjectFile.h
 include/llvm/Target/TargetMachine.h
@@ -1861,6 +1951,7 @@ include/llvm/TargetParser/CSKYTargetParser.h
 include/llvm/TargetParser/Host.h
 include/llvm/TargetParser/LoongArchTargetParser.def
 include/llvm/TargetParser/LoongArchTargetParser.h
+include/llvm/TargetParser/PPCGenTargetFeatures.inc
 include/llvm/TargetParser/PPCTargetParser.def
 include/llvm/TargetParser/PPCTargetParser.h
 include/llvm/TargetParser/RISCVISAInfo.h
@@ -1875,6 +1966,7 @@ include/llvm/Telemetry/Telemetry.h
 include/llvm/Testing/ADT/StringMap.h
 include/llvm/Testing/ADT/StringMapEntry.h
 include/llvm/Testing/Annotations/Annotations.h
+include/llvm/Testing/Demangle/DemangleTestCases.inc
 include/llvm/Testing/Support/Error.h
 include/llvm/Testing/Support/SupportHelpers.h
 include/llvm/TextAPI/Architecture.def
@@ -1926,6 +2018,7 @@ include/llvm/Transforms/IPO/ElimAvailExtern.h
 include/llvm/Transforms/IPO/EmbedBitcodePass.h
 include/llvm/Transforms/IPO/ExpandVariadics.h
 include/llvm/Transforms/IPO/ExtractGV.h
+include/llvm/Transforms/IPO/FatLTOCleanup.h
 include/llvm/Transforms/IPO/ForceFunctionAttrs.h
 include/llvm/Transforms/IPO/FunctionAttrs.h
 include/llvm/Transforms/IPO/FunctionImport.h
@@ -1968,11 +2061,11 @@ include/llvm/Transforms/Instrumentation/ControlHeightReduction.h
 include/llvm/Transforms/Instrumentation/DataFlowSanitizer.h
 include/llvm/Transforms/Instrumentation/GCOVProfiler.h
 include/llvm/Transforms/Instrumentation/HWAddressSanitizer.h
-include/llvm/Transforms/Instrumentation/InstrOrderFile.h
 include/llvm/Transforms/Instrumentation/InstrProfiling.h
 include/llvm/Transforms/Instrumentation/KCFI.h
 include/llvm/Transforms/Instrumentation/LowerAllowCheckPass.h
-include/llvm/Transforms/Instrumentation/MemProfiler.h
+include/llvm/Transforms/Instrumentation/MemProfInstrumentation.h
+include/llvm/Transforms/Instrumentation/MemProfUse.h
 include/llvm/Transforms/Instrumentation/MemorySanitizer.h
 include/llvm/Transforms/Instrumentation/NumericalStabilitySanitizer.h
 include/llvm/Transforms/Instrumentation/PGOCtxProfFlattening.h
@@ -2086,6 +2179,7 @@ include/llvm/Transforms/Utils/CountVisits.h
 include/llvm/Transforms/Utils/CtorUtils.h
 include/llvm/Transforms/Utils/DXILUpgrade.h
 include/llvm/Transforms/Utils/Debugify.h
+include/llvm/Transforms/Utils/DeclareRuntimeLibcalls.h
 include/llvm/Transforms/Utils/EntryExitInstrumenter.h
 include/llvm/Transforms/Utils/EscapeEnumerator.h
 include/llvm/Transforms/Utils/Evaluator.h
@@ -2105,6 +2199,7 @@ include/llvm/Transforms/Utils/IntegerDivision.h
 include/llvm/Transforms/Utils/LCSSA.h
 include/llvm/Transforms/Utils/LibCallsShrinkWrap.h
 include/llvm/Transforms/Utils/Local.h
+include/llvm/Transforms/Utils/LockstepReverseIterator.h
 include/llvm/Transforms/Utils/LongestCommonSequence.h
 include/llvm/Transforms/Utils/LoopConstrainer.h
 include/llvm/Transforms/Utils/LoopPeel.h
@@ -2153,19 +2248,29 @@ 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
 include/llvm/Transforms/Vectorize/LoopVectorize.h
 include/llvm/Transforms/Vectorize/SLPVectorizer.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Debug.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/DependencyGraph.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/InstrMaps.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Legality.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/NullPass.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PackReuse.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PrintInstructionCount.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PrintRegion.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/RegionsFromBBs.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/RegionsFromMetadata.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/SeedCollection.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionAcceptOrRevert.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionAlwaysAccept.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionAlwaysRevert.h
+include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/TransactionSave.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizer.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/SandboxVectorizerPassBuilder.h
 include/llvm/Transforms/Vectorize/SandboxVectorizer/Scheduler.h
@@ -2233,9 +2338,9 @@ lib/cmake/llvm/TensorFlowCompile.cmake
 lib/cmake/llvm/UseLibtool.cmake
 lib/cmake/llvm/VersionFromVCS.cmake
 lib/cmake/llvm/llvm-driver-template.cpp.in
-lib/libLLVM-20.${SHLIB_EXT}
+lib/libLLVM-21.${SHLIB_EXT}
 lib/libLLVM.${SHLIB_EXT}
-${PLIST.notdylib}lib/libLLVM.${SHLIB_EXT}.20.1
+${PLIST.notdylib}lib/libLLVM.${SHLIB_EXT}.21.1
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a
 ${PLIST.AArch64}lib/libLLVMAArch64Desc.a
@@ -2290,6 +2395,7 @@ lib/libLLVMCodeGenTypes.a
 lib/libLLVMCore.a
 lib/libLLVMCoroutines.a
 lib/libLLVMCoverage.a
+lib/libLLVMDWARFCFIChecker.a
 lib/libLLVMDWARFLinker.a
 lib/libLLVMDWARFLinkerClassic.a
 lib/libLLVMDWARFLinkerParallel.a
@@ -2298,6 +2404,7 @@ ${PLIST.DirectX}lib/libLLVMDXILBitWriter.a
 lib/libLLVMDebugInfoBTF.a
 lib/libLLVMDebugInfoCodeView.a
 lib/libLLVMDebugInfoDWARF.a
+lib/libLLVMDebugInfoDWARFLowLevel.a
 lib/libLLVMDebugInfoGSYM.a
 lib/libLLVMDebugInfoLogicalView.a
 lib/libLLVMDebugInfoMSF.a
@@ -2320,6 +2427,7 @@ ${PLIST.X86}lib/libLLVMExegesisX86.a
 lib/libLLVMExtensions.a
 lib/libLLVMFileCheck.a
 lib/libLLVMFrontendAtomic.a
+lib/libLLVMFrontendDirective.a
 lib/libLLVMFrontendDriver.a
 lib/libLLVMFrontendHLSL.a
 lib/libLLVMFrontendOffloading.a
@@ -2464,9 +2572,9 @@ ${PLIST.Xtensa}lib/libLLVMXtensaDisassembler.a
 ${PLIST.Xtensa}lib/libLLVMXtensaInfo.a
 lib/libLLVMipo.a
 lib/libLTO.${SHLIB_EXT}
-${PLIST.notdylib}lib/libLTO.${SHLIB_EXT}.20.1
+${PLIST.notdylib}lib/libLTO.${SHLIB_EXT}.21.1
 lib/libRemarks.${SHLIB_EXT}
-${PLIST.notdylib}lib/libRemarks.${SHLIB_EXT}.20.1
+${PLIST.notdylib}lib/libRemarks.${SHLIB_EXT}.21.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 2fb27df7a6..15b017f75a 100644
--- a/llvm/buildlink3.mk
+++ b/llvm/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	llvm
 .if !defined(LLVM_BUILDLINK3_MK)
 LLVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.llvm+=	llvm>=20.1.0
+BUILDLINK_API_DEPENDS.llvm+=	llvm>=21.1.0
 BUILDLINK_PKGSRCDIR.llvm?=	../../wip/llvm
 
 LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
diff --git a/llvm/distinfo b/llvm/distinfo
index 0210880a19..e2e59c143f 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -1,12 +1,11 @@
 $NetBSD: distinfo,v 1.41 2023/03/05 17:26:09 he Exp $
 
-BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-CMakeLists.txt) = c53cef61bdaeaf5216b78330992357a632a2b0b2
 SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4e6668e0c3e13423ce3e19304f4ad60f66d41562
 SHA1 (patch-include_llvm-c_DataTypes.h) = ff547cae5bdf90c5a1371b9eb196e7537a03b18d
-SHA1 (patch-include_llvm_Analysis_ConstantFolding.h) = 0a8db4d876b749dd492fced6fbc8c4faf3ff2450
-SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 4f3d0f527735126293519b42d7fd33dc41a910c2
+SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 92558f2d7d87b7a26f7f3a2b3b3dc539ae13e672
 SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = 8b18659fe7189c9077b0409e123d41c01e8c8610
diff --git a/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h b/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h
deleted file mode 100644
index 80520032f8..0000000000
--- a/llvm/patches/patch-include_llvm_Analysis_ConstantFolding.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-include_llvm_Analysis_ConstantFolding.h,v 1.2 2022/11/14 18:44:05 adam Exp $
-
-Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
-
---- include/llvm/Analysis/ConstantFolding.h.orig	2022-09-20 06:05:50.000000000 +0000
-+++ include/llvm/Analysis/ConstantFolding.h
-@@ -19,6 +19,10 @@
- #ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H
- #define LLVM_ANALYSIS_CONSTANTFOLDING_H
- 
-+#ifdef __sun
-+#undef CS
-+#endif
-+
- #include <stdint.h>
- 
- namespace llvm {
diff --git a/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt b/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
index f381758c23..e1f54b7649 100644
--- a/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
+++ b/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
@@ -2,14 +2,14 @@ $NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.8 2022/11/14 18:44:05 adam Ex
 
 Add style linking for SunOS.
 
---- tools/llvm-shlib/CMakeLists.txt.orig	2024-04-17 00:21:15.000000000 +0000
+--- tools/llvm-shlib/CMakeLists.txt.orig	2025-10-21 08:14:55.000000000 +0000
 +++ tools/llvm-shlib/CMakeLists.txt
-@@ -44,6 +44,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
+@@ -53,6 +53,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
    list(REMOVE_DUPLICATES LIB_NAMES)
    if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
      set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
 +  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
 +    set(LIB_NAMES -Wl,-Bsymbolic -Wl,-z -Wl,allextract ${LIB_NAMES} -Wl,-z -Wl,defaultextract)
    else()
-     configure_file(
-     ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
+     if("${CMAKE_CFG_INTDIR}" STREQUAL ".")
+       configure_file(
diff --git a/llvm/version.mk b/llvm/version.mk
index 8f444949d3..95aa244d8e 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -14,7 +14,7 @@
 # used by lang/wasi-libcxx
 # used by parallel/openmp
 
-LLVM_VERSION=	20.1.8
+LLVM_VERSION=	21.1.5
 
 DISTNAME=	llvm-project-${LLVM_VERSION}.src
 MASTER_SITES=	${MASTER_SITE_GITHUB:=llvm/}
@@ -29,3 +29,4 @@ LLVM_MAJOR_VERSION=	${LLVM_VERSION:tu:C/\\.[[:digit:]\.]*//}
 EXTRACT_ELEMENTS=	${DISTNAME}/${PKGBASE:S/wasi-//}
 EXTRACT_ELEMENTS+=	${DISTNAME}/cmake
 EXTRACT_ELEMENTS+=	${DISTNAME}/runtimes
+EXTRACT_ELEMENTS+=	${DISTNAME}/third-party
diff --git a/mlir/Makefile b/mlir/Makefile
index db04e012a4..9774ade054 100644
--- a/mlir/Makefile
+++ b/mlir/Makefile
@@ -10,13 +10,17 @@ HOMEPAGE=	http://mlir.llvm.org/
 COMMENT=	Multi-Level Intermediate Representation
 LICENSE=	apache-2.0
 
-USE_CXX_FEATURES=	c++14
+USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_CONFIGURE_ARGS+=	-DMLIR_INSTALL_AGGREGATE_OBJECTS=NO
-CMAKE_CONFIGURE_ARGS+=	-DMLIR_BUILD_MLIR_C_DYLIB=YES
+CMAKE_CONFIGURE_ARGS+=	-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
+CMAKE_CONFIGURE_ARGS+=	-DMLIR_BUILD_MLIR_C_DYLIB=ON
+
+# FIXME: ld: library 'MLIR' not found
+
+BUILD_TARGET=	mlir-tblgen mlir-headers mlir-libraries
 
 .include "../../devel/cmake/build.mk"
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/mlir/buildlink3.mk b/mlir/buildlink3.mk
index 4f49e0c099..e995ed6f73 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>=20.1.0
+BUILDLINK_API_DEPENDS.mlir+=	mlir>=21.1.0
 BUILDLINK_PKGSRCDIR.mlir?=	../../wip/mlir
 
 BUILDLINK_FILES.mlir+=		bin/mlir-tblgen
diff --git a/mlir/distinfo b/mlir/distinfo
index c715ffa200..bcd05696d1 100644
--- a/mlir/distinfo
+++ b/mlir/distinfo
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
-SHA1 (patch-cmake_modules_MLIRConfig.cmake.in) = 0fb129cb22bdb7bca328d5526904482b6081a209
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-tools_mlir-tblgen_CMakeLists.txt) = 7b78acbf8a85443f2cc3f13786bbbda25b0b8d74
diff --git a/mlir/patch-cmake_modules_MLIRConfig.cmake.in b/mlir/patch-cmake_modules_MLIRConfig.cmake.in
new file mode 100644
index 0000000000..7ef4c6a76f
--- /dev/null
+++ b/mlir/patch-cmake_modules_MLIRConfig.cmake.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Provide proper path to mlir-tblgen.
+
+--- cmake/modules/MLIRConfig.cmake.in.orig	2025-10-21 08:14:55.000000000 +0000
++++ cmake/modules/MLIRConfig.cmake.in
+@@ -9,7 +9,7 @@ find_package(LLVM ${LLVM_VERSION} EXACT
+ set(MLIR_EXPORTED_TARGETS "@MLIR_EXPORTS@")
+ set(MLIR_CMAKE_DIR "@MLIR_CONFIG_CMAKE_DIR@")
+ set(MLIR_INCLUDE_DIRS "@MLIR_CONFIG_INCLUDE_DIRS@")
+-set(MLIR_TABLEGEN_EXE "@MLIR_CONFIG_TABLEGEN_EXE@")
++set(MLIR_TABLEGEN_EXE "${MLIR_INSTALL_PREFIX}/bin/@MLIR_CONFIG_TABLEGEN_EXE@")
+ set(MLIR_PDLL_TABLEGEN_EXE "@MLIR_CONFIG_PDLL_TABLEGEN_EXE@")
+ set(MLIR_SRC_SHARDER_TABLEGEN_EXE "@MLIR_CONFIG_SRC_SHARDER_TABLEGEN_EXE@")
+ set(MLIR_IRDL_TO_CPP_EXE "@MLIR_CONFIG_IRDL_TO_CPP_EXE@")
diff --git a/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in b/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
deleted file mode 100644
index 96b9fd7911..0000000000
--- a/mlir/patches/patch-cmake_modules_MLIRConfig.cmake.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Provide proper path to mlir-tblgen.
-
---- cmake/modules/MLIRConfig.cmake.in.orig	2025-04-29 23:05:17.000000000 +0000
-+++ cmake/modules/MLIRConfig.cmake.in
-@@ -9,7 +9,7 @@ find_package(LLVM ${LLVM_VERSION} EXACT
- set(MLIR_EXPORTED_TARGETS "@MLIR_EXPORTS@")
- set(MLIR_CMAKE_DIR "@MLIR_CONFIG_CMAKE_DIR@")
- set(MLIR_INCLUDE_DIRS "@MLIR_CONFIG_INCLUDE_DIRS@")
--set(MLIR_TABLEGEN_EXE "@MLIR_CONFIG_TABLEGEN_EXE@")
-+set(MLIR_TABLEGEN_EXE "${MLIR_INSTALL_PREFIX}/bin/@MLIR_CONFIG_TABLEGEN_EXE@")
- set(MLIR_PDLL_TABLEGEN_EXE "@MLIR_CONFIG_PDLL_TABLEGEN_EXE@")
- set(MLIR_SRC_SHARDER_TABLEGEN_EXE "@MLIR_CONFIG_SRC_SHARDER_TABLEGEN_EXE@")
- set(MLIR_INSTALL_AGGREGATE_OBJECTS "@MLIR_INSTALL_AGGREGATE_OBJECTS@")
diff --git a/openmp/buildlink3.mk b/openmp/buildlink3.mk
index a454f3172d..23061e84f5 100644
--- a/openmp/buildlink3.mk
+++ b/openmp/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	openmp
 .if !defined(OPENMP_BUILDLINK3_MK)
 OPENMP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openmp+=	openmp>=20.1.0
-BUILDLINK_ABI_DEPENDS.openmp+=	openmp>=20.1.0
+BUILDLINK_API_DEPENDS.openmp+=	openmp>=21.1.0
+BUILDLINK_ABI_DEPENDS.openmp+=	openmp>=21.1.0
 BUILDLINK_PKGSRCDIR.openmp?=	../../wip/openmp
 .endif	# OPENMP_BUILDLINK3_MK
 
diff --git a/openmp/distinfo b/openmp/distinfo
index f6cad30211..181b46b333 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
diff --git a/polly/buildlink3.mk b/polly/buildlink3.mk
index da2a53178f..faa7d9cca3 100644
--- a/polly/buildlink3.mk
+++ b/polly/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	polly
 .if !defined(POLLY_BUILDLINK3_MK)
 POLLY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.polly+=	polly>=20.1.0
+BUILDLINK_API_DEPENDS.polly+=	polly>=21.1.0
 BUILDLINK_PKGSRCDIR.polly?=	../../wip/polly
 
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/polly/distinfo b/polly/distinfo
index 2920c2a36b..49fc53fe4b 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
diff --git a/wasi-compiler-rt/buildlink3.mk b/wasi-compiler-rt/buildlink3.mk
index ba9bd95624..77d5547616 100644
--- a/wasi-compiler-rt/buildlink3.mk
+++ b/wasi-compiler-rt/buildlink3.mk
@@ -7,7 +7,7 @@ BUILDLINK_DEPMETHOD.wasi-compiler-rt?=	build
 .if !defined(WASI_COMPILER_RT_BUILDLINK3_MK)
 WASI_COMPILER_RT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wasi-compiler-rt+=	wasi-compiler-rt>=19.1.0
+BUILDLINK_API_DEPENDS.wasi-compiler-rt+=	wasi-compiler-rt>=21.1.0
 BUILDLINK_PKGSRCDIR.wasi-compiler-rt?=		../../wip/wasi-compiler-rt
 
 .endif	# WASI_COMPILER_RT_BUILDLINK3_MK
diff --git a/wasi-libcxx/buildlink3.mk b/wasi-libcxx/buildlink3.mk
index 9df83736ae..2ac5a47466 100644
--- a/wasi-libcxx/buildlink3.mk
+++ b/wasi-libcxx/buildlink3.mk
@@ -7,7 +7,7 @@ BUILDLINK_DEPMETHOD.wasi-libcxx?=	build
 .if !defined(WASI_LIBCXX_BUILDLINK3_MK)
 WASI_LIBCXX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wasi-libcxx+=	wasi-libcxx>=19.1.0
+BUILDLINK_API_DEPENDS.wasi-libcxx+=	wasi-libcxx>=21.1.0
 BUILDLINK_PKGSRCDIR.wasi-libcxx?=	../../wip/wasi-libcxx
 
 .endif	# WASI_LIBCXX_BUILDLINK3_MK
diff --git a/wasi-libcxx/distinfo b/wasi-libcxx/distinfo
index bb75b2f6f8..cb1e301970 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-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
-SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
-Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
+BLAKE2s (llvm-project-21.1.5.src.tar.xz) = f2853f6eeeb23c2fc74d8cebbbaf1da72cb4a47d245de8d027ca08526315cb0b
+SHA512 (llvm-project-21.1.5.src.tar.xz) = 865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
+Size (llvm-project-21.1.5.src.tar.xz) = 158957032 bytes
 SHA1 (patch-libcxx_include_CMakeLists.txt) = 1b525baf1c510d50f170feae8111377c97204f65
 SHA1 (patch-libcxx_src_CMakeLists.txt) = 08b4666830c7eb85a47c9b0d5f523e613b2f20d4
 SHA1 (patch-libcxxabi_src_CMakeLists.txt) = 2bd130551c3e7a3b66732358662fbd28f67a4695


Home | Main Index | Thread Index | Old Index