Received: by mail.netbsd.org (Postfix, from userid 605) id A662384FAA; Fri, 12 Aug 2022 08:45:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E082884D1B for ; Fri, 12 Aug 2022 08:45:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id w4sG4RgqwA_i for ; Fri, 12 Aug 2022 08:45:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8961D84CD8 for ; Fri, 12 Aug 2022 08:45:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 86BBBFB1A; Fri, 12 Aug 2022 08:45:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166029394444590" MIME-Version: 1.0 Date: Fri, 12 Aug 2022 08:45:44 +0000 From: "pin" Subject: CVS commit: pkgsrc/lang/clang To: pkgsrc-changes@NetBSD.org Reply-To: pin@netbsd.org X-Mailer: log_accum Message-Id: <20220812084544.86BBBFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166029394444590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pin Date: Fri Aug 12 08:45:44 UTC 2022 Modified Files: pkgsrc/lang/clang: Makefile Makefile.common PLIST buildlink3.mk distinfo pkgsrc/lang/clang/patches: patch-lib_Driver_ToolChains_Solaris.cpp Log Message: lang/clang: llvm update To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 pkgsrc/lang/clang/Makefile cvs rdiff -u -r1.49 -r1.50 pkgsrc/lang/clang/Makefile.common cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/clang/PLIST cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/clang/buildlink3.mk cvs rdiff -u -r1.73 -r1.74 pkgsrc/lang/clang/distinfo cvs rdiff -u -r1.8 -r1.9 \ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_166029394444590 Content-Disposition: inline Content-Length: 15175 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/clang/Makefile diff -u pkgsrc/lang/clang/Makefile:1.70 pkgsrc/lang/clang/Makefile:1.71 --- pkgsrc/lang/clang/Makefile:1.70 Thu Jun 30 11:18:32 2022 +++ pkgsrc/lang/clang/Makefile Fri Aug 12 08:45:44 2022 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.70 2022/06/30 11:18:32 nia Exp $ +# $NetBSD: Makefile,v 1.71 2022/08/12 08:45:44 pin Exp $ -PKGREVISION= 3 .include "Makefile.common" PKGNAME= ${DISTNAME:S/.src//} Index: pkgsrc/lang/clang/Makefile.common diff -u pkgsrc/lang/clang/Makefile.common:1.49 pkgsrc/lang/clang/Makefile.common:1.50 --- pkgsrc/lang/clang/Makefile.common:1.49 Sat Jun 11 13:45:44 2022 +++ pkgsrc/lang/clang/Makefile.common Fri Aug 12 08:45:44 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.49 2022/06/11 13:45:44 fcambus Exp $ +# $NetBSD: Makefile.common,v 1.50 2022/08/12 08:45:44 pin Exp $ # used by lang/clang/Makefile # used by lang/clang-tools-extra/Makefile @@ -110,14 +110,7 @@ LIBCPP_CHECK!= \ LIBCPP_CHECK= NO .endif -# patch NetBSD::GetCXXStdlibType .if ${OPSYS} == "NetBSD" && ${LIBCPP_CHECK} != YES -SUBST_CLASSES+= libcxx -SUBST_STAGE.libcxx= pre-configure -SUBST_MESSAGE.libcxx= Patching toolchain to use libstdc++ (matching the host compiler) -SUBST_FILES.libcxx= lib/Driver/ToolChains/NetBSD.cpp -SUBST_SED.libcxx= -e 's,(Major >= 7 || Major == 0),(false),' - CMAKE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++" .endif Index: pkgsrc/lang/clang/PLIST diff -u pkgsrc/lang/clang/PLIST:1.33 pkgsrc/lang/clang/PLIST:1.34 --- pkgsrc/lang/clang/PLIST:1.33 Mon May 9 11:52:44 2022 +++ pkgsrc/lang/clang/PLIST Fri Aug 12 08:45:44 2022 @@ -1,14 +1,16 @@ -@comment $NetBSD: PLIST,v 1.33 2022/05/09 11:52:44 adam Exp $ +@comment $NetBSD: PLIST,v 1.34 2022/08/12 08:45:44 pin Exp $ bin/analyze-build bin/c-index-test bin/clang bin/clang++ -bin/clang-13 +bin/clang-14 bin/clang-check bin/clang-cl bin/clang-cpp bin/clang-extdef-mapping bin/clang-format +bin/clang-linker-wrapper +bin/clang-nvlink-wrapper bin/clang-offload-bundler bin/clang-offload-wrapper bin/clang-refactor @@ -211,8 +213,18 @@ include/clang/Analysis/CodeInjector.h include/clang/Analysis/ConstructionContext.h include/clang/Analysis/DomainSpecific/CocoaConventions.h include/clang/Analysis/DomainSpecific/ObjCNoReturn.h +include/clang/Analysis/FlowSensitive/ControlFlowContext.h +include/clang/Analysis/FlowSensitive/DataflowAnalysis.h +include/clang/Analysis/FlowSensitive/DataflowAnalysisContext.h +include/clang/Analysis/FlowSensitive/DataflowEnvironment.h +include/clang/Analysis/FlowSensitive/DataflowLattice.h include/clang/Analysis/FlowSensitive/DataflowValues.h include/clang/Analysis/FlowSensitive/DataflowWorklist.h +include/clang/Analysis/FlowSensitive/MapLattice.h +include/clang/Analysis/FlowSensitive/StorageLocation.h +include/clang/Analysis/FlowSensitive/Transfer.h +include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h +include/clang/Analysis/FlowSensitive/Value.h include/clang/Analysis/IssueHash.h include/clang/Analysis/MacroExpansionContext.h include/clang/Analysis/PathDiagnostic.h @@ -236,6 +248,8 @@ include/clang/Basic/BitmaskEnum.h include/clang/Basic/Builtins.def include/clang/Basic/Builtins.h include/clang/Basic/BuiltinsAArch64.def +include/clang/Basic/BuiltinsAArch64NeonSVEBridge.def +include/clang/Basic/BuiltinsAArch64NeonSVEBridge_cg.def include/clang/Basic/BuiltinsAMDGPU.def include/clang/Basic/BuiltinsARM.def include/clang/Basic/BuiltinsBPF.def @@ -247,12 +261,14 @@ include/clang/Basic/BuiltinsNEON.def include/clang/Basic/BuiltinsNVPTX.def include/clang/Basic/BuiltinsPPC.def include/clang/Basic/BuiltinsRISCV.def +include/clang/Basic/BuiltinsRISCVVector.def include/clang/Basic/BuiltinsSVE.def include/clang/Basic/BuiltinsSystemZ.def include/clang/Basic/BuiltinsWebAssembly.def include/clang/Basic/BuiltinsX86.def include/clang/Basic/BuiltinsX86_64.def include/clang/Basic/BuiltinsXCore.def +include/clang/Basic/CLWarnings.h include/clang/Basic/CapturedStmt.h include/clang/Basic/CharInfo.h include/clang/Basic/CodeGenOptions.def @@ -354,7 +370,6 @@ include/clang/Basic/TypeTraits.h include/clang/Basic/Version.h include/clang/Basic/Version.inc 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 @@ -570,6 +585,7 @@ include/clang/StaticAnalyzer/Core/PathSe include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h +include/clang/StaticAnalyzer/Core/PathSensitive/CallDescription.h include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h @@ -688,6 +704,7 @@ lib/clang/${PKGVERSION}/include/__clang_ 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_cuda_texture_intrinsics.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 @@ -717,6 +734,7 @@ lib/clang/${PKGVERSION}/include/avx512cd lib/clang/${PKGVERSION}/include/avx512dqintrin.h lib/clang/${PKGVERSION}/include/avx512erintrin.h lib/clang/${PKGVERSION}/include/avx512fintrin.h +lib/clang/${PKGVERSION}/include/avx512fp16intrin.h lib/clang/${PKGVERSION}/include/avx512ifmaintrin.h lib/clang/${PKGVERSION}/include/avx512ifmavlintrin.h lib/clang/${PKGVERSION}/include/avx512pfintrin.h @@ -728,6 +746,7 @@ lib/clang/${PKGVERSION}/include/avx512vl lib/clang/${PKGVERSION}/include/avx512vlbwintrin.h lib/clang/${PKGVERSION}/include/avx512vlcdintrin.h lib/clang/${PKGVERSION}/include/avx512vldqintrin.h +lib/clang/${PKGVERSION}/include/avx512vlfp16intrin.h lib/clang/${PKGVERSION}/include/avx512vlintrin.h lib/clang/${PKGVERSION}/include/avx512vlvbmi2intrin.h lib/clang/${PKGVERSION}/include/avx512vlvnniintrin.h @@ -748,6 +767,7 @@ lib/clang/${PKGVERSION}/include/clflusho lib/clang/${PKGVERSION}/include/clwbintrin.h lib/clang/${PKGVERSION}/include/clzerointrin.h lib/clang/${PKGVERSION}/include/cpuid.h +lib/clang/${PKGVERSION}/include/crc32intrin.h lib/clang/${PKGVERSION}/include/cuda_wrappers/algorithm lib/clang/${PKGVERSION}/include/cuda_wrappers/complex lib/clang/${PKGVERSION}/include/cuda_wrappers/new @@ -849,16 +869,17 @@ lib/cmake/clang/AddClang.cmake lib/cmake/clang/ClangConfig.cmake lib/cmake/clang/ClangTargets-release.cmake lib/cmake/clang/ClangTargets.cmake +${PLIST.notdylib}lib/libclang-cpp.so.14 lib/libclang-cpp.${SOEXT} -${PLIST.notdylib}lib/libclang-cpp.so.13 -lib/libclang.${SOEXT} -${PLIST.notdylib}lib/libclang.${SOEXT}.13 ${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION} +${PLIST.notdylib}lib/libclang.${SOEXT}.13 +lib/libclang.${SOEXT} lib/libclangAPINotes.a lib/libclangARCMigrate.a lib/libclangAST.a lib/libclangASTMatchers.a lib/libclangAnalysis.a +lib/libclangAnalysisFlowSensitive.a lib/libclangBasic.a lib/libclangCodeGen.a lib/libclangCrossTU.a Index: pkgsrc/lang/clang/buildlink3.mk diff -u pkgsrc/lang/clang/buildlink3.mk:1.18 pkgsrc/lang/clang/buildlink3.mk:1.19 --- pkgsrc/lang/clang/buildlink3.mk:1.18 Tue Jun 28 11:34:09 2022 +++ pkgsrc/lang/clang/buildlink3.mk Fri Aug 12 08:45:44 2022 @@ -1,18 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.18 2022/06/28 11:34:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2022/08/12 08:45:44 pin Exp $ BUILDLINK_TREE+= clang .if !defined(CLANG_BUILDLINK3_MK) CLANG_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.clang+= clang>=9.0.1 -BUILDLINK_ABI_DEPENDS.clang?= clang>=13.0.1nb2 +BUILDLINK_API_DEPENDS.clang+= clang>=14.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-13 +BUILDLINK_FILES.clang+= bin/clang-14 BUILDLINK_FILES.clang+= bin/clang-check BUILDLINK_FILES.clang+= bin/clang-cl BUILDLINK_FILES.clang+= bin/clang-cpp Index: pkgsrc/lang/clang/distinfo diff -u pkgsrc/lang/clang/distinfo:1.73 pkgsrc/lang/clang/distinfo:1.74 --- pkgsrc/lang/clang/distinfo:1.73 Thu Feb 3 20:38:39 2022 +++ pkgsrc/lang/clang/distinfo Fri Aug 12 08:45:44 2022 @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.73 2022/02/03 20:38:39 adam Exp $ +$NetBSD: distinfo,v 1.74 2022/08/12 08:45:44 pin Exp $ -BLAKE2s (clang-13.0.1.src.tar.xz) = b9ccaaf74a15dc150fc9e3d892b43e9402ef41fe3eaaae4879185b9c8c545e26 -SHA512 (clang-13.0.1.src.tar.xz) = 10abb601ce33ec0ec1e966221d958dd6206cfd5b178f8af0850408ed6adf2a9e193afb87a6449d65bb636e70a4debc3818035ab7bfcddf35a54a603851779d57 -Size (clang-13.0.1.src.tar.xz) = 17847584 bytes +BLAKE2s (clang-14.0.6.src.tar.xz) = a39d30a3475f93605cf5cf63374500d78b1583e5c738b3ad7693a9ef08c137c4 +SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b +Size (clang-14.0.6.src.tar.xz) = 18539496 bytes SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e -SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 1a139612ce181dfce1ea3a627dcd76bc81f05455 +SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 29e6ca7cf0bf0b01f50305f50cd555cbb75995e1 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3 -SHA1 (patch-lib_Frontend_InitHeaderSearch.cpp) = 497ddbe1eac8726d736bed58557a795dce207d1a SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4 SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525 Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp diff -u pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.8 pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.9 --- pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.8 Tue Nov 23 20:55:43 2021 +++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp Fri Aug 12 08:45:44 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.8 2021/11/23 20:55:43 wiz Exp $ +$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.9 2022/08/12 08:45:44 pin Exp $ Use compiler-rt instead of libgcc. Pull in libcxx correctly. @@ -7,7 +7,7 @@ Don't specify --dynamic-linker, makes it Ensure we reset to -zdefaultextract prior to adding compiler-rt. Test removing -Bdynamic for golang. ---- lib/Driver/ToolChains/Solaris.cpp.orig 2021-09-24 16:18:10.000000000 +0000 +--- lib/Driver/ToolChains/Solaris.cpp.orig 2022-06-22 16:46:24.000000000 +0000 +++ lib/Driver/ToolChains/Solaris.cpp @@ -50,8 +50,28 @@ void solaris::Linker::ConstructJob(Compi const InputInfoList &Inputs, @@ -46,8 +46,8 @@ Test removing -Bdynamic for golang. if (Args.hasArg(options::OPT_shared)) { CmdArgs.push_back("-shared"); } -@@ -85,9 +104,9 @@ void solaris::Linker::ConstructJob(Compi - if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) { +@@ -86,9 +105,9 @@ void solaris::Linker::ConstructJob(Compi + options::OPT_r)) { if (!Args.hasArg(options::OPT_shared)) CmdArgs.push_back( - Args.MakeArgString(getToolChain().GetFilePath("crt1.o"))); @@ -58,7 +58,7 @@ Test removing -Bdynamic for golang. const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi); bool HaveAnsi = false; -@@ -102,16 +121,14 @@ void solaris::Linker::ConstructJob(Compi +@@ -103,16 +122,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"; @@ -77,10 +77,10 @@ Test removing -Bdynamic for golang. } getToolChain().AddFilePathLibArgs(Args, CmdArgs); -@@ -123,30 +140,23 @@ void solaris::Linker::ConstructJob(Compi - AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA); +@@ -125,15 +142,6 @@ void solaris::Linker::ConstructJob(Compi - if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { + if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs, + options::OPT_r)) { - if (getToolChain().ShouldLinkCXXStdlib(Args)) - getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); - if (Args.hasArg(options::OPT_fstack_protector) || @@ -90,6 +90,13 @@ Test removing -Bdynamic for golang. - CmdArgs.push_back("-lssp_nonshared"); - CmdArgs.push_back("-lssp"); - } + // LLVM support for atomics on 32-bit SPARC V8+ is incomplete, so + // forcibly link with libatomic as a workaround. + if (getToolChain().getTriple().getArch() == llvm::Triple::sparc) { +@@ -141,24 +149,23 @@ void solaris::Linker::ConstructJob(Compi + CmdArgs.push_back("-latomic"); + CmdArgs.push_back(getAsNeededOption(getToolChain(), false)); + } - CmdArgs.push_back("-lgcc_s"); - CmdArgs.push_back("-lc"); - if (!Args.hasArg(options::OPT_shared)) { @@ -110,16 +117,19 @@ Test removing -Bdynamic for golang. linkSanitizerRuntimeDeps(getToolChain(), CmdArgs); } -- if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) { +- if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, +- options::OPT_r)) { - CmdArgs.push_back( - Args.MakeArgString(getToolChain().GetFilePath("crtend.o"))); +- CmdArgs.push_back( +- Args.MakeArgString(getToolChain().GetFilePath("crtn.o"))); - } -- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crtn.o"))); +- + CmdArgs.push_back(Args.MakeArgString(SysPath + "crtn.o")); - getToolChain().addProfileRTLibs(Args, CmdArgs); -@@ -176,26 +186,9 @@ Solaris::Solaris(const Driver &D, const + const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath()); +@@ -187,26 +194,9 @@ Solaris::Solaris(const Driver &D, const const ArgList &Args) : Generic_ELF(D, Triple, Args) { @@ -149,7 +159,7 @@ Test removing -Bdynamic for golang. } SanitizerMask Solaris::getSupportedSanitizers() const { -@@ -220,6 +213,31 @@ Tool *Solaris::buildAssembler() const { +@@ -231,6 +221,31 @@ Tool *Solaris::buildAssembler() const { Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); } @@ -181,7 +191,7 @@ Test removing -Bdynamic for golang. void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { const Driver &D = getDriver(); -@@ -252,38 +270,20 @@ void Solaris::AddClangSystemIncludeArgs( +@@ -263,38 +278,20 @@ void Solaris::AddClangSystemIncludeArgs( return; } --_----------=_166029394444590--