pkgsrc-Changes archive

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

CVS commit: pkgsrc/lang/clang



Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 22 07:03:35 UTC 2024

Modified Files:
        pkgsrc/lang/clang: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/lang/clang/patches: patch-lib_Basic_Targets_OSTargets.h
            patch-lib_Driver_ToolChains_Solaris.cpp
            patch-lib_Lex_InitHeaderSearch.cpp

Log Message:
clang: updated to 17.0.6

17.0.6
https://releases.llvm.org/17.0.1/tools/clang/docs/ReleaseNotes.html


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/lang/clang/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/clang/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/clang/buildlink3.mk
cvs rdiff -u -r1.81 -r1.82 pkgsrc/lang/clang/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h
cvs rdiff -u -r1.11 -r1.12 \
    pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp

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

Modified files:

Index: pkgsrc/lang/clang/Makefile
diff -u pkgsrc/lang/clang/Makefile:1.83 pkgsrc/lang/clang/Makefile:1.84
--- pkgsrc/lang/clang/Makefile:1.83     Wed Nov  8 13:19:48 2023
+++ pkgsrc/lang/clang/Makefile  Mon Apr 22 07:03:35 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.83 2023/11/08 13:19:48 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2024/04/22 07:03:35 adam Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/.src//}

Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.55 pkgsrc/lang/clang/Makefile.common:1.56
--- pkgsrc/lang/clang/Makefile.common:1.55      Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/clang/Makefile.common   Mon Apr 22 07:03:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2023/10/06 19:15:20 adam Exp $
+# $NetBSD: Makefile.common,v 1.56 2024/04/22 07:03:35 adam Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-tools-extra/Makefile
 
@@ -15,7 +15,7 @@ LICENSE=      apache-2.0
 CONFIGURE_DIRS=                build
 CMAKE_ARG_PATH=                ${WRKSRC}
 
-USE_CXX_FEATURES+=     c++14
+USE_CXX_FEATURES=      c++14
 USE_LANGUAGES=         c c++
 USE_CMAKE=             yes
 GCC_REQD+=             7
@@ -129,7 +129,7 @@ CMAKE_ARGS+=    -DCLANG_DEFAULT_CXX_STDL
 LLVM_MAJOR=    ${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/}
 PLIST_SUBST+=  LLVM_MAJOR=${LLVM_MAJOR}
 
-PKGVERSION_MAJOR=      16
+PKGVERSION_MAJOR=      17
 PLIST_SUBST+=          PKGVERSION_MAJOR=${PKGVERSION_MAJOR}
 
 PLIST_VARS+=   notdylib

Index: pkgsrc/lang/clang/PLIST
diff -u pkgsrc/lang/clang/PLIST:1.38 pkgsrc/lang/clang/PLIST:1.39
--- pkgsrc/lang/clang/PLIST:1.38        Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/clang/PLIST     Mon Apr 22 07:03:35 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2023/10/06 19:15:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.39 2024/04/22 07:03:35 adam Exp $
 bin/amdgpu-arch
 bin/analyze-build
 bin/c-index-test
@@ -197,6 +197,7 @@ include/clang/Analysis/Analyses/CalledOn
 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/LiveVariables.h
 include/clang/Analysis/Analyses/PostOrderCFGView.h
 include/clang/Analysis/Analyses/ReachableCode.h
@@ -221,6 +222,7 @@ 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/Arena.h
 include/clang/Analysis/FlowSensitive/CFGMatchSwitch.h
 include/clang/Analysis/FlowSensitive/ControlFlowContext.h
 include/clang/Analysis/FlowSensitive/DataflowAnalysis.h
@@ -230,12 +232,15 @@ include/clang/Analysis/FlowSensitive/Dat
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/FlowSensitive/DataflowWorklist.h
 include/clang/Analysis/FlowSensitive/DebugSupport.h
