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

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Rebase to SVN r. 344035
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Tue, 09 Oct 2018 10:41:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Oct 9 12:41:42 2018 +0200
Changeset:	4aa03789f882f35f204511995fa0e6bd90386a00

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
Removed Files:
	compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
	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
	compiler-rt-netbsd/patches/patch-test_fuzzer_NullDerefTest.cpp
	compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
	compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg
	compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg

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

Drop merged patches:
 - [compiler-rt] r344035 - Reflect the current reality and disable lsan tests on NetBSD
 - [compiler-rt] r344034 - Use PTHREAD_STACK_MIN conditionally in a test

Drop unfinished stubs of support for:
 - profile
 - scudo
 - lsan

These patches do not help much of now as the proper support for these features is missing.

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

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                        |  7 -------
 .../patches/patch-cmake_config-ix.cmake            | 22 --------------------
 ..._asan_TestCases_Posix_stack-use-after-return.cc | 16 ---------------
 .../patch-test_asan_TestCases_heavy__uar__test.cc  | 15 --------------
 .../patches/patch-test_fuzzer_NullDerefTest.cpp    |  9 --------
 .../patches/patch-test_fuzzer_lit.cfg              | 12 -----------
 .../patches/patch-test_lsan_lit.common.cfg         | 17 ---------------
 .../patches/patch-test_scudo_lit.cfg               | 24 ----------------------
 9 files changed, 1 insertion(+), 123 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 836f62c331..dbbf470ede 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=	343840
+SVN_REVISION.compiler-rt=	344035
 
 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 ab258e8b08..c0d69ee83f 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -2,7 +2,6 @@ $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
 SHA1 (patch-CMakeLists.txt) = 43d2c38f405b7096775fdd3036c7ba6be82c3d07
 SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = fde0a4b440a257dec40c4f106c2352d5efecceef
-SHA1 (patch-cmake_config-ix.cmake) = dbd96cf8317e947850aacd01535053619a82b9bf
 SHA1 (patch-lib_asan_asan__posix.cc) = be7e47c252e30184639f7ed1c98c75a8667fd261
 SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = b2e226a0d7b230cc8598a0591ae6f688527c6b2d
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = c3d8a78f96566e5b8d2d8a5cbaba60990bfd6efe
@@ -21,11 +20,5 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 86d530
 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-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) = 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-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
