llvm-netbsd: Update 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:17:25 2018 +0200
Changeset:	7427370bd2d9c7fd87dff0d41ff6bc8b7e51edee

Modified Files:
	llvm-netbsd/Makefile.common
	llvm-netbsd/distinfo
	llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp

Log Message:
llvm-netbsd: Update to SVN r. 332071

Patch merged upstream:
r332069 - Register NetBSD/i386 in AddressSanitizer.cpp

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=7427370bd2d9c7fd87dff0d41ff6bc8b7e51edee

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

diffstat:
 llvm-netbsd/Makefile.common                           |  2 +-
 llvm-netbsd/distinfo                                  |  2 +-
 ...ib_Transforms_Instrumentation_AddressSanitizer.cpp | 19 ++++---------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diffs:
diff --git a/llvm-netbsd/Makefile.common b/llvm-netbsd/Makefile.common
index e55e202c54..34d807ed95 100644
--- a/llvm-netbsd/Makefile.common
+++ b/llvm-netbsd/Makefile.common
@@ -19,7 +19,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	llvm
 SVN_REPO.llvm=		http://llvm.org/svn/llvm-project/llvm/trunk
-SVN_REVISION.llvm=	332053
+SVN_REVISION.llvm=	332071
 
 WRKSRC=			${WRKDIR}/llvm
 
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index 5130279ab9..7d09f39941 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
 SHA1 (patch-cmake_config-ix.cmake) = 55f484948dfb3293917ede3144d7c83f78c555b3
-SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = b7cf17dd0188746ec033f6e0c8780b5de625dc06
+SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 31d2936ccbab17067faf4f3f1695d1002022eb56
 SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 653876deaaecb4aff8fd052d45da7c6516e876fc
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
index 8f9b2c4562..05156c0d97 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
@@ -1,27 +1,16 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2018-02-16 03:29:35.000000000 +0000
+--- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2018-05-11 01:06:43.059844428 +0000
 +++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
-@@ -107,7 +107,9 @@ static const uint64_t kMIPS64_ShadowOffs
- static const uint64_t kAArch64_ShadowOffset64 = 1ULL << 36;
- static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
+@@ -109,6 +109,7 @@ static const uint64_t kFreeBSD_ShadowOff
  static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
-+static const uint64_t kNetBSD_ShadowOffset32 = 1ULL << 30;
+ static const uint64_t kNetBSD_ShadowOffset32 = 1ULL << 30;
  static const uint64_t kNetBSD_ShadowOffset64 = 1ULL << 46;
 +static const uint64_t kNetBSDKasan_ShadowOffset64 = 0xdffffc0000000000;
  static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
  static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
  
-@@ -508,6 +510,8 @@ static ShadowMapping getShadowMapping(Tr
-       Mapping.Offset = kMIPS32_ShadowOffset32;
-     else if (IsFreeBSD)
-       Mapping.Offset = kFreeBSD_ShadowOffset32;
-+    else if (IsNetBSD)
-+      Mapping.Offset = kNetBSD_ShadowOffset32;
-     else if (IsIOS)
-       // If we're targeting iOS and x86, the binary is built for iOS simulator.
-       Mapping.Offset = IsX86 ? kIOSSimShadowOffset32 : kIOSShadowOffset32;
-@@ -526,9 +530,12 @@ static ShadowMapping getShadowMapping(Tr
+@@ -529,9 +530,12 @@ static ShadowMapping getShadowMapping(Tr
        Mapping.Offset = kSystemZ_ShadowOffset64;
      else if (IsFreeBSD)
        Mapping.Offset = kFreeBSD_ShadowOffset64;