clang-netbsd: Upgrade to SVN r. 332071

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri May 11 03:23:29 2018 +0200
Changeset:	d8294692cebf24ec66c51bf294dedec2ae95ffc9

Modified Files:
	clang-netbsd/Makefile.common
	clang-netbsd/distinfo
Removed Files:
	clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp

Log Message:
clang-netbsd: Upgrade to SVN r. 332071

Patches merged upstream:
r332071 Support XRay in the NetBSD driver
r332070 Permit -fxray-instrument for NetBSD/amd64

Sponsored by <The NetBSD Foundation>

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

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

diffstat:
 clang-netbsd/Makefile.common                       |   2 +-
 clang-netbsd/distinfo                              |   1 -
 .../patches/patch-lib_Driver_ToolChains_NetBSD.cpp | 138 ---------------------
 3 files changed, 1 insertion(+), 140 deletions(-)

diffs:
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index 31b0260482..294a967d4c 100644
--- a/clang-netbsd/Makefile.common
+++ b/clang-netbsd/Makefile.common
@@ -6,7 +6,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	clang
 SVN_REPO.clang=		http://llvm.org/svn/llvm-project/cfe/trunk
-SVN_REVISION.clang=	332053
+SVN_REVISION.clang=	332071
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clang.llvm.org/
diff --git a/clang-netbsd/distinfo b/clang-netbsd/distinfo
index 30b0a22925..0b0f116088 100644
--- a/clang-netbsd/distinfo
+++ b/clang-netbsd/distinfo
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
 SHA1 (patch-lib_Basic_Targets_OSTargets.h) = b6acc576a95305931338c54b18e02fe9813796cf
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = c4fda0795e16de454dff1aa07a834a0c9e1a5696
 SHA1 (patch-test_Sema_128bitfloat.cpp) = badf88253b37f921c588f568fb8841be8556c5f3
 SHA1 (patch-tools_clang-format_CMakeLists.txt) = 9ba2acd056dcac4b6cd72bc335f192134ecad125
