clang: updated to 12.0.1

12.0.1:

Non-comprehensive list of changes in this release

The builtin intrinsics __builtin_bitreverse8, __builtin_bitreverse16, __builtin_bitreverse32 and __builtin_bitreverse64 may now be used within constant expressions.
The builtin intrinsics __builtin_rotateleft8, __builtin_rotateleft16, __builtin_rotateleft32 and __builtin_rotateleft64 may now be used within constant expressions.
The builtin intrinsics __builtin_rotateright8, __builtin_rotateright16, __builtin_rotateright32 and __builtin_rotateright64 may now be used within constant expressions.
New Compiler Flags

…
AArch64 options -moutline-atomics, -mno-outline-atomics to enable and disable calls to helper functions implementing atomic operations. These out-of-line helpers like ‘__aarch64_cas8_relax’ will detect at runtime AArch64 Large System Extensions (LSE) availability and either use their atomic instructions, or falls back to LL/SC loop. These options do not apply if the compilation target supports LSE. Atomic instructions are used directly in that case. The option’s behaviour mirrors GCC, the helpers are implemented both in compiler-rt and libgcc.
New option -fbinutils-version= specifies the targeted binutils version. For example, -fbinutils-version=2.35 means compatibility with GNU as/ld before 2.35 is not needed: new features can be used and there is no need to work around old GNU as/ld bugs.
Deprecated Compiler Flags

The following options are deprecated and ignored. They will be removed in future versions of Clang.

The clang-cl /fallback flag, which made clang-cl invoke Microsoft Visual C++ on files it couldn’t compile itself, has been deprecated. It will be removed in Clang 13.
…
Modified Compiler Flags

On ELF, -gz now defaults to -gz=zlib with the integrated assembler. It produces SHF_COMPRESSED style compression of debug information. GNU binutils 2.26 or newer, or lld is required to link produced object files. Use -gz=zlib-gnu to get the old behavior.

Now that this pointers are tagged with nonnull and dereferenceable(N), -fno-delete-null-pointer-checks has gained the power to remove the nonnull attribute on this for configurations that need it to be nullable.

-gsplit-dwarf no longer implies -g2.

-fasynchronous-unwind-tables is now the default on Linux AArch64/PowerPC. This behavior matches newer GCC. (D91760) (D92054)

Support has been added for the following processors (command-line identifiers in parentheses):

Arm Cortex-A78C (cortex-a78c).
Arm Cortex-R82 (cortex-r82).
Arm Neoverse V1 (neoverse-v1).
Arm Neoverse N2 (neoverse-n2).
Fujitsu A64FX (a64fx).
For example, to select architecture support and tuning for Neoverse-V1 based systems, use -mcpu=neoverse-v1.
Removed Compiler Flags

The following options no longer exist.

clang-cl’s /Zd flag no longer exist. But -gline-tables-only still exists and does the same thing.
New Pragmas in Clang

…
Modified Pragmas in Clang

The “#pragma clang loop vectorize_width” has been extended to support an optional ‘fixed|scalable’ argument, which can be used to indicate that the compiler should use fixed-width or scalable vectorization. Fixed-width is assumed by default.

Scalable or vector length agnostic vectorization is an experimental feature for targets that support scalable vectors. For more information please refer to the Clang Language Extensions documentation.
Attribute Changes in Clang

Added support for the C++20 likelihood attributes [[likely]] and [[unlikely]]. As an extension they can be used in C++11 and newer. This extension is enabled by default.

8 files changed, 100 insertions, 71 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index eebab9bd905..e36a0ea0dcb 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.63 2021/05/24 19:52:30 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2021/07/12 18:42:06 adam Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/.src//}
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index 848e8027a79..cac0ecf6b50 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.30 2020/07/01 14:46:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.31 2021/07/12 18:42:06 adam Exp $
 bin/c-index-test
 bin/clang
 bin/clang++
-bin/clang-10
+bin/clang-12
 bin/clang-check
 bin/clang-cl
 bin/clang-cpp
 bin/clang-extdef-mapping
 bin/clang-format
-bin/clang-import-test
 bin/clang-offload-bundler
 bin/clang-offload-wrapper
 bin/clang-refactor
@@ -28,6 +27,9 @@ include/clang-c/ExternC.h
 include/clang-c/FatalErrorHandler.h
 include/clang-c/Index.h
 include/clang-c/Platform.h
