pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-netbsd: Rebase to SVN r. 343840
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Oct 5 09:13:26 2018 +0200
Changeset: 10a407450549a62ecff810762bbe743c298bc08a
Modified Files:
compiler-rt-netbsd/Makefile
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_sanitizer__common_sanitizer__linux.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__mac.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
compiler-rt-netbsd/patches/patch-lib_xray_xray__x86__64.cc
Log Message:
compiler-rt-netbsd: Rebase to SVN r. 343840
Patch merged upstream:
[PATCH] D52793: Introduce internal_sysctlbyname in place of sysctlbyname
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=10a407450549a62ecff810762bbe743c298bc08a
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 +++++------
compiler-rt-netbsd/patches/patch-CMakeLists.txt | 6 ++---
.../patches/patch-cmake_config-ix.cmake | 2 +-
...patch-lib_sanitizer__common_sanitizer__linux.cc | 28 ----------------------
.../patch-lib_sanitizer__common_sanitizer__mac.cc | 15 ------------
...atch-lib_sanitizer__common_sanitizer__netbsd.cc | 17 -------------
.../patch-lib_sanitizer__common_sanitizer__posix.h | 11 ---------
.../patches/patch-lib_xray_xray__x86__64.cc | 26 --------------------
9 files changed, 12 insertions(+), 109 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 72157810e4..836f62c331 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= 343523
+SVN_REVISION.compiler-rt= 343840
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 25f21fbf12..c31b61afeb 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
-SHA1 (patch-CMakeLists.txt) = 4286775f79789de60b44e7ccf15187a21ca6d658
+SHA1 (patch-CMakeLists.txt) = b0570b45cbcb6a5303efa84187244779620e4e6c
SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = fde0a4b440a257dec40c4f106c2352d5efecceef
-SHA1 (patch-cmake_config-ix.cmake) = 021b24dcf1598040d4f77d872e17bbdad91339dd
+SHA1 (patch-cmake_config-ix.cmake) = 47fd4f4daccd26ee3086aa810255cac7c036d00b
SHA1 (patch-lib_asan_asan__posix.cc) = be7e47c252e30184639f7ed1c98c75a8667fd261
SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = b2e226a0d7b230cc8598a0591ae6f688527c6b2d
SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = c3d8a78f96566e5b8d2d8a5cbaba60990bfd6efe
@@ -11,21 +11,21 @@ SHA1 (patch-lib_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = d48fd71509c2adfb5fc5aacfec1dc8fd07640414
SHA1 (patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc) = 8e31ef0974fd12505b2d61723181b852d66815ce
SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9475c8018dadbc4d865b52a03e43f9eae2011c3e
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 692b8abc40d8f932ee87e5f155d5b90e0ad4df9e
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 8d156e4b51961bab6bae3ee30df8e18aea632b5d
-SHA1 (patch-lib_sanitizer__common_sanitizer__mac.cc) = 6d80bd2de5c92a4ec2984b2f490cf4e1d5ce3d99
-SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd.cc) = 093b6f4d8138b56ef2d252a8ac6f133ad09a77e4
+SHA1 (patch-lib_sanitizer__common_sanitizer__mac.cc) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd.cc) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 87684ad05a8e3a5ab2f1c9cf00cbecab4823eeb3
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = b8125c783a773497436536b7f4deead8c36633c5
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e8a0d9389f3ddd41f911e00f8ff62e214441296d
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_sanitizer__common_sanitizer__posix.h) = 2d6c684ba47d591ecdbef19306d50cbaa989be09
+SHA1 (patch-lib_sanitizer__common_sanitizer__posix.h) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 86d53010debaf2cc5c9793d83186db2db76b280f
SHA1 (patch-lib_scudo_scudo__platform.h) = 68f33b18d913984c3a459597ef62f63d36184ca9
SHA1 (patch-lib_tsan_CMakeLists.txt) = 4d8f8081ff2a3249565df26e67a35b5b3509e0b0
SHA1 (patch-lib_xray_tests_CMakeLists.txt) = bb52916184d8e829395dd40d6d1b8b7eac40da92
-SHA1 (patch-lib_xray_xray__x86__64.cc) = 635983973b4fd03227dd99ccb2808faad6e1bb59
+SHA1 (patch-lib_xray_xray__x86__64.cc) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
SHA1 (patch-test_asan_TestCases_Posix_stack-use-after-return.cc) = 474bfca0e8891bb777a81ae926c89c3d56f7cdb9
SHA1 (patch-test_asan_TestCases_heavy__uar__test.cc) = fce8bfec44d93bb606920dba9ddd7165f127d23a
SHA1 (patch-test_asan_TestCases_interception__failure__test.cc) = 0a359141e3c30b672842904b32d1542170b03ab1
diff --git a/compiler-rt-netbsd/patches/patch-CMakeLists.txt b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
index 93da2187f5..0946bb55f5 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-09-26 10:51:26.000000000 +0000
+--- CMakeLists.txt.orig 2018-10-05 07:12:08.785131673 +0000
+++ CMakeLists.txt
-@@ -398,6 +398,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuch
+@@ -390,6 +390,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuch
list(APPEND SANITIZER_COMMON_LINK_LIBS zircon)
endif()
@@ -13,7 +13,7 @@ $NetBSD$
if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++")
if (SANITIZER_CXX_ABI_INTREE)
if (NOT LIBCXXABI_ENABLE_STATIC_UNWINDER AND (TARGET unwind_shared OR HAVE_LIBUNWIND))
-@@ -440,7 +444,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
+@@ -432,7 +436,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 1d4dfb2656..dec992b8d9 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-09-26 10:51:26.000000000 +0000
+--- cmake/config-ix.cmake.orig 2018-10-05 07:12:08.792736398 +0000
+++ cmake/config-ix.cmake
@@ -584,7 +584,7 @@ else()
endif()
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 89cd712f2c..afc76512f4 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,30 +1,2 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_linux.cc.orig 2018-10-01 21:40:24.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_linux.cc
-@@ -591,7 +591,7 @@ static void GetArgsAndEnv(char ***argv,
- // this information. See also <sys/exec.h>.
- ps_strings *pss;
- size_t sz = sizeof(pss);
-- if (sysctlbyname("kern.ps_strings", &pss, &sz, NULL, 0) == -1) {
-+ if (internal_sysctlbyname("kern.ps_strings", &pss, &sz, NULL, 0) == -1) {
- Printf("sysctl kern.ps_strings failed\n");
- Die();
- }
-@@ -796,6 +796,16 @@ int internal_sysctl(const int *name, uns
- return sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
- #endif
- }
-+
-+int internal_sysctlbyname(const char *sname, void *oldp, uptr *oldlenp,
-+ const void *newp, uptr newlen) {
-+#if SANITIZER_OPENBSD
-+ return sysctlbyname(sname, oldp, (size_t *)oldlenp, (void *)newp,
-+ (size_t)newlen);
-+#else
-+ return sysctlbyname(sname, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
-+#endif
-+}
- #endif
-
- #if SANITIZER_LINUX
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__mac.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__mac.cc
index 8c9397d242..afc76512f4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__mac.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__mac.cc
@@ -1,17 +1,2 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_mac.cc.orig 2018-10-01 21:40:24.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_mac.cc
-@@ -219,6 +219,12 @@ int internal_sysctl(const int *name, uns
- const_cast<void *>(newp), (size_t)newlen);
- }
-
-+int internal_sysctlbyname(const char *sname, void *oldp, uptr *oldlenp,
-+ const void *newp, uptr newlen) {
-+ return sysctlbyname(sname, oldp, (size_t *)oldlenp, const_cast<void *>(newp),
-+ (size_t)newlen);
-+}
-+
- int internal_forkpty(int *amaster) {
- int master, slave;
- if (openpty(&master, &slave, nullptr, nullptr, nullptr) == -1) return -1;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd.cc
index 68f6aaf6f9..afc76512f4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd.cc
@@ -1,19 +1,2 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_netbsd.cc.orig 2018-10-01 21:40:24.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_netbsd.cc
-@@ -297,6 +297,14 @@ DEFINE_INTERNAL(int, sysctl, const int *
- return __sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
- }
-
-+DEFINE_INTERNAL(int, sysctlbyname, const char *sname, void *oldp,
-+ uptr *oldlenp, const void *newp, uptr newlen) {
-+ DEFINE__REAL(int, sysctlbyname, const char *a, void *b, size_t *c,
-+ const void *d, size_t e);
-+ return _REAL(sysctlbyname, sname, oldp, (size_t *)oldlenp, newp,
-+ (size_t)newlen);
-+}
-+
- DEFINE_INTERNAL(uptr, sigprocmask, int how, __sanitizer_sigset_t *set,
- __sanitizer_sigset_t *oldset) {
- CHECK(&_sys___sigprocmask14);
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 f835a47527..afc76512f4 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
@@ -1,13 +1,2 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_posix.h.orig 2018-08-31 08:13:43.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_posix.h
-@@ -62,6 +62,8 @@ int internal_forkpty(int *amaster);
-
- int internal_sysctl(const int *name, unsigned int namelen, void *oldp,
- uptr *oldlenp, const void *newp, uptr newlen);
-+int internal_sysctlbyname(const char *sname, void *oldp, uptr *oldlenp,
-+ const void *newp, uptr newlen);
-
- // These functions call appropriate pthread_ functions directly, bypassing
- // the interceptor. They are weak and may not be present in some tools.
diff --git a/compiler-rt-netbsd/patches/patch-lib_xray_xray__x86__64.cc b/compiler-rt-netbsd/patches/patch-lib_xray_xray__x86__64.cc
index 4126dfc030..afc76512f4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_xray_xray__x86__64.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_xray_xray__x86__64.cc
@@ -1,28 +1,2 @@
$NetBSD$
---- lib/xray/xray_x86_64.cc.orig 2018-08-31 08:13:42.000000000 +0000
-+++ lib/xray/xray_x86_64.cc
-@@ -1,5 +1,6 @@
- #include "cpuid.h"
- #include "sanitizer_common/sanitizer_common.h"
-+#include "sanitizer_common/sanitizer_posix.h"
- #include "xray_defs.h"
- #include "xray_interface_internal.h"
-
-@@ -87,13 +88,13 @@ uint64_t getTSCFrequency() XRAY_NEVER_IN
- size_t tscfreqsz = sizeof(TSCFrequency);
- #if SANITIZER_OPENBSD
- int Mib[2] = { CTL_MACHDEP, CPU_TSCFREQ };
-- if (sysctl(Mib, 2, &TSCFrequency, &tscfreqsz, NULL, 0) != -1) {
-+ if (internal_sysctl(Mib, 2, &TSCFrequency, &tscfreqsz, NULL, 0) != -1) {
- #elif SANITIZER_MAC
-- if (sysctlbyname("machdep.tsc.frequency", &TSCFrequency, &tscfreqsz,
-+ if (internal_sysctlbyname("machdep.tsc.frequency", &TSCFrequency, &tscfreqsz,
- NULL, 0) != -1 ) {
-
- #else
-- if (sysctlbyname("machdep.tsc_freq", &TSCFrequency, &tscfreqsz,
-+ if (internal_sysctlbyname("machdep.tsc_freq", &TSCFrequency, &tscfreqsz,
- NULL, 0) != -1) {
- #endif
- return static_cast<uint64_t>(TSCFrequency);
Home |
Main Index |
Thread Index |
Old Index