compiler-rt-netbsd: Add missing endif

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

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

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

Log Message:
compiler-rt-netbsd: Add missing endif

This corrects build of platform__limits__posix.h.

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=3248c3080df78e368d970f5bcd648a62917f063e

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 | 69 +++++++++++-----------
 2 files changed, 36 insertions(+), 35 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 1461dd5f64..d864d64c18 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) = 62040a52c4d42da3ad0c7a4a7033086931841c2f
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = dbbd4ac2b1356fe37b8b63c88c1dbf7bce403d86
 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 70ea1e0d45..54c25a7fca 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
@@ -86,7 +86,7 @@ $NetBSD$
      u64   aio_data;
      u32   aio_key_or_aio_reserved1; // Simply crazy.
      u32   aio_reserved1_or_aio_key; // Luckily, we don't need these.
-@@ -144,21 +164,53 @@ namespace __sanitizer {
+@@ -144,21 +164,54 @@ namespace __sanitizer {
      s64   aio_offset;
      u64   aio_reserved2;
      u64   aio_reserved3;
@@ -118,6 +118,7 @@ $NetBSD$
 +#endif
 +#endif
    };
++#endif
  
 +#if SANITIZER_LINUX || SANITIZER_FREEBSD
    struct __sanitizer_io_event {
@@ -140,7 +141,7 @@ $NetBSD$
      int *name;
      int nlen;
      void *oldval;
-@@ -166,10 +218,32 @@ namespace __sanitizer {
+@@ -166,10 +219,32 @@ namespace __sanitizer {
      void *newval;
      uptr newlen;
      unsigned long ___unused[4];
@@ -173,7 +174,7 @@ $NetBSD$
    struct __sanitizer_sem_t {
  #if SANITIZER_ANDROID && defined(_LP64)
      int data[4];
-@@ -179,6 +253,14 @@ namespace __sanitizer {
+@@ -179,6 +254,14 @@ namespace __sanitizer {
      uptr data[4];
  #elif SANITIZER_FREEBSD
      u32 data[4];
@@ -188,7 +189,7 @@ $NetBSD$
  #endif
    };
  #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-@@ -303,7 +385,7 @@ namespace __sanitizer {
+@@ -303,7 +386,7 @@ namespace __sanitizer {
    #endif
  #endif
    };
@@ -197,7 +198,7 @@ $NetBSD$
    struct __sanitizer_ipc_perm {
      unsigned int cuid;
      unsigned int cgid;
-@@ -326,12 +408,12 @@ namespace __sanitizer {
+@@ -326,12 +409,12 @@ namespace __sanitizer {
    };
  #endif
  
@@ -212,7 +213,7 @@ $NetBSD$
  
    struct __sanitizer_iovec {
      void *iov_base;
-@@ -351,6 +433,9 @@ namespace __sanitizer {
+@@ -351,6 +434,9 @@ namespace __sanitizer {
  # endif
      void *ifa_dstaddr; // (struct sockaddr *)
      void *ifa_data;
@@ -222,7 +223,7 @@ $NetBSD$
    };
  #endif  // !SANITIZER_ANDROID
  
-@@ -381,7 +466,7 @@ namespace __sanitizer {
+@@ -381,7 +467,7 @@ namespace __sanitizer {
      char *pw_passwd;
      int pw_uid;
      int pw_gid;
@@ -231,7 +232,7 @@ $NetBSD$
      long pw_change;
      char *pw_class;
  #endif
-@@ -390,7 +475,7 @@ namespace __sanitizer {
+@@ -390,7 +476,7 @@ namespace __sanitizer {
  #endif
      char *pw_dir;
      char *pw_shell;
@@ -240,7 +241,7 @@ $NetBSD$
      long pw_expire;
  #endif
  #if SANITIZER_FREEBSD
-@@ -405,7 +490,7 @@ namespace __sanitizer {
+@@ -405,7 +491,7 @@ namespace __sanitizer {
      char **gr_mem;
    };
  
@@ -249,7 +250,7 @@ $NetBSD$
    typedef long long __sanitizer_time_t;
  #else
    typedef long __sanitizer_time_t;
-@@ -447,7 +532,7 @@ namespace __sanitizer {
+@@ -447,7 +533,7 @@ namespace __sanitizer {
    };
  #endif
  
@@ -258,7 +259,7 @@ $NetBSD$
    struct __sanitizer_msghdr {
      void *msg_name;
      unsigned msg_namelen;
-@@ -497,6 +582,16 @@ namespace __sanitizer {
+@@ -497,6 +583,16 @@ namespace __sanitizer {
      unsigned short d_reclen;
      // more fields that we don't care about
    };
@@ -275,7 +276,7 @@ $NetBSD$
  #elif SANITIZER_ANDROID || defined(__x86_64__)
    struct __sanitizer_dirent {
      unsigned long long d_ino;
-@@ -531,7 +626,7 @@ namespace __sanitizer {
+@@ -531,7 +627,7 @@ namespace __sanitizer {
    typedef long __sanitizer_clock_t;
  #endif
  
@@ -284,7 +285,7 @@ $NetBSD$
    typedef int __sanitizer_clockid_t;
  #endif
  
-@@ -562,8 +657,22 @@ namespace __sanitizer {
+@@ -562,8 +658,22 @@ namespace __sanitizer {
    typedef struct {
      unsigned long fds_bits[1024 / (8 * sizeof(long))];
    } __sanitizer___kernel_fd_set;
@@ -307,7 +308,7 @@ $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,6 +680,7 @@ namespace __sanitizer {
+@@ -571,6 +681,7 @@ namespace __sanitizer {
      char size[pthread_attr_t_max_sz]; // NOLINT
      void *align;
    };
@@ -315,7 +316,7 @@ $NetBSD$
  
  #if SANITIZER_ANDROID
  # if SANITIZER_MIPS
-@@ -590,6 +700,10 @@ namespace __sanitizer {
+@@ -590,6 +701,10 @@ namespace __sanitizer {
       // uint32_t * 4
       unsigned int __bits[4];
    };
@@ -326,7 +327,7 @@ $NetBSD$
  #endif
  
    // Linux system headers define the 'sa_handler' and 'sa_sigaction' macros.
-@@ -631,7 +745,7 @@ namespace __sanitizer {
+@@ -631,7 +746,7 @@ namespace __sanitizer {
        void (*sigaction)(int sig, void *siginfo, void *uctx);
        void (*handler)(int sig);
      };
@@ -335,7 +336,7 @@ $NetBSD$
      int sa_flags;
      __sanitizer_sigset_t sa_mask;
  #else
-@@ -670,7 +784,7 @@ namespace __sanitizer {
+@@ -670,7 +785,7 @@ namespace __sanitizer {
    };
  #endif // !SANITIZER_ANDROID
  
@@ -344,7 +345,7 @@ $NetBSD$
    typedef __sanitizer_sigset_t __sanitizer_kernel_sigset_t;
  #elif defined(__mips__)
    struct __sanitizer_kernel_sigset_t {
-@@ -717,7 +831,7 @@ namespace __sanitizer {
+@@ -717,7 +832,7 @@ namespace __sanitizer {
    extern int af_inet6;
    uptr __sanitizer_in_addr_sz(int af);
  
@@ -353,7 +354,7 @@ $NetBSD$
    struct __sanitizer_dl_phdr_info {
      uptr dlpi_addr;
      const char *dlpi_name;
-@@ -733,7 +847,7 @@ namespace __sanitizer {
+@@ -733,7 +848,7 @@ namespace __sanitizer {
      int ai_family;
      int ai_socktype;
      int ai_protocol;
@@ -362,7 +363,7 @@ $NetBSD$
      unsigned ai_addrlen;
      char *ai_canonname;
      void *ai_addr;
-@@ -759,7 +873,7 @@ namespace __sanitizer {
+@@ -759,7 +874,7 @@ namespace __sanitizer {
      short revents;
    };
  
@@ -371,7 +372,7 @@ $NetBSD$
    typedef unsigned __sanitizer_nfds_t;
  #else
    typedef unsigned long __sanitizer_nfds_t;
-@@ -779,7 +893,7 @@ namespace __sanitizer {
+@@ -779,7 +894,7 @@ namespace __sanitizer {
      int (*gl_lstat)(const char *, void *);
      int (*gl_stat)(const char *, void *);
    };
@@ -380,7 +381,7 @@ $NetBSD$
    struct __sanitizer_glob_t {
      uptr gl_pathc;
      uptr gl_matchc;
-@@ -793,9 +907,9 @@ namespace __sanitizer {
+@@ -793,9 +908,9 @@ namespace __sanitizer {
      int (*gl_lstat)(const char*, void* /* struct stat* */);
      int (*gl_stat)(const char*, void* /* struct stat* */);
    };
@@ -392,7 +393,7 @@ $NetBSD$
    extern int glob_nomatch;
    extern int glob_altdirfunc;
  # endif
-@@ -807,7 +921,7 @@ namespace __sanitizer {
+@@ -807,7 +922,7 @@ namespace __sanitizer {
      uptr we_wordc;
      char **we_wordv;
      uptr we_offs;
@@ -401,7 +402,7 @@ $NetBSD$
      char *we_strings;
      uptr we_nbytes;
  #endif
-@@ -832,6 +946,37 @@ namespace __sanitizer {
+@@ -832,6 +947,37 @@ namespace __sanitizer {
      int _fileno;
    };
  # define SANITIZER_HAS_STRUCT_FILE 1
@@ -439,7 +440,7 @@ $NetBSD$
  #else
    typedef void __sanitizer_FILE;
  # define SANITIZER_HAS_STRUCT_FILE 0
-@@ -873,6 +1018,10 @@ namespace __sanitizer {
+@@ -873,6 +1019,10 @@ namespace __sanitizer {
    extern int shmctl_shm_stat;
  #endif
  
@@ -450,7 +451,7 @@ $NetBSD$
  #if !SANITIZER_MAC && !SANITIZER_FREEBSD
    extern unsigned struct_utmp_sz;
  #endif
-@@ -923,6 +1072,7 @@ struct __sanitizer_cookie_io_functions_t
+@@ -923,6 +1073,7 @@ struct __sanitizer_cookie_io_functions_t
  };
  #endif
  
@@ -458,7 +459,7 @@ $NetBSD$
  #define IOC_NRBITS 8
  #define IOC_TYPEBITS 8
  #if defined(__powerpc__) || defined(__powerpc64__) || defined(__mips__) || \
-@@ -966,13 +1116,17 @@ struct __sanitizer_cookie_io_functions_t
+@@ -966,13 +1117,17 @@ struct __sanitizer_cookie_io_functions_t
  #else
  #define IOC_SIZE(nr) (((nr) >> IOC_SIZESHIFT) & IOC_SIZEMASK)
  #endif
@@ -477,7 +478,7 @@ $NetBSD$
    extern unsigned struct_cdrom_msf_sz;
    extern unsigned struct_cdrom_multisession_sz;
    extern unsigned struct_cdrom_read_audio_sz;
-@@ -1006,6 +1160,9 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1006,6 +1161,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;
@@ -487,7 +488,7 @@ $NetBSD$
    extern unsigned struct_mtget_sz;
    extern unsigned struct_mtop_sz;
    extern unsigned struct_rtentry_sz;
-@@ -1013,7 +1170,7 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1013,7 +1171,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;
@@ -496,7 +497,7 @@ $NetBSD$
  
  #if SANITIZER_LINUX && !SANITIZER_ANDROID
    extern unsigned struct_ax25_parms_struct_sz;
-@@ -1035,10 +1192,10 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1035,10 +1193,10 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned struct_unimapinit_sz;
  #endif  // SANITIZER_LINUX && !SANITIZER_ANDROID
  
@@ -509,7 +510,7 @@ $NetBSD$
  
  #if !SANITIZER_ANDROID && !SANITIZER_MAC
    extern unsigned struct_sioc_sg_req_sz;
-@@ -1095,7 +1252,7 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1095,7 +1253,7 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_TIOCSPGRP;
    extern unsigned IOCTL_TIOCSTI;
    extern unsigned IOCTL_TIOCSWINSZ;
@@ -518,7 +519,7 @@ $NetBSD$
    extern unsigned IOCTL_SIOCGETSGCNT;
    extern unsigned IOCTL_SIOCGETVIFCNT;
  #endif
-@@ -1258,10 +1415,10 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1258,10 +1416,10 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_VT_RESIZEX;
    extern unsigned IOCTL_VT_SENDSIG;
  #endif  // SANITIZER_LINUX
@@ -531,7 +532,7 @@ $NetBSD$
    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
+@@ -1359,7 +1517,7 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_VT_RELDISP;
    extern unsigned IOCTL_VT_SETMODE;
    extern unsigned IOCTL_VT_WAITACTIVE;
@@ -540,7 +541,7 @@ $NetBSD$
  
  #if SANITIZER_LINUX && !SANITIZER_ANDROID
    extern unsigned IOCTL_CYGETDEFTHRESH;
-@@ -1448,24 +1605,32 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1448,24 +1606,32 @@ struct __sanitizer_cookie_io_functions_t
    extern unsigned IOCTL_TIOCSSERIAL;
  #endif  // SANITIZER_LINUX && !SANITIZER_ANDROID