compiler-rt-netbsd: Upgrade to SVN r. 325599

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Upgrade to SVN r. 325599
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Tue, 20 Feb 2018 18:43:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Feb 20 19:43:04 2018 +0100
Changeset:	54605f11d3b9d6d0d309c589b2bc54c2f72e6c8f

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_msan_msan__interceptors.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
	compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
	compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc

Log Message:
compiler-rt-netbsd: Upgrade to SVN r. 325599

Patches merged upstream:
[compiler-rt] r325585 - Stop intercepting forkpty(3) and openpty(3) on NetBSD
[compiler-rt] r325587 - Add new interceptor: fgetln(3)
[compiler-rt] r325588 - Add new interceptor: strmode(3)

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=54605f11d3b9d6d0d309c589b2bc54c2f72e6c8f

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                        | 14 +++----
 .../patches/patch-cmake_config-ix.cmake            |  2 +-
 .../patches/patch-lib_msan_msan__interceptors.cc   |  6 +--
 ...zer__common_sanitizer__common__interceptors.inc | 44 +++-------------------
 ...patch-lib_sanitizer__common_sanitizer__linux.cc |  2 +-
 ...zer__common_sanitizer__platform__interceptors.h | 17 ++++-----
 ...sanitizer__common_TestCases_NetBSD_kvm__open.cc |  2 +-
 ...izer__common_TestCases_NetBSD_kvm__openfiles.cc |  2 +-
 9 files changed, 28 insertions(+), 63 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index a9137d92dd..3ebf53b222 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=	325519
+SVN_REVISION.compiler-rt=	325599
 
 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 c0b31cf930..17b385ef5e 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,19 +1,19 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-SHA1 (patch-cmake_config-ix.cmake) = efbacbaae705ca71158614b3653bd158b88785b5
+SHA1 (patch-cmake_config-ix.cmake) = 720ede87150ae1ac59d8415c77644d917da9cd16
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 766b817c2ede73ca90d6e25a4b8330ed3d38b84b
-SHA1 (patch-lib_msan_msan__interceptors.cc) = 2bd1fb8c0c65ad044095f67c49829656197b3f98
+SHA1 (patch-lib_msan_msan__interceptors.cc) = 0aa08e580841d2ff99e01de03ca903e13d5ea497
 SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 38ff31d06c4ed85e2eb7b266fa47aab41350f11e
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 2d2208691b0cb7002a963cb935f3b765ac5dac8c
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 307d786c6618a462ae2f2dfc004f91b0de8091c9
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = dc0884c32a1fee38b76664b437110a7ada3ec1ed
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 558a7762c5aea4cca9eb0fe42f4d1b91937e4c28
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = ca62ab5e28a66988c7877b2f3041ef45a4a44894
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 785aaf50784742ab9a86f0a40cb63fcc6f7cf74d
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 9336ec4a7e075155fe61c9005539f82af8ec46a8
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 12593295cb2fa217b73b571855d6ceb32c39943d
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = c6459f21789a5ef13e37714487c09110062c9c5d
 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
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = f9253e16ce5bd38e24a174c0d76f45e6b01ea310
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = a6004120ec1353ba8b605413c9ff2fda7664a653
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = f40ea4714c64d9d376b6a56ef9bcba37aee0aaa2
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = 6a31721bff9ffa720ba95d85e058bc4f5dcf0aff
 SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
diff --git a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
index fcbbe84e84..1a2a6ea96f 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- cmake/config-ix.cmake.orig	2018-02-19 18:40:37.199984867 +0000
+--- cmake/config-ix.cmake.orig	2018-02-19 18:40:37.000000000 +0000
 +++ cmake/config-ix.cmake
 @@ -542,7 +542,7 @@ else()
  endif()
diff --git a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
index af8be221a3..93e6c8a576 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/msan/msan_interceptors.cc.orig	2018-02-15 04:24:49.000000000 +0000
+--- lib/msan/msan_interceptors.cc.orig	2018-02-20 18:23:53.000000000 +0000
 +++ lib/msan/msan_interceptors.cc
 @@ -33,11 +33,13 @@
  #include "sanitizer_common/sanitizer_libc.h"
