llvm-netbsd: Register NetBSD/i386 ASan address range

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon May 7 23:49:51 2018 +0200
Changeset:	500a1ece31e5e1993a84d132c5d168e11d3296f5

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

Log Message:
llvm-netbsd: Register NetBSD/i386 ASan address range

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=500a1ece31e5e1993a84d132c5d168e11d3296f5

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

diffstat:
 llvm-netbsd/distinfo                                    |  2 +-
 ...-lib_Transforms_Instrumentation_AddressSanitizer.cpp | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diffs:
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index 48315cf744..5130279ab9 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) = 239ca19d58c644a3eeed3387b03b95aeceeac8ba
+SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = b7cf17dd0188746ec033f6e0c8780b5de625dc06
 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 79792b534f..8f9b2c4562 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
@@ -1,16 +1,27 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2017-12-08 18:49:42.512633016 +0000
+--- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2018-02-16 03:29:35.000000000 +0000
 +++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
-@@ -108,6 +108,7 @@ static const uint64_t kAArch64_ShadowOff
+@@ -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;
  static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
++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;
  
-@@ -526,9 +527,12 @@ static ShadowMapping getShadowMapping(Tr
+@@ -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
        Mapping.Offset = kSystemZ_ShadowOffset64;
      else if (IsFreeBSD)
        Mapping.Offset = kFreeBSD_ShadowOffset64;