compiler-rt-netbsd: Update common sanitizer for NetBSD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Update common sanitizer for NetBSD
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Mon, 28 Aug 2017 18:57:19 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Aug 28 20:57:19 2017 +0200
Changeset:	5c60a77823a46345494c8fdbca082a7895af9289

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc

Log Message:
compiler-rt-netbsd: Update common sanitizer for NetBSD

Apply comments from review.

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=5c60a77823a46345494c8fdbca082a7895af9289

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

diffstat:
 compiler-rt-netbsd/distinfo                                 | 12 ++++++------
 .../patches/patch-lib_sanitizer__common_sanitizer__linux.h  |  6 +-----
 ...ib_sanitizer__common_sanitizer__platform__interceptors.h | 11 +++--------
 ..._sanitizer__common_sanitizer__platform__limits__netbsd.h | 10 +++++++---
 ...b_sanitizer__common_sanitizer__platform__limits__posix.h | 13 +++++++++----
 .../patches/patch-lib_sanitizer__common_sanitizer__posix.h  |  6 +-----
 ...patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc |  6 +-----
 7 files changed, 28 insertions(+), 36 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 1a93c22309..f604df8728 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -23,13 +23,13 @@ SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = eaffd9f8f2621ad465b5c734a764bdff0
 SHA1 (patch-lib_lsan_lsan__interceptors.cc) = 04cb038163d9d9eb098666d394bfca38e9f78a2f
 SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = e031b35f1cbdcc95184f9cae81c548b9b8aa32fd
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = db4ed1ac4b21906c23c159e63ce8efe7edbb5afa
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = bcf367307bc52f1185a099fdb488c1e6f485dbde
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = f179544393a9a884ab669c10f323539f80d8efad
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = 232213b5d65d8a76e9a024bd5dc4103e26321565
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 9ba6676c007713c38b30170872b62d9a4dd45b20
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 98a40050b48f94f6dc2a8bfba05f9fb3e062b216
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 222d699a5af20899d45b54b8746f9a514e0ffe35
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 86d872c585bfde552276a5f3e3d198338663bafd
-SHA1 (patch-lib_sanitizer__common_sanitizer__posix.h) = e3c6e3f438dbc0911ec54f24bb5a325afe07fbe1
-SHA1 (patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc) = 24be4a422f108c24fd095ef725a3b3b582553e66
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 3593763a228846b500d56fdec90c5105b84957c4
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 64df602cec94311cafcb9e2f2bac69fdf4ee8f65
+SHA1 (patch-lib_sanitizer__common_sanitizer__posix.h) = acbf4de1aebde6ccc5f3c25ad47f09b5bb05fd96
+SHA1 (patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc) = 91bae2714d755ce9c826ed1034189686012d5187
 SHA1 (patch-lib_tsan_go_buildgo.sh) = fe64b3389bbf6ae2ddf187df3e0600b2f817f51d
 SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = feeaf47e154105201240af271c0187f146961523
 SHA1 (patch-lib_tsan_rtl_tsan__platform__linux.cc) = e572f99e72257dbaa17838378b34cde40e91bd54
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h
index fd506cda51..a7dcd1ba05 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h
@@ -2,15 +2,11 @@ $NetBSD$
 
 --- lib/sanitizer_common/sanitizer_linux.h.orig	2017-08-08 20:43:41.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_linux.h
-@@ -18,7 +18,11 @@
+@@ -18,6 +18,7 @@
  #include "sanitizer_common.h"
  #include "sanitizer_internal_defs.h"
  #include "sanitizer_posix.h"
-+#if SANITIZER_NETBSD
 +#include "sanitizer_platform_limits_netbsd.h"
-+#else
  #include "sanitizer_platform_limits_posix.h"
-+#endif
  
  struct link_map;  // Opaque type returned by dlopen().
- 
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
index 0a7139642f..fe5e695e67 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
@@ -2,16 +2,11 @@ $NetBSD$
 
 --- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2017-08-03 21:24:37.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -33,7 +33,11 @@
+@@ -33,6 +33,7 @@
  #endif
  
  #if SI_POSIX