diff --git a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
deleted file mode 100644
index c4b8ec723e..0000000000
--- a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/NetBSD.cpp.orig	2018-04-27 13:38:11.000000000 +0000
-+++ lib/Driver/ToolChains/NetBSD.cpp
-@@ -112,7 +112,9 @@ void netbsd::Linker::ConstructJob(Compil
-                                   const InputInfoList &Inputs,
-                                   const ArgList &Args,
-                                   const char *LinkingOutput) const {
--  const Driver &D = getToolChain().getDriver();
-+  const toolchains::NetBSD &ToolChain =
-+    static_cast<const toolchains::NetBSD &>(getToolChain());
-+  const Driver &D = ToolChain.getDriver();
-   ArgStringList CmdArgs;
- 
-   if (!D.SysRoot.empty())
-@@ -135,7 +137,7 @@ void netbsd::Linker::ConstructJob(Compil
- 
-   // Many NetBSD architectures support more than one ABI.
-   // Determine the correct emulation for ld.
--  switch (getToolChain().getArch()) {
-+  switch (ToolChain.getArch()) {
-   case llvm::Triple::x86:
-     CmdArgs.push_back("-m");
-     CmdArgs.push_back("elf_i386");
-@@ -143,7 +145,7 @@ void netbsd::Linker::ConstructJob(Compil
-   case llvm::Triple::arm:
-   case llvm::Triple::thumb:
-     CmdArgs.push_back("-m");
--    switch (getToolChain().getTriple().getEnvironment()) {
-+    switch (ToolChain.getTriple().getEnvironment()) {
-     case llvm::Triple::EABI:
-     case llvm::Triple::GNUEABI:
-       CmdArgs.push_back("armelf_nbsd_eabi");
-@@ -159,9 +161,9 @@ void netbsd::Linker::ConstructJob(Compil
-     break;
-   case llvm::Triple::armeb:
-   case llvm::Triple::thumbeb:
--    arm::appendEBLinkFlags(Args, CmdArgs, getToolChain().getEffectiveTriple());
-+    arm::appendEBLinkFlags(Args, CmdArgs, ToolChain.getEffectiveTriple());
-     CmdArgs.push_back("-m");
--    switch (getToolChain().getTriple().getEnvironment()) {
-+    switch (ToolChain.getTriple().getEnvironment()) {
-     case llvm::Triple::EABI:
-     case llvm::Triple::GNUEABI:
-       CmdArgs.push_back("armelfb_nbsd_eabi");
-@@ -179,13 +181,13 @@ void netbsd::Linker::ConstructJob(Compil
-   case llvm::Triple::mips64el:
-     if (mips::hasMipsAbiArg(Args, "32")) {
-       CmdArgs.push_back("-m");
--      if (getToolChain().getArch() == llvm::Triple::mips64)
-+      if (ToolChain.getArch() == llvm::Triple::mips64)
-         CmdArgs.push_back("elf32btsmip");
-       else
-         CmdArgs.push_back("elf32ltsmip");
-     } else if (mips::hasMipsAbiArg(Args, "64")) {
-       CmdArgs.push_back("-m");
--      if (getToolChain().getArch() == llvm::Triple::mips64)
-+      if (ToolChain.getArch() == llvm::Triple::mips64)
-         CmdArgs.push_back("elf64btsmip");
-       else
-         CmdArgs.push_back("elf64ltsmip");
-@@ -226,16 +228,16 @@ void netbsd::Linker::ConstructJob(Compil
-   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
-     if (!Args.hasArg(options::OPT_shared)) {
-       CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crt0.o")));
-+          Args.MakeArgString(ToolChain.GetFilePath("crt0.o")));
-     }
-     CmdArgs.push_back(
--        Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
-+        Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
-     if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie)) {
-       CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crtbeginS.o")));
-+          Args.MakeArgString(ToolChain.GetFilePath("crtbeginS.o")));
-     } else {
-       CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crtbegin.o")));
-+          Args.MakeArgString(ToolChain.GetFilePath("crtbegin.o")));
-     }
-   }
- 
-@@ -248,13 +250,14 @@ void netbsd::Linker::ConstructJob(Compil
-   Args.AddAllArgs(CmdArgs, options::OPT_r);
- 
-   bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, CmdArgs);
-+  bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
-   AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
- 
-   unsigned Major, Minor, Micro;
--  getToolChain().getTriple().getOSVersion(Major, Minor, Micro);
-+  ToolChain.getTriple().getOSVersion(Major, Minor, Micro);
-   bool useLibgcc = true;
-   if (Major >= 7 || Major == 0) {
--    switch (getToolChain().getArch()) {
-+    switch (ToolChain.getArch()) {
-     case llvm::Triple::aarch64:
-     case llvm::Triple::aarch64_be:
-     case llvm::Triple::arm:
-@@ -278,12 +281,14 @@ void netbsd::Linker::ConstructJob(Compil
-   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
-     addOpenMPRuntime(CmdArgs, getToolChain(), Args);
-     if (D.CCCIsCXX()) {
--      if (getToolChain().ShouldLinkCXXStdlib(Args))
--        getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
-+      if (ToolChain.ShouldLinkCXXStdlib(Args))
-+        ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-       CmdArgs.push_back("-lm");
-     }
-     if (NeedsSanitizerDeps)
-       linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
-+    if (NeedsXRayDeps)
-+      linkXRayRuntimeDeps(ToolChain, CmdArgs);
-     if (Args.hasArg(options::OPT_pthread))
-       CmdArgs.push_back("-lpthread");
-     CmdArgs.push_back("-lc");
-@@ -308,16 +313,16 @@ void netbsd::Linker::ConstructJob(Compil
-   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
-     if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie))
-       CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crtendS.o")));
-+          Args.MakeArgString(ToolChain.GetFilePath("crtendS.o")));
-     else
-       CmdArgs.push_back(
--          Args.MakeArgString(getToolChain().GetFilePath("crtend.o")));
--    CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crtn.o")));
-+          Args.MakeArgString(ToolChain.GetFilePath("crtend.o")));
-+    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
-   }
- 
--  getToolChain().addProfileRTLibs(Args, CmdArgs);
-+  ToolChain.addProfileRTLibs(Args, CmdArgs);
- 
--  const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath());
-+  const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath());
-   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
- }
-