diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-06 11:48:24 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-06 11:48:24 +0000 |
| commit | 4a3acb2c7d36b39b86b4e9fcfff1dd67b362323f (patch) | |
| tree | a4c8b7d3017c40af5d30303da010fa125b989af2 /libsanitizer | |
| parent | e2691b3bc8334ed86e55c37776288efdedabd31f (diff) | |
| download | gcc-4a3acb2c7d36b39b86b4e9fcfff1dd67b362323f.tar.gz | |
Use int64 on time and clock for x32
* sanitizer_common/sanitizer_platform_limits_posix.h
(__sanitizer_shmid_ds): Use u64 on time fields for x32.
(__sanitizer_clock_t): Use long long for x32.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205737 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 3e03d587660..bb568b9d4a0 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,5 +1,11 @@ 2013-12-06 H.J. Lu <hongjiu.lu@intel.com> + * sanitizer_common/sanitizer_platform_limits_posix.h + (__sanitizer_shmid_ds): Use u64 on time fields for x32. + (__sanitizer_clock_t): Use long long for x32. + +2013-12-06 H.J. Lu <hongjiu.lu@intel.com> + * sanitizer_common/sanitizer_platform_limits_linux.cc: Include <sys/stat.h>, instead of <asm/stat.h>, if __x86_64__ is defined. (struct___old_kernel_stat_sz): Don't check if __x86_64__ is defined. diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h index f98ebea79f4..be6e6cf1c3f 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h @@ -167,6 +167,11 @@ namespace __sanitizer { #elif !defined(__powerpc64__) uptr __unused0; #endif + #if defined(__x86_64__) && !defined(_LP64) + u64 shm_atime; + u64 shm_dtime; + u64 shm_ctime; + #else uptr shm_atime; #ifndef _LP64 uptr __unused1; @@ -179,14 +184,21 @@ namespace __sanitizer { #ifndef _LP64 uptr __unused3; #endif + #endif #ifdef __powerpc__ uptr shm_segsz; #endif int shm_cpid; int shm_lpid; + #if defined(__x86_64__) && !defined(_LP64) + u64 shm_nattch; + u64 __unused4; + u64 __unused5; + #else uptr shm_nattch; uptr __unused4; uptr __unused5; + #endif }; #endif // SANITIZER_LINUX && !SANITIZER_ANDROID @@ -294,7 +306,11 @@ namespace __sanitizer { }; #endif +#if defined(__x86_64__) && !defined(_LP64) + typedef long long __sanitizer_clock_t; +#else typedef long __sanitizer_clock_t; +#endif #if SANITIZER_LINUX #if defined(_LP64) || defined(__x86_64__) || defined(__powerpc__) |