compiler-rt-netbsd: Rebase to trunk

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Apr 25 23:18:41 2018 +0200
Changeset:	34fc39627ea62c1520f02f4607fcc19e67bf994b

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
Added Files:
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc

Log Message:
compiler-rt-netbsd: Rebase to trunk

Fix the procmap module, it was renamed from freebsd to bsd.

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=34fc39627ea62c1520f02f4607fcc19e67bf994b

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                               |  4 ++--
 .../patch-lib_sanitizer__common_sanitizer__linux.cc       |  6 +++---
 ...atch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc | 15 +++++++++++++++
 ...-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc | 14 --------------
 5 files changed, 21 insertions(+), 20 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 70c8d3ce0d..31f5265242 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=	326163
+SVN_REVISION.compiler-rt=	330862
 
 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 6bdb933615..1ae9042330 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -6,11 +6,11 @@ SHA1 (patch-lib_msan_msan__interceptors.cc) = 0aa08e580841d2ff99e01de03ca903e13d
 SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 3fb4836fb665a272094bbb0a9026b21b293f9a0a
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = bd972f5a18ffd76662b161515b31fe4940abbb5a
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = a3213b029fc52e59591dce75dce4bc30da6a4de0
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 0ea2f811b94e8bc3aff929d0671c0d56376972b1
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = c11001b5e4f99d340fea4c661c51a14d4e5c61d6
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 92c7aad101270b8403fcc7faf553d13210402f13
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 1c8e35603d97b8dc86f991feebb11276e1310115
-SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = c6459f21789a5ef13e37714487c09110062c9c5d
+SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc) = 8b629840ff7f56c670d322a9dbbdf7e33ce90cb5
 SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = e520ec1e0fefb3cf9fb1d872ebf81952599a6c49
 SHA1 (patch-lib_scudo_scudo__platform.h) = 119d7ad8f8ca9d3e846dbdd7f805ca771e30e410
 SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
index 557e65c337..e3c541deeb 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
@@ -1,12 +1,12 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_linux.cc.orig	2018-02-27 02:50:00.132306283 +0000
+--- lib/sanitizer_common/sanitizer_linux.cc.orig	2018-04-25 21:13:40.388126746 +0000
 +++ lib/sanitizer_common/sanitizer_linux.cc
-@@ -89,6 +89,7 @@ extern char **environ;  // provided by c
+@@ -93,6 +93,7 @@ extern "C" {
  
  #if SANITIZER_NETBSD
  #include <limits.h>  // For NAME_MAX
 +#define sysctl _sysctl
  #include <sys/sysctl.h>
- extern char **environ;  // provided by crt1
  #include <sys/exec.h>
+ extern struct ps_strings *__ps_strings;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc
new file mode 100644
index 0000000000..3caee22a2f
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- lib/sanitizer_common/sanitizer_procmaps_bsd.cc.orig	2018-04-25 21:13:40.000000000 +0000
++++ lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+@@ -19,6 +19,10 @@
+ #endif
+ #include "sanitizer_procmaps.h"
+ 
++#if SANITIZER_NETBSD
++#define sysctl _sysctl // Use an internal symbol to bypass the interceptor
++#endif
++
+ // clang-format off
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc
deleted file mode 100644
index b25f850e5d..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_procmaps_freebsd.cc.orig	2018-02-01 23:46:05.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_procmaps_freebsd.cc
-@@ -19,6 +19,9 @@
- #include "sanitizer_procmaps.h"
- 
- #include <unistd.h>
-+#if SANITIZER_NETBSD
-+#define sysctl _sysctl // Use an internal symbol to omit the interceptor
-+#endif
- #include <sys/sysctl.h>
- #if SANITIZER_FREEBSD
- #include <sys/user.h>