clang-netbsd: Revamp local patch for HEAD

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Aug 9 19:26:28 2017 +0200
Changeset:	c2e93f844105a3f0779f326fa7c9df1dbb8b2fb1

Modified Files:
	clang-netbsd/distinfo
Added Files:
	clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
	clang-netbsd/patches/patch-test_Driver_fsanitize.c
Removed Files:
	clang-netbsd/patches/patch-aa
	clang-netbsd/patches/patch-lib_Basic_Targets.cpp

Log Message:
clang-netbsd: Revamp local patch for HEAD

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

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

diffstat:
 clang-netbsd/distinfo                              |  4 +--
 clang-netbsd/patches/patch-aa                      | 18 ------------
 clang-netbsd/patches/patch-lib_Basic_Targets.cpp   |  2 --
 .../patches/patch-lib_Driver_ToolChains_NetBSD.cpp | 24 +++++++++++++++
 clang-netbsd/patches/patch-test_Driver_fsanitize.c | 34 ++++++++++++++++++++++
 5 files changed, 60 insertions(+), 22 deletions(-)

diffs:
diff --git a/clang-netbsd/distinfo b/clang-netbsd/distinfo
index 6d88a17b86..a5f3713961 100644
--- a/clang-netbsd/distinfo
+++ b/clang-netbsd/distinfo
@@ -12,10 +12,10 @@ 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-aa) = 181ffa84ba9f089920423d2b8bb9abcf55e03561
-SHA1 (patch-lib_Basic_Targets.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
 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-aa b/clang-netbsd/patches/patch-aa
deleted file mode 100644
index ce9408b3b0..0000000000
--- a/clang-netbsd/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- ./lib/Driver/ToolChains/NetBSD.cpp.orig	2017-08-08 20:54:53.959690124 +0000
-+++ ./lib/Driver/ToolChains/NetBSD.cpp
-@@ -422,6 +422,13 @@ SanitizerMask NetBSD::getSupportedSaniti
-   SanitizerMask Res = ToolChain::getSupportedSanitizers();
-   if (IsX86 || IsX86_64) {
-     Res |= SanitizerKind::Address;
-+    Res |= SanitizerKind::Vptr;
-+    Res |= SanitizerKind::Leak;
-+    Res |= SanitizerKind::SafeStack;
-+  }
-+  if (IsX86_64) {
-+    Res |= SanitizerKind::Leak;
-+    Res |= SanitizerKind::Thread;
-   }
-   return Res;
- }
diff --git a/clang-netbsd/patches/patch-lib_Basic_Targets.cpp b/clang-netbsd/patches/patch-lib_Basic_Targets.cpp
deleted file mode 100644
index afc76512f4..0000000000
--- a/clang-netbsd/patches/patch-lib_Basic_Targets.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-$NetBSD$
-
diff --git a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
new file mode 100644
index 0000000000..e951783cc6
--- /dev/null
+++ b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 0000000000..ea7c123545
--- /dev/null
+++ b/clang-netbsd/patches/patch-test_Driver_fsanitize.c
@@ -0,0 +1,34 @@
+$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