pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-netbsd: Rebase patches to SVN r. 345620
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Oct 30 19:41:16 2018 +0100
Changeset: 27995ec8df3dffb5b0ba6c49bccc40036e2e1452
Modified Files:
compiler-rt-netbsd/Makefile
compiler-rt-netbsd/distinfo
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
Removed Files:
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc
Log Message:
compiler-rt-netbsd: Rebase patches to SVN r. 345620
Merged upstream:
[compiler-rt] r345586 - Cleanup includes in sanitizer_platform_limits_netbsd.cc
[compiler-rt] r345595 - Mark breaking TSan tests on NetBSD with XFAIL
[compiler-rt] r345599 - Adapt ASan test heavy_uar_test for NetBSD
[compiler-rt] r345600 - Disable ASan test asan_and_llvm_coverage_test for NetBSD
[compiler-rt] r345619 - Mark interception_failure_test with XFAIL for NetBSD
[compiler-rt] r345620 - Cast the return value of _Unwind_GetIP() to uptr
Pull a patch pending upstream from:
D53863 Handle NetBSD alias for pthread_sigmask
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=27995ec8df3dffb5b0ba6c49bccc40036e2e1452
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 | 6 +-
...__common_sanitizer__platform__limits__netbsd.cc | 125 +++------------------
...er__common_sanitizer__unwind__linux__libcdep.cc | 13 ---
...t_asan_TestCases_interception__failure__test.cc | 13 ---
5 files changed, 22 insertions(+), 137 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 59b14c2033..25c81d708c 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= 345582
+SVN_REVISION.compiler-rt= 345620
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 1aaca08b69..8d4f746c47 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -12,12 +12,12 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc) =
SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9475c8018dadbc4d865b52a03e43f9eae2011c3e
SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 58a1dea6a852a4de20f23cd90900c387fe555dce
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 48a0178377ff0610913487e1ee7032b198cd0437
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 363cefe2a4b5d1755b79bf5ed5b6561a3194bcb7
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = db78d4ade22951d8849ffb982ac18e8cf1e8a203
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e8a0d9389f3ddd41f911e00f8ff62e214441296d
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 7c16ba866352f3a695a544094ca46f0f561c43c5
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 9f535e84c3e1ab5704b11e388ac240439a9900d6
-SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 86d53010debaf2cc5c9793d83186db2db76b280f
SHA1 (patch-lib_scudo_scudo__platform.h) = 68f33b18d913984c3a459597ef62f63d36184ca9
SHA1 (patch-lib_tsan_CMakeLists.txt) = 4d8f8081ff2a3249565df26e67a35b5b3509e0b0
+SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = e9e5dbdb8702dbbf5efbd1594a91c262dce1b283
+SHA1 (patch-lib_tsan_rtl_tsan__interceptors.h) = a118fdb7a9767284972588e5433810caef106270
SHA1 (patch-lib_xray_tests_CMakeLists.txt) = bb52916184d8e829395dd40d6d1b8b7eac40da92
-SHA1 (patch-test_asan_TestCases_interception__failure__test.cc) = 0a359141e3c30b672842904b32d1542170b03ab1
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
index 5836777228..72d0eca7cf 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
@@ -1,90 +1,8 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig 2018-08-21 21:25:40.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig 2018-10-30 18:38:54.122499322 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
-@@ -15,9 +15,15 @@
- #include "sanitizer_platform.h"
-
- #if SANITIZER_NETBSD
-+
-+#define _KMEMUSER
-+#define RAY_DO_SIGLEV
-+
- #include <sys/param.h>
- #include <sys/types.h>
-
-+#include <sys/sysctl.h>
-+
- #include <altq/altq.h>
- #include <altq/altq_afmap.h>
- #include <altq/altq_blue.h>
-@@ -87,7 +93,6 @@
- #include <sys/disk.h>
- #include <sys/disklabel.h>
- #include <sys/mount.h>
--#define RAY_DO_SIGLEV
- #include <dev/biovar.h>
- #include <dev/bluetooth/btdev.h>
- #include <dev/bluetooth/btsco.h>
-@@ -115,8 +120,10 @@
- #include <dev/vndvar.h>
- #include <dev/wscons/wsconsio.h>
- #include <dev/wscons/wsdisplay_usl_io.h>
-+#include <md2.h>
-+#include <md4.h>
-+#include <md5.h>
- #include <net/bpf.h>
--#include <net/if_atm.h>
- #include <net/if_gre.h>
- #include <net/if_ppp.h>
- #include <net/if_pppoe.h>
-@@ -132,12 +139,13 @@
- #include <netinet/ip_proxy.h>
- #include <netinet6/in6_var.h>
- #include <netinet6/nd6.h>
--#include <netnatm/natm.h>
- #include <netsmb/smb_dev.h>
-+#include <rmd160.h>
- #include <soundcard.h>
- #include <sys/agpio.h>
- #include <sys/ataio.h>
- #include <sys/audioio.h>
-+#include <sys/cdbr.h>
- #include <sys/cdio.h>
- #include <sys/chio.h>
- #include <sys/clockctl.h>
-@@ -173,6 +181,7 @@
- #include <sys/filio.h>
- #include <sys/ipc.h>
- #include <sys/mman.h>
-+#include <sys/module.h>
- #include <sys/mount.h>
- #include <sys/mqueue.h>
- #include <sys/msg.h>
-@@ -180,6 +189,8 @@
- #include <sys/ptrace.h>
- #include <sys/resource.h>
- #include <sys/sem.h>
-+#include <sys/sha1.h>
-+#include <sys/sha2.h>
- #include <sys/shm.h>
- #include <sys/signal.h>
- #include <sys/socket.h>
-@@ -202,8 +213,13 @@
- #include <utime.h>
- #include <utmp.h>
- #include <utmpx.h>
-+#include <vis.h>
- #include <wchar.h>
- #include <wordexp.h>
-+#include <ttyent.h>
-+
-+#include <fts.h>
-+#include <regex.h>
-
- // Include these after system headers to avoid name clashes and ambiguities.
- #include "sanitizer_internal_defs.h"
-@@ -238,6 +254,10 @@ unsigned struct_rlimit_sz = sizeof(struc
+@@ -252,6 +252,10 @@ unsigned struct_rlimit_sz = sizeof(struc
unsigned struct_timespec_sz = sizeof(struct timespec);
unsigned struct_sembuf_sz = sizeof(struct sembuf);
unsigned struct_kevent_sz = sizeof(struct kevent);
@@ -95,7 +13,7 @@ $NetBSD$
unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
unsigned struct_timex_sz = sizeof(struct timex);
-@@ -350,7 +370,6 @@ unsigned struct_atabusiodetach_args_sz =
+@@ -364,7 +368,6 @@ unsigned struct_atabusiodetach_args_sz =
unsigned struct_atabusioscan_args_sz = sizeof(atabusioscan_args);
unsigned struct_ath_diag_sz = sizeof(ath_diag);
unsigned struct_atm_flowmap_sz = sizeof(atm_flowmap);
@@ -103,7 +21,7 @@ $NetBSD$
unsigned struct_audio_buf_info_sz = sizeof(audio_buf_info);
unsigned struct_audio_device_sz = sizeof(audio_device);
unsigned struct_audio_encoding_sz = sizeof(audio_encoding);
-@@ -596,7 +615,6 @@ unsigned struct_priq_delete_filter_sz =
+@@ -610,7 +613,6 @@ unsigned struct_priq_delete_filter_sz =
unsigned struct_priq_interface_sz = sizeof(priq_interface);
unsigned struct_priq_modify_class_sz = sizeof(priq_modify_class);
unsigned struct_ptmget_sz = sizeof(ptmget);
@@ -111,7 +29,7 @@ $NetBSD$
unsigned struct_radio_info_sz = sizeof(radio_info);
unsigned struct_red_conf_sz = sizeof(red_conf);
unsigned struct_red_interface_sz = sizeof(red_interface);
-@@ -1414,13 +1432,6 @@ unsigned IOCTL_BIOCSRTIMEOUT = BIOCSRTIM
+@@ -1428,13 +1430,6 @@ unsigned IOCTL_BIOCSRTIMEOUT = BIOCSRTIM
unsigned IOCTL_BIOCGRTIMEOUT = BIOCGRTIMEOUT;
unsigned IOCTL_BIOCGFEEDBACK = BIOCGFEEDBACK;
unsigned IOCTL_BIOCSFEEDBACK = BIOCSFEEDBACK;
@@ -125,30 +43,23 @@ $NetBSD$
unsigned IOCTL_GRESADDRS = GRESADDRS;
unsigned IOCTL_GRESADDRD = GRESADDRD;
unsigned IOCTL_GREGADDRS = GREGADDRS;
-@@ -1451,14 +1462,14 @@ unsigned IOCTL_PPPIOCGMTU = PPPIOCGMTU;
+@@ -1465,6 +1460,7 @@ unsigned IOCTL_PPPIOCGMTU = PPPIOCGMTU;
unsigned IOCTL_PPPIOCSMTU = PPPIOCSMTU;
unsigned IOCTL_SIOCGPPPSTATS = SIOCGPPPSTATS;
unsigned IOCTL_SIOCGPPPCSTATS = SIOCGPPPCSTATS;
--unsigned IOCTL_IOC_NPF_VERSION = IOC_NPF_VERSION;
--unsigned IOCTL_IOC_NPF_SWITCH = IOC_NPF_SWITCH;
--unsigned IOCTL_IOC_NPF_LOAD = IOC_NPF_LOAD;
--unsigned IOCTL_IOC_NPF_TABLE = IOC_NPF_TABLE;
--unsigned IOCTL_IOC_NPF_STATS = IOC_NPF_STATS;
--unsigned IOCTL_IOC_NPF_SAVE = IOC_NPF_SAVE;
--unsigned IOCTL_IOC_NPF_RULE = IOC_NPF_RULE;
--unsigned IOCTL_IOC_NPF_CONN_LOOKUP = IOC_NPF_CONN_LOOKUP;
-+//unsigned IOCTL_IOC_NPF_VERSION = IOC_NPF_VERSION;
-+//unsigned IOCTL_IOC_NPF_SWITCH = IOC_NPF_SWITCH;
-+//unsigned IOCTL_IOC_NPF_LOAD = IOC_NPF_LOAD;
-+//unsigned IOCTL_IOC_NPF_TABLE = IOC_NPF_TABLE;
-+//unsigned IOCTL_IOC_NPF_STATS = IOC_NPF_STATS;
-+//unsigned IOCTL_IOC_NPF_SAVE = IOC_NPF_SAVE;
-+//unsigned IOCTL_IOC_NPF_RULE = IOC_NPF_RULE;
-+//unsigned IOCTL_IOC_NPF_CONN_LOOKUP = IOC_NPF_CONN_LOOKUP;
++#if 0
+ unsigned IOCTL_IOC_NPF_VERSION = IOC_NPF_VERSION;
+ unsigned IOCTL_IOC_NPF_SWITCH = IOC_NPF_SWITCH;
+ unsigned IOCTL_IOC_NPF_LOAD = IOC_NPF_LOAD;
+@@ -1473,6 +1469,7 @@ unsigned IOCTL_IOC_NPF_STATS = IOC_NPF_S
+ unsigned IOCTL_IOC_NPF_SAVE = IOC_NPF_SAVE;
+ unsigned IOCTL_IOC_NPF_RULE = IOC_NPF_RULE;
+ unsigned IOCTL_IOC_NPF_CONN_LOOKUP = IOC_NPF_CONN_LOOKUP;
++#endif
unsigned IOCTL_PPPOESETPARMS = PPPOESETPARMS;
unsigned IOCTL_PPPOEGETPARMS = PPPOEGETPARMS;
unsigned IOCTL_PPPOEGETSESSION = PPPOEGETSESSION;
-@@ -1804,8 +1815,6 @@ unsigned IOCTL_MTIOCSLOCATE = MTIOCSLOCA
+@@ -1818,8 +1815,6 @@ unsigned IOCTL_MTIOCSLOCATE = MTIOCSLOCA
unsigned IOCTL_MTIOCHLOCATE = MTIOCHLOCATE;
unsigned IOCTL_POWER_EVENT_RECVDICT = POWER_EVENT_RECVDICT;
unsigned IOCTL_POWER_IOC_GET_TYPE = POWER_IOC_GET_TYPE;
@@ -157,7 +68,7 @@ $NetBSD$
unsigned IOCTL_RIOCGINFO = RIOCGINFO;
unsigned IOCTL_RIOCSINFO = RIOCSINFO;
unsigned IOCTL_RIOCSSRCH = RIOCSSRCH;
-@@ -2063,6 +2072,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
+@@ -2077,6 +2072,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
const int si_SEGV_MAPERR = SEGV_MAPERR;
const int si_SEGV_ACCERR = SEGV_ACCERR;
@@ -197,7 +108,7 @@ $NetBSD$
} // namespace __sanitizer
using namespace __sanitizer;
-@@ -2224,4 +2266,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
+@@ -2238,4 +2266,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
CHECK_SIZE_AND_OFFSET(group, gr_gid);
CHECK_SIZE_AND_OFFSET(group, gr_mem);
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
deleted file mode 100644
index 8d9d103baa..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc.orig 2018-08-21 21:25:40.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-@@ -97,7 +97,7 @@ uptr Unwind_GetIP(struct _Unwind_Context
- // Clear the Thumb bit.
- return val & ~(uptr)1;
- #else
-- return _Unwind_GetIP(ctx);
-+ return (uptr)_Unwind_GetIP(ctx);
- #endif
- }
-
diff --git a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc
deleted file mode 100644
index 36abb20d49..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- test/asan/TestCases/interception_failure_test.cc.orig 2018-08-21 21:25:31.000000000 +0000
-+++ test/asan/TestCases/interception_failure_test.cc
-@@ -5,7 +5,7 @@
- // RUN: %clangxx_asan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
- // RUN: %clangxx_asan -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
- // RUN: %clangxx_asan -O3 %s -o %t && %run %t 2>&1 | FileCheck %s
--// XFAIL: freebsd
-+// XFAIL: freebsd, netbsd
-
- // On Windows, defining strtoll in a static build results in linker errors, but
- // it works with the dynamic runtime.
Home |
Main Index |
Thread Index |
Old Index