pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-netbsd: Update to SVN r. 345774
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Oct 31 23:54:52 2018 +0100
Changeset: e6a5c1f973de460eba5c886384e5bea853c96e6c
Modified Files:
compiler-rt-netbsd/Makefile
compiler-rt-netbsd/distinfo
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
Removed Files:
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
Log Message:
compiler-rt-netbsd: Update to SVN r. 345774
Merged upstream:
[compiler-rt] r345707 - Diable test suppressions-library for NetBSD/i386
[compiler-rt] r345715 - Update generate_netbsd_ioctls.awk for NetBSD 8.99.25
[compiler-rt] r345726 - Update ioctl(2) operations for NetBSD 8.99.25
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e6a5c1f973de460eba5c886384e5bea853c96e6c
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 | 5 +-
...mmon_sanitizer__interceptors__ioctl__netbsd.inc | 50 ------------
...__common_sanitizer__platform__limits__netbsd.cc | 88 +---------------------
...r__common_sanitizer__platform__limits__netbsd.h | 12 +--
5 files changed, 8 insertions(+), 149 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 729a804198..4abecfa382 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= 345697
+SVN_REVISION.compiler-rt= 345774
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 af52d23c5a..ff782c41f0 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -8,12 +8,11 @@ SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = ee809130e36a9157a9bd1c01d45e651b4
SHA1 (patch-lib_msan_msan__interceptors.cc) = b12404d0dd3ac08c1c6cfeb51c6e28b23b82f770
SHA1 (patch-lib_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = d8a3a0398e0fbc99a4d8ff0682aa7ec02a621c0a
-SHA1 (patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc) = 2a5a1edb38f87320959c57fa53f3a7080b562aea
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) = 468924aba6200ddfdf359c3f33c2ca78fb6e0d31
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e8a0d9389f3ddd41f911e00f8ff62e214441296d
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = aff1fd946493ad57b4400b85166c6919cd0fa841
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 3784ed310aef9b516201faf25572aff8a3fae220
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_tsan_CMakeLists.txt) = 4d8f8081ff2a3249565df26e67a35b5b3509e0b0
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
deleted file mode 100644
index 1eaab1514c..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc.orig 2018-08-21 21:25:40.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
-@@ -672,14 +672,6 @@ static void ioctl_table_fill() {
- _(BIOCGRTIMEOUT, WRITE, struct_timeval_sz);
- _(BIOCGFEEDBACK, WRITE, sizeof(unsigned int));
- _(BIOCSFEEDBACK, READ, sizeof(unsigned int));
-- /* Entries from file: net/if_atm.h */
-- _(SIOCRAWATM, READWRITE, sizeof(int));
-- _(SIOCATMENA, READWRITE, struct_atm_pseudoioctl_sz);
-- _(SIOCATMDIS, READWRITE, struct_atm_pseudoioctl_sz);
-- _(SIOCSPVCTX, READWRITE, struct_pvctxreq_sz);
-- _(SIOCGPVCTX, READWRITE, struct_pvctxreq_sz);
-- _(SIOCSPVCSIF, READWRITE, struct_ifreq_sz);
-- _(SIOCGPVCSIF, READWRITE, struct_ifreq_sz);
- /* Entries from file: net/if_gre.h */
- _(GRESADDRS, READ, struct_ifreq_sz);
- _(GRESADDRD, READ, struct_ifreq_sz);
-@@ -713,14 +705,14 @@ static void ioctl_table_fill() {
- _(SIOCGPPPSTATS, READWRITE, struct_ifpppstatsreq_sz);
- _(SIOCGPPPCSTATS, READWRITE, struct_ifpppcstatsreq_sz);
- /* Entries from file: net/npf.h */
-- _(IOC_NPF_VERSION, WRITE, sizeof(int));
-- _(IOC_NPF_SWITCH, READ, sizeof(int));
-- _(IOC_NPF_LOAD, READWRITE, struct_plistref_sz);
-- _(IOC_NPF_TABLE, READ, struct_npf_ioctl_table_sz);
-- _(IOC_NPF_STATS, READ, sizeof(uptr));
-- _(IOC_NPF_SAVE, WRITE, struct_plistref_sz);
-- _(IOC_NPF_RULE, READWRITE, struct_plistref_sz);
-- _(IOC_NPF_CONN_LOOKUP, READWRITE, struct_plistref_sz);
-+// _(IOC_NPF_VERSION, WRITE, sizeof(int));
-+// _(IOC_NPF_SWITCH, READ, sizeof(int));
-+// _(IOC_NPF_LOAD, READWRITE, struct_plistref_sz);
-+// _(IOC_NPF_TABLE, READ, struct_npf_ioctl_table_sz);
-+// _(IOC_NPF_STATS, READ, sizeof(uptr));
-+// _(IOC_NPF_SAVE, WRITE, struct_plistref_sz);
-+// _(IOC_NPF_RULE, READWRITE, struct_plistref_sz);
-+// _(IOC_NPF_CONN_LOOKUP, READWRITE, struct_plistref_sz);
- /* Entries from file: net/if_pppoe.h */
- _(PPPOESETPARMS, READ, struct_pppoediscparms_sz);
- _(PPPOEGETPARMS, READWRITE, struct_pppoediscparms_sz);
-@@ -1095,7 +1087,6 @@ static void ioctl_table_fill() {
- /* Entries from file: sys/power.h */
- _(POWER_EVENT_RECVDICT, READWRITE, struct_plistref_sz);
- _(POWER_IOC_GET_TYPE, WRITE, struct_power_type_sz);
-- _(POWER_IOC_GET_TYPE_WITH_LOSSAGE, WRITE, sizeof(uptr));
- /* Entries from file: sys/radioio.h */
- _(RIOCGINFO, WRITE, struct_radio_info_sz);
- _(RIOCSINFO, READWRITE, struct_radio_info_sz);
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 833585abf5..351f29f2b5 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-10-30 21:53:20.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig 2018-10-31 22:51:05.435055634 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
-@@ -132,7 +132,6 @@
- #include <dev/pci/tweio.h>
- #include <dev/pcmcia/if_cnwioctl.h>
- #include <net/bpf.h>
--#include <net/if_atm.h>
- #include <net/if_gre.h>
- #include <net/ppp_defs.h>
- #include <net/if_ppp.h>
-@@ -151,7 +150,6 @@
- #include <netinet/ip_proxy.h>
- #include <netinet6/in6_var.h>
- #include <netinet6/nd6.h>
--#include <netnatm/natm.h>
- #include <netsmb/smb_dev.h>
- #include <dev/biovar.h>
- #include <dev/bluetooth/btdev.h>
-@@ -252,6 +250,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);
-+unsigned struct_FTS_sz = sizeof(FTS);
-+unsigned struct_FTSENT_sz = sizeof(FTSENT);
-+unsigned struct_regex_sz = sizeof(regex_t);
-+unsigned struct_regmatch_sz = sizeof(regmatch_t);
- unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
- unsigned struct_timex_sz = sizeof(struct timex);
-@@ -364,7 +366,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);
--unsigned struct_atm_pseudoioctl_sz = sizeof(atm_pseudoioctl);
- 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);
-@@ -610,7 +611,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);
--unsigned struct_pvctxreq_sz = sizeof(pvctxreq);
- unsigned struct_radio_info_sz = sizeof(radio_info);
- unsigned struct_red_conf_sz = sizeof(red_conf);
- unsigned struct_red_interface_sz = sizeof(red_interface);
-@@ -1428,13 +1428,6 @@ unsigned IOCTL_BIOCSRTIMEOUT = BIOCSRTIM
- unsigned IOCTL_BIOCGRTIMEOUT = BIOCGRTIMEOUT;
- unsigned IOCTL_BIOCGFEEDBACK = BIOCGFEEDBACK;
- unsigned IOCTL_BIOCSFEEDBACK = BIOCSFEEDBACK;
--unsigned IOCTL_SIOCRAWATM = SIOCRAWATM;
--unsigned IOCTL_SIOCATMENA = SIOCATMENA;
--unsigned IOCTL_SIOCATMDIS = SIOCATMDIS;
--unsigned IOCTL_SIOCSPVCTX = SIOCSPVCTX;
--unsigned IOCTL_SIOCGPVCTX = SIOCGPVCTX;
--unsigned IOCTL_SIOCSPVCSIF = SIOCSPVCSIF;
--unsigned IOCTL_SIOCGPVCSIF = SIOCGPVCSIF;
- unsigned IOCTL_GRESADDRS = GRESADDRS;
- unsigned IOCTL_GRESADDRD = GRESADDRD;
- unsigned IOCTL_GREGADDRS = GREGADDRS;
-@@ -1465,6 +1458,7 @@ unsigned IOCTL_PPPIOCGMTU = PPPIOCGMTU;
- unsigned IOCTL_PPPIOCSMTU = PPPIOCSMTU;
- unsigned IOCTL_SIOCGPPPSTATS = SIOCGPPPSTATS;
- unsigned IOCTL_SIOCGPPPCSTATS = SIOCGPPPCSTATS;
-+#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 +1467,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;
-@@ -1818,8 +1813,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;
--unsigned IOCTL_POWER_IOC_GET_TYPE_WITH_LOSSAGE =
-- POWER_IOC_GET_TYPE_WITH_LOSSAGE;
- unsigned IOCTL_RIOCGINFO = RIOCGINFO;
- unsigned IOCTL_RIOCSINFO = RIOCSINFO;
- unsigned IOCTL_RIOCSSRCH = RIOCSSRCH;
-@@ -2077,6 +2070,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
+@@ -2090,6 +2090,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
const int si_SEGV_MAPERR = SEGV_MAPERR;
const int si_SEGV_ACCERR = SEGV_ACCERR;
@@ -124,7 +42,7 @@ $NetBSD$
} // namespace __sanitizer
using namespace __sanitizer;
-@@ -2238,4 +2264,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
+@@ -2251,4 +2284,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__platform__limits__netbsd.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
index 28bd3cd409..636a30e1c2 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
@@ -1,6 +1,6 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig 2018-08-21 21:25:38.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig 2018-10-31 22:51:05.435928790 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
@@ -60,6 +60,15 @@ extern unsigned struct_timespec_sz;
extern unsigned struct_sembuf_sz;
@@ -26,15 +26,7 @@ $NetBSD$
struct __sanitizer_ptrace_io_desc {
int piod_op;
void *piod_offs;
-@@ -1936,7 +1946,6 @@ extern unsigned IOCTL_MTIOCSLOCATE;
- extern unsigned IOCTL_MTIOCHLOCATE;
- extern unsigned IOCTL_POWER_EVENT_RECVDICT;
- extern unsigned IOCTL_POWER_IOC_GET_TYPE;
--extern unsigned IOCTL_POWER_IOC_GET_TYPE_WITH_LOSSAGE;
- extern unsigned IOCTL_RIOCGINFO;
- extern unsigned IOCTL_RIOCSINFO;
- extern unsigned IOCTL_RIOCSSRCH;
-@@ -2194,6 +2203,80 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
+@@ -2200,6 +2210,80 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
extern const int si_SEGV_MAPERR;
extern const int si_SEGV_ACCERR;
Home |
Main Index |
Thread Index |
Old Index