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. 343084
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Sep 26 12:56:50 2018 +0200
Changeset: 258ef95ecffae48d03274fecb7a019b6b0ba9b0a
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__internal__defs.h
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
Log Message:
compiler-rt-netbsd: Rebase to SVN r. 343084
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=258ef95ecffae48d03274fecb7a019b6b0ba9b0a
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 | 15 +++---
compiler-rt-netbsd/patches/patch-CMakeLists.txt | 6 +--
.../patches/patch-cmake_config-ix.cmake | 6 +--
...b_sanitizer__common_sanitizer__internal__defs.h | 2 +-
...patch-lib_sanitizer__common_sanitizer__linux.cc | 55 +++++++++++-----------
...r__common_sanitizer__platform__limits__posix.cc | 2 +-
.../patches/patch-lib_tsan_CMakeLists.txt | 4 +-
.../patches/patch-test_fuzzer_lit.cfg | 15 +++---
9 files changed, 52 insertions(+), 55 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index eb83d14a04..14cb841461 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= 341183
+SVN_REVISION.compiler-rt= 343084
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 5af126442c..8276b1ca7b 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) = 41a98b874a62c46fb83b899d547c72c817be8127
+SHA1 (patch-CMakeLists.txt) = 4286775f79789de60b44e7ccf15187a21ca6d658
SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = fde0a4b440a257dec40c4f106c2352d5efecceef
-SHA1 (patch-cmake_config-ix.cmake) = 9edb16aff65429d088082d1869b6034019abed33
+SHA1 (patch-cmake_config-ix.cmake) = 021b24dcf1598040d4f77d872e17bbdad91339dd
SHA1 (patch-lib_asan_asan__posix.cc) = be7e47c252e30184639f7ed1c98c75a8667fd261
SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = b2e226a0d7b230cc8598a0591ae6f688527c6b2d
SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = c3d8a78f96566e5b8d2d8a5cbaba60990bfd6efe
@@ -10,24 +10,23 @@ SHA1 (patch-lib_msan_msan__interceptors.cc) = 7af07c88b0ddf650f3df5dea4f6664ff93
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) = 1c6e8c4a755af57d523d06b12f08a1946f1aef25
-SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = e231d87d8e04d528f73275f5de7000c2b395a9c4
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 858b68b4e472cc0fc90f88406c3d159ae107e38c
+SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9475c8018dadbc4d865b52a03e43f9eae2011c3e
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 1e62caf8663ab25a7894a397bc6b14be3384ccec
SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 8d156e4b51961bab6bae3ee30df8e18aea632b5d
-SHA1 (patch-lib_sanitizer__common_sanitizer__mac.cc) = 6f1b9ae0ee35166f32b0865c82cfdd6eca5c1047
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 87684ad05a8e3a5ab2f1c9cf00cbecab4823eeb3
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = b52e02792201d54d1f9e9336a8cf74ff8c9eca68
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e8a0d9389f3ddd41f911e00f8ff62e214441296d
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 3fb785fdc01d68425b7ff9ccabd7d28057b47597
+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__procmaps__bsd.cc) = c4ef1f0bd0f297c5b9e8f93b75cd9df082cb9394
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) = 11fda934da12d046350463076bed2c209ec682e9
+SHA1 (patch-lib_tsan_CMakeLists.txt) = 4d8f8081ff2a3249565df26e67a35b5b3509e0b0
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
SHA1 (patch-test_fuzzer_NullDerefTest.cpp) = 32b012ffd94a935cbdf9d8f53402f79743ccca74
-SHA1 (patch-test_fuzzer_lit.cfg) = 22ff655f201f1df7a8dcaf3e1b70e113647ef705
+SHA1 (patch-test_fuzzer_lit.cfg) = 20f060b479ffefeed9241f53faee0a22adb0ade8
SHA1 (patch-test_lsan_lit.common.cfg) = 4e0a0f71dfb7c19b62747abaa5f265e0f0dc1e05
SHA1 (patch-test_scudo_lit.cfg) = 708c7bcf31b5fbf1c5b48da8882978c25908362c
SHA1 (patch-utils_generate__netbsd__ioctls.awk) = 56c92131aa95b64765af3e9b60fd7d7cc55facbc
diff --git a/compiler-rt-netbsd/patches/patch-CMakeLists.txt b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
index 0329f1a781..93da2187f5 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-08-31 08:13:43.000000000 +0000
+--- CMakeLists.txt.orig 2018-09-26 10:51:26.000000000 +0000
+++ CMakeLists.txt
-@@ -341,6 +341,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuch
+@@ -398,6 +398,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))
-@@ -383,7 +387,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
+@@ -440,7 +444,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 e5d6ab65c0..1d4dfb2656 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-08-31 08:13:42.000000000 +0000
+--- cmake/config-ix.cmake.orig 2018-09-26 10:51:26.000000000 +0000
+++ cmake/config-ix.cmake
-@@ -557,7 +557,7 @@ else()
+@@ -584,7 +584,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)
-@@ -605,7 +605,7 @@ else()
+@@ -632,7 +632,7 @@ else()
endif()
if (COMPILER_RT_HAS_SANITIZER_COMMON AND SCUDO_SUPPORTED_ARCH AND
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 1fb84c264d..0edac63440 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-08-21 21:25:40.000000000 +0000
+--- lib/sanitizer_common/sanitizer_internal_defs.h.orig 2018-09-26 10:51:27.000000000 +0000
+++ lib/sanitizer_common/sanitizer_internal_defs.h
@@ -196,7 +196,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 cc8d4d061c..82f96a2c23 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,8 +1,8 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_linux.cc.orig 2018-08-31 08:32:18.000000000 +0000
+--- lib/sanitizer_common/sanitizer_linux.cc.orig 2018-09-26 10:51:27.000000000 +0000
+++ lib/sanitizer_common/sanitizer_linux.cc
-@@ -160,6 +160,32 @@ extern void internal_sigreturn();
+@@ -161,6 +161,32 @@ extern void internal_sigreturn();
# endif
#endif // SANITIZER_USE_GETENTROPY
@@ -35,7 +35,7 @@ $NetBSD$
namespace __sanitizer {
#if SANITIZER_LINUX && defined(__x86_64__)
-@@ -172,14 +198,27 @@ namespace __sanitizer {
+@@ -173,14 +199,27 @@ namespace __sanitizer {
#include "sanitizer_syscall_generic.inc"
#endif
@@ -65,7 +65,7 @@ $NetBSD$
#elif SANITIZER_FREEBSD || SANITIZER_LINUX_USES_64BIT_SYSCALLS
return internal_syscall(SYSCALL(mmap), (uptr)addr, length, prot, flags, fd,
offset);
-@@ -194,20 +233,46 @@ uptr internal_mmap(void *addr, uptr leng
+@@ -195,20 +234,46 @@ uptr internal_mmap(void *addr, uptr leng
#if !SANITIZER_OPENBSD
uptr internal_munmap(void *addr, uptr length) {
@@ -113,7 +113,7 @@ $NetBSD$
return internal_syscall(SYSCALL(openat), AT_FDCWD, (uptr)filename, flags);
#else
return internal_syscall_ptr(SYSCALL(open), (uptr)filename, flags);
-@@ -215,7 +280,10 @@ uptr internal_open(const char *filename,
+@@ -216,7 +281,10 @@ uptr internal_open(const char *filename,
}
uptr internal_open(const char *filename, int flags, u32 mode) {
@@ -125,7 +125,7 @@ $NetBSD$
return internal_syscall(SYSCALL(openat), AT_FDCWD, (uptr)filename, flags,
mode);
#else
-@@ -225,22 +293,33 @@ uptr internal_open(const char *filename,
+@@ -226,22 +294,33 @@ uptr internal_open(const char *filename,
uptr internal_read(fd_t fd, void *buf, uptr count) {
sptr res;
@@ -160,7 +160,7 @@ $NetBSD$
#else
HANDLE_EINTR(res, (sptr)internal_syscall(SYSCALL(ftruncate), fd,
(OFF_T)size));
-@@ -316,7 +395,14 @@ static void kernel_stat_to_stat(struct k
+@@ -317,7 +396,14 @@ static void kernel_stat_to_stat(struct k
#endif
uptr internal_stat(const char *path, void *buf) {
@@ -176,7 +176,7 @@ $NetBSD$
return internal_syscall_ptr(SYSCALL(fstatat), AT_FDCWD, (uptr)path, (uptr)buf,
0);
#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
-@@ -342,7 +428,13 @@ uptr internal_stat(const char *path, voi
+@@ -343,7 +429,13 @@ uptr internal_stat(const char *path, voi
uptr internal_lstat(const char *path, void *buf) {
#if SANITIZER_NETBSD
@@ -191,7 +191,7 @@ $NetBSD$
#elif SANITIZER_FREEBSD || SANITIZER_OPENBSD
return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path, (uptr)buf,
AT_SYMLINK_NOFOLLOW);
-@@ -368,9 +460,16 @@ uptr internal_lstat(const char *path, vo
+@@ -369,9 +461,16 @@ uptr internal_lstat(const char *path, vo
}
uptr internal_fstat(fd_t fd, void *buf) {
@@ -210,7 +210,7 @@ $NetBSD$
// For mips64, fstat syscall fills buffer in the format of kernel_stat
struct kernel_stat kbuf;
int res = internal_syscall(SYSCALL(fstat), fd, &kbuf);
-@@ -395,7 +494,14 @@ uptr internal_filesize(fd_t fd) {
+@@ -396,7 +495,14 @@ uptr internal_filesize(fd_t fd) {
}
uptr internal_dup2(int oldfd, int newfd) {
@@ -226,7 +226,7 @@ $NetBSD$
return internal_syscall(SYSCALL(dup3), oldfd, newfd, 0);
#else
return internal_syscall(SYSCALL(dup2), oldfd, newfd);
-@@ -403,7 +509,9 @@ uptr internal_dup2(int oldfd, int newfd)
+@@ -404,7 +510,9 @@ uptr internal_dup2(int oldfd, int newfd)
}
uptr internal_readlink(const char *path, char *buf, uptr bufsize) {
@@ -237,7 +237,7 @@ $NetBSD$
return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,
bufsize);
#elif SANITIZER_OPENBSD
-@@ -415,7 +523,14 @@ uptr internal_readlink(const char *path,
+@@ -416,7 +524,14 @@ uptr internal_readlink(const char *path,
}
uptr internal_unlink(const char *path) {
@@ -253,7 +253,7 @@ $NetBSD$
return internal_syscall(SYSCALL(unlinkat), AT_FDCWD, (uptr)path, 0);
#else
return internal_syscall_ptr(SYSCALL(unlink), (uptr)path);
-@@ -423,7 +538,15 @@ uptr internal_unlink(const char *path) {
+@@ -424,7 +539,15 @@ uptr internal_unlink(const char *path) {
}
uptr internal_rename(const char *oldpath, const char *newpath) {
@@ -270,7 +270,7 @@ $NetBSD$
return internal_syscall(SYSCALL(renameat), AT_FDCWD, (uptr)oldpath, AT_FDCWD,
(uptr)newpath);
#else
-@@ -432,11 +555,23 @@ uptr internal_rename(const char *oldpath
+@@ -433,11 +556,23 @@ uptr internal_rename(const char *oldpath
}
uptr internal_sched_yield() {
@@ -295,7 +295,7 @@ $NetBSD$
internal_syscall(SYSCALL(exit), exitcode);
#else
internal_syscall(SYSCALL(exit_group), exitcode);
-@@ -448,15 +583,25 @@ unsigned int internal_sleep(unsigned int
+@@ -449,15 +584,25 @@ unsigned int internal_sleep(unsigned int
struct timespec ts;
ts.tv_sec = 1;
ts.tv_nsec = 0;
@@ -321,7 +321,7 @@ $NetBSD$
}
#endif // !SANITIZER_SOLARIS
-@@ -514,12 +659,33 @@ u64 NanoTime() {
+@@ -515,12 +660,33 @@ u64 NanoTime() {
kernel_timeval tv;
#endif
internal_memset(&tv, 0, sizeof(tv));
@@ -355,7 +355,7 @@ $NetBSD$
}
#endif // !SANITIZER_SOLARIS
-@@ -527,7 +693,7 @@ uptr internal_clock_gettime(__sanitizer_
+@@ -528,7 +694,7 @@ uptr internal_clock_gettime(__sanitizer_
// 'environ' array (on some others) and does not use libc. This function
// should be called first inside __asan_init.
const char *GetEnv(const char *name) {
@@ -364,7 +364,7 @@ $NetBSD$
SANITIZER_SOLARIS
if (::environ != 0) {
uptr NameLen = internal_strlen(name);
-@@ -767,20 +933,51 @@ uptr internal_ptrace(int request, int pi
+@@ -768,20 +934,51 @@ uptr internal_ptrace(int request, int pi
}
uptr internal_waitpid(int pid, int *status, int options) {
@@ -417,7 +417,7 @@ $NetBSD$
return internal_syscall(SYSCALL(getdirentries), fd, (uptr)dirp, count, NULL);
#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(getdents64), fd, (uptr)dirp, count);
-@@ -791,7 +988,8 @@ uptr internal_getdents(fd_t fd, struct l
+@@ -792,7 +989,8 @@ uptr internal_getdents(fd_t fd, struct l
uptr internal_lseek(fd_t fd, OFF_T offset, int whence) {
#if SANITIZER_NETBSD
@@ -427,7 +427,7 @@ $NetBSD$
#else
return internal_syscall(SYSCALL(lseek), fd, offset, whence);
#endif
-@@ -804,11 +1002,24 @@ uptr internal_prctl(int option, uptr arg
+@@ -805,11 +1003,24 @@ uptr internal_prctl(int option, uptr arg
#endif
uptr internal_sigaltstack(const void *ss, void *oss) {
@@ -453,20 +453,19 @@ $NetBSD$
return internal_syscall(SYSCALL(clone), SIGCHLD, 0);
#else
return internal_syscall(SYSCALL(fork));
-@@ -818,7 +1029,12 @@ int internal_fork() {
+@@ -819,7 +1030,10 @@ int internal_fork() {
#if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD
int internal_sysctl(const int *name, unsigned int namelen, void *oldp,
uptr *oldlenp, const void *newp, uptr newlen) {
+-#if SANITIZER_OPENBSD
+#if SANITIZER_NETBSD
+ CHECK(&__sysctl);
+ return __sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
-+#else
- return sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
-+#endif
- }
- #endif
-
-@@ -891,7 +1107,10 @@ int internal_sigaction_syscall(int signu
++#elif SANITIZER_OPENBSD
+ return sysctl(name, namelen, oldp, (size_t *)oldlenp, (void *)newp,
+ (size_t)newlen);
+ #else
+@@ -897,7 +1111,10 @@ int internal_sigaction_syscall(int signu
uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
__sanitizer_sigset_t *oldset) {
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
index 792c5f91da..13e934cb79 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
@@ -1,6 +1,6 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2018-08-21 21:25:39.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2018-09-26 10:51:26.000000000 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -945,6 +945,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
diff --git a/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
index 201d11f061..4a288a28aa 100644
--- a/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
@@ -1,8 +1,8 @@
$NetBSD$
---- lib/tsan/CMakeLists.txt.orig 2018-08-21 21:25:37.000000000 +0000
+--- lib/tsan/CMakeLists.txt.orig 2018-09-26 10:51:27.000000000 +0000
+++ lib/tsan/CMakeLists.txt
-@@ -215,7 +215,7 @@ endif()
+@@ -224,7 +224,7 @@ endif()
# in the base system due to incompatibilities between FreeBSD's and Clang's
# versions. As a workaround do not use --sysroot=. on FreeBSD until this is
# addressed.
diff --git a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg b/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
index a1d5e22632..e2996fe85b 100644
--- a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
@@ -1,13 +1,12 @@
$NetBSD$
---- test/fuzzer/lit.cfg.orig 2018-08-21 21:25:32.000000000 +0000
+--- test/fuzzer/lit.cfg.orig 2018-09-26 10:51:26.000000000 +0000
+++ test/fuzzer/lit.cfg
-@@ -25,7 +25,7 @@ else:
- config.test_format = lit.formats.ShTest(execute_external)
-
- # LeakSanitizer is not supported on OSX right now.
--if sys.platform.startswith('darwin') or sys.platform.startswith('freebsd'):
-+if sys.platform.startswith('darwin') or sys.platform.startswith('freebsd') or sys.platform.startswith('netbsd'):
+@@ -27,6 +27,7 @@ config.test_format = lit.formats.ShTest(
+ # LeakSanitizer is not supported on OSX or Windows right now.
+ if (sys.platform.startswith('darwin') or
+ sys.platform.startswith('freebsd') or
++ sys.platform.startswith('netbsd') or
+ sys.platform.startswith('win')):
lit_config.note('lsan feature unavailable')
else:
- lit_config.note('lsan feature available')
Home |
Main Index |
Thread Index |
Old Index