[src/trunk]: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common Fix ILP...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e080c4788a0d
branches:  trunk
changeset: 345627:e080c4788a0d
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jun 02 19:54:38 2016 +0000

description:
Fix ILP32 build.

diffstat:

 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h         |  3 ++-
 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h |  2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 0ed21605bfe4 -r e080c4788a0d external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h    Thu Jun 02 15:11:18 2016 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_internal_defs.h    Thu Jun 02 19:54:38 2016 +0000
@@ -80,7 +80,8 @@
 // _FILE_OFFSET_BITS. This definition of OFF_T matches the ABI of system calls
 // like pread and mmap, as opposed to pread64 and mmap64.
 // Mac and Linux/x86-64 are special.
-#if SANITIZER_MAC || (SANITIZER_LINUX && defined(__x86_64__))
+#if SANITIZER_MAC || (SANITIZER_LINUX && defined(__x86_64__)) || SANITIZER_NETBSD
+// XXX: It is signed!
 typedef u64 OFF_T;
 #else
 typedef uptr OFF_T;
diff -r 0ed21605bfe4 -r e080c4788a0d external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h    Thu Jun 02 15:11:18 2016 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h    Thu Jun 02 19:54:38 2016 +0000
@@ -398,7 +398,7 @@
     char **gr_mem;
   };
 
-#if defined(__x86_64__) && !defined(_LP64)
+#if (defined(__x86_64__) && !defined(_LP64)) || SANITIZER_NETBSD
   typedef long long __sanitizer_time_t;
 #else
   typedef long __sanitizer_time_t;