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

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Update to SVN r. 334704
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Thu, 14 Jun 2018 12:19:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Jun 14 14:19:52 2018 +0200
Changeset:	1278243a51689501d849ba93ae902e3e087d361f

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
	compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
	compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_esan_esan__interceptors.cpp
	compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc

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

Initial process of rebasing local patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1278243a51689501d849ba93ae902e3e087d361f

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-lib_esan_esan__interceptors.cpp  | 26 ----------------------
 .../patches/patch-lib_msan_msan__interceptors.cc   | 12 +++++-----
 .../patches/patch-lib_msan_msan__linux.cc          |  8 +++----
 ...zer__common_sanitizer__common__interceptors.inc | 10 ++++-----
 ..._sanitizer__common_sanitizer__linux__libcdep.cc |  2 +-
 ...zer__common_sanitizer__platform__interceptors.h |  4 ++--
 .../patch-lib_tsan_rtl_tsan__interceptors.cc       | 25 ---------------------
 .../patches/patch-test_fuzzer_lit.cfg              |  2 +-
 10 files changed, 26 insertions(+), 79 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 63fb9992c5..b529c3cddb 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=	334168
+SVN_REVISION.compiler-rt=	334704
 
 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 331ad3f36a..8ba7060171 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -5,17 +5,16 @@ SHA1 (patch-cmake_Modules_CompilerRTUtils.cmake) = 4867cf598d1b080c7077aaf021cf6
 SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = 2456af23f62cc919aba7358b8af25ef86cc64dc1
 SHA1 (patch-cmake_config-ix.cmake) = 3962a19ae0c07c194e8dbc56ebfc4b2c5e5ff41b
 SHA1 (patch-lib_asan_asan__posix.cc) = 0f596061c078eaab0b5b4b183550aa7820677f46
-SHA1 (patch-lib_esan_esan__interceptors.cpp) = d65c31b0d44330c669bf6d81a3cfa51954078c32
 SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = 01456bfacb94c06e008eefc660781d3c7bb1c2e7
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = e2e0e397eaf148df329f2c25ca9185f57989d082
 SHA1 (patch-lib_interception_interception.h) = a7f97b191769c846be27e17430bbe39435976642
-SHA1 (patch-lib_msan_msan__interceptors.cc) = b8d6a174a0b302a87d3f1489a439f186b034313d
-SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 0b59bf76e85b40c3ee220b3ea75e68e685f704a3
+SHA1 (patch-lib_msan_msan__interceptors.cc) = b62c0d7178031020351f2b2d4b0d4b68348bbb2e
+SHA1 (patch-lib_msan_msan__linux.cc) = 5d01793c5147cd95affe015b407f70fe01685ee6
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 925f197989db237b32c1333feff6a503925ede2d
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9ffcb3ae5ccfcb99d842efe55f6d698cd2e02846
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 83636321cef6a17281a27e2ed3dd1b71e5429a6a
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = c1ce6657580cc0865808dd713d1f28afc3baaaa7
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 0a33e3002b5074512818d21a5ede9bb0e55bfcad
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = ac380ee0334c33e1a3f112ae6ac1444e04845e43
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = d8fa7a85ff8b3214ad985a8c17ac3ffdf4db10bf
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 9a605e4fef4177c125eb7e010ef18b196e74242e
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 4ca25c16e8c586c6333976632c145ce30e71690a
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 95fef4690641063603db1b1dcb00c610948142f1
@@ -24,11 +23,10 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc) = 8b629840ff7f56c
 SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 5225619de386fa8e017b6d391c9f1eba4bdda2af
 SHA1 (patch-lib_scudo_scudo__platform.h) = 119d7ad8f8ca9d3e846dbdd7f805ca771e30e410
 SHA1 (patch-lib_tsan_CMakeLists.txt) = 1407f3eaa0edf1ddd13ceac8a6341a9e1f0a906b
-SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = e6322e4c5cdc0c052957a211079f26f49cd826d8
 SHA1 (patch-test_asan_TestCases_Posix_stack-use-after-return.cc) = 7eb1109c646b5eb4cce26140246949eb4c593a3b
 SHA1 (patch-test_asan_TestCases_heavy__uar__test.cc) = a0d7c228b02c4b5d4a198bce9ef8bc594c92544d
 SHA1 (patch-test_asan_TestCases_interception__failure__test.cc) = b4711fcc3315eaacc2a4ec1021e04b8200749e51
 SHA1 (patch-test_fuzzer_NullDerefTest.cpp) = 80b63f1c77fef2747af03c3c09a8b805ed2f27f9
-SHA1 (patch-test_fuzzer_lit.cfg) = b36c905a14ff1594dac503bc04e08f61d7e843b0
+SHA1 (patch-test_fuzzer_lit.cfg) = e4862e52b743c2ca9ac0cd0aac541e247b5baa52
 SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
 SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
