Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit fc738cb

Browse files
committed
[sanitizer] fix the ppc32 build (patch by Jakub Jelinek)
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@196489 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 940bd71 commit fc738cb

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

lib/sanitizer_common/sanitizer_platform_limits_posix.h

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,23 +142,32 @@ namespace __sanitizer {
142142
int gid;
143143
int cuid;
144144
int cgid;
145-
#ifdef __powerpc64__
145+
#ifdef __powerpc__
146146
unsigned mode;
147147
unsigned __seq;
148+
u64 __unused1;
149+
u64 __unused2;
148150
#else
149151
unsigned short mode;
150152
unsigned short __pad1;
151153
unsigned short __seq;
152154
unsigned short __pad2;
155+
#if defined(__x86_64__) && !defined(_LP64)
156+
u64 __unused1;
157+
u64 __unused2;
158+
#else
159+
unsigned long __unused1;
160+
unsigned long __unused2;
161+
#endif
153162
#endif
154-
uptr __unused1;
155-
uptr __unused2;
156163
};
157164

158165
struct __sanitizer_shmid_ds {
159166
__sanitizer_ipc_perm shm_perm;
160167
#ifndef __powerpc__
161168
uptr shm_segsz;
169+
#elif !defined(__powerpc64__)
170+
uptr __unused0;
162171
#endif
163172
uptr shm_atime;
164173
#ifndef _LP64
@@ -290,17 +299,20 @@ namespace __sanitizer {
290299
typedef long __sanitizer_clock_t;
291300

292301
#if SANITIZER_LINUX
293-
#if defined(_LP64) || defined(__x86_64__)
302+
#if defined(_LP64) || defined(__x86_64__) || defined(__powerpc__)
294303
typedef unsigned __sanitizer___kernel_uid_t;
295304
typedef unsigned __sanitizer___kernel_gid_t;
296-
typedef long long __sanitizer___kernel_off_t;
297305
#else
298306
typedef unsigned short __sanitizer___kernel_uid_t;
299307
typedef unsigned short __sanitizer___kernel_gid_t;
308+
#endif
309+
#if defined(__x86_64__) && !defined(_LP64)
310+
typedef long long __sanitizer___kernel_off_t;
311+
#else
300312
typedef long __sanitizer___kernel_off_t;
301313
#endif
302314

303-
#if defined(__powerpc64__)
315+
#if defined(__powerpc__)
304316
typedef unsigned int __sanitizer___kernel_old_uid_t;
305317
typedef unsigned int __sanitizer___kernel_old_gid_t;
306318
#else

0 commit comments

Comments
 (0)