--# include "sanitizer_platform_limits_posix.h"
-+#if SANITIZER_NETBSD
-+#include "sanitizer_platform_limits_netbsd.h"
-+#else
-+#include "sanitizer_platform_limits_posix.h"
-+#endif
++# include "sanitizer_platform_limits_netbsd.h"
+ # include "sanitizer_platform_limits_posix.h"
  #endif
  
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
index c1b20c55b0..bdbff91bd7 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2017-08-27 06:20:41.507773424 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2017-08-28 18:08:46.866135570 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
-@@ -0,0 +1,562 @@
+@@ -0,0 +1,566 @@
 +//===-- sanitizer_platform_limits_posix.h ---------------------------------===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -20,6 +20,8 @@ $NetBSD$
 +#ifndef SANITIZER_PLATFORM_LIMITS_NETBSD_H
 +#define SANITIZER_PLATFORM_LIMITS_NETBSD_H
 +
++#if SANITIZER_NETBSD
++
 +#include "sanitizer_internal_defs.h"
 +#include "sanitizer_platform.h"
 +
@@ -67,7 +69,7 @@ $NetBSD$
 +  u32 aio_fildes;
 +  u32 aio_lio_opcode;
 +  long aio_reqprio;
-+#if _LP64
++#if SANITIZER_WORDSIZE == 64
 +  u8 aio_sigevent[32];
 +#else
 +  u8 aio_sigevent[20];
@@ -564,4 +566,6 @@ $NetBSD$
 +  COMPILER_CHECK(offsetof(struct __sanitizer_##CLASS, MEMBER) ==         \
 +                 offsetof(struct CLASS, MEMBER))
 +
++#endif // SANITIZER_NETBSD
++
 +#endif
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
index 219d8c55f9..044a6486a2 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
@@ -2,14 +2,19 @@ $NetBSD$
 
 --- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2017-07-16 22:40:10.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -15,6 +15,10 @@
+@@ -15,6 +15,8 @@
  #ifndef SANITIZER_PLATFORM_LIMITS_POSIX_H
  #define SANITIZER_PLATFORM_LIMITS_POSIX_H
  
-+#if SANITIZER_NETBSD
-+#error include sanitizer_platform_limits_netbsd.h on NetBSD
-+#endif
++#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC
 +
  #include "sanitizer_internal_defs.h"
  #include "sanitizer_platform.h"
  
+@@ -1485,4 +1487,6 @@ struct __sanitizer_cookie_io_functions_t
+   COMPILER_CHECK(offsetof(struct __sanitizer_##CLASS, MEMBER) ==          \
+                  offsetof(struct CLASS, MEMBER))
+ 
++#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC
++
+ #endif
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
index 981ef1708c..710d71bd01 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
@@ -2,15 +2,11 @@ $NetBSD$
 
 --- lib/sanitizer_common/sanitizer_posix.h.orig	2017-07-04 05:53:22.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_posix.h
-@@ -16,7 +16,11 @@
+@@ -16,6 +16,7 @@
  // ----------- ATTENTION -------------
  // This header should NOT include any other headers from sanitizer runtime.
  #include "sanitizer_internal_defs.h"
-+#if SANITIZER_NETBSD
 +#include "sanitizer_platform_limits_netbsd.h"
-+#else
  #include "sanitizer_platform_limits_posix.h"
-+#endif
  
  #if !SANITIZER_POSIX
- // Make it hard to accidentally use any of functions declared in this file:
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc
index db0c4de5f1..37267eebd4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc
@@ -2,16 +2,12 @@ $NetBSD$
 
 --- lib/sanitizer_common/sanitizer_posix_libcdep.cc.orig	2017-07-07 06:32:45.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_posix_libcdep.cc
-@@ -18,7 +18,13 @@
+@@ -18,7 +18,9 @@
  
  #include "sanitizer_common.h"
  #include "sanitizer_flags.h"
-+
-+#if SANITIZER_NETBSD
 +#include "sanitizer_platform_limits_netbsd.h"
-+#else
  #include "sanitizer_platform_limits_posix.h"
-+#endif
 +
  #include "sanitizer_posix.h"
  #include "sanitizer_procmaps.h"
Prev by Date: libretro-nestopia: Switch to stable upstream release
Next by Date: freeswitch-core: Update to version 1.6.19.
Previous by Thread: libretro-nestopia: Switch to stable upstream release
Next by Thread: freeswitch-core: Update to version 1.6.19.
Indexes:
Home | Main Index | Thread Index | Old Index