CVS commit: pkgsrc/lang/clang

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sun Nov  3 11:55:53 UTC 2019

Modified Files:
        pkgsrc/lang/clang: Makefile distinfo
Added Files:
        pkgsrc/lang/clang/patches: patch-lib_Driver_ToolChain.cpp

Log Message:
lld: Cherry-pick NetBSD LLD pending patch from review

[LLD] Add NetBSD support as a new flavor of LLD (nb.lld)
https://reviews.llvm.org/D69755


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/lang/clang/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/lang/clang/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.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.52 pkgsrc/lang/clang/Makefile:1.53
--- pkgsrc/lang/clang/Makefile:1.52     Thu Oct 24 11:40:00 2019
+++ pkgsrc/lang/clang/Makefile  Sun Nov  3 11:55:53 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2019/10/24 11:40:00 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/03 11:55:53 kamil Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/.src//:S/cfe/clang/}
-PKGREVISION=   2
+PKGREVISION=   3
 
 CMAKE_ARGS+=   -DCLANG_ENABLE_STATIC_ANALYZER=OFF
 

Index: pkgsrc/lang/clang/distinfo
diff -u pkgsrc/lang/clang/distinfo:1.61 pkgsrc/lang/clang/distinfo:1.62
--- pkgsrc/lang/clang/distinfo:1.61     Mon Oct 21 11:47:16 2019
+++ pkgsrc/lang/clang/distinfo  Sun Nov  3 11:55:53 2019
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.61 2019/10/21 11:47:16 rjs Exp $
+$NetBSD: distinfo,v 1.62 2019/11/03 11:55:53 kamil Exp $
 
 SHA1 (cfe-9.0.0.src.tar.xz) = 6977cf7a802a053c57fa74138d3648b563e71e88
 RMD160 (cfe-9.0.0.src.tar.xz) = 43a9fde0f388fe6d021357bb4382bef6d445f279
 SHA512 (cfe-9.0.0.src.tar.xz) = 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
 Size (cfe-9.0.0.src.tar.xz) = 13533024 bytes
 SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
+SHA1 (patch-lib_Driver_ToolChain.cpp) = b49a6032d75e33ffe2606012addd826e9fdbb1db
 SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = 139daaafefeb23101b74a89cb6a932d4ec460c8e
 SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = a704f038f98adf4e92baaf9058bd801921af9ede
 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 94968d0de0972ff832727822fbdc02442be74ab8

Added files:

Index: pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp
diff -u /dev/null pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp:1.1
--- /dev/null   Sun Nov  3 11:55:54 2019
+++ pkgsrc/lang/clang/patches/patch-lib_Driver_ToolChain.cpp    Sun Nov  3 11:55:53 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_Driver_ToolChain.cpp,v 1.1 2019/11/03 11:55:53 kamil Exp $
+
+[LLD] Add NetBSD support as a new flavor of LLD (nb.lld)
+https://reviews.llvm.org/D69755
+
+--- lib/Driver/ToolChain.cpp.orig      2019-07-11 19:06:38.000000000 +0000
++++ lib/Driver/ToolChain.cpp
+@@ -506,6 +506,8 @@ std::string ToolChain::GetLinkerPath() c
+     llvm::SmallString<8> LinkerName;
+     if (Triple.isOSDarwin())
+       LinkerName.append("ld64.");
++    else if (Triple.isOSNetBSD())
++      LinkerName.append("nb.");
+     else
+       LinkerName.append("ld.");
+     LinkerName.append(UseLinker);