compiler-rt-netbsd: Update to SVN r. 309959

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Aug 4 14:17:11 2017 +0200
Changeset:	607635cba8dcf8e952060edc778df414cc9563ea

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
	compiler-rt-netbsd/patches/patch-lib_interception_interception.h
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt

Log Message:
compiler-rt-netbsd: Update to SVN r. 309959

Rebase local patches.

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=607635cba8dcf8e952060edc778df414cc9563ea

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

diffstat:
 compiler-rt-netbsd/Makefile                                |  2 +-
 compiler-rt-netbsd/distinfo                                |  5 ++---
 compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake     | 10 +++++-----
 .../patches/patch-lib_interception_interception.h          | 14 ++++++--------
 .../patches/patch-lib_sanitizer__common_CMakeLists.txt     |  0
 5 files changed, 14 insertions(+), 17 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index dcb30a9400..2bf52d1965 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	compiler-rt
 SVN_REPO.compiler-rt=	http://llvm.org/svn/llvm-project/compiler-rt/trunk
-SVN_REVISION.compiler-rt=	308868
+SVN_REVISION.compiler-rt=	309959
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 57ef949c3d..727c78bbcd 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -12,11 +12,10 @@ 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) = cda8fd307a7bb6817a2119b5140b3bb107f6d105
-SHA1 (patch-lib_interception_interception.h) = df1c7a5291279f43a195d2de769e7fee8357271c
+SHA1 (patch-cmake_config-ix.cmake) = 497da73e6ce4abe19f048a94b4d80b92c0ce7e82
+SHA1 (patch-lib_interception_interception.h) = 9e0c8964c5f099c2a1b8cde2bc22fbb60594b659
 SHA1 (patch-lib_interception_interception__linux.cc) = 41e29e48d879a7c1a8e8c5c466439310783d5e9f
 SHA1 (patch-lib_interception_interception__linux.h) = ebbdd314aeff8be22107a78872a71b9606748b36
-SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 041c1036c925dad11040c6724c90ab2b4851f1cd
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = f2a8938cf1162a4c820f17f5b28879cdbc01cba0
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = b3177dc169208b1b3e0c951fe3fd9c07e82fff49
diff --git a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
index 7ded072da0..b7e26bbd75 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
@@ -1,17 +1,17 @@
 $NetBSD$
 
---- cmake/config-ix.cmake.orig	2017-07-16 22:40:10.000000000 +0000
+--- cmake/config-ix.cmake.orig	2017-08-03 21:24:37.000000000 +0000
 +++ cmake/config-ix.cmake
-@@ -440,7 +440,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD ${AL
+@@ -470,7 +470,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD ${AL
  list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
  
  if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD" OR
-+    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD" OR
+-    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|Fuchsia" OR
++    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR
      (OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN))))
    set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
  else()
-@@ -453,7 +453,8 @@ else()
+@@ -483,7 +483,8 @@ else()
    set(COMPILER_RT_HAS_INTERCEPTION FALSE)
  endif()
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_interception_interception.h b/compiler-rt-netbsd/patches/patch-lib_interception_interception.h
index 5923526677..2b0f142f3e 100644
--- a/compiler-rt-netbsd/patches/patch-lib_interception_interception.h
+++ b/compiler-rt-netbsd/patches/patch-lib_interception_interception.h
@@ -1,18 +1,16 @@
 $NetBSD$
 
---- lib/interception/interception.h.orig	2017-07-04 05:53:20.000000000 +0000
+--- lib/interception/interception.h.orig	2017-08-03 21:24:37.000000000 +0000
 +++ lib/interception/interception.h
-@@ -15,8 +15,8 @@
+@@ -15,7 +15,7 @@
  #ifndef INTERCEPTION_H
  #define INTERCEPTION_H
  
--#if !defined(__linux__) && !defined(__FreeBSD__) && \
--  !defined(__APPLE__) && !defined(_WIN32)
-+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
-+    !defined(__APPLE__) && !defined(_WIN32)
+-#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && \
++#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__) && \
+     !defined(_WIN32) && !defined(__Fuchsia__)
  # error "Interception doesn't work on this operating system."
  #endif
- 
 @@ -129,7 +129,7 @@ const interpose_substitution substitutio
      extern "C" ret_type func(__VA_ARGS__);
  # define DECLARE_WRAPPER_WINAPI(ret_type, func, ...) \
@@ -22,7 +20,7 @@ $NetBSD$
  # define WRAP(x) __interceptor_ ## x
  # define WRAPPER_NAME(x) "__interceptor_" #x
  # define INTERCEPTOR_ATTRIBUTE __attribute__((visibility("default")))
-@@ -241,7 +241,7 @@ typedef unsigned long uptr;  // NOLINT
+@@ -264,7 +264,7 @@ typedef unsigned long uptr;  // NOLINT
  
  #define INCLUDED_FROM_INTERCEPTION_LIB
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
deleted file mode 100644
index e69de29bb2..0000000000