compiler-rt-netbsd: Rebase to SVN r. 346098

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Rebase to SVN r. 346098
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Sun, 04 Nov 2018 15:56:21 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Nov 4 16:56:21 2018 +0100
Changeset:	c1fcfc3b63c8008f4f159969134930ea3891de66

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
	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__platform__interceptors.h
	compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt

Log Message:
compiler-rt-netbsd: Rebase to SVN r. 346098

Partially merged upstream patch for tzset interceptor in MSan.
[PATCH] D42050: Intercept tzset in MSan on NetBSD
[compiler-rt] r346098 - Disable recursive interception for tzset in MSan

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

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                        | 10 +++----
 .../patches/patch-lib_fuzzer_tests_CMakeLists.txt  |  2 +-
 .../patches/patch-lib_msan_msan__interceptors.cc   | 34 +++-------------------
 ...zer__common_sanitizer__common__interceptors.inc |  2 +-
 ...zer__common_sanitizer__platform__interceptors.h |  2 +-
 .../patches/patch-lib_xray_tests_CMakeLists.txt    |  2 +-
 7 files changed, 14 insertions(+), 40 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 43d728c667..1831c3bcf6 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=	346042
+SVN_REVISION.compiler-rt=	346098
 
 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 8c169145b2..b44e9da259 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -4,18 +4,18 @@ SHA1 (patch-CMakeLists.txt) = 1b1dadaae195fd040ebde7428a8af8915c35d2c1
 SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = fde0a4b440a257dec40c4f106c2352d5efecceef
 SHA1 (patch-lib_asan_asan__posix.cc) = be7e47c252e30184639f7ed1c98c75a8667fd261
 SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = b2e226a0d7b230cc8598a0591ae6f688527c6b2d
-SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = ee809130e36a9157a9bd1c01d45e651b4f2ba26b
-SHA1 (patch-lib_msan_msan__interceptors.cc) = b12404d0dd3ac08c1c6cfeb51c6e28b23b82f770
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 2a81399dddc19de5bd51e77ef52b8b5cd61b7dc4
+SHA1 (patch-lib_msan_msan__interceptors.cc) = a5098beb0035b34239c39ee517a554b2b84458d1
 SHA1 (patch-lib_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 736749f53ea6f51e2eb6650a5c0e336b773581b3
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 80ba348d0fa17ad408a96c47dcdfa082ad87d482
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9475c8018dadbc4d865b52a03e43f9eae2011c3e
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 58a1dea6a852a4de20f23cd90900c387fe555dce
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 834f7497726ff8d6cf974a07634e0073d07b5c55
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = f0733196629f3750a214b801fb24305c86095dd1
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 9e4e6625f756f248650f1f17d30b3e0bd6b7559e
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = eb112d60396d34a25ed4d150bf5282bc4265f738
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 7c16ba866352f3a695a544094ca46f0f561c43c5
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 9f535e84c3e1ab5704b11e388ac240439a9900d6
 SHA1 (patch-lib_tsan_CMakeLists.txt) = 4d8f8081ff2a3249565df26e67a35b5b3509e0b0
-SHA1 (patch-lib_xray_tests_CMakeLists.txt) = 2030111b5d6b02575544ad3f18cd3fe4c1277f98
+SHA1 (patch-lib_xray_tests_CMakeLists.txt) = 3e36be790ac2e03a6873d502486f2d4e21a4a1a0
 SHA1 (patch-lib_xray_xray__init.cc) = 734a67f9daef2a675a04e5fe3a5ace0b2d38c991
 SHA1 (patch-test_xray_TestCases_Posix_fork__basic__logging.cc) = fb1af8ec67bcd775614050f39e793020bcb280e4
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
index 492285e811..3e548ef2af 100644
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/fuzzer/tests/CMakeLists.txt.orig	2018-10-25 20:11:47.000000000 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig	2018-11-04 15:43:06.000000000 +0000
 +++ lib/fuzzer/tests/CMakeLists.txt
 @@ -13,6 +13,9 @@ add_custom_target(FuzzerUnitTests)
  set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
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 1db8ab26c5..0124b05fec 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-10-30 08:42:08.000000000 +0000
+--- lib/msan/msan_interceptors.cc.orig	2018-11-04 15:43:06.000000000 +0000
 +++ lib/msan/msan_interceptors.cc
 @@ -34,6 +34,7 @@
  #include "sanitizer_common/sanitizer_libc.h"
@@ -10,33 +10,7 @@ $NetBSD$
  
  #if SANITIZER_NETBSD
  #define fstat __fstat50
-@@ -1070,6 +1071,18 @@ INTERCEPTOR(int, pthread_join, void *th,
- 
- extern char *tzname[2];
- 
-+#if SANITIZER_NETBSD
-+INTERCEPTOR(void, tzset, void) {
-+  ENSURE_MSAN_INITED();
-+  InterceptorScope interceptor_scope;
-+  REAL(tzset)();
-+  if (tzname[0])
-+    __msan_unpoison(tzname[0], REAL(strlen)(tzname[0]) + 1);
-+  if (tzname[1])
-+    __msan_unpoison(tzname[1], REAL(strlen)(tzname[1]) + 1);
-+  return;
-+}
-+#else
- INTERCEPTOR(void, tzset, int fake) {
-   ENSURE_MSAN_INITED();
-   REAL(tzset)(fake);
-@@ -1079,29 +1092,85 @@ INTERCEPTOR(void, tzset, int fake) {
-     __msan_unpoison(tzname[1], REAL(strlen)(tzname[1]) + 1);
-   return;
- }
-+#endif
- 
- struct MSanAtExitRecord {
-   void (*func)(void *arg);
+@@ -1086,23 +1087,78 @@ struct MSanAtExitRecord {
    void *arg;
  };
  
@@ -118,7 +92,7 @@ $NetBSD$
  }
  
  static void BeforeFork() {
-@@ -1521,6 +1590,9 @@ namespace __msan {
+@@ -1522,6 +1578,9 @@ namespace __msan {
  void InitializeInterceptors() {
    static int inited = 0;
    CHECK_EQ(inited, 0);
@@ -128,7 +102,7 @@ $NetBSD$
    InitializeCommonInterceptors();
    InitializeSignalInterceptors();
  
-@@ -1630,6 +1702,7 @@ void InitializeInterceptors() {
+@@ -1631,6 +1690,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 d29c2e40ed..fdd0adf4fa 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-11-02 21:28:35.000460171 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-11-02 21:28:35.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -77,6 +77,11 @@
  #define ctime __ctime50
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 efc7abd8fa..70ab2ec59e 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,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-11-02 21:28:35.000953061 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-11-02 21:28:35.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
 @@ -360,7 +360,9 @@
  #define SANITIZER_INTERCEPT_TEMPNAM SI_POSIX
diff --git a/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
index 9d1155c570..867c128410 100644
--- a/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/xray/tests/CMakeLists.txt.orig	2018-11-02 21:28:34.413617931 +0000
+--- lib/xray/tests/CMakeLists.txt.orig	2018-11-02 21:28:34.000000000 +0000
 +++ lib/xray/tests/CMakeLists.txt
 @@ -70,6 +70,7 @@ if (NOT APPLE)
      list(APPEND XRAY_UNITTEST_LINK_FLAGS -lLLVMXRay -lLLVMSupport -lLLVMTestingSupport)
Prev by Date: wyeb-git: patch to check response status code before downloading files
Next by Date: gitea: Add a reference to CVE-2018-18926
Previous by Thread: wyeb-git: patch to check response status code before downloading files
Next by Thread: gitea: Add a reference to CVE-2018-18926
Indexes:
Home | Main Index | Thread Index | Old Index