diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-12-05 08:51:48 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2013-12-05 08:51:48 +0000 |
| commit | f2c93b29739ebfca1585a2c5d234e126472cd299 (patch) | |
| tree | 9087bcd559e243adc5ad1c30c08bc64da262a6c8 /compiler-rt | |
| parent | f03bd30854adf16bc30fce18120ef5f31954275e (diff) | |
| download | bcm5719-llvm-f2c93b29739ebfca1585a2c5d234e126472cd299.tar.gz bcm5719-llvm-f2c93b29739ebfca1585a2c5d234e126472cd299.zip | |
[sanitizer] fix the ppc32 build (patch by Jakub Jelinek)
llvm-svn: 196489
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h index 26df301f314..97866b814e5 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -142,23 +142,32 @@ namespace __sanitizer { int gid; int cuid; int cgid; -#ifdef __powerpc64__ +#ifdef __powerpc__ unsigned mode; unsigned __seq; + u64 __unused1; + u64 __unused2; #else unsigned short mode; unsigned short __pad1; unsigned short __seq; unsigned short __pad2; +#if defined(__x86_64__) && !defined(_LP64) + u64 __unused1; + u64 __unused2; +#else + unsigned long __unused1; + unsigned long __unused2; +#endif #endif - uptr __unused1; - uptr __unused2; }; struct __sanitizer_shmid_ds { __sanitizer_ipc_perm shm_perm; #ifndef __powerpc__ uptr shm_segsz; + #elif !defined(__powerpc64__) + uptr __unused0; #endif uptr shm_atime; #ifndef _LP64 @@ -290,17 +299,20 @@ namespace __sanitizer { typedef long __sanitizer_clock_t; #if SANITIZER_LINUX -#if defined(_LP64) || defined(__x86_64__) +#if defined(_LP64) || defined(__x86_64__) || defined(__powerpc__) 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; +#endif +#if defined(__x86_64__) && !defined(_LP64) + typedef long long __sanitizer___kernel_off_t; +#else typedef long __sanitizer___kernel_off_t; #endif -#if defined(__powerpc64__) +#if defined(__powerpc__) typedef unsigned int __sanitizer___kernel_old_uid_t; typedef unsigned int __sanitizer___kernel_old_gid_t; #else |
