From 9a668cb07b04ade0428a7ab91b6892b8822de7c5 Mon Sep 17 00:00:00 2001 From: hjl Date: Wed, 6 Nov 2013 21:51:41 +0000 Subject: Use 64-bit system types for x86-64 PR sanitizer/59018 * sanitizer_common/sanitizer_platform_limits_linux.cc (struct_kernel_stat64_sz): Initialize to 0 if __x86_64__ is defined. * sanitizer_common/sanitizer_platform_limits_posix.h (__sanitizer_dirent): Use 64-bit d_ino/d_off if __x86_64__ is defined. (__sanitizer___kernel_uid_t): Typedef as unsigned if __x86_64__ is defined. (__sanitizer___kernel_gid_t): Likewise. (__sanitizer___kernel_off_t): Typedef as long long if __x86_64__ is defined. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204482 138bc75d-0d04-0410-961f-82ee72b054a4 --- libsanitizer/ChangeLog | 15 +++++++++++++++ .../sanitizer_common/sanitizer_platform_limits_linux.cc | 2 +- .../sanitizer_common/sanitizer_platform_limits_posix.h | 7 ++++--- 3 files changed, 20 insertions(+), 4 deletions(-) (limited to 'libsanitizer') diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 6103d62b329..03b45e8fadd 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,18 @@ +2013-11-05 H.J. Lu + + PR sanitizer/59018 + * sanitizer_common/sanitizer_platform_limits_linux.cc + (struct_kernel_stat64_sz): Initialize to 0 if __x86_64__ is + defined. + * sanitizer_common/sanitizer_platform_limits_posix.h + (__sanitizer_dirent): Use 64-bit d_ino/d_off if __x86_64__ is + defined. + (__sanitizer___kernel_uid_t): Typedef as unsigned if __x86_64__ + is defined. + (__sanitizer___kernel_gid_t): Likewise. + (__sanitizer___kernel_off_t): Typedef as long long if __x86_64__ + is defined. + 2013-11-05 H.J. Lu PR sanitizer/59018 diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc index fbea5962c81..98702436c4f 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc @@ -31,7 +31,7 @@ namespace __sanitizer { unsigned struct_io_event_sz = sizeof(struct io_event); unsigned struct_iocb_sz = sizeof(struct iocb); -#ifndef _LP64 +#if !defined(_LP64) && !defined(__x86_64__) unsigned struct_kernel_stat64_sz = sizeof(struct stat64); #else unsigned struct_kernel_stat64_sz = 0; diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h index 007b4ec7b96..67c459caabb 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h @@ -133,7 +133,7 @@ namespace __sanitizer { unsigned short d_reclen; // more fields that we don't care about }; -#elif SANITIZER_ANDROID +#elif SANITIZER_ANDROID || defined(__x86_64__) struct __sanitizer_dirent { unsigned long long d_ino; unsigned long long d_off; @@ -159,16 +159,17 @@ namespace __sanitizer { #endif #if SANITIZER_LINUX -#ifdef _LP64 +#if defined(_LP64) || defined(__x86_64__) typedef unsigned __sanitizer___kernel_uid_t; typedef unsigned __sanitizer___kernel_gid_t; + typedef long long __sanitizer___kernel_off_t; #else typedef unsigned short __sanitizer___kernel_uid_t; typedef unsigned short __sanitizer___kernel_gid_t; + typedef long __sanitizer___kernel_off_t; #endif typedef unsigned short __sanitizer___kernel_old_uid_t; typedef unsigned short __sanitizer___kernel_old_gid_t; - typedef long __sanitizer___kernel_off_t; typedef long long __sanitizer___kernel_loff_t; typedef struct { unsigned long fds_bits[1024 / (8 * sizeof(long))]; -- cgit v1.2.1