compiler-rt-netbsd: Reduce diff with local patches

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Feb 28 08:05:29 2018 +0100
Changeset:	8b4cc3e4acac444374dcb53610d02caa11a892aa

Modified Files:
	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

Log Message:
compiler-rt-netbsd: Reduce diff with local patches

Remove part of the patch in:
 - lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 - lib/sanitizer_common/sanitizer_platform_limits_netbsd.h

These parts are already 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=8b4cc3e4acac444374dcb53610d02caa11a892aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/distinfo                        |  4 +--
 ...__common_sanitizer__platform__limits__netbsd.cc |  6 ++--
 ...r__common_sanitizer__platform__limits__netbsd.h | 40 +++-------------------
 3 files changed, 8 insertions(+), 42 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 192c74e8a8..6bdb933615 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -8,8 +8,8 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 3fb4836
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = bd972f5a18ffd76662b161515b31fe4940abbb5a
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = a3213b029fc52e59591dce75dce4bc30da6a4de0
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = c11001b5e4f99d340fea4c661c51a14d4e5c61d6
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 1eac155001d0055c0409676daa716c93da496ab0
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 545d4d335b883db3e5b0e351236f0df95dc59ac3
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 92c7aad101270b8403fcc7faf553d13210402f13
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 1c8e35603d97b8dc86f991feebb11276e1310115
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = c6459f21789a5ef13e37714487c09110062c9c5d
 SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = e520ec1e0fefb3cf9fb1d872ebf81952599a6c49
 SHA1 (patch-lib_scudo_scudo__platform.h) = 119d7ad8f8ca9d3e846dbdd7f805ca771e30e410
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 b11a174cb7..de1c4f1b43 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,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-02-27 02:50:00.131312840 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-02-27 02:50:00.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 @@ -15,9 +15,15 @@
  #include "sanitizer_platform.h"
@@ -48,14 +48,12 @@ $NetBSD$
  unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
  unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
  unsigned struct_timex_sz = sizeof(struct timex);
-@@ -341,6 +354,11 @@ unsigned path_max = PATH_MAX;
+@@ -341,6 +354,9 @@ unsigned path_max = PATH_MAX;
  
  int struct_ttyent_sz = sizeof(struct ttyent);
  
 +int struct_kinfo_proc_sz = sizeof(struct kinfo_proc);
 +int struct_kinfo_proc2_sz = sizeof(struct kinfo_proc2);
-+
-+int struct_ttyent_sz = sizeof(struct ttyent);
 +
  // ioctl arguments
  unsigned struct_altqreq_sz = sizeof(altqreq);
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 610517ca93..0f91b7f8c4 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-02-27 02:50:00.133905896 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-02-27 02:50:00.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
 @@ -60,6 +60,15 @@ extern unsigned struct_timespec_sz;
  extern unsigned struct_sembuf_sz;
@@ -18,39 +18,17 @@ $NetBSD$
  
  union __sanitizer_sigval {
    int sival_int;
-@@ -126,6 +135,19 @@ struct __sanitizer_netent {
-   u32 n_net;
- };
- 
-+struct __sanitizer_protoent {
-+  char *p_name;
-+  char **p_aliases;
-+  int p_proto;
-+};
-+
-+struct __sanitizer_netent {
-+  char *n_name;
-+  char **n_aliases;
-+  int n_addrtype;
-+  u32 n_net;
-+};
-+
- extern unsigned struct_msqid_ds_sz;
- extern unsigned struct_mq_attr_sz;
- extern unsigned struct_timex_sz;
-@@ -377,6 +399,11 @@ extern unsigned path_max;
+@@ -377,6 +386,9 @@ extern unsigned path_max;
  
  extern int struct_ttyent_sz;
  
 +extern int struct_kinfo_proc_sz;
 +extern int struct_kinfo_proc2_sz;
-+
-+extern int struct_ttyent_sz;
 +
  extern int ptrace_pt_io;
  extern int ptrace_pt_lwpinfo;
  extern int ptrace_pt_set_event_mask;
-@@ -398,6 +425,7 @@ extern int ptrace_pt_getfpregs;
+@@ -398,6 +410,7 @@ extern int ptrace_pt_getfpregs;
  extern int ptrace_pt_setdbregs;
  extern int ptrace_pt_getdbregs;
  
@@ -58,7 +36,7 @@ $NetBSD$
  struct __sanitizer_ptrace_io_desc {
    int piod_op;
    void *piod_offs;
-@@ -462,6 +490,53 @@ struct __sanitizer_ttyent {
+@@ -462,6 +475,43 @@ struct __sanitizer_ttyent {
    char *ty_class;
  };
  
@@ -98,16 +76,6 @@ $NetBSD$
 +  uptr iobufsz;
 +  char kernelname[1024];
 +};
-+
-+struct __sanitizer_ttyent {
-+  char *ty_name;
-+  char *ty_getty;
-+  char *ty_type;
-+  int ty_status;
-+  char *ty_window;
-+  char *ty_comment;
-+  char *ty_class;
-+};
 +
  #define IOC_NRBITS 8
  #define IOC_TYPEBITS 8