+include/clang/Analysis/FlowSensitive/Formula.h
+include/clang/Analysis/FlowSensitive/Logger.h
 include/clang/Analysis/FlowSensitive/MapLattice.h
 include/clang/Analysis/FlowSensitive/MatchSwitch.h
 include/clang/Analysis/FlowSensitive/Models/ChromiumCheckModel.h
 include/clang/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.h
 include/clang/Analysis/FlowSensitive/NoopAnalysis.h
 include/clang/Analysis/FlowSensitive/NoopLattice.h
+include/clang/Analysis/FlowSensitive/RecordOps.h
 include/clang/Analysis/FlowSensitive/Solver.h
 include/clang/Analysis/FlowSensitive/StorageLocation.h
 include/clang/Analysis/FlowSensitive/Transfer.h
@@ -259,6 +264,7 @@ include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
 include/clang/Basic/AttrSubMatchRulesList.inc
 include/clang/Basic/AttrSubjectMatchRules.h
+include/clang/Basic/AttrTokenKinds.inc
 include/clang/Basic/AttributeCommonInfo.h
 include/clang/Basic/Attributes.h
 include/clang/Basic/BitmaskEnum.h
@@ -281,6 +287,7 @@ include/clang/Basic/BuiltinsNVPTX.def
 include/clang/Basic/BuiltinsPPC.def
 include/clang/Basic/BuiltinsRISCV.def
 include/clang/Basic/BuiltinsRISCVVector.def
+include/clang/Basic/BuiltinsSME.def
 include/clang/Basic/BuiltinsSVE.def
 include/clang/Basic/BuiltinsSystemZ.def
 include/clang/Basic/BuiltinsVE.def
@@ -298,7 +305,6 @@ include/clang/Basic/CommentOptions.h
 include/clang/Basic/Cuda.h
 include/clang/Basic/CustomizableOptional.h
 include/clang/Basic/DarwinSDKInfo.h
-include/clang/Basic/DebugInfoOptions.h
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticAST.h
 include/clang/Basic/DiagnosticASTKinds.inc
@@ -366,6 +372,7 @@ include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/OperatorPrecedence.h
 include/clang/Basic/PPCTypes.def
+include/clang/Basic/ParsedAttrInfo.h
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PlistSupport.h
 include/clang/Basic/PragmaKinds.h
@@ -397,6 +404,7 @@ include/clang/Basic/TypeTraits.h
 include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
 include/clang/Basic/Visibility.h
+include/clang/Basic/WebAssemblyReferenceTypes.def
 include/clang/Basic/XRayInstr.h
 include/clang/Basic/XRayLists.h
 include/clang/Basic/arm_cde_builtin_aliases.inc
@@ -409,10 +417,16 @@ include/clang/Basic/arm_mve_builtin_cg.i
 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_sme_builtin_cg.inc
+include/clang/Basic/arm_sme_builtins.inc
+include/clang/Basic/arm_sme_sema_rangechecks.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/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
@@ -437,6 +451,7 @@ include/clang/Driver/DriverDiagnostic.h
 include/clang/Driver/InputInfo.h
 include/clang/Driver/Job.h
 include/clang/Driver/Multilib.h
+include/clang/Driver/MultilibBuilder.h
 include/clang/Driver/OffloadBundler.h
 include/clang/Driver/OptionUtils.h
 include/clang/Driver/Options.h
@@ -458,10 +473,12 @@ include/clang/ExtractAPI/API.h
 include/clang/ExtractAPI/APIIgnoresList.h
 include/clang/ExtractAPI/AvailabilityInfo.h
 include/clang/ExtractAPI/DeclarationFragments.h
+include/clang/ExtractAPI/ExtractAPIActionBase.h
 include/clang/ExtractAPI/ExtractAPIVisitor.h
 include/clang/ExtractAPI/FrontendActions.h
 include/clang/ExtractAPI/Serialization/SerializerBase.h
 include/clang/ExtractAPI/Serialization/SymbolGraphSerializer.h
+include/clang/ExtractAPI/TypedefUnderlyingTypeResolver.h
 include/clang/Format/Format.h
 include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
