compiler-rt-commonsan: Apply changes from review

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jul 8 14:18:25 2017 +0200
Changeset:	cccf08ad0b88e16a4c12c4aeb651ce66a71e7597

Modified Files:
	compiler-rt-commonsan/distinfo
	compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
	compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc

Log Message:
compiler-rt-commonsan: Apply changes from review

Minor non-functional changes.

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=cccf08ad0b88e16a4c12c4aeb651ce66a71e7597

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

diffstat:
 compiler-rt-commonsan/distinfo                     |  4 +--
 ...er__common_sanitizer__platform__limits__posix.h | 34 +++++++---------------
 ...nitizer__common_sanitizer__syscall__generic.inc |  3 +-
 3 files changed, 14 insertions(+), 27 deletions(-)

diffs:
diff --git a/compiler-rt-commonsan/distinfo b/compiler-rt-commonsan/distinfo
index 7b1f83fcac..f68a763ca9 100644
--- a/compiler-rt-commonsan/distinfo
+++ b/compiler-rt-commonsan/distinfo
@@ -26,9 +26,9 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd.h) = 851d900d3edad48af9e3259
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform.h) = ffb31dccce9824c81f3686de47c4b1e79bda3e1e
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = b985ae53dafddfc5b4112eae65cab49176fc1989
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 9093a94b1ebc727c83cc169edc1bf6996e05dc17
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 78f0ee62291b5f43ca68da577017e3aef7d83f7a
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = ae6bc1254f30fddfd3bab1762033cc8d8b32cd15
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps.h) = 2bc9a7c32f0a7d18fe4d0d465b9b42547abbd989
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__common.cc) = 5a407e496f92dfd2dd78a3b2582d7c695e2547fb
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__netbsd.cc) = 67e12a7c98a520f9fca9c6970a1e009d726aa5d6
-SHA1 (patch-lib_sanitizer__common_sanitizer__syscall__generic.inc) = b9ab90fafcb14d589e02a2062fe7e978d6b7edbb
+SHA1 (patch-lib_sanitizer__common_sanitizer__syscall__generic.inc) = a38e0d01a26de55092af30840be7577f83d90917
 SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = cf7e016fff0f57e7bcae93696ec05e5cff7b7093
diff --git a/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h b/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
index 8f6bc9a3a0..3a2681c77d 100644
--- a/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
+++ b/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2017-07-07 07:44:02.474288555 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2017-07-07 07:44:02.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
 @@ -18,18 +18,31 @@
  #include "sanitizer_internal_defs.h"
@@ -520,19 +520,9 @@ $NetBSD$
    extern unsigned struct_shminfo_sz;
    extern unsigned struct_shm_info_sz;
    extern int shmctl_ipc_stat;
-@@ -923,6 +1110,7 @@ struct __sanitizer_cookie_io_functions_t
- };
- #endif
- 
-+#if 1  // !SANITIZER_NETBSD
- #define IOC_NRBITS 8
- #define IOC_TYPEBITS 8
- #if defined(__powerpc__) || defined(__powerpc64__) || defined(__mips__) || \
-@@ -966,39 +1154,43 @@ struct __sanitizer_cookie_io_functions_t
- #else
+@@ -967,38 +1154,41 @@ struct __sanitizer_cookie_io_functions_t
  #define IOC_SIZE(nr) (((nr) >> IOC_SIZESHIFT) & IOC_SIZEMASK)
  #endif
-+#endif
  
 -  extern unsigned struct_ifreq_sz;
 -  extern unsigned struct_termios_sz;
@@ -602,7 +592,7 @@ $NetBSD$
  #endif  // SANITIZER_LINUX
  
  #if SANITIZER_LINUX || SANITIZER_FREEBSD
-@@ -1006,6 +1198,9 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1006,6 +1196,9 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned struct_copr_debug_buf_sz;
    extern unsigned struct_copr_msg_sz;
    extern unsigned struct_midi_info_sz;
