diff options
author | Maxime Arthaud | 2018-05-29 10:12:57 -0700 |
---|---|---|
committer | Maxime Arthaud | 2018-05-29 10:12:57 -0700 |
commit | 7621713c6d9698764028ecaf81ddf3a370188446 (patch) | |
tree | 67e2f6cec622a04f1d5761b4e8304ac730f0e318 /D35246-Fix-sanitizer-build-against-latest-glibc.patch | |
parent | 2f4ee8b2c89558c5b59d2ca30dc90cc1e9e54a98 (diff) | |
download | aur-7621713c6d9698764028ecaf81ddf3a370188446.tar.gz |
Clean up patches
Diffstat (limited to 'D35246-Fix-sanitizer-build-against-latest-glibc.patch')
-rw-r--r-- | D35246-Fix-sanitizer-build-against-latest-glibc.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/D35246-Fix-sanitizer-build-against-latest-glibc.patch b/D35246-Fix-sanitizer-build-against-latest-glibc.patch new file mode 100644 index 000000000000..480c837cd5ec --- /dev/null +++ b/D35246-Fix-sanitizer-build-against-latest-glibc.patch @@ -0,0 +1,76 @@ +Index: lib/sanitizer_common/sanitizer_linux.h +=================================================================== +--- lib/sanitizer_common/sanitizer_linux.h ++++ lib/sanitizer_common/sanitizer_linux.h +@@ -21,17 +21,15 @@ + #include "sanitizer_platform_limits_posix.h" + + struct link_map; // Opaque type returned by dlopen(). +-struct sigaltstack; + + namespace __sanitizer { + // Dirent structure for getdents(). Note that this structure is different from + // the one in <dirent.h>, which is used by readdir(). + struct linux_dirent; + + // Syscall wrappers. + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); +-uptr internal_sigaltstack(const struct sigaltstack* ss, +- struct sigaltstack* oss); ++uptr internal_sigaltstack(const void* ss, void* oss); + uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, + __sanitizer_sigset_t *oldset); + +Index: lib/sanitizer_common/sanitizer_linux.cc +=================================================================== +--- lib/sanitizer_common/sanitizer_linux.cc ++++ lib/sanitizer_common/sanitizer_linux.cc +@@ -607,8 +607,7 @@ + } + #endif + +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const void *ss, void *oss) { + return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); + } + +Index: lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +=================================================================== +--- lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -275,7 +275,7 @@ + + // Alternate stack for signal handling. + InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); +- struct sigaltstack handler_stack; ++ stack_t handler_stack; + internal_memset(&handler_stack, 0, sizeof(handler_stack)); + handler_stack.ss_sp = handler_stack_memory.data(); + handler_stack.ss_size = kHandlerStackSize; +Index: lib/tsan/rtl/tsan_platform_linux.cc +=================================================================== +--- lib/tsan/rtl/tsan_platform_linux.cc ++++ lib/tsan/rtl/tsan_platform_linux.cc +@@ -289,7 +289,7 @@ + int ExtractResolvFDs(void *state, int *fds, int nfd) { + #if SANITIZER_LINUX && !SANITIZER_ANDROID + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; +Index: lib/esan/esan_sideline_linux.cpp +=================================================================== +--- lib/esan/esan_sideline_linux.cpp ++++ lib/esan/esan_sideline_linux.cpp +@@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Arg) { + + // Set up a signal handler on an alternate stack for safety. + InternalScopedBuffer<char> StackMap(SigAltStackSize); +- struct sigaltstack SigAltStack; ++ stack_t SigAltStack; + SigAltStack.ss_sp = StackMap.data(); + SigAltStack.ss_size = SigAltStackSize; + SigAltStack.ss_flags = 0; |