+include/clang-c/Rewrite.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
@@ -89,6 +91,7 @@ include/clang/AST/CommentParser.h
 include/clang/AST/CommentSema.h
 include/clang/AST/CommentVisitor.h
 include/clang/AST/ComparisonCategories.h
+include/clang/AST/ComputeDependence.h
 include/clang/AST/CurrentSourceLocExprScope.h
 include/clang/AST/DataCollection.h
 include/clang/AST/Decl.h
@@ -101,10 +104,12 @@ include/clang/AST/DeclGroup.h
 include/clang/AST/DeclLookups.h
 include/clang/AST/DeclNodes.inc
 include/clang/AST/DeclObjC.h
+include/clang/AST/DeclObjCCommon.h
 include/clang/AST/DeclOpenMP.h
 include/clang/AST/DeclTemplate.h
 include/clang/AST/DeclVisitor.h
 include/clang/AST/DeclarationName.h
+include/clang/AST/DependenceFlags.h
 include/clang/AST/DependentDiagnostic.h
 include/clang/AST/EvaluatedExprVisitor.h
 include/clang/AST/Expr.h
@@ -116,6 +121,7 @@ include/clang/AST/ExternalASTMerger.h
 include/clang/AST/ExternalASTSource.h
 include/clang/AST/FormatString.h
 include/clang/AST/GlobalDecl.h
+include/clang/AST/IgnoreExpr.h
 include/clang/AST/JSONNodeDumper.h
 include/clang/AST/LambdaCapture.h
 include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
@@ -132,6 +138,7 @@ include/clang/AST/OperationKinds.def
 include/clang/AST/OperationKinds.h
 include/clang/AST/OptionalDiagnostic.h
 include/clang/AST/ParentMap.h
+include/clang/AST/ParentMapContext.h
 include/clang/AST/PrettyDeclStackTrace.h
 include/clang/AST/PrettyPrinter.h
 include/clang/AST/QualTypeNames.h
@@ -171,7 +178,9 @@ include/clang/ASTMatchers/Dynamic/Diagnostics.h
 include/clang/ASTMatchers/Dynamic/Parser.h
 include/clang/ASTMatchers/Dynamic/Registry.h
 include/clang/ASTMatchers/Dynamic/VariantValue.h
+include/clang/ASTMatchers/GtestMatchers.h
 include/clang/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
@@ -199,6 +208,8 @@ include/clang/Analysis/ConstructionContext.h
 include/clang/Analysis/DomainSpecific/CocoaConventions.h
 include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
+include/clang/Analysis/FlowSensitive/DataflowWorklist.h
+include/clang/Analysis/IssueHash.h
 include/clang/Analysis/PathDiagnostic.h
 include/clang/Analysis/ProgramPoint.h
 include/clang/Analysis/RetainSummaryManager.h
@@ -224,11 +235,14 @@ include/clang/Basic/BuiltinsAMDGPU.def
 include/clang/Basic/BuiltinsARM.def
 include/clang/Basic/BuiltinsBPF.def
 include/clang/Basic/BuiltinsHexagon.def
+include/clang/Basic/BuiltinsHexagonDep.def
+include/clang/Basic/BuiltinsHexagonMapCustomDep.def
 include/clang/Basic/BuiltinsLe64.def
 include/clang/Basic/BuiltinsMips.def
 include/clang/Basic/BuiltinsNEON.def
 include/clang/Basic/BuiltinsNVPTX.def
 include/clang/Basic/BuiltinsPPC.def
+include/clang/Basic/BuiltinsSVE.def
 include/clang/Basic/BuiltinsSystemZ.def
 include/clang/Basic/BuiltinsWebAssembly.def
 include/clang/Basic/BuiltinsX86.def
@@ -272,13 +286,15 @@ include/clang/Basic/DiagnosticSema.h
 include/clang/Basic/DiagnosticSemaKinds.inc
 include/clang/Basic/DiagnosticSerialization.h
 include/clang/Basic/DiagnosticSerializationKinds.inc
+include/clang/Basic/DirectoryEntry.h
 include/clang/Basic/ExceptionSpecificationType.h
 include/clang/Basic/ExpressionTraits.h
+include/clang/Basic/FPOptions.def
 include/clang/Basic/Features.def
+include/clang/Basic/FileEntry.h
 include/clang/Basic/FileManager.h
 include/clang/Basic/FileSystemOptions.h
 include/clang/Basic/FileSystemStatCache.h
-include/clang/Basic/FixedPoint.h
 include/clang/Basic/IdentifierTable.h
 include/clang/Basic/JsonSupport.h
 include/clang/Basic/LLVM.h
