clang-git: Rebase to current and drop merged patches

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Aug 5 16:47:31 2017 +0200
Changeset:	a213f8f9cc71bcb5f5b0648db19ad6f80c0c3203

Modified Files:
	clang-git/Makefile.common
	clang-git/distinfo
Removed Files:
	clang-git/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
	clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
	clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.h

Log Message:
clang-git: Rebase to current and drop merged patches

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=a213f8f9cc71bcb5f5b0648db19ad6f80c0c3203

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

diffstat:
 clang-git/Makefile.common                          |  1 -
 clang-git/distinfo                                 |  3 --
 .../patch-lib_Driver_ToolChains_CommonArgs.cpp     | 12 -------
 .../patches/patch-lib_Driver_ToolChains_NetBSD.cpp | 42 ----------------------
 .../patches/patch-lib_Driver_ToolChains_NetBSD.h   | 12 -------
 5 files changed, 70 deletions(-)

diffs:
diff --git a/clang-git/Makefile.common b/clang-git/Makefile.common
index 09428d259e..9ead3f9a50 100644
--- a/clang-git/Makefile.common
+++ b/clang-git/Makefile.common
@@ -6,7 +6,6 @@ CATEGORIES=	lang devel
 
 GIT_REPOSITORIES=	clang
 GIT_REPO.clang=		git://github.com/llvm-mirror/clang.git
-GIT_REVISION.clang=	58123a81df74bcd2051b11f77a6a38277764a0d7
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clang.llvm.org/
diff --git a/clang-git/distinfo b/clang-git/distinfo
index c39686c0df..1ca315a1c5 100644
--- a/clang-git/distinfo
+++ b/clang-git/distinfo
@@ -12,7 +12,4 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-lib_Driver_ToolChains_CommonArgs.cpp) = 285bbfc2cdc058e53e8160bd6aff1ce5298b76e5
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = 6ddeadc54bed840bd7654ec602dfbd20b071f2d9
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.h) = 4891098cce9cab17e01924fa7ea3a9b7cff69b26
 SHA1 (patch-tools_clang-format_CMakeLists.txt) = f119d2a94cbfb8c00a285d1aa7789ed26f8309cf
diff --git a/clang-git/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp b/clang-git/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
deleted file mode 100644
index 7a585748fb..0000000000
--- a/clang-git/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-07-02 16:11:01.135157051 +0000
-+++ lib/Driver/ToolChains/CommonArgs.cpp
-@@ -524,6 +524,7 @@ void tools::linkSanitizerRuntimeDeps(con
-   CmdArgs.push_back("-lm");
-   // There's no libdl on FreeBSD or RTEMS.
-   if (TC.getTriple().getOS() != llvm::Triple::FreeBSD &&
-+      TC.getTriple().getOS() != llvm::Triple::NetBSD &&
-       TC.getTriple().getOS() != llvm::Triple::RTEMS)
-     CmdArgs.push_back("-ldl");
- }
diff --git a/clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.cpp b/clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
deleted file mode 100644
index 86732b4148..0000000000
--- a/clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/NetBSD.cpp.orig	2017-07-02 16:11:01.139600632 +0000
-+++ lib/Driver/ToolChains/NetBSD.cpp
-@@ -15,6 +15,7 @@
- #include "clang/Driver/Compilation.h"
- #include "clang/Driver/Driver.h"
- #include "clang/Driver/Options.h"
-+#include "clang/Driver/SanitizerArgs.h"
- #include "llvm/Option/ArgList.h"
- 
- using namespace clang::driver;
-@@ -246,6 +247,7 @@ void netbsd::Linker::ConstructJob(Compil
-   Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);
-   Args.AddAllArgs(CmdArgs, options::OPT_r);
- 
-+  bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, CmdArgs);
-   AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
- 
-   unsigned Major, Minor, Micro;
-@@ -279,6 +281,8 @@ void netbsd::Linker::ConstructJob(Compil
-       getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
-       CmdArgs.push_back("-lm");
-     }
-+    if (NeedsSanitizerDeps)
-+      linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
-     if (Args.hasArg(options::OPT_pthread))
-       CmdArgs.push_back("-lpthread");
-     CmdArgs.push_back("-lc");
-@@ -410,3 +414,12 @@ void NetBSD::addLibStdCxxIncludePaths(co
-   addLibStdCXXIncludePaths(getDriver().SysRoot, "/usr/include/g++", "", "", "",
-                            "", DriverArgs, CC1Args);
- }
-+
-+SanitizerMask NetBSD::getSupportedSanitizers() const {
-+  const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
-+  SanitizerMask Res = ToolChain::getSupportedSanitizers();
-+  if (IsX86_64) {
-+    Res |= SanitizerKind::Address;
-+  }
-+  return Res;
-+}
diff --git a/clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.h b/clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.h
deleted file mode 100644
index 3c269bb64f..0000000000
--- a/clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/NetBSD.h.orig	2017-07-02 16:11:01.139650639 +0000
-+++ lib/Driver/ToolChains/NetBSD.h
-@@ -66,6 +66,7 @@ public:
-       llvm::opt::ArgStringList &CC1Args) const override;
- 
-   bool IsUnwindTablesDefault() const override { return true; }
-+  SanitizerMask getSupportedSanitizers() const override;
- 
- protected:
-   Tool *buildAssembler() const override;