pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

compiler-rt-git: Drop merged patches



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 8 21:09:50 2017 +0200
Changeset:	045ec5ee24b998c7456e5aadf285edfe3e10c4ec

Modified Files:
	compiler-rt-git/distinfo
Removed Files:
	compiler-rt-git/patches/patch-cmake_config-ix.cmake
	compiler-rt-git/patches/patch-lib_asan_asan__interceptors.cc

Log Message:
compiler-rt-git: Drop merged patches

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=045ec5ee24b998c7456e5aadf285edfe3e10c4ec

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-git/distinfo                                 |  2 --
 compiler-rt-git/patches/patch-cmake_config-ix.cmake      | 13 -------------
 .../patches/patch-lib_asan_asan__interceptors.cc         | 16 ----------------
 3 files changed, 31 deletions(-)

diffs:
diff --git a/compiler-rt-git/distinfo b/compiler-rt-git/distinfo
index f0843ba601..b321bf38a5 100644
--- a/compiler-rt-git/distinfo
+++ b/compiler-rt-git/distinfo
@@ -12,8 +12,6 @@ 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) = dccb5876d7dc532d49a8e89dbafc11a60e0ab83a
-SHA1 (patch-lib_asan_asan__interceptors.cc) = 9786a54c62e081c7194efa26139f8539ad1e8c41
 SHA1 (patch-lib_asan_asan__linux.cc) = 8cc2c9b75ac690f0ef79f912c429fb259bc0dcbd
 SHA1 (patch-lib_asan_asan__malloc__linux.cc) = 8d690c207d11e19ca96f231d41a6c192c8528933
 SHA1 (patch-lib_asan_asan__mapping.h) = 73f5f33e946868b4780864e633916376b11b16f1
diff --git a/compiler-rt-git/patches/patch-cmake_config-ix.cmake b/compiler-rt-git/patches/patch-cmake_config-ix.cmake
deleted file mode 100644
index 2c77604c20..0000000000
--- a/compiler-rt-git/patches/patch-cmake_config-ix.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- cmake/config-ix.cmake.orig	2017-08-05 14:29:08.000000000 +0000
-+++ cmake/config-ix.cmake
-@@ -470,7 +470,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD ${AL
- list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
- 
- if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|Fuchsia" OR
-+    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR
-     (OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN))))
-   set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
- else()
diff --git a/compiler-rt-git/patches/patch-lib_asan_asan__interceptors.cc b/compiler-rt-git/patches/patch-lib_asan_asan__interceptors.cc
deleted file mode 100644
index 3722150a17..0000000000
--- a/compiler-rt-git/patches/patch-lib_asan_asan__interceptors.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- lib/asan/asan_interceptors.cc.orig	2017-07-03 15:33:06.000000000 +0000
-+++ lib/asan/asan_interceptors.cc
-@@ -424,6 +424,11 @@ INTERCEPTOR(int, swapcontext, struct uco
- }
- #endif  // ASAN_INTERCEPT_SWAPCONTEXT
- 
-+#if SANITIZER_NETBSD
-+#define longjmp __longjmp14
-+#define siglongjmp __siglongjmp14
-+#endif
-+
- INTERCEPTOR(void, longjmp, void *env, int val) {
-   __asan_handle_no_return();
-   REAL(longjmp)(env, val);


Home | Main Index | Thread Index | Old Index