llvm-netbsd: Update to SVN r. 320165

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Dec 8 19:51:12 2017 +0100
Changeset:	9034148a092403b6934b08592d8e8b8b2e0255da

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

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

Sync local patches with this package.

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=9034148a092403b6934b08592d8e8b8b2e0255da

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                                 |  8 ++++----
 llvm-netbsd/patches/patch-cmake_config-ix.cmake      | 20 ++++++++++----------
 ...b_Transforms_Instrumentation_AddressSanitizer.cpp |  6 +++---
 ...lib_Transforms_Instrumentation_InstrProfiling.cpp |  4 ++--
 ...ib_Transforms_Instrumentation_MemorySanitizer.cpp | 10 +++++-----
 6 files changed, 25 insertions(+), 25 deletions(-)

diffs:
diff --git a/llvm-netbsd/Makefile.common b/llvm-netbsd/Makefile.common
index 4a28c68674..b123e61313 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=	319004
+SVN_REVISION.llvm=	320165
 
 WRKSRC=			${WRKDIR}/llvm
 
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index 043e7e59ce..e6048201f5 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) = 7dc1016433e88c397e066512f1909a0beae4d22e
-SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 871b474f415d9dc468cc07477101f88d7a20868b
-SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = c6487f23df920a2d049ba80e7224b32af55b5545
+SHA1 (patch-cmake_config-ix.cmake) = 55f484948dfb3293917ede3144d7c83f78c555b3
+SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 239ca19d58c644a3eeed3387b03b95aeceeac8ba
+SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 653876deaaecb4aff8fd052d45da7c6516e876fc
+SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = 06d6d61b3f73ff866db8f8a31af8f038a338980f
diff --git a/llvm-netbsd/patches/patch-cmake_config-ix.cmake b/llvm-netbsd/patches/patch-cmake_config-ix.cmake
index a92443422a..f318a77e2c 100644
--- a/llvm-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/llvm-netbsd/patches/patch-cmake_config-ix.cmake
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- cmake/config-ix.cmake.orig	2017-10-16 20:22:53.000000000 +0000
+--- cmake/config-ix.cmake.orig	2017-12-08 18:50:04.615602612 +0000
 +++ cmake/config-ix.cmake
-@@ -144,7 +144,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SA
-   endif()
-   if(LLVM_ENABLE_TERMINFO)
-     set(HAVE_TERMINFO 0)
--    foreach(library tinfo terminfo curses ncurses ncursesw)
-+    foreach(library terminfo tinfo curses ncurses ncursesw)
-       string(TOUPPER ${library} library_suffix)
-       check_library_exists(${library} setupterm "" HAVE_TERMINFO_${library_suffix})
-       if(HAVE_TERMINFO_${library_suffix})
+@@ -153,7 +153,7 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memor
+     endif()
+     if(LLVM_ENABLE_TERMINFO)
+       set(HAVE_TERMINFO 0)
+-      foreach(library tinfo terminfo curses ncurses ncursesw)
++      foreach(library terminfo tinfo curses ncurses ncursesw)
+         string(TOUPPER ${library} library_suffix)
+         check_library_exists(${library} setupterm "" HAVE_TERMINFO_${library_suffix})
+         if(HAVE_TERMINFO_${library_suffix})
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
index e0296cfa61..79792b534f 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2017-10-25 17:03:37.916518801 +0000
+--- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig	2017-12-08 18:49:42.512633016 +0000
 +++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
-@@ -107,6 +107,7 @@ static const uint64_t kAArch64_ShadowOff
+@@ -108,6 +108,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;
@@ -10,7 +10,7 @@ $NetBSD$
  static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
  static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
  
-@@ -505,9 +506,12 @@ static ShadowMapping getShadowMapping(Tr
+@@ -526,9 +527,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_InstrProfiling.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
index e8229cc198..fee38c9144 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/InstrProfiling.cpp.orig	2017-06-17 16:34:37.000000000 +0000
+--- lib/Transforms/Instrumentation/InstrProfiling.cpp.orig	2017-12-08 18:49:41.938921680 +0000
 +++ lib/Transforms/Instrumentation/InstrProfiling.cpp
-@@ -394,6 +394,7 @@ static bool needsRuntimeRegistrationOfSe
+@@ -670,6 +670,7 @@ static bool needsRuntimeRegistrationOfSe
    // Use linker script magic to get data/cnts/name start/end.
    if (Triple(M.getTargetTriple()).isOSLinux() ||
        Triple(M.getTargetTriple()).isOSFreeBSD() ||
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
index ecb73afe0d..ff10704e5f 100644
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
+++ b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig	2017-10-25 17:03:32.656232584 +0000
+--- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig	2017-12-08 18:49:42.329089043 +0000
 +++ lib/Transforms/Instrumentation/MemorySanitizer.cpp
 @@ -320,6 +320,14 @@ static const MemoryMapParams FreeBSD_X86
    0x380000000000,  // OriginBase
@@ -8,10 +8,10 @@ $NetBSD$
  
 +// x86_64 NetBSD
 +static const MemoryMapParams NetBSD_X86_64_MemoryMapParams = {
-+  0xc00000000000,  // AndMask
-+  0x200000000000,  // XorMask
-+  0x100000000000,  // ShadowBase
-+  0x380000000000,  // OriginBase
++  0,               // AndMask
++  0x500000000000,  // XorMask
++  0,               // ShadowBase
++  0x100000000000,  // OriginBase
 +};
 +
  static const PlatformMemoryMapParams Linux_X86_MemoryMapParams = {