@@ -124,7 +124,7 @@ $NetBSD$
  }
  
  static void BeforeFork() {
-@@ -1560,6 +1630,9 @@ namespace __msan {
+@@ -1574,6 +1644,9 @@ namespace __msan {
  void InitializeInterceptors() {
    static int inited = 0;
    CHECK_EQ(inited, 0);
@@ -134,7 +134,7 @@ $NetBSD$
    InitializeCommonInterceptors();
    InitializeSignalInterceptors();
  
-@@ -1675,6 +1748,7 @@ void InitializeInterceptors() {
+@@ -1689,6 +1762,7 @@ void InitializeInterceptors() {
  
    INTERCEPT_FUNCTION(pthread_join);
    INTERCEPT_FUNCTION(tzset);
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
index 607774273b..32f2b44767 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-02-15 04:24:49.000000000 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-02-20 18:23:53.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -76,6 +76,11 @@
  #define ctime __ctime50
@@ -40,8 +40,8 @@ $NetBSD$
    return res;
  }
  
-@@ -6807,6 +6822,869 @@ INTERCEPTOR(int, devname_r, u64 dev, u32
- #define INIT_DEVNAME_R
+@@ -6836,6 +6851,839 @@ INTERCEPTOR(void, strmode, u32 mode, cha
+ #define INIT_STRMODE
  #endif
  
 +#if SANITIZER_INTERCEPT_KVM
@@ -549,23 +549,6 @@ $NetBSD$
 +#define INIT_GETTTYENT
 +#endif
 +
-+#if SANITIZER_INTERCEPT_FGETLN
-+INTERCEPTOR(char *, fgetln, __sanitizer_FILE *stream, SIZE_T *len) {
-+  void *ctx;
-+  char *str;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fgetln, stream, len);
-+  str = REAL(fgetln)(stream, len);
-+  if (str && len) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, len, sizeof(*len));
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, str, *len);
-+  }
-+  return str;
-+}
-+#define INIT_FGETLN COMMON_INTERCEPT_FUNCTION(fgetln)
-+#else
-+#define INIT_FGETLN
-+#endif
-+
 +#if SANITIZER_INTERCEPT_GETPROTOENT
 +INTERCEPTOR(struct __sanitizer_protoent *, getprotoent) {
 +  void *ctx;
@@ -797,19 +780,6 @@ $NetBSD$
 +#define INIT_FTS
 +#endif
 +
-+#if SANITIZER_INTERCEPT_STRMODE
-+INTERCEPTOR(void, strmode, u32 mode, char *bp) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, strmode, mode, bp);
-+  REAL(strmode)(mode, bp);
-+  if (bp)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, bp, REAL(strlen)(bp) + 1);
-+}
-+#define INIT_STRMODE COMMON_INTERCEPT_FUNCTION(strmode)
-+#else
-+#define INIT_STRMODE
-+#endif
-+
 +#if SANITIZER_INTERCEPT_REGEX
 +INTERCEPTOR(int, regcomp, void *preg, const char *pattern, int cflags) {
 +  void *ctx;
@@ -910,19 +880,17 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7035,6 +7913,16 @@ static void InitializeCommonInterceptors
-   INIT_STRLCPY;
-   INIT_DEVNAME;
+@@ -7066,6 +7914,14 @@ static void InitializeCommonInterceptors
    INIT_DEVNAME_R;
+   INIT_FGETLN;
+   INIT_STRMODE;
 +  INIT_KVM;
 +  INIT_SYSCTL;
 +  INIT_ATOF;
 +  INIT_GETTTYENT;
-+  INIT_FGETLN;
 +  INIT_GETPROTOENT;
 +  INIT_GETNETENT;
 +  INIT_FTS;
-+  INIT_STRMODE;
 +  INIT_REGEX;
  
  #if SANITIZER_NETBSD
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 37601e79d0..2093e7f531 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,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_linux.cc.orig	2018-02-10 18:57:25.000000000 +0000
+--- lib/sanitizer_common/sanitizer_linux.cc.orig	2018-02-19 18:40:37.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_linux.cc
 @@ -89,6 +89,7 @@ extern char **environ;  // provided by c
  
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 d47abaae66..42cd7914fa 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
@@ -1,21 +1,18 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-02-15 04:24:49.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-02-20 18:23:53.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -443,6 +443,16 @@
- #define SANITIZER_INTERCEPT_FACCESSAT SI_NETBSD
- #define SANITIZER_INTERCEPT_GETGROUPLIST SI_NETBSD
- #define SANITIZER_INTERCEPT_STRLCPY SI_NETBSD
+@@ -462,4 +462,13 @@
+ #define SANITIZER_INTERCEPT_FGETLN SI_NETBSD
+ #define SANITIZER_INTERCEPT_STRMODE SI_NETBSD
+ 
 +#define SANITIZER_INTERCEPT_KVM SI_NETBSD
 +#define SANITIZER_INTERCEPT_SYSCTL SI_NETBSD
 +#define SANITIZER_INTERCEPT_ATOF SI_NETBSD
 +#define SANITIZER_INTERCEPT_GETTTYENT SI_NETBSD
-+#define SANITIZER_INTERCEPT_FGETLN SI_NETBSD
 +#define SANITIZER_INTERCEPT_GETPROTOENT SI_NETBSD
 +#define SANITIZER_INTERCEPT_GETNETENT SI_NETBSD
 +#define SANITIZER_INTERCEPT_FTS SI_NETBSD
-+#define SANITIZER_INTERCEPT_STRMODE SI_NETBSD
 +#define SANITIZER_INTERCEPT_REGEX SI_NETBSD
- 
- #define SANITIZER_INTERCEPT_NAME_TO_HANDLE_AT SI_LINUX_NOT_ANDROID
- #define SANITIZER_INTERCEPT_OPEN_BY_HANDLE_AT SI_LINUX_NOT_ANDROID
++
+ #endif  // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H
diff --git a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
index 8eb99b4caf..21099bb1e8 100644
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
+++ b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/sanitizer_common/TestCases/NetBSD/kvm_open.cc.orig	2018-02-16 03:15:54.219171653 +0000
+--- test/sanitizer_common/TestCases/NetBSD/kvm_open.cc.orig	2018-02-20 18:42:30.946892346 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/kvm_open.cc
 @@ -0,0 +1,13 @@
 +// RUN: %clangxx -O0 -g %s -o %t && %run %t
diff --git a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc
index f952c495ea..eb6dd83869 100644
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc
+++ b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.cc.orig	2018-02-16 03:15:54.219296677 +0000
+--- test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.cc.orig	2018-02-20 18:42:30.946969881 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.cc
 @@ -0,0 +1,13 @@
 +// RUN: %clangxx -O0 -g %s -o %t && %run %t
Prev by Date: gnucash-git: fix build after upstream converted to CMake.
Next by Date: Move over recent patches from lang/go.
Previous by Thread: gnucash-git: fix build after upstream converted to CMake.
Next by Thread: Move over recent patches from lang/go.
Indexes:
Home | Main Index | Thread Index | Old Index