compiler-rt-netbsd: Fix build

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Jul 17 01:39:27 2017 +0200
Changeset:	094e0b2946e69c8236d1e382ea4a7746bd32fdef

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc

Log Message:
compiler-rt-netbsd: Fix build

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=094e0b2946e69c8236d1e382ea4a7746bd32fdef

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

diffstat:
 compiler-rt-netbsd/distinfo                            |  5 ++---
 .../patches/patch-lib_sanitizer__common_CMakeLists.txt | 12 ------------
 ...-lib_sanitizer__common_sanitizer__linux__libcdep.cc | 18 +++++-------------
 3 files changed, 7 insertions(+), 28 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 603feea10f..370ecfadc2 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -16,12 +16,12 @@ SHA1 (patch-cmake_config-ix.cmake) = cda8fd307a7bb6817a2119b5140b3bb107f6d105
 SHA1 (patch-lib_interception_interception.h) = df1c7a5291279f43a195d2de769e7fee8357271c
 SHA1 (patch-lib_interception_interception__linux.cc) = 41e29e48d879a7c1a8e8c5c466439310783d5e9f
 SHA1 (patch-lib_interception_interception__linux.h) = ebbdd314aeff8be22107a78872a71b9606748b36
-SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = d21d5fad13c0881b144265313075826bf285789a
+SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 041c1036c925dad11040c6724c90ab2b4851f1cd
 SHA1 (patch-lib_sanitizer__common_sanitizer__libignore.cc) = 6f5d8730af229ae6ba9f7799a4b46eb7f83c56de
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = f2a8938cf1162a4c820f17f5b28879cdbc01cba0
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = b3177dc169208b1b3e0c951fe3fd9c07e82fff49
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 90831f802b22365c6f51600496988b0886858fa0
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 1a937daa428db0a9b41293794e491599ac1e8699
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform.h) = 85de2f512fc1386f21e2d20bde66c78731f2d55f
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = f402a33b98e1a657c780f587003b942afa98a96e
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 36a89517584891a1a50536a681a5d42e99ef904d
@@ -30,4 +30,3 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps.h) = 2f58ff97566505a5f2027
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__common.cc) = 6d40fdfc327d8042f1e48480cd84c59aeca81cf2
 SHA1 (patch-lib_sanitizer__common_sanitizer__syscall__generic.inc) = 0ec7db864f385794972a79d85d04f72fb8894a9d
 SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 446f72ab0d740dd441c208b08360175e0f0b992c
-SHA1 (patch-lib_sanitizer__common_tests_sanitizer__test__utils.h) = 3bd1a39352b4ee76e6e366c06fbbf329cb5d970b
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
index 7c41adac5b..e69de29bb2 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/CMakeLists.txt.orig	2017-07-16 22:40:10.000000000 +0000
-+++ lib/sanitizer_common/CMakeLists.txt
-@@ -23,6 +23,7 @@ set(SANITIZER_SOURCES_NOTERMINATION
-   sanitizer_procmaps_freebsd.cc
-   sanitizer_procmaps_linux.cc
-   sanitizer_procmaps_mac.cc
-+  sanitizer_procmaps_netbsd.cc
-   sanitizer_stackdepot.cc
-   sanitizer_stacktrace.cc
-   sanitizer_stacktrace_printer.cc
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
index 732c2da4d0..0847e9b342 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
@@ -11,15 +11,7 @@ $NetBSD$
  
  #include "sanitizer_allocator_internal.h"
  #include "sanitizer_atomic.h"
-@@ -22,6 +22,7 @@
- #include "sanitizer_flags.h"
- #include "sanitizer_freebsd.h"
- #include "sanitizer_linux.h"
-+#include "sanitizer_netbsd.h"
- #include "sanitizer_placement_new.h"
- #include "sanitizer_procmaps.h"
- #include "sanitizer_stacktrace.h"
-@@ -148,7 +149,8 @@ bool SanitizerGetThreadName(char *name, 
+@@ -148,7 +148,8 @@ bool SanitizerGetThreadName(char *name, 
  #endif
  }
  
@@ -29,7 +21,7 @@ $NetBSD$
  static uptr g_tls_size;
  
  #ifdef __i386__
-@@ -176,7 +178,8 @@ void InitTlsSize() {
+@@ -176,7 +177,8 @@ void InitTlsSize() {
  }
  #else
  void InitTlsSize() { }
@@ -39,7 +31,7 @@ $NetBSD$
  
  #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
      || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
-@@ -333,6 +336,10 @@ uptr ThreadSelf() {
+@@ -333,6 +335,10 @@ uptr ThreadSelf() {
  }
  #endif  // SANITIZER_FREEBSD
  
@@ -50,7 +42,7 @@ $NetBSD$
  #if !SANITIZER_GO
  static void GetTls(uptr *addr, uptr *size) {
  #if SANITIZER_LINUX && !SANITIZER_ANDROID
-@@ -362,7 +369,7 @@ static void GetTls(uptr *addr, uptr *siz
+@@ -362,7 +368,7 @@ static void GetTls(uptr *addr, uptr *siz
      *addr = (uptr) dtv[2];
      *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
    }
@@ -59,7 +51,7 @@ $NetBSD$
    *addr = 0;
    *size = 0;
  #else
-@@ -373,7 +380,7 @@ static void GetTls(uptr *addr, uptr *siz
+@@ -373,7 +379,7 @@ static void GetTls(uptr *addr, uptr *siz
  
  #if !SANITIZER_GO
  uptr GetTlsSize() {