HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| d6593070 LC |
1 | This is a backport of this patch from 6.5 to 4.9: |
| 2 | ||
| 3 | https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=8937b94d1a643fd9760714642296d034a45254a8 | |
| 4 | ||
| 5 | diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc | |
| 6 | index 69c9c10..8e53673 100644 | |
| 7 | --- a/libsanitizer/sanitizer_common/sanitizer_linux.cc | |
| 8 | +++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc | |
| 9 | @@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { | |
| 10 | return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5); | |
| 11 | } | |
| 12 | ||
| 13 | -uptr internal_sigaltstack(const struct sigaltstack *ss, | |
| 14 | - struct sigaltstack *oss) { | |
| 15 | +uptr internal_sigaltstack(const void *ss, void *oss) { | |
| 16 | return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss); | |
| 17 | } | |
| 18 | ||
| 19 | diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h | |
| 20 | index 6422df1..8a8e526 100644 | |
| 21 | --- a/libsanitizer/sanitizer_common/sanitizer_linux.h | |
| 22 | +++ b/libsanitizer/sanitizer_common/sanitizer_linux.h | |
| 23 | @@ -18,7 +18,6 @@ | |
| 24 | #include "sanitizer_platform_limits_posix.h" | |
| 25 | ||
| 26 | struct link_map; // Opaque type returned by dlopen(). | |
| 27 | -struct sigaltstack; | |
| 28 | ||
| 29 | namespace __sanitizer { | |
| 30 | // Dirent structure for getdents(). Note that this structure is different from | |
| 31 | @@ -28,8 +27,7 @@ struct linux_dirent; | |
| 32 | // Syscall wrappers. | |
| 33 | uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); | |
| 34 | uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5); | |
| 35 | -uptr internal_sigaltstack(const struct sigaltstack* ss, | |
| 36 | - struct sigaltstack* oss); | |
| 37 | +uptr internal_sigaltstack(const void *ss, void *oss); | |
| 38 | uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act, | |
| 39 | __sanitizer_kernel_sigaction_t *oldact); | |
| 40 | uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set, | |
| 41 | diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | |
| 42 | index 6ee63ec..50c21a3 100644 | |
| 43 | --- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | |
| 44 | +++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | |
| 45 | @@ -238,7 +238,7 @@ static int TracerThread(void* argument) { | |
| 46 | ||
| 47 | // Alternate stack for signal handling. | |
| 48 | InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); | |
| 49 | - struct sigaltstack handler_stack; | |
| 50 | + stack_t handler_stack; | |
| 51 | internal_memset(&handler_stack, 0, sizeof(handler_stack)); | |
| 52 | handler_stack.ss_sp = handler_stack_memory.data(); | |
| 53 | handler_stack.ss_size = kHandlerStackSize; | |
| 54 | diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc | |
| 55 | index fe69430..49f5270 100644 | |
| 56 | --- a/libsanitizer/tsan/tsan_platform_linux.cc | |
| 57 | +++ b/libsanitizer/tsan/tsan_platform_linux.cc | |
| 58 | @@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) { | |
| 59 | // closes within glibc. The code is a pure hack. | |
| 60 | int ExtractResolvFDs(void *state, int *fds, int nfd) { | |
| 61 | int cnt = 0; | |
| 62 | - __res_state *statp = (__res_state*)state; | |
| 63 | + struct __res_state *statp = (struct __res_state*)state; | |
| 64 | for (int i = 0; i < MAXNS && cnt < nfd; i++) { | |
| 65 | if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) | |
| 66 | fds[cnt++] = statp->_u._ext.nssocks[i]; |