@@ -301,10 +317,12 @@ include/clang/Basic/OpenMPKinds.h
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/OperatorPrecedence.h
+include/clang/Basic/PPCTypes.def
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PlistSupport.h
 include/clang/Basic/PragmaKinds.h
 include/clang/Basic/PrettyStackTrace.h
+include/clang/Basic/ProfileList.h
 include/clang/Basic/SanitizerBlacklist.h
 include/clang/Basic/SanitizerSpecialCaseList.h
 include/clang/Basic/Sanitizers.def
@@ -317,6 +335,7 @@ include/clang/Basic/Stack.h
 include/clang/Basic/SyncScope.h
 include/clang/Basic/TargetBuiltins.h
 include/clang/Basic/TargetCXXABI.h
+include/clang/Basic/TargetID.h
 include/clang/Basic/TargetInfo.h
 include/clang/Basic/TargetOptions.h
 include/clang/Basic/TemplateKinds.h
@@ -329,12 +348,20 @@ include/clang/Basic/Visibility.h
 include/clang/Basic/X86Target.def
 include/clang/Basic/XRayInstr.h
 include/clang/Basic/XRayLists.h
+include/clang/Basic/arm_cde_builtin_aliases.inc
+include/clang/Basic/arm_cde_builtin_cg.inc
+include/clang/Basic/arm_cde_builtin_sema.inc
+include/clang/Basic/arm_cde_builtins.inc
 include/clang/Basic/arm_fp16.inc
 include/clang/Basic/arm_mve_builtin_aliases.inc
 include/clang/Basic/arm_mve_builtin_cg.inc
 include/clang/Basic/arm_mve_builtin_sema.inc
 include/clang/Basic/arm_mve_builtins.inc
 include/clang/Basic/arm_neon.inc
+include/clang/Basic/arm_sve_builtin_cg.inc
+include/clang/Basic/arm_sve_builtins.inc
+include/clang/Basic/arm_sve_sema_rangechecks.inc
+include/clang/Basic/arm_sve_typeflags.inc
 include/clang/CodeGen/BackendUtil.h
 include/clang/CodeGen/CGFunctionInfo.h
 include/clang/CodeGen/CodeGenABITypes.h
@@ -409,6 +436,7 @@ include/clang/Index/IndexSymbol.h
 include/clang/Index/IndexingAction.h
 include/clang/Index/IndexingOptions.h
 include/clang/Index/USRGeneration.h
+include/clang/IndexSerialization/SerializablePathCollection.h
 include/clang/Lex/CodeCompletionHandler.h
 include/clang/Lex/DependencyDirectivesSourceMinimizer.h
 include/clang/Lex/DirectoryLookup.h
@@ -523,7 +551,7 @@ include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
 include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h
 include/clang/StaticAnalyzer/Core/Checker.h
 include/clang/StaticAnalyzer/Core/CheckerManager.h
-include/clang/StaticAnalyzer/Core/IssueHash.h
+include/clang/StaticAnalyzer/Core/CheckerRegistryData.h
 include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
 include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
 include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
@@ -535,6 +563,7 @@ include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h
+include/clang/StaticAnalyzer/Core/PathSensitive/DynamicSize.h
 include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h
 include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
@@ -558,17 +587,18 @@ include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SimpleConstraintManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
 include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h
-include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SymExpr.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Symbols.def
 include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
 include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h
-include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
+include/clang/StaticAnalyzer/Frontend/AnalyzerHelpFlags.h
 include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
 include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
+include/clang/Testing/CommandLineArgs.h
+include/clang/Testing/TestClangConfig.h
 include/clang/Tooling/ASTDiff/ASTDiff.h
 include/clang/Tooling/ASTDiff/ASTDiffInternal.h
 include/clang/Tooling/AllTUsExecution.h
@@ -577,7 +607,6 @@ include/clang/Tooling/CommonOptionsParser.h
 include/clang/Tooling/CompilationDatabase.h
 include/clang/Tooling/CompilationDatabasePluginRegistry.h
 include/clang/Tooling/Core/Diagnostic.h
-include/clang/Tooling/Core/Lookup.h
 include/clang/Tooling/Core/Replacement.h
 include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h
 include/clang/Tooling/DependencyScanning/DependencyScanningService.h