deleted file mode 100644
index 3d53c0bffc..0000000000
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- cmake/config-ix.cmake.orig	2018-10-05 07:12:08.000000000 +0000
-+++ cmake/config-ix.cmake
-@@ -584,7 +584,7 @@ else()
- endif()
- 
- if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD")
-   set(COMPILER_RT_HAS_PROFILE TRUE)
- else()
-   set(COMPILER_RT_HAS_PROFILE FALSE)
-@@ -632,7 +632,7 @@ else()
- endif()
- 
- if (COMPILER_RT_HAS_SANITIZER_COMMON AND SCUDO_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Linux|Android|Fuchsia")
-+    OS_NAME MATCHES "Linux|Android|Fuchsia|NetBSD")
-   set(COMPILER_RT_HAS_SCUDO TRUE)
- else()
-   set(COMPILER_RT_HAS_SCUDO FALSE)
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
deleted file mode 100644
index be1e1500a8..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_Posix_stack-use-after-return.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- test/asan/TestCases/Posix/stack-use-after-return.cc.orig	2018-08-21 21:25:30.000000000 +0000
-+++ test/asan/TestCases/Posix/stack-use-after-return.cc
-@@ -78,9 +78,11 @@ int main(int argc, char **argv) {
-   pthread_attr_init(&attr);
-   if (kStackSize > 0) {
-     size_t desired_stack_size = kStackSize;
-+#ifdef PTHREAD_STACK_MIN
-     if (desired_stack_size < PTHREAD_STACK_MIN) {
-       desired_stack_size = PTHREAD_STACK_MIN;
-     }
-+#endif
- 
-     int ret = pthread_attr_setstacksize(&attr, desired_stack_size);
-     if (ret != 0) {
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
deleted file mode 100644
index 0f3b28f52f..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_heavy__uar__test.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- test/asan/TestCases/heavy_uar_test.cc.orig	2018-08-21 21:25:29.000000000 +0000
-+++ test/asan/TestCases/heavy_uar_test.cc
-@@ -53,8 +53,8 @@ int main(int argc, char **argv) {
-     RecursiveFunctionWithStackFrame<1024>(depth);
-     RecursiveFunctionWithStackFrame<2000>(depth);
-     // The stack size is tight for the main thread in multithread
--    // environment on FreeBSD.
--#if !defined(__FreeBSD__)
-+    // environment on FreeBSD and NetBSD.
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
-     RecursiveFunctionWithStackFrame<5000>(depth);
-     RecursiveFunctionWithStackFrame<10000>(depth);
- #endif
diff --git a/compiler-rt-netbsd/patches/patch-test_fuzzer_NullDerefTest.cpp b/compiler-rt-netbsd/patches/patch-test_fuzzer_NullDerefTest.cpp
deleted file mode 100644
index 36e473b5a7..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_fuzzer_NullDerefTest.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
---- test/fuzzer/NullDerefTest.cpp.orig	2018-08-21 21:25:32.000000000 +0000
-+++ test/fuzzer/NullDerefTest.cpp
-@@ -23,4 +23,3 @@ extern "C" int LLVMFuzzerTestOneInput(co
-   }
-   return 0;
- }
--
diff --git a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg b/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
deleted file mode 100644
index e2996fe85b..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- test/fuzzer/lit.cfg.orig	2018-09-26 10:51:26.000000000 +0000
-+++ test/fuzzer/lit.cfg
-@@ -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:
diff --git a/compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg b/compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg
deleted file mode 100644
index 618eea8826..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- test/lsan/lit.common.cfg.orig	2018-08-21 21:25:23.000000000 +0000
-+++ test/lsan/lit.common.cfg
-@@ -67,10 +67,10 @@ config.substitutions.append( ("%clangxx 
- config.substitutions.append( ("%clang_lsan ", build_invocation(clang_lsan_cflags)) )
- config.substitutions.append( ("%clangxx_lsan ", build_invocation(clang_lsan_cxxflags)) )
- 
--# LeakSanitizer tests are currently supported on x86-64 Linux, PowerPC64 Linux, arm Linux, mips64 Linux, and x86_64 Darwin.
- supported_linux = config.host_os is 'Linux' and config.host_arch in ['x86_64', 'ppc64', 'ppc64le', 'mips64', 'arm', 'armhf', 'armv7l']
- supported_darwin = config.host_os is 'Darwin' and config.target_arch is 'x86_64'
--if not (supported_linux or supported_darwin):
-+supported_netbsd = config.host_os is 'NetBSD' and config.host_arch is 'x86_64'
-+if not (supported_linux or supported_darwin or supported_netbsd):
-   config.unsupported = True
- 
- # Don't support Thumb due to broken fast unwinder
diff --git a/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg b/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
deleted file mode 100644
index 1a3edd78b6..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- test/scudo/lit.cfg.orig	2018-08-21 21:25:27.000000000 +0000
-+++ test/scudo/lit.cfg
-@@ -22,9 +22,11 @@ c_flags = ([config.target_cflags] +
-            "-pie",
-            "-O0",
-            "-UNDEBUG",
--           "-ldl",
-            "-Wl,--gc-sections"])
- 
-+if config.host_os not in ['NetBSD']:
-+  c_flags += ["-ldl"]
-+
- # Android doesn't want -lrt.
- if not config.android:
-   c_flags += ["-lrt"]
-@@ -56,5 +58,5 @@ config.substitutions.append(('%env_scudo
-                              'env SCUDO_OPTIONS=' + default_scudo_opts))
- 
- # Hardened Allocator tests are currently supported on Linux only.
--if config.host_os not in ['Linux']:
-+if config.host_os not in ['Linux', 'NetBSD']:
-    config.unsupported = True
Prev by Date: gjs: Fix a typo in the COMMENT
Next by Date: compiler-rt-netbsd: Drop scudo patch
Previous by Thread: gjs: Fix a typo in the COMMENT
Next by Thread: compiler-rt-netbsd: Drop scudo patch
Indexes:
Home | Main Index | Thread Index | Old Index