llvm-all-in-one: Update to SVN r. 311941

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 29 00:05:49 2017 +0200
Changeset:	a6531a085d0d81e30bc3e91147181daa33fa71ef

Modified Files:
	llvm-all-in-one/Makefile
	llvm-all-in-one/distinfo
Removed Files:
	llvm-all-in-one/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp

Log Message:
llvm-all-in-one: Update to SVN r. 311941

Drop local patch for asan, merged upstream.

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

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

diffstat:
 llvm-all-in-one/Makefile                           |  2 +-
 llvm-all-in-one/distinfo                           |  1 -
 ...Transforms_Instrumentation_AddressSanitizer.cpp | 29 ----------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diffs:
diff --git a/llvm-all-in-one/Makefile b/llvm-all-in-one/Makefile
index 7394f127a8..6453adb25a 100644
--- a/llvm-all-in-one/Makefile
+++ b/llvm-all-in-one/Makefile
@@ -4,7 +4,7 @@ LLVM_VERSION=	6.0.0
 
 CATEGORIES=	lang devel
 
-LLVM_SVN_REV=		311454
+LLVM_SVN_REV=		311941
 
 SVN_REPOSITORIES=		llvm
 SVN_REPO.llvm=			http://llvm.org/svn/llvm-project/llvm/trunk
diff --git a/llvm-all-in-one/distinfo b/llvm-all-in-one/distinfo
index 218cd09607..af8a590409 100644
--- a/llvm-all-in-one/distinfo
+++ b/llvm-all-in-one/distinfo
@@ -17,7 +17,6 @@ SHA1 (patch-include_llvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h) = e2f96f49
 SHA1 (patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp) = b24a57af1c6fea12f0dd252ccfd23ce6945f307d
 SHA1 (patch-lib_ExecutionEngine_SectionMemoryManager.cpp) = f3498378be67171ad4d1a211f6172d5f2f8248f7
 SHA1 (patch-lib_Support_Unix_Memory.inc) = 8b9b220178e94f17d1a66637277e07f887db9f79
-SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 67eee29c4d8525b603e6b7c0a52278bdf3353687
 SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 871b474f415d9dc468cc07477101f88d7a20868b
 SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = 64fdbb55c77d5f5f73152d2f8daa28adfc428e40
 SHA1 (patch-unittests_Support_MemoryTest.cpp) = 2b70513d36138d37eda5636c07b195e1ff0c9097
diff --git a/llvm-all-in-one/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp b/llvm-all-in-one/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
deleted file mode 100644
index a28fed92ae..0000000000
--- a/llvm-all-in-one/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2017-05-29 09:26:46.000000000 +0000
-+++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
-@@ -80,6 +80,7 @@ static const uint64_t kMIPS64_ShadowOffs
- static const uint64_t kAArch64_ShadowOffset64 = 1ULL << 36;
- static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
- static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
-+static const uint64_t kNetBSD_ShadowOffset64 = 1ULL << 46;
- static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
- static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
- // The shadow memory space is dynamically allocated.
-@@ -394,6 +395,7 @@ static ShadowMapping getShadowMapping(Tr
-   bool IsAndroid = TargetTriple.isAndroid();
-   bool IsIOS = TargetTriple.isiOS() || TargetTriple.isWatchOS();
-   bool IsFreeBSD = TargetTriple.isOSFreeBSD();
-+  bool IsNetBSD = TargetTriple.isOSNetBSD();
-   bool IsPS4CPU = TargetTriple.isPS4CPU();
-   bool IsLinux = TargetTriple.isOSLinux();
-   bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64 ||
-@@ -438,6 +440,8 @@ static ShadowMapping getShadowMapping(Tr
-       Mapping.Offset = kSystemZ_ShadowOffset64;
-     else if (IsFreeBSD)
-       Mapping.Offset = kFreeBSD_ShadowOffset64;
-+    else if (IsNetBSD)
-+      Mapping.Offset = kNetBSD_ShadowOffset64;
-     else if (IsPS4CPU)
-       Mapping.Offset = kPS4CPU_ShadowOffset64;
-     else if (IsLinux && IsX86_64) {