@@ -596,6 +625,7 @@ include/clang/Tooling/Refactoring/ASTSelection.h
 include/clang/Tooling/Refactoring/AtomicChange.h
 include/clang/Tooling/Refactoring/Extract/Extract.h
 include/clang/Tooling/Refactoring/Extract/SourceExtraction.h
+include/clang/Tooling/Refactoring/Lookup.h
 include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
 include/clang/Tooling/Refactoring/RefactoringAction.h
 include/clang/Tooling/Refactoring/RefactoringActionRule.h
@@ -619,12 +649,15 @@ include/clang/Tooling/ReplacementsYaml.h
 include/clang/Tooling/StandaloneExecution.h
 include/clang/Tooling/Syntax/BuildTree.h
 include/clang/Tooling/Syntax/Mutations.h
+include/clang/Tooling/Syntax/NodeClasses.inc
 include/clang/Tooling/Syntax/Nodes.h
+include/clang/Tooling/Syntax/Nodes.inc
 include/clang/Tooling/Syntax/Tokens.h
 include/clang/Tooling/Syntax/Tree.h
 include/clang/Tooling/ToolExecutorPluginRegistry.h
 include/clang/Tooling/Tooling.h
 include/clang/Tooling/Transformer/MatchConsumer.h
+include/clang/Tooling/Transformer/Parsing.h
 include/clang/Tooling/Transformer/RangeSelector.h
 include/clang/Tooling/Transformer/RewriteRule.h
 include/clang/Tooling/Transformer/SourceCode.h
@@ -637,20 +670,29 @@ lib/clang/${PKGVERSION}/include/__clang_cuda_complex_builtins.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_device_functions.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_intrinsics.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_libdevice_declares.h
+lib/clang/${PKGVERSION}/include/__clang_cuda_math.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_math_forward_declares.h
 lib/clang/${PKGVERSION}/include/__clang_cuda_runtime_wrapper.h
+lib/clang/${PKGVERSION}/include/__clang_hip_cmath.h
+lib/clang/${PKGVERSION}/include/__clang_hip_libdevice_declares.h
+lib/clang/${PKGVERSION}/include/__clang_hip_math.h
+lib/clang/${PKGVERSION}/include/__clang_hip_runtime_wrapper.h
 lib/clang/${PKGVERSION}/include/__stddef_max_align_t.h
 lib/clang/${PKGVERSION}/include/__wmmintrin_aes.h
 lib/clang/${PKGVERSION}/include/__wmmintrin_pclmul.h
 lib/clang/${PKGVERSION}/include/adxintrin.h
 lib/clang/${PKGVERSION}/include/altivec.h
 lib/clang/${PKGVERSION}/include/ammintrin.h
+lib/clang/${PKGVERSION}/include/amxintrin.h
 lib/clang/${PKGVERSION}/include/arm64intr.h
 lib/clang/${PKGVERSION}/include/arm_acle.h
+lib/clang/${PKGVERSION}/include/arm_bf16.h
+lib/clang/${PKGVERSION}/include/arm_cde.h
 lib/clang/${PKGVERSION}/include/arm_cmse.h
 lib/clang/${PKGVERSION}/include/arm_fp16.h
 lib/clang/${PKGVERSION}/include/arm_mve.h
 lib/clang/${PKGVERSION}/include/arm_neon.h
+lib/clang/${PKGVERSION}/include/arm_sve.h
 lib/clang/${PKGVERSION}/include/armintr.h
 lib/clang/${PKGVERSION}/include/avx2intrin.h
 lib/clang/${PKGVERSION}/include/avx512bf16intrin.h
@@ -680,8 +722,10 @@ lib/clang/${PKGVERSION}/include/avx512vp2intersectintrin.h
 lib/clang/${PKGVERSION}/include/avx512vpopcntdqintrin.h
 lib/clang/${PKGVERSION}/include/avx512vpopcntdqvlintrin.h
 lib/clang/${PKGVERSION}/include/avxintrin.h
+lib/clang/${PKGVERSION}/include/avxvnniintrin.h
 lib/clang/${PKGVERSION}/include/bmi2intrin.h
 lib/clang/${PKGVERSION}/include/bmiintrin.h
+lib/clang/${PKGVERSION}/include/cet.h
 lib/clang/${PKGVERSION}/include/cetintrin.h
 lib/clang/${PKGVERSION}/include/cldemoteintrin.h
 lib/clang/${PKGVERSION}/include/clflushoptintrin.h
