compiler-rt-netbsd: Update to SVN r. 312184

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Update to SVN r. 312184
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Wed, 30 Aug 2017 22:46:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Aug 31 00:46:40 2017 +0200
Changeset:	7246731606191751110e9e8ad11f4cef8c2677b1

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/PLIST
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerDefs.h
	compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtFunctionsWeak.cpp
	compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtraCounters.cpp
	compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp
	compiler-rt-netbsd/patches/patch-lib_fuzzer_afl_afl__driver.cpp
	compiler-rt-netbsd/patches/patch-lib_lsan_lsan__interceptors.cc

Log Message:
compiler-rt-netbsd: Update to SVN r. 312184

Part of code for libfuzzer and lsan merged upstream.

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=7246731606191751110e9e8ad11f4cef8c2677b1

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/PLIST                           |  2 +-
 compiler-rt-netbsd/distinfo                        |  8 +----
 .../patches/patch-cmake_config-ix.cmake            |  9 ------
 .../patches/patch-lib_fuzzer_FuzzerDefs.h          | 36 ----------------------
 .../patch-lib_fuzzer_FuzzerExtFunctionsWeak.cpp    | 19 ------------
 .../patch-lib_fuzzer_FuzzerExtraCounters.cpp       | 13 --------
 .../patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp   | 19 ------------
 .../patches/patch-lib_fuzzer_afl_afl__driver.cpp   | 29 -----------------
 .../patches/patch-lib_lsan_lsan__interceptors.cc   | 16 ----------
 10 files changed, 3 insertions(+), 150 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index b919d8e537..1a95d162e0 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=	312160
+SVN_REVISION.compiler-rt=	312184
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/PLIST b/compiler-rt-netbsd/PLIST
index d0cbda626b..3e2387a8be 100644
--- a/compiler-rt-netbsd/PLIST
+++ b/compiler-rt-netbsd/PLIST
@@ -46,7 +46,7 @@ lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.tsan_cxx-x86_64.a.
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-i386.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-i386.so
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-x86_64.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-x86_64.a.sym
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-x86_64.a.syms
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-x86_64.so
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_standalone-i386.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_standalone-i386.so
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 2ca9e0fe8c..fe9f41192d 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -12,14 +12,8 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-cmake_config-ix.cmake) = 2255939ffe6948fbc1f0dfa518559efee16e721a
-SHA1 (patch-lib_fuzzer_FuzzerDefs.h) = 681e36a3cb3c6be0a6493c79dde74aa3e1c2e979
-SHA1 (patch-lib_fuzzer_FuzzerExtFunctionsWeak.cpp) = c142b22c7aedb1f1a350423c391bc4c1147f5354
-SHA1 (patch-lib_fuzzer_FuzzerExtraCounters.cpp) = 52fefa927397acd7e83df06df7ec13d78f1c53b0
-SHA1 (patch-lib_fuzzer_FuzzerUtilLinux.cpp) = 30e0ead2deb98ac0a7f67403c47044ef6ec16185
-SHA1 (patch-lib_fuzzer_afl_afl__driver.cpp) = a114e28152558b7147d0931eb638109c3d2f32a2
+SHA1 (patch-cmake_config-ix.cmake) = 5b1842f08cc8c2b96e0529b552b09c7adf2065dc
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = eaffd9f8f2621ad465b5c734a764bdff0243af3d
-SHA1 (patch-lib_lsan_lsan__interceptors.cc) = 04cb038163d9d9eb098666d394bfca38e9f78a2f
 SHA1 (patch-lib_tsan_go_buildgo.sh) = fe64b3389bbf6ae2ddf187df3e0600b2f817f51d
 SHA1 (patch-lib_tsan_rtl_tsan__platform__linux.cc) = e572f99e72257dbaa17838378b34cde40e91bd54
 SHA1 (patch-lib_tsan_rtl_tsan__rtl__amd64.S) = 95591667c23372ceb72334b2ceae800d32574ac6