@@ -612,7 +602,7 @@ $NetBSD$
    extern unsigned struct_mtget_sz;
    extern unsigned struct_mtop_sz;
    extern unsigned struct_rtentry_sz;
-@@ -1013,7 +1208,7 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1013,7 +1206,7 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned struct_seq_event_rec_sz;
    extern unsigned struct_synth_info_sz;
    extern unsigned struct_vt_mode_sz;
@@ -621,7 +611,7 @@ $NetBSD$
  
  #if SANITIZER_LINUX && !SANITIZER_ANDROID
    extern unsigned struct_ax25_parms_struct_sz;
-@@ -1035,10 +1230,12 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1035,10 +1228,12 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned struct_unimapinit_sz;
  #endif  // SANITIZER_LINUX && !SANITIZER_ANDROID
  
@@ -636,7 +626,7 @@ $NetBSD$
  
  #if !SANITIZER_ANDROID && !SANITIZER_MAC
    extern unsigned struct_sioc_sg_req_sz;
-@@ -1095,7 +1292,8 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1095,7 +1290,8 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_TIOCSPGRP;
    extern unsigned IOCTL_TIOCSTI;
    extern unsigned IOCTL_TIOCSWINSZ;
@@ -646,7 +636,7 @@ $NetBSD$
    extern unsigned IOCTL_SIOCGETSGCNT;
    extern unsigned IOCTL_SIOCGETVIFCNT;
  #endif
-@@ -1258,10 +1456,10 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1258,7 +1454,7 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_VT_RESIZEX;
    extern unsigned IOCTL_VT_SENDSIG;
  #endif  // SANITIZER_LINUX
@@ -654,12 +644,8 @@ $NetBSD$
 +#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD
    extern unsigned IOCTL_MTIOCGET;
    extern unsigned IOCTL_MTIOCTOP;
--  extern unsigned IOCTL_SIOCADDRT;
-+  extern unsigned IOCTL_SIOCADDRT;  //
-   extern unsigned IOCTL_SIOCDELRT;
-   extern unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE;
-   extern unsigned IOCTL_SNDCTL_DSP_GETFMTS;
-@@ -1359,7 +1557,7 @@ struct __sanitizer_cookie_io_functions_t
+   extern unsigned IOCTL_SIOCADDRT;
+@@ -1359,7 +1555,7 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_VT_RELDISP;
    extern unsigned IOCTL_VT_SETMODE;
    extern unsigned IOCTL_VT_WAITACTIVE;
@@ -668,7 +654,7 @@ $NetBSD$
  
  #if SANITIZER_LINUX && !SANITIZER_ANDROID
    extern unsigned IOCTL_CYGETDEFTHRESH;
-@@ -1448,21 +1646,28 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1448,21 +1644,28 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_TIOCSSERIAL;
  #endif  // SANITIZER_LINUX && !SANITIZER_ANDROID
  
diff --git a/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc b/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc
index 5a3029f57f..6f00d28e7b 100644
--- a/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc
+++ b/compiler-rt-commonsan/patches/patch-lib_sanitizer__common_sanitizer__syscall__generic.inc
@@ -2,7 +2,7 @@ $NetBSD$
 
 --- lib/sanitizer_common/sanitizer_syscall_generic.inc.orig	2017-07-03 15:33:06.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_syscall_generic.inc
-@@ -11,13 +11,37 @@
+@@ -11,13 +11,38 @@
  //
  //===----------------------------------------------------------------------===//
  
@@ -18,6 +18,7 @@ $NetBSD$
 +# define SYS_sigprocmask SYS___sigprocmask14
 +# define SYS_nanosleep SYS___nanosleep50
 +#endif
++
 +#if SANITIZER_FREEBSD || SANITIZER_MAC || SANITIZER_NETBSD
  # define SYSCALL(name) SYS_ ## name
  #else