@@ -699,6 +743,7 @@ lib/clang/${PKGVERSION}/include/fma4intrin.h
 lib/clang/${PKGVERSION}/include/fmaintrin.h
 lib/clang/${PKGVERSION}/include/fxsrintrin.h
 lib/clang/${PKGVERSION}/include/gfniintrin.h
+lib/clang/${PKGVERSION}/include/hresetintrin.h
 lib/clang/${PKGVERSION}/include/htmintrin.h
 lib/clang/${PKGVERSION}/include/htmxlintrin.h
 lib/clang/${PKGVERSION}/include/ia32intrin.h
@@ -707,6 +752,7 @@ lib/clang/${PKGVERSION}/include/intrin.h
 lib/clang/${PKGVERSION}/include/inttypes.h
 lib/clang/${PKGVERSION}/include/invpcidintrin.h
 lib/clang/${PKGVERSION}/include/iso646.h
+lib/clang/${PKGVERSION}/include/keylockerintrin.h
 lib/clang/${PKGVERSION}/include/limits.h
 lib/clang/${PKGVERSION}/include/lwpintrin.h
 lib/clang/${PKGVERSION}/include/lzcntintrin.h
@@ -720,10 +766,13 @@ lib/clang/${PKGVERSION}/include/mwaitxintrin.h
 lib/clang/${PKGVERSION}/include/nmmintrin.h
 lib/clang/${PKGVERSION}/include/opencl-c-base.h
 lib/clang/${PKGVERSION}/include/opencl-c.h
-lib/clang/${PKGVERSION}/include/openmp_wrappers/__clang_openmp_math.h
-lib/clang/${PKGVERSION}/include/openmp_wrappers/__clang_openmp_math_declares.h
+lib/clang/${PKGVERSION}/include/openmp_wrappers/__clang_openmp_device_functions.h
 lib/clang/${PKGVERSION}/include/openmp_wrappers/cmath
+lib/clang/${PKGVERSION}/include/openmp_wrappers/complex
+lib/clang/${PKGVERSION}/include/openmp_wrappers/complex.h
+lib/clang/${PKGVERSION}/include/openmp_wrappers/complex_cmath.h
 lib/clang/${PKGVERSION}/include/openmp_wrappers/math.h
+lib/clang/${PKGVERSION}/include/openmp_wrappers/new
 lib/clang/${PKGVERSION}/include/pconfigintrin.h
 lib/clang/${PKGVERSION}/include/pkuintrin.h
 lib/clang/${PKGVERSION}/include/pmmintrin.h
@@ -740,6 +789,7 @@ lib/clang/${PKGVERSION}/include/ptwriteintrin.h
 lib/clang/${PKGVERSION}/include/rdseedintrin.h
 lib/clang/${PKGVERSION}/include/rtmintrin.h
 lib/clang/${PKGVERSION}/include/s390intrin.h
+lib/clang/${PKGVERSION}/include/serializeintrin.h
 lib/clang/${PKGVERSION}/include/sgxintrin.h
 lib/clang/${PKGVERSION}/include/shaintrin.h
 lib/clang/${PKGVERSION}/include/smmintrin.h
@@ -753,6 +803,8 @@ lib/clang/${PKGVERSION}/include/stdnoreturn.h
 lib/clang/${PKGVERSION}/include/tbmintrin.h
 lib/clang/${PKGVERSION}/include/tgmath.h
 lib/clang/${PKGVERSION}/include/tmmintrin.h
+lib/clang/${PKGVERSION}/include/tsxldtrkintrin.h
+lib/clang/${PKGVERSION}/include/uintrintrin.h
 lib/clang/${PKGVERSION}/include/unwind.h
 lib/clang/${PKGVERSION}/include/vadefs.h
 lib/clang/${PKGVERSION}/include/vaesintrin.h
@@ -760,8 +812,10 @@ lib/clang/${PKGVERSION}/include/varargs.h
 lib/clang/${PKGVERSION}/include/vecintrin.h
 lib/clang/${PKGVERSION}/include/vpclmulqdqintrin.h
 lib/clang/${PKGVERSION}/include/waitpkgintrin.h
+lib/clang/${PKGVERSION}/include/wasm_simd128.h
 lib/clang/${PKGVERSION}/include/wbnoinvdintrin.h
 lib/clang/${PKGVERSION}/include/wmmintrin.h
+lib/clang/${PKGVERSION}/include/x86gprintrin.h
 lib/clang/${PKGVERSION}/include/x86intrin.h
 lib/clang/${PKGVERSION}/include/xmmintrin.h
 lib/clang/${PKGVERSION}/include/xopintrin.h
