clang-netbsd: Update to SVN r. 310649

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Aug 10 20:53:00 2017 +0200
Changeset:	1d5584eb80189eef3938426a1db863d9039686f6

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

Log Message:
clang-netbsd: Update to SVN r. 310649

This change eliminates 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=1d5584eb80189eef3938426a1db863d9039686f6

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                              |  2 --
 .../patches/patch-lib_Driver_ToolChains_NetBSD.cpp | 24 ---------------
 clang-netbsd/patches/patch-test_Driver_fsanitize.c | 34 ----------------------
 4 files changed, 1 insertion(+), 61 deletions(-)

diffs:
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index ae2738193b..4e32236c4b 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=	309959
+SVN_REVISION.clang=	310649
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clang.llvm.org/
diff --git a/clang-netbsd/distinfo b/clang-netbsd/distinfo
index a5f3713961..6b4b43fbde 100644
--- a/clang-netbsd/distinfo
+++ b/clang-netbsd/distinfo
@@ -15,7 +15,5 @@ Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
 SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 6af7531d9cdc39037d8b0fb0c734cfba75922fc7
 SHA1 (patch-lib_Driver_ToolChains_CommonArgs.cpp) = 0319867c1a10db204d9ad6aa2a9d495503ee9395
 SHA1 (patch-lib_Driver_ToolChains_Gnu.cpp) = 241c603172fffe6bc8ef3a3733bd3f42c19abbf1
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = 73030f367e7671e198e8cab28d6c10c57e85c524
-SHA1 (patch-test_Driver_fsanitize.c) = d3b7913745c446c10f9a6cb93c2919f31ce2bc8f
 SHA1 (patch-test_Sema_128bitfloat.cpp) = cc11582dd9495b603a22ef73609ab04f65324da2
 SHA1 (patch-tools_clang-format_CMakeLists.txt) = f119d2a94cbfb8c00a285d1aa7789ed26f8309cf
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 e951783cc6..0000000000
--- a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/NetBSD.cpp.orig	2017-08-03 20:23:21.000000000 +0000
-+++ lib/Driver/ToolChains/NetBSD.cpp
-@@ -417,10 +417,18 @@ void NetBSD::addLibStdCxxIncludePaths(co
- }
- 
- SanitizerMask NetBSD::getSupportedSanitizers() const {
-+  const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
-   const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
-   SanitizerMask Res = ToolChain::getSupportedSanitizers();
--  if (IsX86_64) {
-+  if (IsX86 || IsX86_64) {
-     Res |= SanitizerKind::Address;
-+    Res |= SanitizerKind::Function;
-+    Res |= SanitizerKind::Leak;
-+    Res |= SanitizerKind::SafeStack;
-+    Res |= SanitizerKind::Vptr;
-+  }
-+  if (IsX86_64) {
-+    Res |= SanitizerKind::Thread;
-   }
-   return Res;
- }
diff --git a/clang-netbsd/patches/patch-test_Driver_fsanitize.c b/clang-netbsd/patches/patch-test_Driver_fsanitize.c
deleted file mode 100644
index ea7c123545..0000000000
--- a/clang-netbsd/patches/patch-test_Driver_fsanitize.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
---- test/Driver/fsanitize.c.orig	2017-08-09 17:39:17.394187956 +0000
-+++ test/Driver/fsanitize.c
-@@ -516,6 +516,29 @@
- // RUN: %clang -target x86_64-unknown-cloudabi -fsanitize=safe-stack %s -### 2>&1 | FileCheck %s -check-prefix=SAFESTACK-CLOUDABI
- // SAFESTACK-CLOUDABI: "-fsanitize=safe-stack"
- 
-+// RUN: %clang -target i386--netbsd -fsanitize=address %s -### 2>&1 | FileCheck %s -check-prefix=ADDRESS-NETBSD
-+// RUN: %clang -target x86_64--netbsd -fsanitize=address %s -### 2>&1 | FileCheck %s -check-prefix=ADDRESS-NETBSD
-+// ADDRESS-NETBSD: "-fsanitize=address"
-+
-+// RUN: %clang -target i386--netbsd -fsanitize=vptr %s -### 2>&1 | FileCheck %s -check-prefix=VPTR-NETBSD
-+// RUN: %clang -target x86_64--netbsd -fsanitize=vptr %s -### 2>&1 | FileCheck %s -check-prefix=VPTR-NETBSD
-+// VPTR-NETBSD: "-fsanitize=vptr"
-+
-+// RUN: %clang -target i386--netbsd -fsanitize=safe-stack %s -### 2>&1 | FileCheck %s -check-prefix=SAFESTACK-NETBSD
-+// RUN: %clang -target x86_64--netbsd -fsanitize=safe-stack %s -### 2>&1 | FileCheck %s -check-prefix=SAFESTACK-NETBSD
-+// SAFESTACK-NETBSD: "-fsanitize=safe-stack"
-+
-+// RUN: %clang -target i386--netbsd -fsanitize=function %s -### 2>&1 | FileCheck %s -check-prefix=FUNCTION-NETBSD
-+// RUN: %clang -target x86_64--netbsd -fsanitize=function %s -### 2>&1 | FileCheck %s -check-prefix=FUNCTION-NETBSD
-+// FUNCTION-NETBSD: "-fsanitize=function"
-+
-+// RUN: %clang -target i386--netbsd -fsanitize=leak %s -### 2>&1 | FileCheck %s -check-prefix=LEAK-NETBSD
-+// RUN: %clang -target x86_64--netbsd -fsanitize=leak %s -### 2>&1 | FileCheck %s -check-prefix=LEAK-NETBSD
-+// LEAK-NETBSD: "-fsanitize=leak"
-+
-+// RUN: %clang -target x86_64--netbsd -fsanitize=thread %s -### 2>&1 | FileCheck %s -check-prefix=THREAD-NETBSD
-+// THREAD-NETBSD: "-fsanitize=thread"
-+
- // RUN: %clang -target x86_64-scei-ps4 -fsanitize=function -fsanitize=undefined %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-FSAN-UBSAN-PS4
- // CHECK-FSAN-UBSAN-PS4: unsupported option '-fsanitize=function' for target 'x86_64-scei-ps4'
- // RUN: %clang -target x86_64-scei-ps4 -fsanitize=function %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-FSAN-PS4