]>
Commit | Line | Data |
---|---|---|
3a980ab4 JR |
1 | --- projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.h |
2 | +++ projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.h | |
3 | @@ -21,17 +21,15 @@ | |
4 | #include "sanitizer_platform_limits_posix.h" | |
5 | ||
6 | struct link_map; // Opaque type returned by dlopen(). | |
7 | -struct sigaltstack; | |
8 | ||
9 | namespace __sanitizer { | |
10 | // Dirent structure for getdents(). Note that this structure is different from | |
11 | // the one in <dirent.h>, which is used by readdir(). | |
12 | struct linux_dirent; | |
13 | ||
14 | // Syscall wrappers. | |
15 | uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); | |
16 | -uptr internal_sigaltstack(const struct sigaltstack* ss, | |
17 | - struct sigaltstack* oss); | |
18 | +uptr internal_sigaltstack(const void* ss, void* oss); | |
19 | uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, | |
20 | __sanitizer_sigset_t *oldset); | |
21 | ||
22 | --- projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | |
23 | +++ projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | |
24 | @@ -631,8 +631,7 @@ | |
25 | } | |
26 | #endif | |
27 | ||
28 | -uptr internal_sigaltstack(const struct sigaltstack *ss, | |
29 | - struct sigaltstack *oss) { | |
30 | +uptr internal_sigaltstack(const void *ss, void *oss) { | |
31 | return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); | |
32 | } | |
33 | ||
34 | --- projects/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | |
35 | +++ projects/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | |
36 | @@ -287,7 +287,7 @@ | |
37 | ||
38 | // Alternate stack for signal handling. | |
39 | InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); | |
40 | - struct sigaltstack handler_stack; | |
41 | + stack_t handler_stack; | |
42 | internal_memset(&handler_stack, 0, sizeof(handler_stack)); | |
43 | handler_stack.ss_sp = handler_stack_memory.data(); | |
44 | handler_stack.ss_size = kHandlerStackSize; | |
45 | --- projects/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc | |
46 | +++ projects/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc | |
47 | @@ -288,7 +288,7 @@ | |
48 | int ExtractResolvFDs(void *state, int *fds, int nfd) { | |
49 | #if SANITIZER_LINUX && !SANITIZER_ANDROID | |
50 | int cnt = 0; | |
51 | - __res_state *statp = (__res_state*)state; | |
52 | + struct __res_state *statp = (struct __res_state*)state; | |
53 | for (int i = 0; i < MAXNS && cnt < nfd; i++) { | |
54 | if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) | |
55 | fds[cnt++] = statp->_u._ext.nssocks[i]; | |
56 | --- projects/compiler-rt/lib/esan/esan_sideline_linux.cpp | |
57 | +++ projects/compiler-rt/lib/esan/esan_sideline_linux.cpp | |
58 | @@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Arg) { | |
59 | ||
60 | // Set up a signal handler on an alternate stack for safety. | |
61 | InternalScopedBuffer<char> StackMap(SigAltStackSize); | |
62 | - struct sigaltstack SigAltStack; | |
63 | + stack_t SigAltStack; | |
64 | SigAltStack.ss_sp = StackMap.data(); | |
65 | SigAltStack.ss_size = SigAltStackSize; | |
66 | SigAltStack.ss_flags = 0; |