@@ -774,9 +828,10 @@ lib/cmake/clang/ClangConfig.cmake
 lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
 lib/libclang-cpp.${SOEXT}
-${PLIST.notdylib}lib/libclang-cpp.${SOEXT}.10
+lib/libclang-cpp.so.12
 lib/libclang.${SOEXT}
-${PLIST.notdylib}lib/libclang.${SOEXT}.10
+${PLIST.notdylib}lib/libclang.${SOEXT}.12
+lib/libclangAPINotes.a
 lib/libclangARCMigrate.a
 lib/libclangAST.a
 lib/libclangASTMatchers.a
@@ -795,6 +850,7 @@ lib/libclangFrontendTool.a
 lib/libclangHandleCXX.a
 lib/libclangHandleLLVM.a
 lib/libclangIndex.a
+lib/libclangIndexSerialization.a
 lib/libclangLex.a
 lib/libclangParse.a
 lib/libclangRewrite.a
@@ -804,6 +860,7 @@ lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
 lib/libclangStaticAnalyzerCore.a
 lib/libclangStaticAnalyzerFrontend.a
+lib/libclangTesting.a
 lib/libclangTooling.a
 lib/libclangToolingASTDiff.a
 lib/libclangToolingCore.a
@@ -824,8 +881,6 @@ share/clang/clang-rename.el
 share/clang/clang-rename.py
 share/scan-build/scanview.css
 share/scan-build/sorttable.js
-share/scan-view/FileRadar.scpt
-share/scan-view/GetRadarVersion.scpt
 share/scan-view/Reporter.py
 share/scan-view/ScanView.py
 share/scan-view/bugcatcher.ico
diff --git a/lang/clang/buildlink3.mk b/lang/clang/buildlink3.mk
index 64a27a97a1f..ff71127932b 100644
--- a/lang/clang/buildlink3.mk
+++ b/lang/clang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2021/06/21 10:09:10 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2021/07/12 18:42:06 adam Exp $
 
 BUILDLINK_TREE+=	clang
 
@@ -6,13 +6,13 @@ BUILDLINK_TREE+=	clang
 CLANG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.clang+=	clang>=9.0.1
-BUILDLINK_ABI_DEPENDS.clang?=	clang>=10.0.1nb2
+BUILDLINK_ABI_DEPENDS.clang?=	clang>=12.0.0
 BUILDLINK_PKGSRCDIR.clang?=	../../lang/clang
 
 BUILDLINK_FILES.clang+=		bin/c-index-test
 BUILDLINK_FILES.clang+=		bin/clang
 BUILDLINK_FILES.clang+=		bin/clang++
-BUILDLINK_FILES.clang+=		bin/clang-10
+BUILDLINK_FILES.clang+=		bin/clang-12
 BUILDLINK_FILES.clang+=		bin/clang-check
 BUILDLINK_FILES.clang+=		bin/clang-cl
 BUILDLINK_FILES.clang+=		bin/clang-cpp
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 60b8243ee5c..8301379f8b8 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.66 2020/07/26 19:20:13 adam Exp $
+$NetBSD: distinfo,v 1.67 2021/07/12 18:42:06 adam Exp $
 
-SHA1 (clang-10.0.1.src.tar.xz) = 0e61e92b22a620fe7f833fa8b2a56f2db96f7335
-RMD160 (clang-10.0.1.src.tar.xz) = 15b8a3b6c6f1a2896146006b30fbcf104be7c2b6
-SHA512 (clang-10.0.1.src.tar.xz) = c6712d491ce5e166ef72724cf855d742d88da825ffc25585612d7f2eb7770343e3ae48fa78e0af3e5d5efdde3a9686a7361dac3b546a4378de22448ea6e4026c
-Size (clang-10.0.1.src.tar.xz) = 14046188 bytes
+SHA1 (clang-12.0.1.src.tar.xz) = e3cdd3fb39c78a5bcb0a1d5706678cf8643a48f6
+RMD160 (clang-12.0.1.src.tar.xz) = 662d890fe81218fbf79c25540eb09c7664bc5b8a
+SHA512 (clang-12.0.1.src.tar.xz) = 405011f0974b239427ca87c65e7485709c77705a9b7d51d679fe2abec79865f8c51c7ab085b4e6bf7aa4d0eade4b1438d88dd5feb56b434dc5d718ebf5715efa
+Size (clang-12.0.1.src.tar.xz) = 15323860 bytes
 SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