@@ -504,6 +521,7 @@ include/clang/Index/USRGeneration.h
 include/clang/IndexSerialization/SerializablePathCollection.h
 include/clang/Interpreter/Interpreter.h
 include/clang/Interpreter/PartialTranslationUnit.h
+include/clang/Interpreter/Value.h
 include/clang/Lex/CodeCompletionHandler.h
 include/clang/Lex/DependencyDirectivesScanner.h
 include/clang/Lex/DirectoryLookup.h
@@ -562,6 +580,7 @@ include/clang/Sema/CodeCompleteOptions.h
 include/clang/Sema/DeclSpec.h
 include/clang/Sema/DelayedDiagnostic.h
 include/clang/Sema/Designator.h
+include/clang/Sema/EnterExpressionEvaluationContext.h
 include/clang/Sema/ExternalSemaSource.h
 include/clang/Sema/HLSLExternalSemaSource.h
 include/clang/Sema/IdentifierResolver.h
@@ -763,6 +782,7 @@ lib/clang/${PKGVERSION_MAJOR}/include/__
 lib/clang/${PKGVERSION_MAJOR}/include/adxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/altivec.h
 lib/clang/${PKGVERSION_MAJOR}/include/ammintrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/amxcomplexintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/amxfp16intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/amxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm64intr.h
