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

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 8 14:08:22 2017 +0200
Changeset:	e7ca3013d6891d01f4853e647293d6242717e9cc

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.cc
	compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.h

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

Eliminate 2 local patches, merged upstream.

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=e7ca3013d6891d01f4853e647293d6242717e9cc

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                        |  2 --
 .../patch-lib_interception_interception__linux.cc  | 39 ----------------------
 .../patch-lib_interception_interception__linux.h   | 19 -----------
 4 files changed, 1 insertion(+), 61 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index eeb93bddf8..15451fcaaa 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=	310349
+SVN_REVISION.compiler-rt=	310351
 
 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 40b6c74fd1..bff1e2afac 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -13,8 +13,6 @@ 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-lib_interception_interception__linux.cc) = 41e29e48d879a7c1a8e8c5c466439310783d5e9f
-SHA1 (patch-lib_interception_interception__linux.h) = ebbdd314aeff8be22107a78872a71b9606748b36
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 5d09c96941940fb7bb21b83161a5723140ac31e6
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = b3177dc169208b1b3e0c951fe3fd9c07e82fff49
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 36a89517584891a1a50536a681a5d42e99ef904d
diff --git a/compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.cc b/compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.cc
deleted file mode 100644
index 1038330d7c..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
---- lib/interception/interception_linux.cc.orig	2017-07-04 05:53:20.000000000 +0000
-+++ lib/interception/interception_linux.cc
-@@ -12,14 +12,26 @@
- // Linux-specific interception methods.
- //===----------------------------------------------------------------------===//
- 
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
- #include "interception.h"
- 
- #include <dlfcn.h>   // for dlsym() and dlvsym()
- 
-+#ifdef __NetBSD__
-+static int mystrcmp(const char *s1, const char *s2) {
-+  while (*s1 == *s2++)
-+    if (*s1++ == 0) return (0);
-+  return (*(const unsigned char *)s1 - *(const unsigned char *)--s2);
-+}
-+#endif
-+
- namespace __interception {
- bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
-     uptr real, uptr wrapper) {
-+#ifdef __NetBSD__
-+  // XXX: Until I come up with something better to deal with renames.
-+  if (mystrcmp(func_name, "sigaction") == 0) func_name = "__sigaction14";
-+#endif
-   *func_addr = (uptr)dlsym(RTLD_NEXT, func_name);
-   return real == wrapper;
- }
-@@ -32,5 +44,4 @@ void *GetFuncAddrVer(const char *func_na
- 
- }  // namespace __interception
- 
--
--#endif  // __linux__ || __FreeBSD__
-+#endif  // __linux__ || __FreeBSD__ || __NetBSD__
diff --git a/compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.h b/compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.h
deleted file mode 100644
index 12e8b384ec..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_interception_interception__linux.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- lib/interception/interception_linux.h.orig	2017-07-04 05:53:20.000000000 +0000
-+++ lib/interception/interception_linux.h
-@@ -12,7 +12,7 @@
- // Linux-specific interception methods.
- //===----------------------------------------------------------------------===//
- 
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) | defined(__NetBSD__)
- 
- #if !defined(INCLUDED_FROM_INTERCEPTION_LIB)
- # error "interception_linux.h should be included from interception library only"
-@@ -44,4 +44,4 @@ void *GetFuncAddrVer(const char *func_na
- #endif  // !defined(__ANDROID__)
- 
- #endif  // INTERCEPTION_LINUX_H
--#endif  // __linux__ || __FreeBSD__
-+#endif  // __linux__ || __FreeBSD__ || __NetBSD__