-SHA1 (patch-lib_Driver_ToolChain.cpp) = b49a6032d75e33ffe2606012addd826e9fdbb1db
-SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 222d157f44444eeef33ac97e0ed072a55b666690
-SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 94968d0de0972ff832727822fbdc02442be74ab8
+SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
+SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 36b08829c6f6fca2a5b6fecda790bf9af26eda5d
+SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
 SHA1 (patch-lib_Frontend_InitHeaderSearch.cpp) = 497ddbe1eac8726d736bed58557a795dce207d1a
-SHA1 (patch-tools_libclang_FatalErrorHandler.cpp) = 5761b54b493587272667d3f79388e98e37a4b1fb
diff --git a/lang/clang/patches/patch-lib_Driver_ToolChain.cpp b/lang/clang/patches/patch-lib_Driver_ToolChain.cpp
index bcd5d152aa8..c18216f5d15 100644
--- a/lang/clang/patches/patch-lib_Driver_ToolChain.cpp
+++ b/lang/clang/patches/patch-lib_Driver_ToolChain.cpp
@@ -1,7 +1,7 @@
-$NetBSD: patch-lib_Driver_ToolChain.cpp,v 1.1 2019/11/03 11:55:53 kamil Exp $
+$NetBSD: patch-lib_Driver_ToolChain.cpp,v 1.2 2021/07/12 18:42:06 adam Exp $
 
 [LLD] Add NetBSD support as a new flavor of LLD (nb.lld)
-https://reviews.llvm.org/D69755
+https://reviews.llvm.org/D70048
 
 --- lib/Driver/ToolChain.cpp.orig	2019-07-11 19:06:38.000000000 +0000
 +++ lib/Driver/ToolChain.cpp
diff --git a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
index 2d74a0486b3..1afeae1c82b 100644
--- a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
+++ b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.6 2020/06/05 15:28:54 jperkin Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.7 2021/07/12 18:42:06 adam Exp $
 
 Use compiler-rt instead of libgcc.
 Pull in libcxx correctly.
@@ -7,9 +7,9 @@ Don't specify --dynamic-linker, makes it impossible for the user to use -Wl,-r
 Ensure we reset to -zdefaultextract prior to adding compiler-rt.
 Test removing -Bdynamic for golang.
 
