pkgsrc-WIP-changes archive

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

compiler-rt-git: Drop another local patch, merged upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Aug 10 21:04:00 2017 +0200
Changeset:	54287d2fb1feb43a89fc669c0336564573043dec

Modified Files:
	compiler-rt-git/distinfo
Removed Files:
	compiler-rt-git/patches/patch-lib_asan_asan__linux.cc

Log Message:
compiler-rt-git: Drop another local patch, 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=54287d2fb1feb43a89fc669c0336564573043dec

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

diffstat:
 compiler-rt-git/distinfo                           |  1 -
 .../patches/patch-lib_asan_asan__linux.cc          | 46 ----------------------
 2 files changed, 47 deletions(-)

diffs:
diff --git a/compiler-rt-git/distinfo b/compiler-rt-git/distinfo
index eeab9c84ad..7e87528e56 100644
--- a/compiler-rt-git/distinfo
+++ b/compiler-rt-git/distinfo
@@ -12,7 +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-lib_asan_asan__linux.cc) = 8cc2c9b75ac690f0ef79f912c429fb259bc0dcbd
 SHA1 (patch-lib_asan_asan__mapping.h) = 73f5f33e946868b4780864e633916376b11b16f1
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 36a89517584891a1a50536a681a5d42e99ef904d
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 7ae546fe4c5fada950a8e06c73f7ac0e5ba81924
diff --git a/compiler-rt-git/patches/patch-lib_asan_asan__linux.cc b/compiler-rt-git/patches/patch-lib_asan_asan__linux.cc
deleted file mode 100644
index 87f36b045e..0000000000
--- a/compiler-rt-git/patches/patch-lib_asan_asan__linux.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
---- lib/asan/asan_linux.cc.orig	2017-08-05 14:29:08.000000000 +0000
-+++ lib/asan/asan_linux.cc
-@@ -13,7 +13,7 @@
- //===----------------------------------------------------------------------===//
- 
- #include "sanitizer_common/sanitizer_platform.h"
--#if SANITIZER_FREEBSD || SANITIZER_LINUX
-+#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
- 
- #include "asan_interceptors.h"
- #include "asan_internal.h"
-@@ -42,6 +42,10 @@
- #if SANITIZER_ANDROID || SANITIZER_FREEBSD
- #include <ucontext.h>
- extern "C" void* _DYNAMIC;
-+#elif SANITIZER_NETBSD
-+#include <link_elf.h>
-+#include <ucontext.h>
-+extern Elf_Dyn _DYNAMIC;
- #else
- #include <sys/ucontext.h>
- #include <link.h>
-@@ -101,6 +105,15 @@ static int FindFirstDSOCallback(struct d
-   if (internal_strncmp(info->dlpi_name, "linux-", sizeof("linux-") - 1) == 0)
-     return 0;
- 
-+#if SANITIZER_NETBSD
-+  // Ignore first entry (the main program)
-+  char **p = (char **)data;
-+  if (*p == NULL) {
-+    *p = (char *)-1;
-+    return 0;
-+  }
-+#endif
-+
-   *(const char **)data = info->dlpi_name;
-   return 1;
- }
-@@ -179,4 +192,4 @@ void *AsanDlSymNext(const char *sym) {
- 
- } // namespace __asan
- 
--#endif // SANITIZER_FREEBSD || SANITIZER_LINUX
-+#endif  // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD


Home | Main Index | Thread Index | Old Index