pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

compiler-rt-netbsd: Finish porting platform__limits__posix.h for NetBSD



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Jun 14 01:08:19 2017 +0200
Changeset:	bca4536fc56cd9dcc24e4ea1441ad468f77204bf

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h

Log Message:
compiler-rt-netbsd: Finish porting platform__limits__posix.h for NetBSD

There are still issues that somewhere #ifdef isn't closed.

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

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

diffstat:
 compiler-rt-netbsd/distinfo                        |  2 +-
 ...er__common_sanitizer__platform__limits__posix.h | 76 ++++++++++++++++++----
 2 files changed, 66 insertions(+), 12 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 832c1c149a..1461dd5f64 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -17,7 +17,7 @@ SHA1 (patch-lib_asan_scripts_asan__symbolize.py) = d6c079e7092b22b5379293dbb8d1e
 SHA1 (patch-lib_builtins_gcc__personality__v0.c) = 0a48656e68614730ea05e8fb2588434e774b3c45
 SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = 45b18179c5d1d9f284ccfe4670a989ac30d05e92
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform.h) = 47360a8352cc34fddc71c8f71081d7d589a63dad
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 8efb84fe4f6ad2379c50a63ac4e601df78d1b9b6
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 62040a52c4d42da3ad0c7a4a7033086931841c2f
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__netbsd.cc) = 0b8d88529f7374a1159c65c0bccd946ccf6a65f3
 SHA1 (patch-test_asan_lit.cfg) = 259b0e262b5975b862a51f015ec6b646ce2af10a
 SHA1 (patch-test_sanitizer__common_CMakeLists.txt) = 6af4c5ca42f17bb09823c36bf32d5576fbc0b4c8
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
index 2dc214b0d4..70ea1e0d45 100644
--- 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
@@ -307,17 +307,14 @@ $NetBSD$
    // This thing depends on the platform. We are only interested in the upper
    // limit. Verified with a compiler assert in .cc.
    const int pthread_attr_t_max_sz = 128;
-@@ -571,8 +680,9 @@ namespace __sanitizer {
+@@ -571,6 +680,7 @@ namespace __sanitizer {
      char size[pthread_attr_t_max_sz]; // NOLINT
      void *align;
    };
 +#endif
  
--#if SANITIZER_ANDROID
-+#if SANITIZER_ANDROID // XXX MARKER
+ #if SANITIZER_ANDROID
  # if SANITIZER_MIPS
-   typedef unsigned long __sanitizer_sigset_t[16/sizeof(unsigned long)];
- # else
 @@ -590,6 +700,10 @@ namespace __sanitizer {
       // uint32_t * 4
       unsigned int __bits[4];
@@ -499,7 +496,7 @@ $NetBSD$
  
  #if SANITIZER_LINUX && !SANITIZER_ANDROID
    extern unsigned struct_ax25_parms_struct_sz;
-@@ -1035,17 +1192,17 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1035,10 +1192,10 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned struct_unimapinit_sz;
  #endif  // SANITIZER_LINUX && !SANITIZER_ANDROID
  
@@ -512,11 +509,68 @@ $NetBSD$
  
  #if !SANITIZER_ANDROID && !SANITIZER_MAC
    extern unsigned struct_sioc_sg_req_sz;
-   extern unsigned struct_sioc_vif_req_sz;
+@@ -1095,7 +1252,7 @@ struct __sanitizer_cookie_io_functions_t
+   extern unsigned IOCTL_TIOCSPGRP;
+   extern unsigned IOCTL_TIOCSTI;
+   extern unsigned IOCTL_TIOCSWINSZ;
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD) && !SANITIZER_ANDROID
+   extern unsigned IOCTL_SIOCGETSGCNT;
+   extern unsigned IOCTL_SIOCGETVIFCNT;
+ #endif
+@@ -1258,10 +1415,10 @@ struct __sanitizer_cookie_io_functions_t
+   extern unsigned IOCTL_VT_RESIZEX;
+   extern unsigned IOCTL_VT_SENDSIG;
+ #endif  // SANITIZER_LINUX
+-#if SANITIZER_LINUX || SANITIZER_FREEBSD
++#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 +1516,7 @@ struct __sanitizer_cookie_io_functions_t
+   extern unsigned IOCTL_VT_RELDISP;
+   extern unsigned IOCTL_VT_SETMODE;
+   extern unsigned IOCTL_VT_WAITACTIVE;
+-#endif  // SANITIZER_LINUX || SANITIZER_FREEBSD
++#endif  // SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+   extern unsigned IOCTL_CYGETDEFTHRESH;
+@@ -1448,24 +1605,32 @@ struct __sanitizer_cookie_io_functions_t
+   extern unsigned IOCTL_TIOCSSERIAL;
+ #endif  // SANITIZER_LINUX && !SANITIZER_ANDROID
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD) && !SANITIZER_ANDROID
++#if !SANITIZER_NETBSD
+   extern unsigned IOCTL_GIO_SCRNMAP;
++#endif
+   extern unsigned IOCTL_KDDISABIO;
+   extern unsigned IOCTL_KDENABIO;
+   extern unsigned IOCTL_KDGETLED;
++#if !SANITIZER_NETBSD
+   extern unsigned IOCTL_KDGETMODE;
++#endif
+   extern unsigned IOCTL_KDGKBMODE;
+   extern unsigned IOCTL_KDGKBTYPE;
+   extern unsigned IOCTL_KDMKTONE;
+   extern unsigned IOCTL_KDSETLED;
+   extern unsigned IOCTL_KDSETMODE;
+   extern unsigned IOCTL_KDSKBMODE;
++#if !SANITIZER_NETBSD
+   extern unsigned IOCTL_KIOCSOUND;
+   extern unsigned IOCTL_PIO_SCRNMAP;
  #endif
++#endif
  
--  // ioctl request identifiers
-+  // ioctl request identifiers // XXX MARK
+   extern const int errno_EINVAL;
++#if !SANITIZER_NETBSD
+   extern const int errno_EOWNERDEAD;
++#endif
  
-   // 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 int si_SEGV_MAPERR;
+   extern const int si_SEGV_ACCERR;


Home | Main Index | Thread Index | Old Index