---- lib/Driver/ToolChains/Solaris.cpp.orig	2020-03-23 15:01:02.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.cpp.orig	2020-10-07 10:10:48.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.cpp
-@@ -49,8 +49,29 @@ void solaris::Linker::ConstructJob(Compi
+@@ -50,8 +50,28 @@ void solaris::Linker::ConstructJob(Compi
                                     const InputInfoList &Inputs,
                                     const ArgList &Args,
                                     const char *LinkingOutput) const {
@@ -17,8 +17,7 @@ Test removing -Bdynamic for golang.
    ArgStringList CmdArgs;
  
 +  // XXX: assumes pkgsrc layout
-+  std::string LibPath;
-+  LibPath = llvm::sys::path::parent_path(D.getInstalledDir());
++  std::string LibPath = llvm::sys::path::parent_path(D.getInstalledDir()).str();
 +  LibPath += "/lib/";
 +
 +  std::string SysPath = "/usr/lib/";
@@ -39,7 +38,7 @@ Test removing -Bdynamic for golang.
    // Demangle C++ names in errors
    CmdArgs.push_back("-C");
  
-@@ -63,7 +84,6 @@ void solaris::Linker::ConstructJob(Compi
+@@ -64,7 +84,6 @@ void solaris::Linker::ConstructJob(Compi
      CmdArgs.push_back("-Bstatic");
      CmdArgs.push_back("-dn");
    } else {
@@ -47,7 +46,7 @@ Test removing -Bdynamic for golang.
      if (Args.hasArg(options::OPT_shared)) {
        CmdArgs.push_back("-shared");
      }
-@@ -84,9 +104,9 @@ void solaris::Linker::ConstructJob(Compi
+@@ -85,9 +104,9 @@ void solaris::Linker::ConstructJob(Compi
    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
      if (!Args.hasArg(options::OPT_shared))
        CmdArgs.push_back(
@@ -59,7 +58,7 @@ Test removing -Bdynamic for golang.
  
      const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
      bool HaveAnsi = false;
-@@ -101,16 +121,14 @@ void solaris::Linker::ConstructJob(Compi
+@@ -102,16 +121,14 @@ void solaris::Linker::ConstructJob(Compi
      // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
      if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
        values_X = "values-Xc.o";
@@ -78,7 +77,7 @@ Test removing -Bdynamic for golang.
    }
  
    getToolChain().AddFilePathLibArgs(Args, CmdArgs);
-@@ -122,30 +140,23 @@ void solaris::Linker::ConstructJob(Compi
+@@ -123,30 +140,23 @@ void solaris::Linker::ConstructJob(Compi
    AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
  
    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
@@ -120,7 +119,7 @@ Test removing -Bdynamic for golang.
  
    getToolChain().addProfileRTLibs(Args, CmdArgs);
  
-@@ -174,26 +185,9 @@ Solaris::Solaris(const Driver &D, const 
+@@ -176,26 +186,9 @@ Solaris::Solaris(const Driver &D, const 
                   const ArgList &Args)
      : Generic_ELF(D, Triple, Args) {
  
@@ -150,7 +149,7 @@ Test removing -Bdynamic for golang.
  }
  
  SanitizerMask Solaris::getSupportedSanitizers() const {
-@@ -218,6 +212,32 @@ Tool *Solaris::buildAssembler() const {
+@@ -220,6 +213,31 @@ Tool *Solaris::buildAssembler() const {
  
  Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); }
  
@@ -160,8 +159,7 @@ Test removing -Bdynamic for golang.
 +
 +  // Currently assumes pkgsrc layout where libcxx and libcxxabi are installed
 +  // in the same prefixed directory that we are.
-+  std::string LibPath;
-+  LibPath = llvm::sys::path::parent_path(getDriver().getInstalledDir());
++  std::string LibPath = llvm::sys::path::parent_path(getDriver().getInstalledDir()).str();
 +  LibPath += "/lib";
 +
 +  switch (Type) {
@@ -183,7 +181,7 @@ Test removing -Bdynamic for golang.
  void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
                                          ArgStringList &CC1Args) const {
    const Driver &D = getDriver();
-@@ -250,40 +270,20 @@ void Solaris::AddClangSystemIncludeArgs(
+@@ -252,40 +270,20 @@ void Solaris::AddClangSystemIncludeArgs(
      return;
    }
  
diff --git a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h
index afc14ac54c9..80f57c36ca4 100644
--- a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h
+++ b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_Driver_ToolChains_Solaris.h,v 1.3 2019/01/23 15:44:34 jperkin Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Solaris.h,v 1.4 2021/07/12 18:42:06 adam Exp $
 
 Override AddCXXStdlibLibArgs().
 
---- lib/Driver/ToolChains/Solaris.h.orig	2018-02-05 23:59:13.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.h.orig	2021-04-06 16:38:18.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.h
-@@ -62,11 +62,17 @@ public:
+@@ -59,11 +59,17 @@ public:
                              llvm::opt::ArgStringList &CC1Args) const override;
  
    void
@@ -20,5 +20,5 @@ Override AddCXXStdlibLibArgs().
 +     const llvm::opt::ArgList &Args,
 +     llvm::opt::ArgStringList &CmdArgs) const override;
  
- protected:
-   Tool *buildAssembler() const override;
+   const char *getDefaultLinker() const override {
+     // clang currently uses Solaris ld-only options.
diff --git a/lang/clang/patches/patch-tools_libclang_FatalErrorHandler.cpp b/lang/clang/patches/patch-tools_libclang_FatalErrorHandler.cpp
deleted file mode 100644
index 22d02574eb8..00000000000
--- a/lang/clang/patches/patch-tools_libclang_FatalErrorHandler.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-tools_libclang_FatalErrorHandler.cpp,v 1.1 2020/04/18 07:53:38 adam Exp $
-
-Fix error: no member named 'abort' in the global namespace.
-
---- tools/libclang/FatalErrorHandler.cpp.orig	2020-03-21 13:07:00.218249876 +0000
-+++ tools/libclang/FatalErrorHandler.cpp
-@@ -9,13 +9,14 @@
- 
- #include "clang-c/FatalErrorHandler.h"
- #include "llvm/Support/ErrorHandling.h"
-+#include <cstdlib>
- 
- static void aborting_fatal_error_handler(void *, const std::string &reason,
-                                          bool) {
-   // Write the result out to stderr avoiding errs() because raw_ostreams can
-   // call report_fatal_error.
-   fprintf(stderr, "LIBCLANG FATAL ERROR: %s\n", reason.c_str());
--  ::abort();
-+  abort();
- }
- 
- extern "C" {