diff --git a/compiler-rt-netbsd/patches/patch-lib_esan_esan__interceptors.cpp b/compiler-rt-netbsd/patches/patch-lib_esan_esan__interceptors.cpp
deleted file mode 100644
index 77942803a7..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_esan_esan__interceptors.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- lib/esan/esan_interceptors.cpp.orig	2018-04-25 21:13:40.000000000 +0000
-+++ lib/esan/esan_interceptors.cpp
-@@ -316,13 +316,6 @@ INTERCEPTOR(int, unlink, char *path) {
-   return REAL(unlink)(path);
- }
- 
--INTERCEPTOR(int, puts, const char *s) {
--  void *ctx;
--  COMMON_INTERCEPTOR_ENTER(ctx, puts, s);
--  COMMON_INTERCEPTOR_READ_RANGE(ctx, s, internal_strlen(s));
--  return REAL(puts)(s);
--}
--
- INTERCEPTOR(int, rmdir, char *path) {
-   void *ctx;
-   COMMON_INTERCEPTOR_ENTER(ctx, rmdir, path);
-@@ -495,7 +488,6 @@ void initializeInterceptors() {
-   INTERCEPT_FUNCTION(unlink);
-   INTERCEPT_FUNCTION(fread);
-   INTERCEPT_FUNCTION(fwrite);
--  INTERCEPT_FUNCTION(puts);
-   INTERCEPT_FUNCTION(rmdir);
- 
-   ESAN_MAYBE_INTERCEPT_SIGNAL;
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 f2e40132db..e0d3643756 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/msan/msan_interceptors.cc.orig	2018-06-07 08:27:17.000000000 +0000
+--- lib/msan/msan_interceptors.cc.orig	2018-06-14 12:14:39.632758893 +0000
 +++ lib/msan/msan_interceptors.cc
-@@ -33,11 +33,13 @@
+@@ -34,11 +34,13 @@
  #include "sanitizer_common/sanitizer_libc.h"
  #include "sanitizer_common/sanitizer_linux.h"
  #include "sanitizer_common/sanitizer_tls_get_addr.h"
@@ -16,7 +16,7 @@ $NetBSD$
  #endif
  
  #include <stdarg.h>
-@@ -1074,6 +1076,18 @@ INTERCEPTOR(int, pthread_join, void *th,
+@@ -1066,6 +1068,18 @@ INTERCEPTOR(int, pthread_join, void *th,
  
  extern char *tzname[2];
  
@@ -35,7 +35,7 @@ $NetBSD$
  INTERCEPTOR(void, tzset, int fake) {
    ENSURE_MSAN_INITED();
    REAL(tzset)(fake);
-@@ -1083,29 +1097,85 @@ INTERCEPTOR(void, tzset, int fake) {
+@@ -1075,29 +1089,85 @@ INTERCEPTOR(void, tzset, int fake) {
      __msan_unpoison(tzname[1], REAL(strlen)(tzname[1]) + 1);
    return;
  }
@@ -124,7 +124,7 @@ $NetBSD$
  }
  
  static void BeforeFork() {
-@@ -1525,6 +1595,9 @@ namespace __msan {
+@@ -1517,6 +1587,9 @@ namespace __msan {
  void InitializeInterceptors() {
    static int inited = 0;
    CHECK_EQ(inited, 0);
@@ -134,7 +134,7 @@ $NetBSD$
    InitializeCommonInterceptors();
    InitializeSignalInterceptors();
  
-@@ -1635,6 +1708,7 @@ void InitializeInterceptors() {
+@@ -1626,6 +1699,7 @@ void InitializeInterceptors() {
  
    INTERCEPT_FUNCTION(pthread_join);
    INTERCEPT_FUNCTION(tzset);
diff --git a/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc b/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
index 9d80fab403..85e11ac063 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/msan/msan_linux.cc.orig	2018-02-01 23:45:59.000000000 +0000
+--- lib/msan/msan_linux.cc.orig	2018-06-14 12:14:39.633338965 +0000
 +++ lib/msan/msan_linux.cc
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
  #include <sys/time.h>
  #include <sys/resource.h>
  
@@ -10,7 +10,7 @@ $NetBSD$
  #include "sanitizer_common/sanitizer_common.h"
  #include "sanitizer_common/sanitizer_procmaps.h"
  
-@@ -174,13 +175,28 @@ void InstallAtExitHandler() {
+@@ -175,13 +176,28 @@ void InstallAtExitHandler() {
  
  // ---------------------- TSD ---------------- {{{1
  
@@ -39,7 +39,7 @@ $NetBSD$
  }
  
  static THREADLOCAL MsanThread* msan_current_thread;
-@@ -195,16 +211,20 @@ void SetCurrentThread(MsanThread *t) {
+@@ -196,16 +212,20 @@ void SetCurrentThread(MsanThread *t) {
    msan_current_thread = t;
    // Make sure that MsanTSDDtor gets called at the end.
    CHECK(tsd_key_inited);
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 f3db0d6946..0257d30cc3 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-06-01 09:36:54.000000000 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-06-14 12:14:39.819761270 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -77,6 +77,11 @@
  #define ctime __ctime50
@@ -23,7 +23,7 @@ $NetBSD$
  extern const unsigned short *_ctype_tab_;
  extern const short *_toupper_tab_;
  extern const short *_tolower_tab_;
-@@ -3301,14 +3308,14 @@ INTERCEPTOR(INTMAX_T, strtoimax, const c
+@@ -3345,14 +3352,14 @@ INTERCEPTOR(INTMAX_T, strtoimax, const c
    return res;
  }
  
@@ -40,7 +40,7 @@ $NetBSD$
    StrtolFixAndCheck(ctx, nptr, endptr, real_endptr, base);
    return res;
  }
-@@ -4196,7 +4203,7 @@ INTERCEPTOR(int, fstatfs64, int fd, void
+@@ -4240,7 +4247,7 @@ INTERCEPTOR(int, fstatfs64, int fd, void
  #endif
  
  #if SANITIZER_INTERCEPT_STATVFS
@@ -49,7 +49,7 @@ $NetBSD$
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, statvfs, path, buf);
    if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1);
-@@ -7190,6 +7197,1534 @@ INTERCEPTOR(struct __sanitizer_netent *,
+@@ -7234,6 +7241,1534 @@ INTERCEPTOR(struct __sanitizer_netent *,
  #define INIT_NETENT
  #endif
  
@@ -1584,7 +1584,7 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7436,6 +8971,28 @@ static void InitializeCommonInterceptors
+@@ -7483,6 +9018,28 @@ static void InitializeCommonInterceptors
    INIT_TTYENT;
    INIT_PROTOENT;
    INIT_NETENT;
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 40c788e70c..5994f41c7e 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
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig	2018-05-10 23:16:36.000000000 +0000
+--- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig	2018-06-14 12:14:40.034210928 +0000
 +++ lib/sanitizer_common/sanitizer_linux_libcdep.cc
 @@ -47,6 +47,7 @@
  #endif
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 bcc87fa880..530e36ec7f 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,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-06-06 19:08:28.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-06-14 12:14:40.207391924 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -507,4 +507,27 @@
+@@ -510,4 +510,27 @@
  #define SANITIZER_INTERCEPT_PROTOENT SI_NETBSD
  #define SANITIZER_INTERCEPT_NETENT SI_NETBSD
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc b/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc
deleted file mode 100644
index 8583e9da15..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- lib/tsan/rtl/tsan_interceptors.cc.orig	2018-06-06 19:08:28.000000000 +0000
-+++ lib/tsan/rtl/tsan_interceptors.cc
-@@ -1736,12 +1736,6 @@ TSAN_INTERCEPTOR(void, abort, int fake) 
-   REAL(abort)(fake);
- }
- 
--TSAN_INTERCEPTOR(int, puts, const char *s) {
--  SCOPED_TSAN_INTERCEPTOR(puts, s);
--  MemoryAccessRange(thr, pc, (uptr)s, internal_strlen(s), false);
--  return REAL(puts)(s);
--}
--
- TSAN_INTERCEPTOR(int, rmdir, char *path) {
-   SCOPED_TSAN_INTERCEPTOR(rmdir, path);
-   Release(thr, pc, Dir2addr(path));
-@@ -2709,7 +2703,6 @@ void InitializeInterceptors() {
-   TSAN_INTERCEPT(fread);
-   TSAN_INTERCEPT(fwrite);
-   TSAN_INTERCEPT(abort);
--  TSAN_INTERCEPT(puts);
-   TSAN_INTERCEPT(rmdir);
-   TSAN_INTERCEPT(closedir);
- 
diff --git a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg b/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
index 1bac92a929..f92b1cdc63 100644
--- a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/fuzzer/lit.cfg.orig	2018-04-25 21:13:41.000000000 +0000
+--- test/fuzzer/lit.cfg.orig	2018-06-14 12:14:40.053065388 +0000
 +++ test/fuzzer/lit.cfg
 @@ -25,7 +25,7 @@ else:
  config.test_format = lit.formats.ShTest(execute_external)
Prev by Date: 389-ds-base: Add a reference to CVE-2018-10850
Next by Date: (editors/emacs26) DESCR updated for 26.x
Previous by Thread: 389-ds-base: Add a reference to CVE-2018-10850
Next by Thread: (editors/emacs26) DESCR updated for 26.x
Indexes:
Home | Main Index | Thread Index | Old Index