pkgsrc-WIP-changes archive

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

compiler-rt-netbsd: Push forwards porting msan



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jun 13 04:21:26 2017 +0200
Changeset:	5fe5a41084080fe4845d1b661449e8ea2d245390

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

Log Message:
compiler-rt-netbsd: Push forwards porting msan

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=5fe5a41084080fe4845d1b661449e8ea2d245390

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 | 72 ++++++++++++++++++----
 2 files changed, 61 insertions(+), 13 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 9713ab15f6..aebdf4cea8 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) = 60101ed5d68fd8681d6f378ed1f204260f2214fa
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 5c7f96537a7c387ceb8545f4a9ded0f826af188f
 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 11f1110a29..186b800fe5 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
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2017-06-12 15:01:29.910328073 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2017-06-12 15:01:29.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
 @@ -18,18 +18,31 @@
  #include "sanitizer_internal_defs.h"
@@ -92,7 +92,7 @@ $NetBSD$
      s64   aio_offset;
      u64   aio_reserved2;
      u64   aio_reserved3;
-+#else SANITIZER_NETBSD
++#elif SANITIZER_NETBSD
 +#if defined(__x86_64__)
 +    u64   aio_offset;
 +    u64   aio_buf;
@@ -142,17 +142,28 @@ $NetBSD$
      int *name;
      int nlen;
      void *oldval;
-@@ -166,10 +220,21 @@ namespace __sanitizer {
+@@ -166,10 +220,32 @@ namespace __sanitizer {
      void *newval;
      uptr newlen;
      unsigned long ___unused[4];
 +#else
-+    int          *name;
-+    unsigned int  namelen;
-+    void         *oldp;
-+    size_t       *oldlenp;
-+    void         *newp;
-+    size_t        newlen;
++#if defined(__x86_64__)
++    u64   name;
++    u32   namelen;
++    u64   oldp;
++    u64   oldlenp;
++    u64   newp;
++    u64   newlen;
++#elif defined(__i386__)
++    u32   name;
++    u32   namelen;
++    u32   oldp;
++    u32   oldlenp;
++    u32   newp;
++    u32   newlen;
++#else
++#error port this
++#endif
 +#endif
    };
  
@@ -164,7 +175,7 @@ $NetBSD$
    struct __sanitizer_sem_t {
  #if SANITIZER_ANDROID && defined(_LP64)
      int data[4];
-@@ -179,6 +244,14 @@ namespace __sanitizer {
+@@ -179,6 +255,14 @@ namespace __sanitizer {
      uptr data[4];
  #elif SANITIZER_FREEBSD
      u32 data[4];
@@ -179,12 +190,49 @@ $NetBSD$
  #endif
    };
  #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-@@ -303,7 +376,7 @@ namespace __sanitizer {
+@@ -303,7 +387,7 @@ namespace __sanitizer {
    #endif
  #endif
    };
 -#elif SANITIZER_FREEBSD
-+#elif SANITIZER_FREEBSD /// XXX MARK
++#elif SANITIZER_FREEBSD || SANITIZER_NETBSD
    struct __sanitizer_ipc_perm {
      unsigned int cuid;
      unsigned int cgid;
+@@ -351,6 +435,9 @@ namespace __sanitizer {
+ # endif
+     void *ifa_dstaddr; // (struct sockaddr *)
+     void *ifa_data;
++#if SANITIZER_NETBSD
++    unsigned int ifa_addrflags;
++#endif
+   };
+ #endif  // !SANITIZER_ANDROID
+ 
+@@ -381,7 +468,7 @@ namespace __sanitizer {
+     char *pw_passwd;
+     int pw_uid;
+     int pw_gid;
+-#if SANITIZER_MAC || SANITIZER_FREEBSD
++#if SANITIZER_MAC || SANITIZER_FREEBSD || SANITIZER_NETBSD
+     long pw_change;
+     char *pw_class;
+ #endif
+@@ -390,7 +477,7 @@ namespace __sanitizer {
+ #endif
+     char *pw_dir;
+     char *pw_shell;
+-#if SANITIZER_MAC || SANITIZER_FREEBSD
++#if SANITIZER_MAC || SANITIZER_FREEBSD || SANITIZER_NETBSD
+     long pw_expire;
+ #endif
+ #if SANITIZER_FREEBSD
+@@ -447,7 +534,7 @@ namespace __sanitizer {
+   };
+ #endif
+ 
+-#if SANITIZER_MAC || SANITIZER_FREEBSD
++#if SANITIZER_MAC || SANITIZER_FREEBSD // XXX MARKER
+   struct __sanitizer_msghdr {
+     void *msg_name;
+     unsigned msg_namelen;


Home | Main Index | Thread Index | Old Index