llvm-netbsd: Rebase to svn r. 340168

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 21 22:50:04 2018 +0200
Changeset:	ace54a31be9b7060fbeb3768bc3a214917b14545

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_InstrProfiling.cpp

Log Message:
llvm-netbsd: Rebase to svn r. 340168

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ace54a31be9b7060fbeb3768bc3a214917b14545

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_InstrProfiling.cpp       | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs:
diff --git a/llvm-netbsd/Makefile.common b/llvm-netbsd/Makefile.common
index d524fb62f2..b46734b7ef 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=	333732
+SVN_REVISION.llvm=	340168
 
 WRKSRC=			${WRKDIR}/llvm
 
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index 38f15ac484..6cf1243907 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -2,5 +2,5 @@ $NetBSD$
 
 SHA1 (patch-cmake_config-ix.cmake) = 55f484948dfb3293917ede3144d7c83f78c555b3
 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 8b3f8fb7377f741796f1b427b6ef5f830059a8f9
-SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 31d2936ccbab17067faf4f3f1695d1002022eb56
-SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 653876deaaecb4aff8fd052d45da7c6516e876fc
+SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = b9385bca21c08803ca675b85012f68b8de08d99a
+SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 7febdbfdc31c20b50910abc19079b2828a7c3ddf
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
index 05156c0d97..4075db456d 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2018-05-11 01:06:43.059844428 +0000
+--- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2018-08-20 14:06:28.442123766 +0000
 +++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
 @@ -109,6 +109,7 @@ static const uint64_t kFreeBSD_ShadowOff
  static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
@@ -10,14 +10,14 @@ $NetBSD$
  static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
  static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
  
-@@ -529,9 +530,12 @@ static ShadowMapping getShadowMapping(Tr
+@@ -540,9 +541,12 @@ static ShadowMapping getShadowMapping(Tr
        Mapping.Offset = kSystemZ_ShadowOffset64;
-     else if (IsFreeBSD)
+     else if (IsFreeBSD && !IsMIPS64)
        Mapping.Offset = kFreeBSD_ShadowOffset64;
 -    else if (IsNetBSD)
 -      Mapping.Offset = kNetBSD_ShadowOffset64;
 -    else if (IsPS4CPU)
-+    else if (IsNetBSD && IsX86_64) {
++    else if (IsNetBSD) {
 +      if (IsKasan)
 +        Mapping.Offset = kNetBSDKasan_ShadowOffset64;
 +      else
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
index fee38c9144..0796696e78 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
@@ -1,12 +1,12 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/InstrProfiling.cpp.orig	2017-12-08 18:49:41.938921680 +0000
+--- lib/Transforms/Instrumentation/InstrProfiling.cpp.orig	2018-08-20 14:06:28.441231794 +0000
 +++ lib/Transforms/Instrumentation/InstrProfiling.cpp
-@@ -670,6 +670,7 @@ static bool needsRuntimeRegistrationOfSe
+@@ -701,6 +701,7 @@ static bool needsRuntimeRegistrationOfSe
    // Use linker script magic to get data/cnts/name start/end.
    if (Triple(M.getTargetTriple()).isOSLinux() ||
        Triple(M.getTargetTriple()).isOSFreeBSD() ||
 +      Triple(M.getTargetTriple()).isOSNetBSD() ||
+       Triple(M.getTargetTriple()).isOSFuchsia() ||
        Triple(M.getTargetTriple()).isPS4CPU())
      return false;
-