@@ -774,6 +794,7 @@ ${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR
 ${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_mve.h
 ${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_neon.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm_neon_sve_bridge.h
+lib/clang/${PKGVERSION_MAJOR}/include/arm_sme_draft_spec_subject_to_change.h
 ${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_sve.h
 lib/clang/${PKGVERSION_MAJOR}/include/armintr.h
 lib/clang/${PKGVERSION_MAJOR}/include/avx2intrin.h
@@ -808,8 +829,9 @@ lib/clang/${PKGVERSION_MAJOR}/include/av
 lib/clang/${PKGVERSION_MAJOR}/include/avxifmaintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/avxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/avxneconvertintrin.h
-lib/clang/${PKGVERSION_MAJOR}/include/avxvnniintrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/avxvnniint16intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/avxvnniint8intrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/avxvnniintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/bmi2intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/bmiintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/builtins.h
@@ -823,8 +845,11 @@ lib/clang/${PKGVERSION_MAJOR}/include/cm
 lib/clang/${PKGVERSION_MAJOR}/include/cpuid.h
 lib/clang/${PKGVERSION_MAJOR}/include/crc32intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/algorithm
-lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/complex
+lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/bits/basic_string.h
+lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/bits/basic_string.tcc
+lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/bits/shared_ptr_base.h
 lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/cmath
+lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/complex
 lib/clang/${PKGVERSION_MAJOR}/include/cuda_wrappers/new
 lib/clang/${PKGVERSION_MAJOR}/include/emmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/enqcmdintrin.h
@@ -850,6 +875,11 @@ lib/clang/${PKGVERSION_MAJOR}/include/is
 lib/clang/${PKGVERSION_MAJOR}/include/keylockerintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/larchintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/limits.h
+lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/ctype.h
+lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/inttypes.h
+lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/stdio.h
+lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/stdlib.h
+lib/clang/${PKGVERSION_MAJOR}/include/llvm_libc_wrappers/string.h
 lib/clang/${PKGVERSION_MAJOR}/include/lwpintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/lzcntintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/mm3dnow.h
@@ -891,12 +921,17 @@ lib/clang/${PKGVERSION_MAJOR}/include/pt
 lib/clang/${PKGVERSION_MAJOR}/include/raointintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/rdpruintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/rdseedintrin.h
+${PLIST.RISCV}lib/clang/${PKGVERSION_MAJOR}/include/riscv_ntlh.h
 ${PLIST.RISCV}lib/clang/${PKGVERSION_MAJOR}/include/riscv_vector.h
 lib/clang/${PKGVERSION_MAJOR}/include/rtmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/s390intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/serializeintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/sgxintrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/sha512intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/shaintrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/sifive_vector.h
+lib/clang/${PKGVERSION_MAJOR}/include/sm3intrin.h
+lib/clang/${PKGVERSION_MAJOR}/include/sm4intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/smmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/stdalign.h
 lib/clang/${PKGVERSION_MAJOR}/include/stdarg.h
@@ -940,8 +975,8 @@ lib/cmake/clang/ClangTargets.cmake
 lib/libclang-cpp.${SOEXT}
 ${PLIST.notdylib}lib/libclang-cpp.so.${PKGVERSION_MAJOR}
 lib/libclang.${SOEXT}
-${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION}
 ${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION_MAJOR}
+${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION}
 lib/libclangAPINotes.a
 lib/libclangARCMigrate.a
 lib/libclangAST.a

Index: pkgsrc/lang/clang/buildlink3.mk
diff -u pkgsrc/lang/clang/buildlink3.mk:1.26 pkgsrc/lang/clang/buildlink3.mk:1.27
--- pkgsrc/lang/clang/buildlink3.mk:1.26        Wed Nov  8 13:19:48 2023
+++ pkgsrc/lang/clang/buildlink3.mk     Mon Apr 22 07:03:35 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.26 2023/11/08 13:19:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2024/04/22 07:03:35 adam Exp $
 
 BUILDLINK_TREE+=       clang
 
 .if !defined(CLANG_BUILDLINK3_MK)
 CLANG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clang+=  clang>=16.0.0<17
-BUILDLINK_ABI_DEPENDS.clang+=  clang>=16.0.6nb1
+BUILDLINK_API_DEPENDS.clang+=  clang>=17.0.0<18
+BUILDLINK_ABI_DEPENDS.clang+=  clang>=17.0.0
 BUILDLINK_PKGSRCDIR.clang?=    ../../lang/clang
 
 BUILDLINK_FILES.clang+=                bin/amdgpu-arch
@@ -14,7 +14,7 @@ BUILDLINK_FILES.clang+=               bin/analyze-bui
 BUILDLINK_FILES.clang+=                bin/c-index-test
 BUILDLINK_FILES.clang+=                bin/clang
 BUILDLINK_FILES.clang+=                bin/clang++
-BUILDLINK_FILES.clang+=                bin/clang-16
+BUILDLINK_FILES.clang+=                bin/clang-17
 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.81 pkgsrc/lang/clang/distinfo:1.82
--- pkgsrc/lang/clang/distinfo:1.81     Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/clang/distinfo  Mon Apr 22 07:03:35 2024
@@ -1,16 +1,19 @@
-$NetBSD: distinfo,v 1.81 2023/10/06 19:15:20 adam Exp $
+$NetBSD: distinfo,v 1.82 2024/04/22 07:03:35 adam Exp $
 
-BLAKE2s (clang-16.0.6.src.tar.xz) = 528647ba7c3b87280ceb8c4a46eecf514600bad27cd1b71ee5ab32a28f8c5069
-SHA512 (clang-16.0.6.src.tar.xz) = 92c65b882e1504f4a9b8a3f6b8a24061505987aaacc8bb835115b4e4d74ac3a8c98343a308567b07c6b42bb99877c300bce3c4a5a25ada77abe65606aa25188d
-Size (clang-16.0.6.src.tar.xz) = 20356652 bytes
-BLAKE2s (cmake-16.0.6.src.tar.xz) = a967225f31bcd98484d632a2d530c498131b0035f18b15e27915663b915dc6ba
-SHA512 (cmake-16.0.6.src.tar.xz) = 52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b
-Size (cmake-16.0.6.src.tar.xz) = 9008 bytes
-SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
+BLAKE2s (clang-17.0.6.src.tar.xz) = 888020252b920ca120cc022d13cf411d7dc024f4076ccaff5eccc38dc1e4b438
+SHA512 (clang-17.0.6.src.tar.xz) = da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439
+Size (clang-17.0.6.src.tar.xz) = 21577596 bytes
+BLAKE2s (cmake-17.0.6.src.tar.xz) = 582f437814c47608b5a8e97e32b602103684755251f75c1b176d595db997ce1b
+SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
+Size (cmake-17.0.6.src.tar.xz) = 8712 bytes
+BLAKE2s (runtimes-17.0.6.src.tar.xz) = 73840072a471442d27a106bbd026ef334d4fe6be083f3e3f79f9ac69c8c9e1b9
+SHA512 (runtimes-17.0.6.src.tar.xz) = 3d73abf3c25eb319e12d9f4118158a05f26bb569534b1fe0dd2e99f948046e0bfa9511b61d65863506444ff330c065b9e3bb77310daf3c71dd658a01622fd812
+Size (runtimes-17.0.6.src.tar.xz) = 6240 bytes
+SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 4b511871c8a38d57f3fddc4a6c0e921ff53194cb
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
-SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 39d72a7f6cb9d0780c9fb79de6d032f320cccce3
+SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = f1f11228408a8872a1d3d57b18b389db14d592e8
 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
 SHA1 (patch-lib_Interpreter_IncrementalParser.cpp) = c5ace959ce566478316447b1621e9bfd9a537cc5
-SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = 4f0164da57d66f42c86a812e9b6703712ef7391c
+SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = d37f5f2fff2fb358911875f73f5bf48446940436
 SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
 SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525

Index: pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h
diff -u pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.4 pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.5
--- pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h:1.4   Sat Oct 19 13:54:29 2019
+++ pkgsrc/lang/clang/patches/patch-lib_Basic_Targets_OSTargets.h       Mon Apr 22 07:03:35 2024
@@ -1,36 +1,13 @@
-$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.4 2019/10/19 13:54:29 adam Exp $
+$NetBSD: patch-lib_Basic_Targets_OSTargets.h,v 1.5 2024/04/22 07:03:35 adam Exp $
 
 Sync SunOS default defines with a working reality.
 NetBSD __float128, needed to build anything with base libstdc++
 which assumes __float128.
 
---- lib/Basic/Targets/OSTargets.h.orig 2019-08-01 08:49:35.000000000 +0000
+--- lib/Basic/Targets/OSTargets.h.orig 2023-10-03 06:37:35.000000000 +0000
 +++ lib/Basic/Targets/OSTargets.h
-@@ -436,12 +436,22 @@ protected:
-     Builder.defineMacro("__ELF__");
-     if (Opts.POSIXThreads)
-       Builder.defineMacro("_REENTRANT");
-+    if (this->HasFloat128)
-+      Builder.defineMacro("__FLOAT128__");
-   }
- 
- public:
-   NetBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-       : OSTargetInfo<Target>(Triple, Opts) {
-     this->MCountName = "__mcount";
-+    switch (Triple.getArch()) {
-+    default:
-+      break;
-+    case llvm::Triple::x86:
-+    case llvm::Triple::x86_64:
-+      this->HasFloat128 = true;
-+      break;
-+    }
-   }
- };
- 
-@@ -610,22 +620,15 @@ protected:
-     Builder.defineMacro("__ELF__");
+@@ -628,22 +638,15 @@ protected:
+     DefineStd(Builder, "unix", Opts);
      Builder.defineMacro("__svr4__");
      Builder.defineMacro("__SVR4");
 -    // Solaris headers require _XOPEN_SOURCE to be set to 600 for C99 and

Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.11 pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.12
--- pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp:1.11      Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp   Mon Apr 22 07:03:35 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.11 2023/10/06 19:15:20 adam Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.12 2024/04/22 07:03:35 adam Exp $
 
 Use compiler-rt instead of libgcc.
 Pull in libcxx correctly.
@@ -7,13 +7,10 @@ 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     2023-04-05 05:36:38.000000000 +0200
-+++ lib/Driver/ToolChains/Solaris.cpp  2023-04-29 00:04:57.086200010 +0200
-@@ -52,8 +52,28 @@
-                                    const InputInfoList &Inputs,
-                                    const ArgList &Args,
-                                    const char *LinkingOutput) const {
-+  const Driver &D = getToolChain().getDriver();
+--- lib/Driver/ToolChains/Solaris.cpp.orig     2023-11-14 08:22:39.000000000 +0000
++++ lib/Driver/ToolChains/Solaris.cpp
+@@ -68,6 +68,25 @@ void solaris::Linker::ConstructJob(Compi
+   const bool IsPIE = getPIE(Args, getToolChain());
    ArgStringList CmdArgs;
  
 +  // XXX: assumes pkgsrc layout
@@ -38,7 +35,7 @@ Test removing -Bdynamic for golang.
    // Demangle C++ names in errors
    CmdArgs.push_back("-C");
  
-@@ -66,7 +86,6 @@
+@@ -85,7 +104,6 @@ void solaris::Linker::ConstructJob(Compi
      CmdArgs.push_back("-Bstatic");
      CmdArgs.push_back("-dn");
    } else {
@@ -46,7 +43,7 @@ Test removing -Bdynamic for golang.
      if (Args.hasArg(options::OPT_shared)) {
        CmdArgs.push_back("-shared");
      }
-@@ -88,9 +107,9 @@
+@@ -107,9 +125,9 @@ void solaris::Linker::ConstructJob(Compi
                     options::OPT_r)) {
      if (!Args.hasArg(options::OPT_shared))
        CmdArgs.push_back(
@@ -58,7 +55,7 @@ Test removing -Bdynamic for golang.
  
      const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
      bool HaveAnsi = false;
-@@ -105,16 +124,14 @@
+@@ -124,7 +142,7 @@ 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";
@@ -67,22 +64,10 @@ Test removing -Bdynamic for golang.
  
      const char *values_xpg = "values-xpg6.o";
      // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
-     if (LangStd && LangStd->getLanguage() == Language::C && !LangStd->isC99())
-       values_xpg = "values-xpg4.o";
-     CmdArgs.push_back(
--        Args.MakeArgString(getToolChain().GetFilePath(values_xpg)));
--    CmdArgs.push_back(
--        Args.MakeArgString(getToolChain().GetFilePath("crtbegin.o")));
-+        Args.MakeArgString(SysPath + values_xpg));
-     // Add crtfastmath.o if available and fast math is enabled.
-     getToolChain().addFastMathRuntimeIfAvailable(Args, CmdArgs);
-   }
-@@ -129,15 +146,6 @@
- 
-   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
-                    options::OPT_r)) {
--    if (getToolChain().ShouldLinkCXXStdlib(Args))
--      getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+@@ -158,13 +176,6 @@ void solaris::Linker::ConstructJob(Compi
+         getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+       CmdArgs.push_back("-lm");
+     }
 -    if (Args.hasArg(options::OPT_fstack_protector) ||
 -        Args.hasArg(options::OPT_fstack_protector_strong) ||
 -        Args.hasArg(options::OPT_fstack_protector_all)) {
@@ -93,7 +78,7 @@ Test removing -Bdynamic for golang.
      // 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) {
-@@ -145,12 +153,18 @@
+@@ -172,11 +183,13 @@ void solaris::Linker::ConstructJob(Compi
        CmdArgs.push_back("-latomic");
        CmdArgs.push_back(getAsNeededOption(getToolChain(), false));
      }
@@ -101,29 +86,29 @@ Test removing -Bdynamic for golang.
 -    CmdArgs.push_back("-lc");
 -    if (!Args.hasArg(options::OPT_shared)) {
 -      CmdArgs.push_back("-lgcc");
+-    }
++    
 +    // This specifically uses -Wl to avoid CMake parsing it and trying to
 +    // feed "-zdefaultextract" back into clang, which doesn't support the
 +    // non-space version.
 +    CmdArgs.push_back("-Wl,-zdefaultextract");
 +    AddRunTimeLibs(getToolChain(), D, CmdArgs, Args);
 +    CmdArgs.push_back(Args.MakeArgString(LibPath + "libunwind.a"));
-+    if (D.CCCIsCXX()) {
-+      if (getToolChain().ShouldLinkCXXStdlib(Args))
-+        getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
-       CmdArgs.push_back("-lm");
-     }
-+    CmdArgs.push_back("-lc");
+     const SanitizerArgs &SA = getToolChain().getSanitizerArgs(Args);
      if (NeedsSanitizerDeps) {
        linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
- 
-@@ -165,13 +179,7 @@
-     }
+@@ -195,17 +208,7 @@ void solaris::Linker::ConstructJob(Compi
+       CmdArgs.push_back("-znow");
    }
  
 -  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
 -                   options::OPT_r)) {
--    CmdArgs.push_back(
--        Args.MakeArgString(getToolChain().GetFilePath("crtend.o")));
+-    if (Args.hasArg(options::OPT_shared) || IsPIE)
+-      CmdArgs.push_back(
+-          Args.MakeArgString(getToolChain().GetFilePath("crtendS.o")));
+-    else
+-      CmdArgs.push_back(
+-          Args.MakeArgString(getToolChain().GetFilePath("crtend.o")));
 -    CmdArgs.push_back(
 -        Args.MakeArgString(getToolChain().GetFilePath("crtn.o")));
 -  }
@@ -131,7 +116,7 @@ Test removing -Bdynamic for golang.
  
    getToolChain().addProfileRTLibs(Args, CmdArgs);
  
-@@ -201,26 +209,9 @@
+@@ -235,26 +238,9 @@ Solaris::Solaris(const Driver &D, const
                   const ArgList &Args)
      : Generic_ELF(D, Triple, Args) {
  
@@ -161,7 +146,7 @@ Test removing -Bdynamic for golang.
  }
  
  SanitizerMask Solaris::getSupportedSanitizers() const {
-@@ -245,6 +236,31 @@
+@@ -276,6 +262,31 @@ Tool *Solaris::buildAssembler() const {
  
  Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); }
  
@@ -193,7 +178,7 @@ Test removing -Bdynamic for golang.
  void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
                                          ArgStringList &CC1Args) const {
    const Driver &D = getDriver();
-@@ -277,38 +293,20 @@
+@@ -308,38 +319,20 @@ void Solaris::AddClangSystemIncludeArgs(
      return;
    }
  

Index: pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
diff -u pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp:1.3 pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp:1.4
--- pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp:1.3    Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp        Mon Apr 22 07:03:35 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-lib_Lex_InitHeaderSearch.cpp,v 1.3 2023/10/06 19:15:20 adam Exp $
+$NetBSD: patch-lib_Lex_InitHeaderSearch.cpp,v 1.4 2024/04/22 07:03:35 adam Exp $
 
 Don't add /usr/local/include by default on Solaris.
 was: patch-lib_Frontend_InitHeaderSearch.cpp
 
---- lib/Lex/InitHeaderSearch.cpp.orig  2023-04-05 05:36:38.000000000 +0200
-+++ lib/Lex/InitHeaderSearch.cpp       2023-04-28 23:52:32.313523683 +0200
-@@ -236,6 +236,7 @@
-     case llvm::Triple::PS4:
-     case llvm::Triple::PS5:
+--- lib/Lex/InitHeaderSearch.cpp.orig  2023-10-03 06:37:35.000000000 +0000
++++ lib/Lex/InitHeaderSearch.cpp
+@@ -234,6 +234,7 @@ void InitHeaderSearch::AddDefaultCInclud
+     case llvm::Triple::CloudABI:
+     case llvm::Triple::NaCl:
      case llvm::Triple::ELFIAMCU:
 +    case llvm::Triple::Solaris:
        break;



Home | Main Index | Thread Index | Old Index