diff --git a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
index a5c89bd798..174ed54eeb 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
@@ -28,12 +28,3 @@ $NetBSD$
    set(COMPILER_RT_HAS_TSAN TRUE)
  else()
    set(COMPILER_RT_HAS_TSAN FALSE)
-@@ -581,7 +581,7 @@ else()
- endif()
- 
- if (COMPILER_RT_HAS_SANITIZER_COMMON AND FUZZER_SUPPORTED_ARCH AND
--      OS_NAME MATCHES "Darwin|Linux")
-+      OS_NAME MATCHES "Darwin|Linux|NetBSD")
-   set(COMPILER_RT_HAS_FUZZER TRUE)
- else()
-   set(COMPILER_RT_HAS_FUZZER FALSE)
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerDefs.h b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerDefs.h
deleted file mode 100644
index b616679d09..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerDefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
---- lib/fuzzer/FuzzerDefs.h.orig	2017-08-28 21:09:44.000000000 +0000
-+++ lib/fuzzer/FuzzerDefs.h
-@@ -25,14 +25,22 @@
- #ifdef __linux__
- #define LIBFUZZER_APPLE 0
- #define LIBFUZZER_LINUX 1
-+#define LIBFUZZER_NETBSD 0
- #define LIBFUZZER_WINDOWS 0
- #elif __APPLE__
- #define LIBFUZZER_APPLE 1
- #define LIBFUZZER_LINUX 0
-+#define LIBFUZZER_NETBSD 0
-+#define LIBFUZZER_WINDOWS 0
-+#elif __NetBSD__
-+#define LIBFUZZER_APPLE 0
-+#define LIBFUZZER_LINUX 0
-+#define LIBFUZZER_NETBSD 1
- #define LIBFUZZER_WINDOWS 0
- #elif _WIN32
- #define LIBFUZZER_APPLE 0
- #define LIBFUZZER_LINUX 0
-+#define LIBFUZZER_NETBSD 0
- #define LIBFUZZER_WINDOWS 1
- #else
- #error "Support for your platform has not been implemented"
-@@ -42,7 +50,7 @@
- #  define __has_attribute(x) 0
- #endif
- 
--#define LIBFUZZER_POSIX LIBFUZZER_APPLE || LIBFUZZER_LINUX
-+#define LIBFUZZER_POSIX (LIBFUZZER_APPLE || LIBFUZZER_LINUX || LIBFUZZER_NETBSD)
- 
- #ifdef __x86_64
- #  if __has_attribute(target)
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtFunctionsWeak.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtFunctionsWeak.cpp
deleted file mode 100644
index bbf520bbb7..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtFunctionsWeak.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- lib/fuzzer/FuzzerExtFunctionsWeak.cpp.orig	2017-08-21 23:23:37.000000000 +0000
-+++ lib/fuzzer/FuzzerExtFunctionsWeak.cpp
-@@ -13,7 +13,7 @@
- // to clients right now.
- //===----------------------------------------------------------------------===//
- #include "FuzzerDefs.h"
--#if LIBFUZZER_LINUX
-+#if LIBFUZZER_LINUX || LIBFUZZER_NETBSD
- 
- #include "FuzzerExtFunctions.h"
- #include "FuzzerIO.h"
-@@ -51,4 +51,4 @@ ExternalFunctions::ExternalFunctions() {
- 
- } // namespace fuzzer
- 
--#endif // LIBFUZZER_LINUX
-+#endif // LIBFUZZER_LINUX || LIBFUZZER_NETBSD
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtraCounters.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtraCounters.cpp
deleted file mode 100644
index 70ec4a0a45..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerExtraCounters.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- lib/fuzzer/FuzzerExtraCounters.cpp.orig	2017-08-21 23:23:37.000000000 +0000
-+++ lib/fuzzer/FuzzerExtraCounters.cpp
-@@ -11,7 +11,7 @@
- 
- #include "FuzzerDefs.h"
- 
--#if LIBFUZZER_LINUX
-+#if LIBFUZZER_LINUX || LIBFUZZER_NETBSD
- __attribute__((weak)) extern uint8_t __start___libfuzzer_extra_counters;
- __attribute__((weak)) extern uint8_t __stop___libfuzzer_extra_counters;
- 
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp
deleted file mode 100644
index 957c2b9552..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerUtilLinux.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- lib/fuzzer/FuzzerUtilLinux.cpp.orig	2017-08-21 23:23:37.000000000 +0000
-+++ lib/fuzzer/FuzzerUtilLinux.cpp
-@@ -9,7 +9,7 @@
- // Misc utils for Linux.
- //===----------------------------------------------------------------------===//
- #include "FuzzerDefs.h"
--#if LIBFUZZER_LINUX
-+#if LIBFUZZER_LINUX || LIBFUZZER_NETBSD
- 
- #include <stdlib.h>
- 
-@@ -21,4 +21,4 @@ int ExecuteCommand(const std::string &Co
- 
- } // namespace fuzzer
- 
--#endif // LIBFUZZER_LINUX
-+#endif // LIBFUZZER_LINUX || LIBFUZZER_NETBSD
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_afl_afl__driver.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_afl_afl__driver.cpp
deleted file mode 100644
index f75a6acd88..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_afl_afl__driver.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- lib/fuzzer/afl/afl_driver.cpp.orig	2017-08-21 23:23:37.000000000 +0000
-+++ lib/fuzzer/afl/afl_driver.cpp
-@@ -68,9 +68,15 @@ statistics from the file. If that fails 
- #ifdef __linux__
- #define LIBFUZZER_LINUX 1
- #define LIBFUZZER_APPLE 0
-+#define LIBFUZZER_NETBSD 0
- #elif __APPLE__
- #define LIBFUZZER_LINUX 0
- #define LIBFUZZER_APPLE 1
-+#define LIBFUZZER_NETBSD 0
-+#elif __NetBSD__
-+#define LIBFUZZER_LINUX 0
-+#define LIBFUZZER_APPLE 0
-+#define LIBFUZZER_NETBSD 1
- #else
- #error "Support for your platform has not been implemented"
- #endif
-@@ -119,7 +125,7 @@ size_t GetPeakRSSMb() {
-   struct rusage usage;
-   if (getrusage(RUSAGE_SELF, &usage))
-     return 0;
--  if (LIBFUZZER_LINUX) {
-+  if (LIBFUZZER_LINUX || LIBFUZZER_NETBSD) {
-     // ru_maxrss is in KiB
-     return usage.ru_maxrss >> 10;
-   } else if (LIBFUZZER_APPLE) {
diff --git a/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__interceptors.cc b/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__interceptors.cc
deleted file mode 100644
index ea9cad6b3d..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__interceptors.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- lib/lsan/lsan_interceptors.cc.orig	2017-08-21 23:23:37.000000000 +0000
-+++ lib/lsan/lsan_interceptors.cc
-@@ -20,7 +20,11 @@
- #include "sanitizer_common/sanitizer_internal_defs.h"
- #include "sanitizer_common/sanitizer_linux.h"
- #include "sanitizer_common/sanitizer_platform_interceptors.h"
-+#if SANITIZER_NETBSD
-+#include "sanitizer_common/sanitizer_platform_limits_netbsd.h"
-+#else
- #include "sanitizer_common/sanitizer_platform_limits_posix.h"
-+#endif
- #include "sanitizer_common/sanitizer_posix.h"
- #include "sanitizer_common/sanitizer_tls_get_addr.h"
- #include "lsan.h"
Prev by Date: compiler-rt-netbsd: Update to SVN r. 312160
Next by Date: qemu-git: Sync this package with emulators/qemu
Previous by Thread: compiler-rt-netbsd: Update to SVN r. 312160
Next by Thread: qemu-git: Sync this package with emulators/qemu
Indexes:
Home | Main Index | Thread Index | Old Index