Commit 079db27b by H.J. Lu Committed by H.J. Lu

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.

From-SVN: r205737
parent 7efb96c0
2013-12-06 H.J. Lu <hongjiu.lu@intel.com> 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 * sanitizer_common/sanitizer_platform_limits_linux.cc: Include
<sys/stat.h>, instead of <asm/stat.h>, if __x86_64__ is defined. <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. (struct___old_kernel_stat_sz): Don't check if __x86_64__ is defined.
......
...@@ -167,6 +167,11 @@ namespace __sanitizer { ...@@ -167,6 +167,11 @@ namespace __sanitizer {
#elif !defined(__powerpc64__) #elif !defined(__powerpc64__)
uptr __unused0; uptr __unused0;
#endif #endif
#if defined(__x86_64__) && !defined(_LP64)
u64 shm_atime;
u64 shm_dtime;
u64 shm_ctime;
#else
uptr shm_atime; uptr shm_atime;
#ifndef _LP64 #ifndef _LP64
uptr __unused1; uptr __unused1;
...@@ -179,14 +184,21 @@ namespace __sanitizer { ...@@ -179,14 +184,21 @@ namespace __sanitizer {
#ifndef _LP64 #ifndef _LP64
uptr __unused3; uptr __unused3;
#endif #endif
#endif
#ifdef __powerpc__ #ifdef __powerpc__
uptr shm_segsz; uptr shm_segsz;
#endif #endif
int shm_cpid; int shm_cpid;
int shm_lpid; int shm_lpid;
#if defined(__x86_64__) && !defined(_LP64)
u64 shm_nattch;
u64 __unused4;
u64 __unused5;
#else
uptr shm_nattch; uptr shm_nattch;
uptr __unused4; uptr __unused4;
uptr __unused5; uptr __unused5;
#endif
}; };
#endif // SANITIZER_LINUX && !SANITIZER_ANDROID #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
...@@ -294,7 +306,11 @@ namespace __sanitizer { ...@@ -294,7 +306,11 @@ namespace __sanitizer {
}; };
#endif #endif
#if defined(__x86_64__) && !defined(_LP64)
typedef long long __sanitizer_clock_t;
#else
typedef long __sanitizer_clock_t; typedef long __sanitizer_clock_t;
#endif
#if SANITIZER_LINUX #if SANITIZER_LINUX
#if defined(_LP64) || defined(__x86_64__) || defined(__powerpc__) #if defined(_LP64) || defined(__x86_64__) || defined(__powerpc__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment