llvm-netbsd: Upgrade to SVN r. 316591

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Oct 25 19:45:49 2017 +0200
Changeset:	4aef5cc8921a46da2ab833bb1196b8d25e8404c1

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

Log Message:
llvm-netbsd: Upgrade to SVN r. 316591

This revision contains merged code for sanitizers/NetBSD.

https://reviews.llvm.org/D39124

Rediff local patches for upstream changes.

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=4aef5cc8921a46da2ab833bb1196b8d25e8404c1

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                                         |  4 ++--
 ...patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp |  8 ++++----
 .../patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs:
diff --git a/llvm-netbsd/Makefile.common b/llvm-netbsd/Makefile.common
index a44bc731c1..167ed497f4 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=	315927
+SVN_REVISION.llvm=	316591
 
 WRKSRC=			${WRKDIR}/llvm
 
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index e7629307a6..043e7e59ce 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
 SHA1 (patch-cmake_config-ix.cmake) = ba413c9c566cdc0aee351d6ec53f566de425799a
-SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = ad230c1f0091f28451a29a11050588f412824e53
+SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 7dc1016433e88c397e066512f1909a0beae4d22e
 SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 871b474f415d9dc468cc07477101f88d7a20868b
-SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = 64fdbb55c77d5f5f73152d2f8daa28adfc428e40
+SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = c6487f23df920a2d049ba80e7224b32af55b5545
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
index b4de11fd28..e0296cfa61 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
@@ -1,16 +1,16 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2017-08-28 22:11:31.000000000 +0000
+--- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2017-10-25 17:03:37.916518801 +0000
 +++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
-@@ -84,6 +84,7 @@ static const uint64_t kAArch64_ShadowOff
+@@ -107,6 +107,7 @@ static const uint64_t kAArch64_ShadowOff
  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 kNetBSDKasan_ShadowOffset64 = 0xdffffc0000000000;
  static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
  static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
- // The shadow memory space is dynamically allocated.
-@@ -448,9 +449,12 @@ static ShadowMapping getShadowMapping(Tr
+ 
+@@ -505,9 +506,12 @@ static ShadowMapping getShadowMapping(Tr
        Mapping.Offset = kSystemZ_ShadowOffset64;
      else if (IsFreeBSD)
        Mapping.Offset = kFreeBSD_ShadowOffset64;
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
index 4ef2227185..ecb73afe0d 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig	2017-06-12 00:24:36.000000000 +0000
+--- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig	2017-10-25 17:03:32.656232584 +0000
 +++ lib/Transforms/Instrumentation/MemorySanitizer.cpp
-@@ -280,6 +280,14 @@ static const MemoryMapParams FreeBSD_X86
+@@ -320,6 +320,14 @@ static const MemoryMapParams FreeBSD_X86
    0x380000000000,  // OriginBase
  };
  
@@ -17,7 +17,7 @@ $NetBSD$
  static const PlatformMemoryMapParams Linux_X86_MemoryMapParams = {
    &Linux_I386_MemoryMapParams,
    &Linux_X86_64_MemoryMapParams,
-@@ -305,6 +313,11 @@ static const PlatformMemoryMapParams Fre
+@@ -345,6 +353,11 @@ static const PlatformMemoryMapParams Fre
    &FreeBSD_X86_64_MemoryMapParams,
  };
  
@@ -26,10 +26,10 @@ $NetBSD$
 +  &NetBSD_X86_64_MemoryMapParams,
 +};
 +
+ namespace {
+ 
  /// \brief An instrumentation pass implementing detection of uninitialized
- /// reads.
- ///
-@@ -515,6 +528,15 @@ bool MemorySanitizer::doInitialization(M
+@@ -577,6 +590,15 @@ bool MemorySanitizer::doInitialization(M
            report_fatal_error("unsupported architecture");
        }
        break;