git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

From-SVN: r204482
This commit is contained in:
H.J. Lu 2013-11-06 21:51:41 +00:00 committed by H.J. Lu
parent e45de14ec7
commit f5c36cfc4b
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libsanitizer/ChangeLog
View File

@ -1,3 +1,18 @@
2013-11-05 H.J. Lu <hongjiu.lu@intel.com>
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 <hongjiu.lu@intel.com> 2013-11-05 H.J. Lu <hongjiu.lu@intel.com>
PR sanitizer/59018 PR sanitizer/59018

2
libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc
View File

@ -31,7 +31,7 @@ namespace __sanitizer {
unsigned struct_io_event_sz = sizeof(struct io_event); unsigned struct_io_event_sz = sizeof(struct io_event);
unsigned struct_iocb_sz = sizeof(struct iocb); unsigned struct_iocb_sz = sizeof(struct iocb);
#ifndef _LP64 #if !defined(_LP64) && !defined(__x86_64__)
unsigned struct_kernel_stat64_sz = sizeof(struct stat64); unsigned struct_kernel_stat64_sz = sizeof(struct stat64);
#else #else
unsigned struct_kernel_stat64_sz = 0; unsigned struct_kernel_stat64_sz = 0;

7
libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
View File

@ -133,7 +133,7 @@ namespace __sanitizer {
unsigned short d_reclen; unsigned short d_reclen;
// more fields that we don't care about // more fields that we don't care about
}; };
#elif SANITIZER_ANDROID #elif SANITIZER_ANDROID || defined(__x86_64__)
struct __sanitizer_dirent { struct __sanitizer_dirent {
unsigned long long d_ino; unsigned long long d_ino;
unsigned long long d_off; unsigned long long d_off;
@ -159,16 +159,17 @@ namespace __sanitizer {
#endif #endif
#if SANITIZER_LINUX #if SANITIZER_LINUX
#ifdef _LP64 #if defined(_LP64) || defined(__x86_64__)
typedef unsigned __sanitizer___kernel_uid_t; typedef unsigned __sanitizer___kernel_uid_t;
typedef unsigned __sanitizer___kernel_gid_t; typedef unsigned __sanitizer___kernel_gid_t;
typedef long long __sanitizer___kernel_off_t;
#else #else
typedef unsigned short __sanitizer___kernel_uid_t; typedef unsigned short __sanitizer___kernel_uid_t;
typedef unsigned short __sanitizer___kernel_gid_t; typedef unsigned short __sanitizer___kernel_gid_t;
typedef long __sanitizer___kernel_off_t;
#endif #endif
typedef unsigned short __sanitizer___kernel_old_uid_t; typedef unsigned short __sanitizer___kernel_old_uid_t;
typedef unsigned short __sanitizer___kernel_old_gid_t; typedef unsigned short __sanitizer___kernel_old_gid_t;
typedef long __sanitizer___kernel_off_t;
typedef long long __sanitizer___kernel_loff_t; typedef long long __sanitizer___kernel_loff_t;
typedef struct { typedef struct {
unsigned long fds_bits[1024 / (8 * sizeof(long))]; unsigned long fds_bits[1024 / (8 * sizeof(long))];