pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-netbsd: Eliminate not needed patches, merged upstream
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Aug 5 00:26:30 2017 +0200
Changeset: 6ba200d8976bb4c368a463627a6a7433851a2375
Modified Files:
compiler-rt-netbsd/Makefile
compiler-rt-netbsd/distinfo
Removed Files:
compiler-rt-netbsd/patches/patch-lib_interception_interception.h
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc
Log Message:
compiler-rt-netbsd: Eliminate not needed 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=6ba200d8976bb4c368a463627a6a7433851a2375
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 | 4 --
.../patches/patch-lib_interception_interception.h | 31 -----------
..._sanitizer__common_sanitizer__linux__libcdep.cc | 62 ---------------------
...nitizer__common_sanitizer__procmaps__freebsd.cc | 64 ----------------------
...nitizer__common_sanitizer__syscall__generic.inc | 46 ----------------
6 files changed, 1 insertion(+), 208 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 2bf52d1965..413fd49310 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= 309959
+SVN_REVISION.compiler-rt= 310143
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 901d270509..15e4a4d97e 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -13,15 +13,11 @@ 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) = 497da73e6ce4abe19f048a94b4d80b92c0ce7e82
-SHA1 (patch-lib_interception_interception.h) = 9e0c8964c5f099c2a1b8cde2bc22fbb60594b659
SHA1 (patch-lib_interception_interception__linux.cc) = 41e29e48d879a7c1a8e8c5c466439310783d5e9f
SHA1 (patch-lib_interception_interception__linux.h) = ebbdd314aeff8be22107a78872a71b9606748b36
SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = f84e3442e72b6d07ad7c8e8fcf44718c547e2a93
SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 5d09c96941940fb7bb21b83161a5723140ac31e6
SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = b3177dc169208b1b3e0c951fe3fd9c07e82fff49
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 1a937daa428db0a9b41293794e491599ac1e8699
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 36a89517584891a1a50536a681a5d42e99ef904d
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 7ae546fe4c5fada950a8e06c73f7ac0e5ba81924
-SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = 5adac716d6d86e19727780dd05ca5509223aff13
-SHA1 (patch-lib_sanitizer__common_sanitizer__syscall__generic.inc) = 0ec7db864f385794972a79d85d04f72fb8894a9d
SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = f9f846a6b55f5f920a9a5f6850a1e8776109cdb3
diff --git a/compiler-rt-netbsd/patches/patch-lib_interception_interception.h b/compiler-rt-netbsd/patches/patch-lib_interception_interception.h
deleted file mode 100644
index 2b0f142f3e..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_interception_interception.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
---- lib/interception/interception.h.orig 2017-08-03 21:24:37.000000000 +0000
-+++ lib/interception/interception.h
-@@ -15,7 +15,7 @@
- #ifndef INTERCEPTION_H
- #define INTERCEPTION_H
-
--#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && \
-+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__) && \
- !defined(_WIN32) && !defined(__Fuchsia__)
- # error "Interception doesn't work on this operating system."
- #endif
-@@ -129,7 +129,7 @@ const interpose_substitution substitutio
- extern "C" ret_type func(__VA_ARGS__);
- # define DECLARE_WRAPPER_WINAPI(ret_type, func, ...) \
- extern "C" __declspec(dllimport) ret_type __stdcall func(__VA_ARGS__);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
- # define WRAP(x) __interceptor_ ## x
- # define WRAPPER_NAME(x) "__interceptor_" #x
- # define INTERCEPTOR_ATTRIBUTE __attribute__((visibility("default")))
-@@ -264,7 +264,7 @@ typedef unsigned long uptr; // NOLINT
-
- #define INCLUDED_FROM_INTERCEPTION_LIB
-
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
- # include "interception_linux.h"
- # define INTERCEPT_FUNCTION(func) INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)
- # define INTERCEPT_FUNCTION_VER(func, symver) \
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
deleted file mode 100644
index 0847e9b342..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig 2017-07-16 22:40:10.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -14,7 +14,7 @@
-
- #include "sanitizer_platform.h"
-
--#if SANITIZER_FREEBSD || SANITIZER_LINUX
-+#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
-
- #include "sanitizer_allocator_internal.h"
- #include "sanitizer_atomic.h"
-@@ -148,7 +148,8 @@ bool SanitizerGetThreadName(char *name,
- #endif
- }
-
--#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
-+#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
-+ !SANITIZER_NETBSD
- static uptr g_tls_size;
-
- #ifdef __i386__
-@@ -176,7 +177,8 @@ void InitTlsSize() {
- }
- #else
- void InitTlsSize() { }
--#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
-+#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO &&
-+ // !SANITIZER_NETBSD
-
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
- || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
-@@ -333,6 +335,10 @@ uptr ThreadSelf() {
- }
- #endif // SANITIZER_FREEBSD
-
-+#if SANITIZER_NETBSD
-+uptr ThreadSelf() { return (uptr)pthread_self(); }
-+#endif // SANITIZER_NETBSD
-+
- #if !SANITIZER_GO
- static void GetTls(uptr *addr, uptr *size) {
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
-@@ -362,7 +368,7 @@ static void GetTls(uptr *addr, uptr *siz
- *addr = (uptr) dtv[2];
- *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
- }
--#elif SANITIZER_ANDROID
-+#elif SANITIZER_ANDROID || SANITIZER_NETBSD
- *addr = 0;
- *size = 0;
- #else
-@@ -373,7 +379,7 @@ static void GetTls(uptr *addr, uptr *siz
-
- #if !SANITIZER_GO
- uptr GetTlsSize() {
--#if SANITIZER_FREEBSD || SANITIZER_ANDROID
-+#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD
- uptr addr, size;
- GetTls(&addr, &size);
- return size;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc
deleted file mode 100644
index 68b5408449..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_procmaps_freebsd.cc.orig 2017-07-16 22:40:10.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_procmaps_freebsd.cc
-@@ -11,14 +11,18 @@
- //===----------------------------------------------------------------------===//
-
- #include "sanitizer_platform.h"
--#if SANITIZER_FREEBSD
-+#if SANITIZER_FREEBSD || SANITIZER_NETBSD
- #include "sanitizer_common.h"
-+#if SANITIZER_FREEBSD
- #include "sanitizer_freebsd.h"
-+#endif
- #include "sanitizer_procmaps.h"
-
- #include <unistd.h>
- #include <sys/sysctl.h>
-+#if SANITIZER_FREEBSD
- #include <sys/user.h>
-+#endif
-
- // Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
- #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
-@@ -31,16 +35,24 @@
- namespace __sanitizer {
-
- void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
-- const int Mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid() };
-+
-+ const int Mib[] = {
-+#if SANITIZER_FREEBSD
-+ CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid()
-+#else
-+ CTL_VM, VM_PROC, VM_PROC_MAP, getpid(), sizeof(struct kinfo_vmentry)
-+#endif
-+ };
-+
- size_t Size = 0;
-- int Err = sysctl(Mib, 4, NULL, &Size, NULL, 0);
-+ int Err = sysctl(Mib, ARRAY_SIZE(Mib), NULL, &Size, NULL, 0);
- CHECK_EQ(Err, 0);
- CHECK_GT(Size, 0);
-
- size_t MmapedSize = Size * 4 / 3;
- void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()");
- Size = MmapedSize;
-- Err = sysctl(Mib, 4, VmMap, &Size, NULL, 0);
-+ Err = sysctl(Mib, ARRAY_SIZE(Mib), VmMap, &Size, NULL, 0);
- CHECK_EQ(Err, 0);
-
- proc_maps->data = (char*)VmMap;
-@@ -71,7 +83,11 @@ bool MemoryMappingLayout::Next(MemoryMap
- VmEntry->kve_path);
- }
-
-+#if SANITIZER_FREEBSD
- current_ += VmEntry->kve_structsize;
-+#else
-+ current_ += sizeof(*VmEntry);
-+#endif
-
- return true;
- }
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc
deleted file mode 100644
index 55f1599b51..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_syscall_generic.inc.orig 2017-07-04 05:53:23.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_syscall_generic.inc
-@@ -11,13 +11,39 @@
- //
- //===----------------------------------------------------------------------===//
-
--#if SANITIZER_FREEBSD || SANITIZER_MAC
-+#ifdef SANITIZER_NETBSD
-+# define SYS_stat SYS___stat50
-+# define SYS_lstat SYS___lstat50
-+# define SYS_fstat SYS___fstat50
-+# define SYS_gettimeofday SYS___gettimeofday50
-+# define SYS_wait4 SYS___wait450
-+# define SYS_getdents SYS___getdents30
-+# define SYS_sigaltstack SYS___sigaltstack14
-+# define SYS_sigprocmask SYS___sigprocmask14
-+# define SYS_nanosleep SYS___nanosleep50
-+#endif
-+
-+#if SANITIZER_FREEBSD || SANITIZER_MAC || SANITIZER_NETBSD
- # define SYSCALL(name) SYS_ ## name
- #else
- # define SYSCALL(name) __NR_ ## name
- #endif
-
--#if (SANITIZER_FREEBSD || SANITIZER_MAC) && defined(__x86_64__)
-+#if SANITIZER_NETBSD
-+// We use 3 kinds of internal_syscall's for different types of retval in order
-+// to address differences in calling conventions (e.g. registers to place the
-+// return value in).
-+// - internal_syscall for 32-bit length (int, pid_t)
-+// - internal_syscall64 for 64-bit length (off_t)
-+// - internal_syscall_ptr for pointer and (s)size_t
-+# define internal_syscall syscall
-+# define internal_syscall64 __syscall
-+# if SANITIZER_WORDSIZE == 64
-+# define internal_syscall_ptr __syscall
-+# else
-+# define internal_syscall_ptr syscall
-+# endif
-+#elif defined(__x86_64__) && (SANITIZER_FREEBSD || SANITIZER_MAC)
- # define internal_syscall __syscall
- # else
- # define internal_syscall syscall
Home |
Main Index |
Thread Index |
Old Index