compiler-rt-netbsd: Upgrade to SVN r. 311933

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Upgrade to SVN r. 311933
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Mon, 28 Aug 2017 21:10:38 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Aug 28 23:10:38 2017 +0200
Changeset:	49592972058feb62b2c55e0fb497478e32b425d3

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
	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
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc

Log Message:
compiler-rt-netbsd: Upgrade to SVN r. 311933

The last pending NetBSD patch for common-sanitizer has been 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=49592972058feb62b2c55e0fb497478e32b425d3

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                        |   8 -
 .../patch-lib_sanitizer__common_CMakeLists.txt     |  20 -
 .../patch-lib_sanitizer__common_sanitizer__linux.h |  12 -
 ...zer__common_sanitizer__platform__interceptors.h |  12 -
 ...__common_sanitizer__platform__limits__netbsd.cc | 364 -------------
 ...r__common_sanitizer__platform__limits__netbsd.h | 573 ---------------------
 ...er__common_sanitizer__platform__limits__posix.h |  20 -
 .../patch-lib_sanitizer__common_sanitizer__posix.h |  12 -
 ..._sanitizer__common_sanitizer__posix__libcdep.cc |  14 -
 10 files changed, 1 insertion(+), 1036 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 60b18815e5..1c39a84e0a 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=	311407
+SVN_REVISION.compiler-rt=	311933
 
 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 57ffdfcf7f..4670fbbf69 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -21,14 +21,6 @@ SHA1 (patch-lib_fuzzer_FuzzerUtilLinux.cpp) = 30e0ead2deb98ac0a7f67403c47044ef6e
 SHA1 (patch-lib_fuzzer_afl_afl__driver.cpp) = a114e28152558b7147d0931eb638109c3d2f32a2
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = eaffd9f8f2621ad465b5c734a764bdff0243af3d
 SHA1 (patch-lib_lsan_lsan__interceptors.cc) = 04cb038163d9d9eb098666d394bfca38e9f78a2f
-SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = e031b35f1cbdcc95184f9cae81c548b9b8aa32fd
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.h) = 232213b5d65d8a76e9a024bd5dc4103e26321565
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 9ba6676c007713c38b30170872b62d9a4dd45b20
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 398d47d5257d30d171baa2b831967cbd0547906c
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e72ff69d8bcddf7f1c409cd5781b1c6472b03d77
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 64df602cec94311cafcb9e2f2bac69fdf4ee8f65
-SHA1 (patch-lib_sanitizer__common_sanitizer__posix.h) = acbf4de1aebde6ccc5f3c25ad47f09b5bb05fd96
-SHA1 (patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc) = 91bae2714d755ce9c826ed1034189686012d5187
 SHA1 (patch-lib_tsan_go_buildgo.sh) = fe64b3389bbf6ae2ddf187df3e0600b2f817f51d
 SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = feeaf47e154105201240af271c0187f146961523
 SHA1 (patch-lib_tsan_rtl_tsan__platform__linux.cc) = e572f99e72257dbaa17838378b34cde40e91bd54
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
deleted file mode 100644
index 574b75da15..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/CMakeLists.txt.orig	2017-08-03 21:24:37.000000000 +0000
-+++ lib/sanitizer_common/CMakeLists.txt
-@@ -18,6 +18,7 @@ set(SANITIZER_SOURCES_NOTERMINATION
-   sanitizer_mac.cc
-   sanitizer_persistent_allocator.cc
-   sanitizer_platform_limits_linux.cc
-+  sanitizer_platform_limits_netbsd.cc
-   sanitizer_platform_limits_posix.cc
-   sanitizer_posix.cc
-   sanitizer_printf.cc
-@@ -118,6 +119,7 @@ set(SANITIZER_HEADERS
-   sanitizer_placement_new.h
-   sanitizer_platform.h
-   sanitizer_platform_interceptors.h
-+  sanitizer_platform_limits_netbsd.h
-   sanitizer_platform_limits_posix.h
-   sanitizer_posix.h
-   sanitizer_procmaps.h
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h
deleted file mode 100644
index a7dcd1ba05..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_linux.h.orig	2017-08-08 20:43:41.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_linux.h
-@@ -18,6 +18,7 @@
- #include "sanitizer_common.h"
- #include "sanitizer_internal_defs.h"
- #include "sanitizer_posix.h"
-+#include "sanitizer_platform_limits_netbsd.h"
- #include "sanitizer_platform_limits_posix.h"
- 
- struct link_map;  // Opaque type returned by dlopen().
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
deleted file mode 100644
index fe5e695e67..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2017-08-03 21:24:37.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -33,6 +33,7 @@
- #endif
- 
- #if SI_POSIX
-+# include "sanitizer_platform_limits_netbsd.h"
- # include "sanitizer_platform_limits_posix.h"
- #endif
- 
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
deleted file mode 100644
index 9cff03f7d1..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
+++ /dev/null
@@ -1,364 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2017-08-28 18:08:46.850719854 +0000
-+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
-@@ -0,0 +1,359 @@
-+//===-- sanitizer_platform_limits_posix.cc --------------------------------===//
-+//
-+//                     The LLVM Compiler Infrastructure
-+//
-+// This file is distributed under the University of Illinois Open Source
-+// License. See LICENSE.TXT for details.
-+//
-+//===----------------------------------------------------------------------===//
-+//
-+// This file is a part of Sanitizer common code.
-+//
-+// Sizes and layouts of platform-specific NetBSD data structures.
-+//===----------------------------------------------------------------------===//
-+
-+#include "sanitizer_platform.h"
-+
-+#if SANITIZER_NETBSD
-+#include <arpa/inet.h>
-+#include <dirent.h>
-+#include <glob.h>
-+#include <grp.h>
-+#include <ifaddrs.h>
-+#include <limits.h>
-+#include <link_elf.h>
-+#include <net/if.h>
-+#include <net/if_ether.h>
-+#include <net/ppp_defs.h>
-+#include <net/route.h>
-+#include <netdb.h>
-+#include <netinet/in.h>
-+#include <netinet/ip_mroute.h>
-+#include <poll.h>
-+#include <pthread.h>
-+#include <pwd.h>
-+#include <semaphore.h>
-+#include <signal.h>
-+#include <stddef.h>
-+#include <sys/filio.h>
-+#include <sys/ipc.h>
-+#include <sys/mman.h>
-+#include <sys/mount.h>
-+#include <sys/mqueue.h>
-+#include <sys/msg.h>
-+#include <sys/mtio.h>
-+#include <sys/ptrace.h>
-+#include <sys/resource.h>
-+#include <sys/shm.h>
-+#include <sys/signal.h>
-+#include <sys/socket.h>
-+#include <sys/sockio.h>
-+#include <sys/soundcard.h>
-+#include <sys/stat.h>
-+#include <sys/statvfs.h>
-+#include <sys/time.h>
-+#include <sys/timeb.h>
-+#include <sys/times.h>
-+#include <sys/timespec.h>
-+#include <sys/timex.h>
-+#include <sys/types.h>
-+#include <sys/ucontext.h>
-+#include <sys/utsname.h>
-+#include <term.h>
-+#include <termios.h>
-+#include <time.h>
-+#include <utime.h>
-+#include <utmp.h>
-+#include <utmpx.h>
-+#include <wchar.h>
-+#include <wordexp.h>
-+
-+// Include these after system headers to avoid name clashes and ambiguities.
-+#include "sanitizer_internal_defs.h"
-+#include "sanitizer_platform_limits_netbsd.h"
-+
-+namespace __sanitizer {
-+unsigned struct_utsname_sz = sizeof(struct utsname);
-+unsigned struct_stat_sz = sizeof(struct stat);
-+unsigned struct_rusage_sz = sizeof(struct rusage);
-+unsigned struct_tm_sz = sizeof(struct tm);
-+unsigned struct_passwd_sz = sizeof(struct passwd);
-+unsigned struct_group_sz = sizeof(struct group);
-+unsigned siginfo_t_sz = sizeof(siginfo_t);
-+unsigned struct_sigaction_sz = sizeof(struct sigaction);
-+unsigned struct_itimerval_sz = sizeof(struct itimerval);
-+unsigned pthread_t_sz = sizeof(pthread_t);
-+unsigned pthread_cond_t_sz = sizeof(pthread_cond_t);
-+unsigned pid_t_sz = sizeof(pid_t);
-+unsigned timeval_sz = sizeof(timeval);
-+unsigned uid_t_sz = sizeof(uid_t);
-+unsigned gid_t_sz = sizeof(gid_t);
-+unsigned mbstate_t_sz = sizeof(mbstate_t);
-+unsigned sigset_t_sz = sizeof(sigset_t);
-+unsigned struct_timezone_sz = sizeof(struct timezone);
-+unsigned struct_tms_sz = sizeof(struct tms);
-+unsigned struct_sigevent_sz = sizeof(struct sigevent);
-+unsigned struct_sched_param_sz = sizeof(struct sched_param);
-+unsigned struct_sockaddr_sz = sizeof(struct sockaddr);
-+unsigned ucontext_t_sz = sizeof(ucontext_t);
-+unsigned struct_rlimit_sz = sizeof(struct rlimit);
-+unsigned struct_timespec_sz = sizeof(struct timespec);
-+unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
-+unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
-+unsigned struct_timex_sz = sizeof(struct timex);
-+unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds);
-+unsigned struct_mq_attr_sz = sizeof(struct mq_attr);
-+unsigned struct_statvfs_sz = sizeof(struct statvfs);
-+
-+uptr sig_ign = (uptr)SIG_IGN;
-+uptr sig_dfl = (uptr)SIG_DFL;
-+uptr sa_siginfo = (uptr)SA_SIGINFO;
-+
-+int shmctl_ipc_stat = (int)IPC_STAT;
-+
-+unsigned struct_utmp_sz = sizeof(struct utmp);
-+unsigned struct_utmpx_sz = sizeof(struct utmpx);
-+
-+int map_fixed = MAP_FIXED;
-+
-+int af_inet = (int)AF_INET;
-+int af_inet6 = (int)AF_INET6;
-+
-+uptr __sanitizer_in_addr_sz(int af) {
-+  if (af == AF_INET)
-+    return sizeof(struct in_addr);
-+  else if (af == AF_INET6)
-+    return sizeof(struct in6_addr);
-+  else
-+    return 0;
-+}
-+
-+int glob_nomatch = GLOB_NOMATCH;
-+int glob_altdirfunc = GLOB_ALTDIRFUNC;
-+
-+unsigned path_max = PATH_MAX;
-+
-+// ioctl arguments
-+unsigned struct_ifreq_sz = sizeof(struct ifreq);
-+unsigned struct_termios_sz = sizeof(struct termios);
-+unsigned struct_winsize_sz = sizeof(struct winsize);
-+unsigned struct_mtget_sz = sizeof(struct mtget);
-+unsigned struct_mtop_sz = sizeof(struct mtop);
-+unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-+unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-+unsigned struct_sioc_sg_req_sz = sizeof(struct sioc_sg_req);
-+unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req);
-+
-+const unsigned IOCTL_NOT_PRESENT = 0;
-+
-+unsigned IOCTL_FIOASYNC = FIOASYNC;
-+unsigned IOCTL_FIOCLEX = FIOCLEX;
-+unsigned IOCTL_FIOGETOWN = FIOGETOWN;
-+unsigned IOCTL_FIONBIO = FIONBIO;
-+unsigned IOCTL_FIONCLEX = FIONCLEX;
-+unsigned IOCTL_FIOSETOWN = FIOSETOWN;
-+unsigned IOCTL_SIOCADDMULTI = SIOCADDMULTI;
-+unsigned IOCTL_SIOCATMARK = SIOCATMARK;
-+unsigned IOCTL_SIOCDELMULTI = SIOCDELMULTI;
-+unsigned IOCTL_SIOCGIFADDR = SIOCGIFADDR;
-+unsigned IOCTL_SIOCGIFBRDADDR = SIOCGIFBRDADDR;
-+unsigned IOCTL_SIOCGIFCONF = SIOCGIFCONF;
-+unsigned IOCTL_SIOCGIFDSTADDR = SIOCGIFDSTADDR;
-+unsigned IOCTL_SIOCGIFFLAGS = SIOCGIFFLAGS;
-+unsigned IOCTL_SIOCGIFMETRIC = SIOCGIFMETRIC;
-+unsigned IOCTL_SIOCGIFMTU = SIOCGIFMTU;
-+unsigned IOCTL_SIOCGIFNETMASK = SIOCGIFNETMASK;
-+unsigned IOCTL_SIOCGPGRP = SIOCGPGRP;
-+unsigned IOCTL_SIOCSIFADDR = SIOCSIFADDR;
-+unsigned IOCTL_SIOCSIFBRDADDR = SIOCSIFBRDADDR;
-+unsigned IOCTL_SIOCSIFDSTADDR = SIOCSIFDSTADDR;
-+unsigned IOCTL_SIOCSIFFLAGS = SIOCSIFFLAGS;
-+unsigned IOCTL_SIOCSIFMETRIC = SIOCSIFMETRIC;
-+unsigned IOCTL_SIOCSIFMTU = SIOCSIFMTU;
-+unsigned IOCTL_SIOCSIFNETMASK = SIOCSIFNETMASK;
-+unsigned IOCTL_SIOCSPGRP = SIOCSPGRP;
-+unsigned IOCTL_TIOCCONS = TIOCCONS;
-+unsigned IOCTL_TIOCEXCL = TIOCEXCL;
-+unsigned IOCTL_TIOCGETD = TIOCGETD;
-+unsigned IOCTL_TIOCGPGRP = TIOCGPGRP;
-+unsigned IOCTL_TIOCGWINSZ = TIOCGWINSZ;
-+unsigned IOCTL_TIOCMBIC = TIOCMBIC;
-+unsigned IOCTL_TIOCMBIS = TIOCMBIS;
-+unsigned IOCTL_TIOCMGET = TIOCMGET;
-+unsigned IOCTL_TIOCMSET = TIOCMSET;
-+unsigned IOCTL_TIOCNOTTY = TIOCNOTTY;
-+unsigned IOCTL_TIOCNXCL = TIOCNXCL;
-+unsigned IOCTL_TIOCOUTQ = TIOCOUTQ;
-+unsigned IOCTL_TIOCPKT = TIOCPKT;
-+unsigned IOCTL_TIOCSCTTY = TIOCSCTTY;
-+unsigned IOCTL_TIOCSETD = TIOCSETD;
-+unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;
-+unsigned IOCTL_TIOCSTI = TIOCSTI;
-+unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;
-+unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;
-+unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;
-+
-+const int si_SEGV_MAPERR = SEGV_MAPERR;
-+const int si_SEGV_ACCERR = SEGV_ACCERR;
-+}  // namespace __sanitizer
-+
-+using namespace __sanitizer;
-+
-+COMPILER_CHECK(sizeof(__sanitizer_pthread_attr_t) >= sizeof(pthread_attr_t));
-+
-+COMPILER_CHECK(sizeof(socklen_t) == sizeof(unsigned));
-+CHECK_TYPE_SIZE(pthread_key_t);
-+
-+// There are more undocumented fields in dl_phdr_info that we are not interested
-+// in.
-+COMPILER_CHECK(sizeof(__sanitizer_dl_phdr_info) <= sizeof(dl_phdr_info));
-+CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_addr);
-+CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_name);
-+CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
-+CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
-+
-+CHECK_TYPE_SIZE(glob_t);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_offs);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_flags);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_closedir);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_readdir);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_opendir);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_lstat);
-+CHECK_SIZE_AND_OFFSET(glob_t, gl_stat);
-+
-+CHECK_TYPE_SIZE(addrinfo);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_flags);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_family);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_socktype);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_protocol);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_protocol);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_addrlen);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_canonname);
-+CHECK_SIZE_AND_OFFSET(addrinfo, ai_addr);
-+
-+CHECK_TYPE_SIZE(hostent);
-+CHECK_SIZE_AND_OFFSET(hostent, h_name);
-+CHECK_SIZE_AND_OFFSET(hostent, h_aliases);
-+CHECK_SIZE_AND_OFFSET(hostent, h_addrtype);
-+CHECK_SIZE_AND_OFFSET(hostent, h_length);
-+CHECK_SIZE_AND_OFFSET(hostent, h_addr_list);
-+
-+CHECK_TYPE_SIZE(iovec);
-+CHECK_SIZE_AND_OFFSET(iovec, iov_base);
-+CHECK_SIZE_AND_OFFSET(iovec, iov_len);
-+
-+CHECK_TYPE_SIZE(msghdr);
-+CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
-+CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
-+CHECK_SIZE_AND_OFFSET(msghdr, msg_iov);
-+CHECK_SIZE_AND_OFFSET(msghdr, msg_iovlen);
-+CHECK_SIZE_AND_OFFSET(msghdr, msg_control);
-+CHECK_SIZE_AND_OFFSET(msghdr, msg_controllen);
-+CHECK_SIZE_AND_OFFSET(msghdr, msg_flags);
-+
-+CHECK_TYPE_SIZE(cmsghdr);
-+CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
-+CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
-+CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
-+
-+COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
-+CHECK_SIZE_AND_OFFSET(dirent, d_fileno);
-+CHECK_SIZE_AND_OFFSET(dirent, d_reclen);
-+
-+CHECK_TYPE_SIZE(ifconf);
-+CHECK_SIZE_AND_OFFSET(ifconf, ifc_len);
-+CHECK_SIZE_AND_OFFSET(ifconf, ifc_ifcu);
-+
-+CHECK_TYPE_SIZE(pollfd);
-+CHECK_SIZE_AND_OFFSET(pollfd, fd);
-+CHECK_SIZE_AND_OFFSET(pollfd, events);
-+CHECK_SIZE_AND_OFFSET(pollfd, revents);
-+
-+CHECK_TYPE_SIZE(nfds_t);
-+
-+CHECK_TYPE_SIZE(sigset_t);
-+
-+COMPILER_CHECK(sizeof(__sanitizer_sigaction) == sizeof(struct sigaction));
-+// Can't write checks for sa_handler and sa_sigaction due to them being
-+// preprocessor macros.
-+CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_mask);
-+
-+CHECK_TYPE_SIZE(wordexp_t);
-+CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordc);
-+CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordv);
-+CHECK_SIZE_AND_OFFSET(wordexp_t, we_offs);
-+
-+CHECK_TYPE_SIZE(tm);
-+CHECK_SIZE_AND_OFFSET(tm, tm_sec);
-+CHECK_SIZE_AND_OFFSET(tm, tm_min);
-+CHECK_SIZE_AND_OFFSET(tm, tm_hour);
-+CHECK_SIZE_AND_OFFSET(tm, tm_mday);
-+CHECK_SIZE_AND_OFFSET(tm, tm_mon);
-+CHECK_SIZE_AND_OFFSET(tm, tm_year);
-+CHECK_SIZE_AND_OFFSET(tm, tm_wday);
-+CHECK_SIZE_AND_OFFSET(tm, tm_yday);
-+CHECK_SIZE_AND_OFFSET(tm, tm_isdst);
-+CHECK_SIZE_AND_OFFSET(tm, tm_gmtoff);
-+CHECK_SIZE_AND_OFFSET(tm, tm_zone);
-+
-+CHECK_TYPE_SIZE(ether_addr);
-+
-+CHECK_TYPE_SIZE(ipc_perm);
-+CHECK_SIZE_AND_OFFSET(ipc_perm, _key);
-+CHECK_SIZE_AND_OFFSET(ipc_perm, _seq);
-+CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
-+CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
-+CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
-+CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-+CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
-+
-+CHECK_TYPE_SIZE(shmid_ds);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_perm);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_segsz);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_atime);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_dtime);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_ctime);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_cpid);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_lpid);
-+CHECK_SIZE_AND_OFFSET(shmid_ds, shm_nattch);
-+
-+CHECK_TYPE_SIZE(clock_t);
-+
-+CHECK_TYPE_SIZE(ifaddrs);
-+CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_next);
-+CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_name);
-+CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_addr);
-+CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_netmask);
-+// Compare against the union, because we can't reach into the union in a
-+// compliant way.
-+#ifdef ifa_dstaddr
-+#undef ifa_dstaddr
-+#endif
-+CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
-+CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
-+
-+CHECK_TYPE_SIZE(timeb);
-+CHECK_SIZE_AND_OFFSET(timeb, time);
-+CHECK_SIZE_AND_OFFSET(timeb, millitm);
-+CHECK_SIZE_AND_OFFSET(timeb, timezone);
-+CHECK_SIZE_AND_OFFSET(timeb, dstflag);
-+
-+CHECK_TYPE_SIZE(passwd);
-+CHECK_SIZE_AND_OFFSET(passwd, pw_name);
-+CHECK_SIZE_AND_OFFSET(passwd, pw_passwd);
-+CHECK_SIZE_AND_OFFSET(passwd, pw_uid);
-+CHECK_SIZE_AND_OFFSET(passwd, pw_gid);
-+CHECK_SIZE_AND_OFFSET(passwd, pw_dir);
-+CHECK_SIZE_AND_OFFSET(passwd, pw_shell);
-+
-+CHECK_SIZE_AND_OFFSET(passwd, pw_gecos);
-+
-+CHECK_TYPE_SIZE(group);
-+CHECK_SIZE_AND_OFFSET(group, gr_name);
-+CHECK_SIZE_AND_OFFSET(group, gr_passwd);
-+CHECK_SIZE_AND_OFFSET(group, gr_gid);
-+CHECK_SIZE_AND_OFFSET(group, gr_mem);
-+
-+#endif  // SANITIZER_NETBSD
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
deleted file mode 100644
index eb5ea48d4b..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
+++ /dev/null
@@ -1,573 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2017-08-28 18:08:46.866135570 +0000
-+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
-@@ -0,0 +1,568 @@
-+//===-- sanitizer_platform_limits_posix.h ---------------------------------===//
-+//
-+//                     The LLVM Compiler Infrastructure
-+//
-+// This file is distributed under the University of Illinois Open Source
-+// License. See LICENSE.TXT for details.
-+//
-+//===----------------------------------------------------------------------===//
-+//
-+// This file is a part of Sanitizer common code.
-+//
-+// Sizes and layouts of platform-specific NetBSD data structures.
-+//===----------------------------------------------------------------------===//
-+
-+#ifndef SANITIZER_PLATFORM_LIMITS_NETBSD_H
-+#define SANITIZER_PLATFORM_LIMITS_NETBSD_H
-+
-+#if SANITIZER_NETBSD
-+
-+#include "sanitizer_internal_defs.h"
-+#include "sanitizer_platform.h"
-+
-+#define _GET_LINK_MAP_BY_DLOPEN_HANDLE(handle, shift) \
-+  ((link_map *)((handle) == nullptr ? nullptr : ((char *)(handle) + (shift))))
-+
-+#if defined(__x86_64__)
-+#define GET_LINK_MAP_BY_DLOPEN_HANDLE(handle) \
-+  _GET_LINK_MAP_BY_DLOPEN_HANDLE(handle, 608)
-+#elif defined(__i386__)
-+#define GET_LINK_MAP_BY_DLOPEN_HANDLE(handle) \
-+  _GET_LINK_MAP_BY_DLOPEN_HANDLE(handle, 324)
-+#endif
-+
-+namespace __sanitizer {
-+extern unsigned struct_utsname_sz;
-+extern unsigned struct_stat_sz;
-+extern unsigned struct_rusage_sz;
-+extern unsigned siginfo_t_sz;
-+extern unsigned struct_itimerval_sz;
-+extern unsigned pthread_t_sz;
-+extern unsigned pthread_cond_t_sz;
-+extern unsigned pid_t_sz;
-+extern unsigned timeval_sz;
-+extern unsigned uid_t_sz;
-+extern unsigned gid_t_sz;
-+extern unsigned mbstate_t_sz;
-+extern unsigned struct_timezone_sz;
-+extern unsigned struct_tms_sz;
-+extern unsigned struct_itimerspec_sz;
-+extern unsigned struct_sigevent_sz;
-+extern unsigned struct_sched_param_sz;
-+extern unsigned struct_statfs_sz;
-+extern unsigned struct_sockaddr_sz;
-+extern unsigned ucontext_t_sz;
-+
-+extern unsigned struct_rlimit_sz;
-+extern unsigned struct_utimbuf_sz;
-+extern unsigned struct_timespec_sz;
-+
-+struct __sanitizer_iocb {
-+  u64 aio_offset;
-+  uptr aio_buf;
-+  long aio_nbytes;
-+  u32 aio_fildes;
-+  u32 aio_lio_opcode;
-+  long aio_reqprio;
-+#if SANITIZER_WORDSIZE == 64
-+  u8 aio_sigevent[32];
-+#else
-+  u8 aio_sigevent[20];
-+#endif
-+  u32 _state;
-+  u32 _errno;
-+  long _retval;
-+};
-+
-+struct __sanitizer___sysctl_args {
-+  int *name;
-+  int nlen;
-+  void *oldval;
-+  uptr *oldlenp;
-+  void *newval;
-+  uptr newlen;
-+};
-+
-+struct __sanitizer_sem_t {
-+  uptr data[5];
-+};
-+
-+struct __sanitizer_ipc_perm {
-+  u32 uid;
-+  u32 gid;
-+  u32 cuid;
-+  u32 cgid;
-+  u32 mode;
-+  unsigned short _seq;
-+  long _key;
-+};
-+
-+struct __sanitizer_shmid_ds {
-+  __sanitizer_ipc_perm shm_perm;
-+  unsigned long shm_segsz;
-+  u32 shm_lpid;
-+  u32 shm_cpid;
-+  unsigned int shm_nattch;
-+  u64 shm_atime;
-+  u64 shm_dtime;
-+  u64 shm_ctime;
-+  void *_shm_internal;
-+};
-+
-+extern unsigned struct_msqid_ds_sz;
-+extern unsigned struct_mq_attr_sz;
-+extern unsigned struct_timex_sz;
-+extern unsigned struct_statvfs_sz;
-+
-+struct __sanitizer_iovec {
-+  void *iov_base;
-+  uptr iov_len;
-+};
-+
-+struct __sanitizer_ifaddrs {
-+  struct __sanitizer_ifaddrs *ifa_next;
-+  char *ifa_name;
-+  unsigned int ifa_flags;
-+  void *ifa_addr;     // (struct sockaddr *)
-+  void *ifa_netmask;  // (struct sockaddr *)
-+  void *ifa_dstaddr;  // (struct sockaddr *)
-+  void *ifa_data;
-+  unsigned int ifa_addrflags;
-+};
-+
-+typedef unsigned __sanitizer_pthread_key_t;
-+
-+typedef long long __sanitizer_time_t;
-+
-+struct __sanitizer_passwd {
-+  char *pw_name;
-+  char *pw_passwd;
-+  int pw_uid;
-+  int pw_gid;
-+  __sanitizer_time_t pw_change;
-+  char *pw_class;
-+  char *pw_gecos;
-+  char *pw_dir;
-+  char *pw_shell;
-+  __sanitizer_time_t pw_expire;
-+};
-+
-+struct __sanitizer_group {
-+  char *gr_name;
-+  char *gr_passwd;
-+  int gr_gid;
-+  char **gr_mem;
-+};
-+
-+struct __sanitizer_timeb {
-+  __sanitizer_time_t time;
-+  unsigned short millitm;
-+  short timezone;
-+  short dstflag;
-+};
-+
-+struct __sanitizer_ether_addr {
-+  u8 octet[6];
-+};
-+
-+struct __sanitizer_tm {
-+  int tm_sec;
-+  int tm_min;
-+  int tm_hour;
-+  int tm_mday;
-+  int tm_mon;
-+  int tm_year;
-+  int tm_wday;
-+  int tm_yday;
-+  int tm_isdst;
-+  long int tm_gmtoff;
-+  const char *tm_zone;
-+};
-+
-+struct __sanitizer_msghdr {
-+  void *msg_name;
-+  unsigned msg_namelen;
-+  struct __sanitizer_iovec *msg_iov;
-+  unsigned msg_iovlen;
-+  void *msg_control;
-+  unsigned msg_controllen;
-+  int msg_flags;
-+};
-+struct __sanitizer_cmsghdr {
-+  unsigned cmsg_len;
-+  int cmsg_level;
-+  int cmsg_type;
-+};
-+
-+struct __sanitizer_dirent {
-+  u64 d_fileno;
-+  u16 d_reclen;
-+  // more fields that we don't care about
-+};
-+
-+typedef int __sanitizer_clock_t;
-+typedef int __sanitizer_clockid_t;
-+
-+typedef u32 __sanitizer___kernel_uid_t;
-+typedef u32 __sanitizer___kernel_gid_t;
-+typedef u64 __sanitizer___kernel_off_t;
-+typedef struct {
-+  u32 fds_bits[8];
-+} __sanitizer___kernel_fd_set;
-+
-+typedef struct {
-+  unsigned int pta_magic;
-+  int pta_flags;
-+  void *pta_private;
-+} __sanitizer_pthread_attr_t;
-+
-+struct __sanitizer_sigset_t {
-+  // uint32_t * 4
-+  unsigned int __bits[4];
-+};
-+
-+struct __sanitizer_sigaction {
-+  union {
-+    void (*handler)(int sig);
-+    void (*sigaction)(int sig, void *siginfo, void *uctx);
-+  };
-+  __sanitizer_sigset_t sa_mask;
-+  int sa_flags;
-+};
-+
-+typedef __sanitizer_sigset_t __sanitizer_kernel_sigset_t;
-+
-+struct __sanitizer_kernel_sigaction_t {
-+  union {
-+    void (*handler)(int signo);
-+    void (*sigaction)(int signo, void *info, void *ctx);
-+  };
-+  unsigned long sa_flags;
-+  void (*sa_restorer)(void);
-+  __sanitizer_kernel_sigset_t sa_mask;
-+};
-+
-+extern uptr sig_ign;
-+extern uptr sig_dfl;
-+extern uptr sa_siginfo;
-+
-+extern int af_inet;
-+extern int af_inet6;
-+uptr __sanitizer_in_addr_sz(int af);
-+
-+struct __sanitizer_dl_phdr_info {
-+  uptr dlpi_addr;
-+  const char *dlpi_name;
-+  const void *dlpi_phdr;
-+  short dlpi_phnum;
-+};
-+
-+extern unsigned struct_ElfW_Phdr_sz;
-+
-+struct __sanitizer_addrinfo {
-+  int ai_flags;
-+  int ai_family;
-+  int ai_socktype;
-+  int ai_protocol;
-+  unsigned ai_addrlen;
-+  char *ai_canonname;
-+  void *ai_addr;
-+  struct __sanitizer_addrinfo *ai_next;
-+};
-+
-+struct __sanitizer_hostent {
-+  char *h_name;
-+  char **h_aliases;
-+  int h_addrtype;
-+  int h_length;
-+  char **h_addr_list;
-+};
-+
-+struct __sanitizer_pollfd {
-+  int fd;
-+  short events;
-+  short revents;
-+};
-+
-+typedef unsigned __sanitizer_nfds_t;
-+
-+struct __sanitizer_glob_t {
-+  uptr gl_pathc;
-+  uptr gl_matchc;
-+  uptr gl_offs;
-+  int gl_flags;
-+  char **gl_pathv;
-+  int (*gl_errfunc)(const char *, int);
-+  void (*gl_closedir)(void *dirp);
-+  struct dirent *(*gl_readdir)(void *dirp);
-+  void *(*gl_opendir)(const char *);
-+  int (*gl_lstat)(const char *, void * /* struct stat* */);
-+  int (*gl_stat)(const char *, void * /* struct stat* */);
-+};
-+
-+extern int glob_nomatch;
-+extern int glob_altdirfunc;
-+
-+extern unsigned path_max;
-+
-+struct __sanitizer_wordexp_t {
-+  uptr we_wordc;
-+  char **we_wordv;
-+  uptr we_offs;
-+  char *we_strings;
-+  uptr we_nbytes;
-+};
-+
-+typedef void __sanitizer_FILE;
-+#define SANITIZER_HAS_STRUCT_FILE 0
-+
-+extern int shmctl_ipc_stat;
-+
-+// This simplifies generic code
-+#define struct_shminfo_sz -1
-+#define struct_shm_info_sz -1
-+#define shmctl_shm_stat -1
-+#define shmctl_ipc_info -1
-+#define shmctl_shm_info -1
-+
-+extern unsigned struct_utmp_sz;
-+extern unsigned struct_utmpx_sz;
-+
-+extern int map_fixed;
-+
-+// ioctl arguments
-+struct __sanitizer_ifconf {
-+  int ifc_len;
-+  union {
-+    void *ifcu_req;
-+  } ifc_ifcu;
-+};
-+
-+#define IOC_NRBITS 8
-+#define IOC_TYPEBITS 8
-+#define IOC_SIZEBITS 14
-+#define IOC_DIRBITS 2
-+#define IOC_NONE 0U
-+#define IOC_WRITE 1U
-+#define IOC_READ 2U
-+#define IOC_NRMASK ((1 << IOC_NRBITS) - 1)
-+#define IOC_TYPEMASK ((1 << IOC_TYPEBITS) - 1)
-+#define IOC_SIZEMASK ((1 << IOC_SIZEBITS) - 1)
-+#undef IOC_DIRMASK
-+#define IOC_DIRMASK ((1 << IOC_DIRBITS) - 1)
-+#define IOC_NRSHIFT 0
-+#define IOC_TYPESHIFT (IOC_NRSHIFT + IOC_NRBITS)
-+#define IOC_SIZESHIFT (IOC_TYPESHIFT + IOC_TYPEBITS)
-+#define IOC_DIRSHIFT (IOC_SIZESHIFT + IOC_SIZEBITS)
-+#define EVIOC_EV_MAX 0x1f
-+#define EVIOC_ABS_MAX 0x3f
-+
-+#define IOC_DIR(nr) (((nr) >> IOC_DIRSHIFT) & IOC_DIRMASK)
-+#define IOC_TYPE(nr) (((nr) >> IOC_TYPESHIFT) & IOC_TYPEMASK)
-+#define IOC_NR(nr) (((nr) >> IOC_NRSHIFT) & IOC_NRMASK)
-+#define IOC_SIZE(nr) (((nr) >> IOC_SIZESHIFT) & IOC_SIZEMASK)
-+
-+extern unsigned struct_ifreq_sz;
-+extern unsigned struct_termios_sz;
-+extern unsigned struct_winsize_sz;
-+
-+extern unsigned struct_arpreq_sz;
-+
-+extern unsigned struct_mtget_sz;
-+extern unsigned struct_mtop_sz;
-+extern unsigned struct_rtentry_sz;
-+extern unsigned struct_sbi_instrument_sz;
-+extern unsigned struct_seq_event_rec_sz;
-+extern unsigned struct_synth_info_sz;
-+extern unsigned struct_vt_mode_sz;
-+extern unsigned struct_audio_buf_info_sz;
-+extern unsigned struct_ppp_stats_sz;
-+extern unsigned struct_sioc_sg_req_sz;
-+extern unsigned struct_sioc_vif_req_sz;
-+
-+// ioctl request identifiers
-+
-+// A special value to mark ioctls that are not present on the target platform,
-+// when it can not be determined without including any system headers.
-+extern const unsigned IOCTL_NOT_PRESENT;
-+
-+extern unsigned IOCTL_FIOASYNC;
-+extern unsigned IOCTL_FIOCLEX;
-+extern unsigned IOCTL_FIOGETOWN;
-+extern unsigned IOCTL_FIONBIO;
-+extern unsigned IOCTL_FIONCLEX;
-+extern unsigned IOCTL_FIOSETOWN;
-+extern unsigned IOCTL_SIOCADDMULTI;
-+extern unsigned IOCTL_SIOCATMARK;
-+extern unsigned IOCTL_SIOCDELMULTI;
-+extern unsigned IOCTL_SIOCGIFADDR;
-+extern unsigned IOCTL_SIOCGIFBRDADDR;
-+extern unsigned IOCTL_SIOCGIFCONF;
-+extern unsigned IOCTL_SIOCGIFDSTADDR;
-+extern unsigned IOCTL_SIOCGIFFLAGS;
-+extern unsigned IOCTL_SIOCGIFMETRIC;
-+extern unsigned IOCTL_SIOCGIFMTU;
-+extern unsigned IOCTL_SIOCGIFNETMASK;
-+extern unsigned IOCTL_SIOCGPGRP;
-+extern unsigned IOCTL_SIOCSIFADDR;
-+extern unsigned IOCTL_SIOCSIFBRDADDR;
-+extern unsigned IOCTL_SIOCSIFDSTADDR;
-+extern unsigned IOCTL_SIOCSIFFLAGS;
-+extern unsigned IOCTL_SIOCSIFMETRIC;
-+extern unsigned IOCTL_SIOCSIFMTU;
-+extern unsigned IOCTL_SIOCSIFNETMASK;
-+extern unsigned IOCTL_SIOCSPGRP;
-+extern unsigned IOCTL_TIOCCONS;
-+extern unsigned IOCTL_TIOCEXCL;
-+extern unsigned IOCTL_TIOCGETD;
-+extern unsigned IOCTL_TIOCGPGRP;
-+extern unsigned IOCTL_TIOCGWINSZ;
-+extern unsigned IOCTL_TIOCMBIC;
-+extern unsigned IOCTL_TIOCMBIS;
-+extern unsigned IOCTL_TIOCMGET;
-+extern unsigned IOCTL_TIOCMSET;
-+extern unsigned IOCTL_TIOCNOTTY;
-+extern unsigned IOCTL_TIOCNXCL;
-+extern unsigned IOCTL_TIOCOUTQ;
-+extern unsigned IOCTL_TIOCPKT;
-+extern unsigned IOCTL_TIOCSCTTY;
-+extern unsigned IOCTL_TIOCSETD;
-+extern unsigned IOCTL_TIOCSPGRP;
-+extern unsigned IOCTL_TIOCSTI;
-+extern unsigned IOCTL_TIOCSWINSZ;
-+extern unsigned IOCTL_SIOCGETSGCNT;
-+extern unsigned IOCTL_SIOCGETVIFCNT;
-+extern unsigned IOCTL_MTIOCGET;
-+extern unsigned IOCTL_MTIOCTOP;
-+extern unsigned IOCTL_SIOCADDRT;
-+extern unsigned IOCTL_SIOCDELRT;
-+extern unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE;
-+extern unsigned IOCTL_SNDCTL_DSP_GETFMTS;
-+extern unsigned IOCTL_SNDCTL_DSP_NONBLOCK;
-+extern unsigned IOCTL_SNDCTL_DSP_POST;
-+extern unsigned IOCTL_SNDCTL_DSP_RESET;
-+extern unsigned IOCTL_SNDCTL_DSP_SETFMT;
-+extern unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT;
-+extern unsigned IOCTL_SNDCTL_DSP_SPEED;
-+extern unsigned IOCTL_SNDCTL_DSP_STEREO;
-+extern unsigned IOCTL_SNDCTL_DSP_SUBDIVIDE;
-+extern unsigned IOCTL_SNDCTL_DSP_SYNC;
-+extern unsigned IOCTL_SNDCTL_FM_4OP_ENABLE;
-+extern unsigned IOCTL_SNDCTL_FM_LOAD_INSTR;
-+extern unsigned IOCTL_SNDCTL_MIDI_INFO;
-+extern unsigned IOCTL_SNDCTL_MIDI_PRETIME;
-+extern unsigned IOCTL_SNDCTL_SEQ_CTRLRATE;
-+extern unsigned IOCTL_SNDCTL_SEQ_GETINCOUNT;
-+extern unsigned IOCTL_SNDCTL_SEQ_GETOUTCOUNT;
-+extern unsigned IOCTL_SNDCTL_SEQ_NRMIDIS;
-+extern unsigned IOCTL_SNDCTL_SEQ_NRSYNTHS;
-+extern unsigned IOCTL_SNDCTL_SEQ_OUTOFBAND;
-+extern unsigned IOCTL_SNDCTL_SEQ_PANIC;
-+extern unsigned IOCTL_SNDCTL_SEQ_PERCMODE;
-+extern unsigned IOCTL_SNDCTL_SEQ_RESET;
-+extern unsigned IOCTL_SNDCTL_SEQ_RESETSAMPLES;
-+extern unsigned IOCTL_SNDCTL_SEQ_SYNC;
-+extern unsigned IOCTL_SNDCTL_SEQ_TESTMIDI;
-+extern unsigned IOCTL_SNDCTL_SEQ_THRESHOLD;
-+extern unsigned IOCTL_SNDCTL_SYNTH_INFO;
-+extern unsigned IOCTL_SNDCTL_SYNTH_MEMAVL;
-+extern unsigned IOCTL_SNDCTL_TMR_CONTINUE;
-+extern unsigned IOCTL_SNDCTL_TMR_METRONOME;
-+extern unsigned IOCTL_SNDCTL_TMR_SELECT;
-+extern unsigned IOCTL_SNDCTL_TMR_SOURCE;
-+extern unsigned IOCTL_SNDCTL_TMR_START;
-+extern unsigned IOCTL_SNDCTL_TMR_STOP;
-+extern unsigned IOCTL_SNDCTL_TMR_TEMPO;
-+extern unsigned IOCTL_SNDCTL_TMR_TIMEBASE;
-+extern unsigned IOCTL_SOUND_MIXER_READ_ALTPCM;
-+extern unsigned IOCTL_SOUND_MIXER_READ_BASS;
-+extern unsigned IOCTL_SOUND_MIXER_READ_CAPS;
-+extern unsigned IOCTL_SOUND_MIXER_READ_CD;
-+extern unsigned IOCTL_SOUND_MIXER_READ_DEVMASK;
-+extern unsigned IOCTL_SOUND_MIXER_READ_ENHANCE;
-+extern unsigned IOCTL_SOUND_MIXER_READ_IGAIN;
-+extern unsigned IOCTL_SOUND_MIXER_READ_IMIX;
-+extern unsigned IOCTL_SOUND_MIXER_READ_LINE1;
-+extern unsigned IOCTL_SOUND_MIXER_READ_LINE2;
-+extern unsigned IOCTL_SOUND_MIXER_READ_LINE3;
-+extern unsigned IOCTL_SOUND_MIXER_READ_LINE;
-+extern unsigned IOCTL_SOUND_MIXER_READ_LOUD;
-+extern unsigned IOCTL_SOUND_MIXER_READ_MIC;
-+extern unsigned IOCTL_SOUND_MIXER_READ_MUTE;
-+extern unsigned IOCTL_SOUND_MIXER_READ_OGAIN;
-+extern unsigned IOCTL_SOUND_MIXER_READ_PCM;
-+extern unsigned IOCTL_SOUND_MIXER_READ_RECLEV;
-+extern unsigned IOCTL_SOUND_MIXER_READ_RECMASK;
-+extern unsigned IOCTL_SOUND_MIXER_READ_RECSRC;
-+extern unsigned IOCTL_SOUND_MIXER_READ_SPEAKER;
-+extern unsigned IOCTL_SOUND_MIXER_READ_STEREODEVS;
-+extern unsigned IOCTL_SOUND_MIXER_READ_SYNTH;
-+extern unsigned IOCTL_SOUND_MIXER_READ_TREBLE;
-+extern unsigned IOCTL_SOUND_MIXER_READ_VOLUME;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_ALTPCM;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_BASS;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_CD;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_ENHANCE;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_IGAIN;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_IMIX;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_LINE1;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_LINE2;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_LINE3;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_LINE;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_LOUD;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_MIC;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_MUTE;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_OGAIN;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_PCM;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_RECLEV;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_RECSRC;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_SPEAKER;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_SYNTH;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_TREBLE;
-+extern unsigned IOCTL_SOUND_MIXER_WRITE_VOLUME;
-+extern unsigned IOCTL_SOUND_PCM_READ_BITS;
-+extern unsigned IOCTL_SOUND_PCM_READ_CHANNELS;
-+extern unsigned IOCTL_SOUND_PCM_READ_FILTER;
-+extern unsigned IOCTL_SOUND_PCM_READ_RATE;
-+extern unsigned IOCTL_SOUND_PCM_WRITE_CHANNELS;
-+extern unsigned IOCTL_SOUND_PCM_WRITE_FILTER;
-+extern unsigned IOCTL_VT_ACTIVATE;
-+extern unsigned IOCTL_VT_GETMODE;
-+extern unsigned IOCTL_VT_OPENQRY;
-+extern unsigned IOCTL_VT_RELDISP;
-+extern unsigned IOCTL_VT_SETMODE;
-+extern unsigned IOCTL_VT_WAITACTIVE;
-+extern unsigned IOCTL_KDDISABIO;
-+extern unsigned IOCTL_KDENABIO;
-+extern unsigned IOCTL_KDGETLED;
-+extern unsigned IOCTL_KDGKBMODE;
-+extern unsigned IOCTL_KDGKBTYPE;
-+extern unsigned IOCTL_KDMKTONE;
-+extern unsigned IOCTL_KDSETLED;
-+extern unsigned IOCTL_KDSETMODE;
-+extern unsigned IOCTL_KDSKBMODE;
-+
-+extern const int si_SEGV_MAPERR;
-+extern const int si_SEGV_ACCERR;
-+}  // namespace __sanitizer
-+
-+#define CHECK_TYPE_SIZE(TYPE) \
-+  COMPILER_CHECK(sizeof(__sanitizer_##TYPE) == sizeof(TYPE))
-+
-+#define CHECK_SIZE_AND_OFFSET(CLASS, MEMBER)                      \
-+  COMPILER_CHECK(sizeof(((__sanitizer_##CLASS *)NULL)->MEMBER) == \
-+                 sizeof(((CLASS *)NULL)->MEMBER));                \
-+  COMPILER_CHECK(offsetof(__sanitizer_##CLASS, MEMBER) ==         \
-+                 offsetof(CLASS, MEMBER))
-+
-+// For sigaction, which is a function and struct at the same time,
-+// and thus requires explicit "struct" in sizeof() expression.
-+#define CHECK_STRUCT_SIZE_AND_OFFSET(CLASS, MEMBER)                      \
-+  COMPILER_CHECK(sizeof(((struct __sanitizer_##CLASS *)NULL)->MEMBER) == \
-+                 sizeof(((struct CLASS *)NULL)->MEMBER));                \
-+  COMPILER_CHECK(offsetof(struct __sanitizer_##CLASS, MEMBER) ==         \
-+                 offsetof(struct CLASS, MEMBER))
-+
-+#endif // SANITIZER_NETBSD
-+
-+#endif
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
deleted file mode 100644
index 044a6486a2..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2017-07-16 22:40:10.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -15,6 +15,8 @@
- #ifndef SANITIZER_PLATFORM_LIMITS_POSIX_H
- #define SANITIZER_PLATFORM_LIMITS_POSIX_H
- 
-+#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC
-+
- #include "sanitizer_internal_defs.h"
- #include "sanitizer_platform.h"
- 
-@@ -1485,4 +1487,6 @@ struct __sanitizer_cookie_io_functions_t
-   COMPILER_CHECK(offsetof(struct __sanitizer_##CLASS, MEMBER) ==          \
-                  offsetof(struct CLASS, MEMBER))
- 
-+#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC
-+
- #endif
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
deleted file mode 100644
index 710d71bd01..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_posix.h.orig	2017-07-04 05:53:22.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_posix.h
-@@ -16,6 +16,7 @@
- // ----------- ATTENTION -------------
- // This header should NOT include any other headers from sanitizer runtime.
- #include "sanitizer_internal_defs.h"
-+#include "sanitizer_platform_limits_netbsd.h"
- #include "sanitizer_platform_limits_posix.h"
- 
- #if !SANITIZER_POSIX
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc
deleted file mode 100644
index 37267eebd4..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__posix__libcdep.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- lib/sanitizer_common/sanitizer_posix_libcdep.cc.orig	2017-07-07 06:32:45.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_posix_libcdep.cc
-@@ -18,7 +18,9 @@
- 
- #include "sanitizer_common.h"
- #include "sanitizer_flags.h"
-+#include "sanitizer_platform_limits_netbsd.h"
- #include "sanitizer_platform_limits_posix.h"
-+
- #include "sanitizer_posix.h"
- #include "sanitizer_procmaps.h"
- #include "sanitizer_stacktrace.h"
Prev by Date: compiler-rt-netbsd: update shmctl(2) interception code
Next by Date: compiler-rt-netbsd: Update to SVN r. 311937
Previous by Thread: compiler-rt-netbsd: update shmctl(2) interception code
Next by Thread: compiler-rt-netbsd: Update to SVN r. 311937
Indexes:
Home | Main Index | Thread Index | Old Index