pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-netbsd: Fix local patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Mon Jun 4 10:20:14 2018 +0200
Changeset: b56aa4da44220312077c490a8145d6e762dbe47d
Modified Files:
compiler-rt-netbsd/distinfo
compiler-rt-netbsd/patches/patch-CMakeLists.txt
compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
compiler-rt-netbsd/patches/patch-test_asan_TestCases_Posix_stack-use-after-return.cc
compiler-rt-netbsd/patches/patch-test_asan_TestCases_heavy__uar__test.cc
Added Files:
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
Log Message:
compiler-rt-netbsd: Fix local patches
Resurrect sanitizers.
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=b56aa4da44220312077c490a8145d6e762dbe47d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
compiler-rt-netbsd/distinfo | 19 ++++++++++---------
compiler-rt-netbsd/patches/patch-CMakeLists.txt | 4 ++--
.../patches/patch-cmake_config-ix.cmake | 6 +++---
.../patches/patch-lib_fuzzer_FuzzerLoop.cpp | 4 ++--
.../patches/patch-lib_fuzzer_tests_CMakeLists.txt | 2 +-
...-lib_sanitizer__common_sanitizer__internal__defs.h | 2 +-
.../patch-lib_sanitizer__common_sanitizer__linux.cc | 10 +++++-----
...lib_sanitizer__common_sanitizer__linux__libcdep.cc | 12 ++++++++++++
...tizer__common_sanitizer__unwind__linux__libcdep.cc | 2 +-
...est_asan_TestCases_Posix_stack-use-after-return.cc | 2 +-
.../patch-test_asan_TestCases_heavy__uar__test.cc | 2 +-
11 files changed, 39 insertions(+), 26 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index f70eefe277..a514db3e73 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,30 +1,31 @@
$NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
-SHA1 (patch-CMakeLists.txt) = f84dd8cb370dce65de45e089d85598f15774fa18
-SHA1 (patch-cmake_config-ix.cmake) = 91ffb8c1e65394c7c6e9956379373b28348e3f1f
+SHA1 (patch-CMakeLists.txt) = b80970b86107f4e17f994433e743f83160f71428
+SHA1 (patch-cmake_config-ix.cmake) = c2ac835eb5cddaf2d4820b0d21e36e18d29bd1a5
SHA1 (patch-lib_asan_asan__posix.cc) = 0f596061c078eaab0b5b4b183550aa7820677f46
SHA1 (patch-lib_asan_asan__rtl.cc) = a7570fa1e6818a4fa312d30ef9ed97e1e7ca2ca4
-SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = f658549bdb9b0b875b55e286a0e4df0dd9046117
-SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 0e559ebb791942cba9c83f3098d7752f91e1f187
+SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = 9e86608f740e199b0c1f9b6285f8e5ac3412486a
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = e2e0e397eaf148df329f2c25ca9185f57989d082
SHA1 (patch-lib_msan_msan.cc) = 7e9156927a9c4d76b933348bc15a76957712d7cc
SHA1 (patch-lib_msan_msan__interceptors.cc) = 4c036592c9c5a3b0f658f22b004b30813ad841ec
SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
SHA1 (patch-lib_sanitizer__common_sanitizer__common.h) = b31695d963eb324550ad868cbea7a8199598944c
SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = e1d8ad46afc9bec97b7f0e00d0edf5ee377772b7
SHA1 (patch-lib_sanitizer__common_sanitizer__fuchsia.cc) = 27aedcac4f63376017bb89777411b66139ddcbd9
-SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 91f645a6652d895e97b0aefbb62d80e680cd2c39
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = d4a05cefc04ce8f2428466dbfe50cefc94136421
+SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9ffcb3ae5ccfcb99d842efe55f6d698cd2e02846
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = f641782a88248bb43ef0fbfa244a403935086004
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = c1ce6657580cc0865808dd713d1f28afc3baaaa7
SHA1 (patch-lib_sanitizer__common_sanitizer__mac.cc) = 928b8798802392ae05fbe1a4ea6570681ad327f3
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = dbe5aee67312a9042299cd3bd14d25fa68860fb2
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = f242e307950755010305b004b4c2e21c528114fb
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = a5f5898534bd3c66a0fa9086781bd0124fe43281
SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc) = 8b629840ff7f56c670d322a9dbbdf7e33ce90cb5
-SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = e520ec1e0fefb3cf9fb1d872ebf81952599a6c49
+SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 5225619de386fa8e017b6d391c9f1eba4bdda2af
SHA1 (patch-lib_sanitizer__common_sanitizer__win.cc) = 8715620e8a80735363bf3e876bd2b6133b8ab53b
SHA1 (patch-lib_scudo_scudo__platform.h) = 119d7ad8f8ca9d3e846dbdd7f805ca771e30e410
SHA1 (patch-lib_tsan_rtl_tsan__rtl.cc) = b18c893d75bf682bef92e4331900fb05ec2a1870
-SHA1 (patch-test_asan_TestCases_Posix_stack-use-after-return.cc) = dea34873ff32e999da657766016a2434430be2ad
-SHA1 (patch-test_asan_TestCases_heavy__uar__test.cc) = d271e63af0b399d3e64add96a1b1b1b5e1039d7e
+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_lit.cfg) = b36c905a14ff1594dac503bc04e08f61d7e843b0
SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
diff --git a/compiler-rt-netbsd/patches/patch-CMakeLists.txt b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
index 918fd449eb..3a1f358cf3 100644
--- a/compiler-rt-netbsd/patches/patch-CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
$NetBSD$
---- CMakeLists.txt.orig 2018-04-25 21:13:40.000000000 +0000
+--- CMakeLists.txt.orig 2018-06-01 09:39:33.000000000 +0000
+++ CMakeLists.txt
-@@ -353,7 +353,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
+@@ -370,7 +370,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
${LLVM_MAIN_SRC_DIR}/../libcxx
${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR})
if(IS_DIRECTORY ${path})
diff --git a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
index 1337a02512..a4fa94d64c 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
@@ -1,8 +1,8 @@
$NetBSD$
---- cmake/config-ix.cmake.orig 2018-04-25 21:13:41.000000000 +0000
+--- cmake/config-ix.cmake.orig 2018-06-01 09:39:33.000000000 +0000
+++ cmake/config-ix.cmake
-@@ -551,7 +551,7 @@ else()
+@@ -547,7 +547,7 @@ else()
endif()
if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
@@ -11,7 +11,7 @@ $NetBSD$
set(COMPILER_RT_HAS_PROFILE TRUE)
else()
set(COMPILER_RT_HAS_PROFILE FALSE)
-@@ -599,7 +599,7 @@ else()
+@@ -595,7 +595,7 @@ else()
endif()
if (COMPILER_RT_HAS_SANITIZER_COMMON AND SCUDO_SUPPORTED_ARCH AND
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
index a1e8038195..3cfc5c1461 100644
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
@@ -1,8 +1,8 @@
$NetBSD$
---- lib/fuzzer/FuzzerLoop.cpp.orig 2018-05-10 23:16:36.000000000 +0000
+--- lib/fuzzer/FuzzerLoop.cpp.orig 2018-06-01 09:39:33.000000000 +0000
+++ lib/fuzzer/FuzzerLoop.cpp
-@@ -270,7 +270,7 @@ NO_SANITIZE_MEMORY
+@@ -271,7 +271,7 @@ NO_SANITIZE_MEMORY
void Fuzzer::AlarmCallback() {
assert(Options.UnitTimeoutSec > 0);
// In Windows Alarm callback is executed by a different thread.
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 f38a025815..ffca788606 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-04-25 21:13:39.000000000 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig 2018-06-01 09:39:33.000000000 +0000
+++ lib/fuzzer/tests/CMakeLists.txt
@@ -10,6 +10,9 @@ add_custom_target(FuzzerUnitTests)
set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
index fe925bb13e..dda748de91 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
@@ -1,6 +1,6 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_internal_defs.h.orig 2018-04-25 21:13:40.000000000 +0000
+--- lib/sanitizer_common/sanitizer_internal_defs.h.orig 2018-06-01 09:39:33.000000000 +0000
+++ lib/sanitizer_common/sanitizer_internal_defs.h
@@ -186,7 +186,9 @@ typedef u64 tid_t;
// This header should NOT include any other headers to avoid portability issues.
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 828c545107..fc73bdc5ba 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
@@ -2,14 +2,14 @@ $NetBSD$
--- lib/sanitizer_common/sanitizer_linux.cc.orig 2018-06-01 09:39:33.000000000 +0000
+++ lib/sanitizer_common/sanitizer_linux.cc
-@@ -81,6 +81,7 @@
+@@ -93,6 +93,7 @@ extern "C" {
- #if SANITIZER_FREEBSD
- #include <sys/exec.h>
+ #if SANITIZER_NETBSD
+ #include <limits.h> // For NAME_MAX
+#define sysctl _sysctl
#include <sys/sysctl.h>
- #include <machine/atomic.h>
- extern "C" {
+ #include <sys/exec.h>
+ extern struct ps_strings *__ps_strings;
@@ -1954,6 +1955,30 @@ void MaybeReexec() {
// No need to re-exec on Linux.
}
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
new file mode 100644
index 0000000000..40c788e70c
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig 2018-05-10 23:16:36.000000000 +0000
++++ lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -47,6 +47,7 @@
+ #endif
+
+ #if SANITIZER_NETBSD
++#define sysctl _sysctl
+ #include <sys/sysctl.h>
+ #include <sys/tls.h>
+ #endif
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
index 85b2dc39d1..33e9872f59 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
@@ -1,6 +1,6 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc.orig 2018-02-01 23:46:05.000000000 +0000
+--- lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc.orig 2018-05-10 23:16:36.000000000 +0000
+++ lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc
@@ -97,7 +97,7 @@ uptr Unwind_GetIP(struct _Unwind_Context
// Clear the Thumb bit.
diff --git a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_Posix_stack-use-after-return.cc b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_Posix_stack-use-after-return.cc
index 2580d79580..beb79ca070 100644
--- a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_Posix_stack-use-after-return.cc
+++ b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_Posix_stack-use-after-return.cc
@@ -1,6 +1,6 @@
$NetBSD$
---- test/asan/TestCases/Posix/stack-use-after-return.cc.orig 2018-02-01 23:45:58.000000000 +0000
+--- test/asan/TestCases/Posix/stack-use-after-return.cc.orig 2018-06-01 09:39:33.000000000 +0000
+++ test/asan/TestCases/Posix/stack-use-after-return.cc
@@ -76,9 +76,11 @@ int main(int argc, char **argv) {
pthread_attr_init(&attr);
diff --git a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_heavy__uar__test.cc b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_heavy__uar__test.cc
index 87e7da21b5..64cb4a4c52 100644
--- a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_heavy__uar__test.cc
+++ b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_heavy__uar__test.cc
@@ -1,6 +1,6 @@
$NetBSD$
---- test/asan/TestCases/heavy_uar_test.cc.orig 2018-02-01 23:45:57.000000000 +0000
+--- test/asan/TestCases/heavy_uar_test.cc.orig 2018-06-01 09:39:33.000000000 +0000
+++ test/asan/TestCases/heavy_uar_test.cc
@@ -53,8 +53,8 @@ int main(int argc, char **argv) {
RecursiveFunctionWithStackFrame<1024>(depth);
Home |
Main Index |
Thread Index |
Old Index