pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-git: Drop 2 local patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Aug 8 14:05:50 2017 +0200
Changeset: f884b29e2530d432459091eeb15716df8d921c86
Modified Files:
compiler-rt-git/distinfo
Removed Files:
compiler-rt-git/patches/patch-lib_interception_interception__linux.cc
compiler-rt-git/patches/patch-lib_interception_interception__linux.h
Log Message:
compiler-rt-git: Drop 2 local patches
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=f884b29e2530d432459091eeb15716df8d921c86
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 --
.../patch-lib_interception_interception__linux.cc | 39 ----------------------
.../patch-lib_interception_interception__linux.h | 19 -----------
3 files changed, 60 deletions(-)
diffs:
diff --git a/compiler-rt-git/distinfo b/compiler-rt-git/distinfo
index 30a5e10383..f0843ba601 100644
--- a/compiler-rt-git/distinfo
+++ b/compiler-rt-git/distinfo
@@ -18,8 +18,6 @@ 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
SHA1 (patch-lib_asan_scripts_asan__symbolize.py) = 95024c8d49fdcbdbf5ccc9013e54ad9b3f469e14
-SHA1 (patch-lib_interception_interception__linux.cc) = 41e29e48d879a7c1a8e8c5c466439310783d5e9f
-SHA1 (patch-lib_interception_interception__linux.h) = ebbdd314aeff8be22107a78872a71b9606748b36
SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 5d09c96941940fb7bb21b83161a5723140ac31e6
SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = b3177dc169208b1b3e0c951fe3fd9c07e82fff49
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 36a89517584891a1a50536a681a5d42e99ef904d
diff --git a/compiler-rt-git/patches/patch-lib_interception_interception__linux.cc b/compiler-rt-git/patches/patch-lib_interception_interception__linux.cc
deleted file mode 100644
index 1038330d7c..0000000000
--- a/compiler-rt-git/patches/patch-lib_interception_interception__linux.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
---- lib/interception/interception_linux.cc.orig 2017-07-04 05:53:20.000000000 +0000
-+++ lib/interception/interception_linux.cc
-@@ -12,14 +12,26 @@
- // Linux-specific interception methods.
- //===----------------------------------------------------------------------===//
-
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
- #include "interception.h"
-
- #include <dlfcn.h> // for dlsym() and dlvsym()
-
-+#ifdef __NetBSD__
-+static int mystrcmp(const char *s1, const char *s2) {
-+ while (*s1 == *s2++)
-+ if (*s1++ == 0) return (0);
-+ return (*(const unsigned char *)s1 - *(const unsigned char *)--s2);
-+}
-+#endif
-+
- namespace __interception {
- bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
- uptr real, uptr wrapper) {
-+#ifdef __NetBSD__
-+ // XXX: Until I come up with something better to deal with renames.
-+ if (mystrcmp(func_name, "sigaction") == 0) func_name = "__sigaction14";
-+#endif
- *func_addr = (uptr)dlsym(RTLD_NEXT, func_name);
- return real == wrapper;
- }
-@@ -32,5 +44,4 @@ void *GetFuncAddrVer(const char *func_na
-
- } // namespace __interception
-
--
--#endif // __linux__ || __FreeBSD__
-+#endif // __linux__ || __FreeBSD__ || __NetBSD__
diff --git a/compiler-rt-git/patches/patch-lib_interception_interception__linux.h b/compiler-rt-git/patches/patch-lib_interception_interception__linux.h
deleted file mode 100644
index 12e8b384ec..0000000000
--- a/compiler-rt-git/patches/patch-lib_interception_interception__linux.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- lib/interception/interception_linux.h.orig 2017-07-04 05:53:20.000000000 +0000
-+++ lib/interception/interception_linux.h
-@@ -12,7 +12,7 @@
- // Linux-specific interception methods.
- //===----------------------------------------------------------------------===//
-
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) | defined(__NetBSD__)
-
- #if !defined(INCLUDED_FROM_INTERCEPTION_LIB)
- # error "interception_linux.h should be included from interception library only"
-@@ -44,4 +44,4 @@ void *GetFuncAddrVer(const char *func_na
- #endif // !defined(__ANDROID__)
-
- #endif // INTERCEPTION_LINUX_H
--#endif // __linux__ || __FreeBSD__
-+#endif // __linux__ || __FreeBSD__ || __NetBSD__
Home |
Main Index |
Thread Index |
Old Index