compiler-rt-git: Restore ASAN build

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Aug 5 16:36:39 2017 +0200
Changeset:	77a5a614d207c3f3c1086bd782c2acdff38f8e2d

Modified Files:
	compiler-rt-git/distinfo
	compiler-rt-git/patches/patch-cmake_config-ix.cmake
	compiler-rt-git/patches/patch-lib_asan_asan__linux.cc

Log Message:
compiler-rt-git: Restore ASAN build

Not tested.

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=77a5a614d207c3f3c1086bd782c2acdff38f8e2d

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

diffstat:
 compiler-rt-git/distinfo                              |  4 ++--
 compiler-rt-git/patches/patch-cmake_config-ix.cmake   | 12 +-----------
 compiler-rt-git/patches/patch-lib_asan_asan__linux.cc | 16 ++++------------
 3 files changed, 7 insertions(+), 25 deletions(-)

diffs:
diff --git a/compiler-rt-git/distinfo b/compiler-rt-git/distinfo
index 789b8c3354..4cf37d3902 100644
--- a/compiler-rt-git/distinfo
+++ b/compiler-rt-git/distinfo
@@ -12,11 +12,11 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-cmake_config-ix.cmake) = 497da73e6ce4abe19f048a94b4d80b92c0ce7e82
+SHA1 (patch-cmake_config-ix.cmake) = dccb5876d7dc532d49a8e89dbafc11a60e0ab83a
 SHA1 (patch-lib_asan_asan__errors.cc) = c029fa05715dfc5bcbda0fd6e28c966a96c2c278
 SHA1 (patch-lib_asan_asan__interceptors.cc) = 9786a54c62e081c7194efa26139f8539ad1e8c41
 SHA1 (patch-lib_asan_asan__interceptors.h) = 520419376759f2991c6f74f4c2a5ef62851d7838
-SHA1 (patch-lib_asan_asan__linux.cc) = 31dd5c3978d64ccc28c8af037a967c2360d71cff
+SHA1 (patch-lib_asan_asan__linux.cc) = 8cc2c9b75ac690f0ef79f912c429fb259bc0dcbd
 SHA1 (patch-lib_asan_asan__malloc__linux.cc) = 8d690c207d11e19ca96f231d41a6c192c8528933
 SHA1 (patch-lib_asan_asan__mapping.h) = 73f5f33e946868b4780864e633916376b11b16f1
 SHA1 (patch-lib_asan_asan__stack.h) = 58aa9e67cf2a92863fd3bd545074dff136bed7c5
diff --git a/compiler-rt-git/patches/patch-cmake_config-ix.cmake b/compiler-rt-git/patches/patch-cmake_config-ix.cmake
index b7e26bbd75..2c77604c20 100644
--- a/compiler-rt-git/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-git/patches/patch-cmake_config-ix.cmake
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- cmake/config-ix.cmake.orig	2017-08-03 21:24:37.000000000 +0000
+--- cmake/config-ix.cmake.orig	2017-08-05 14:29:08.000000000 +0000
 +++ cmake/config-ix.cmake
 @@ -470,7 +470,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD ${AL
  list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
@@ -11,13 +11,3 @@ $NetBSD$
      (OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN))))
    set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
  else()
-@@ -483,7 +483,8 @@ else()
-   set(COMPILER_RT_HAS_INTERCEPTION FALSE)
- endif()
- 
--if (COMPILER_RT_HAS_SANITIZER_COMMON AND ASAN_SUPPORTED_ARCH)
-+if (COMPILER_RT_HAS_SANITIZER_COMMON AND ASAN_SUPPORTED_ARCH AND
-+    (NOT OS_NAME MATCHES "NetBSD"))
-   set(COMPILER_RT_HAS_ASAN TRUE)
- else()
-   set(COMPILER_RT_HAS_ASAN FALSE)
diff --git a/compiler-rt-git/patches/patch-lib_asan_asan__linux.cc b/compiler-rt-git/patches/patch-lib_asan_asan__linux.cc
index c968e6a128..87f36b045e 100644
--- a/compiler-rt-git/patches/patch-lib_asan_asan__linux.cc
+++ b/compiler-rt-git/patches/patch-lib_asan_asan__linux.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/asan/asan_linux.cc.orig	2017-07-03 15:33:06.000000000 +0000
+--- lib/asan/asan_linux.cc.orig	2017-08-05 14:29:08.000000000 +0000
 +++ lib/asan/asan_linux.cc
 @@ -13,7 +13,7 @@
  //===----------------------------------------------------------------------===//
@@ -11,15 +11,7 @@ $NetBSD$
  
  #include "asan_interceptors.h"
  #include "asan_internal.h"
-@@ -21,6 +21,7 @@
- #include "sanitizer_common/sanitizer_flags.h"
- #include "sanitizer_common/sanitizer_freebsd.h"
- #include "sanitizer_common/sanitizer_libc.h"
-+#include "sanitizer_common/sanitizer_netbsd.h"
- #include "sanitizer_common/sanitizer_procmaps.h"
- 
- #include <sys/time.h>
-@@ -42,6 +43,10 @@
+@@ -42,6 +42,10 @@
  #if SANITIZER_ANDROID || SANITIZER_FREEBSD
  #include <ucontext.h>
  extern "C" void* _DYNAMIC;
@@ -30,7 +22,7 @@ $NetBSD$
  #else
  #include <sys/ucontext.h>
  #include <link.h>
-@@ -96,6 +101,15 @@ static int FindFirstDSOCallback(struct d
+@@ -101,6 +105,15 @@ static int FindFirstDSOCallback(struct d
    if (internal_strncmp(info->dlpi_name, "linux-", sizeof("linux-") - 1) == 0)
      return 0;
  
@@ -46,7 +38,7 @@ $NetBSD$
    *(const char **)data = info->dlpi_name;
    return 1;
  }
-@@ -174,4 +188,4 @@ void *AsanDlSymNext(const char *sym) {
+@@ -179,4 +192,4 @@ void *AsanDlSymNext(const char *sym) {
  
  } // namespace __asan