mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-12 11:06:17 +00:00
78982e2b84
https://bugs.llvm.org/show_bug.cgi?id=32379 (Closes: #876072) * Fix sanitizer build failure with glibc-2.26. * build using gold on arm64 and s390x. For backports, arm64 might still need the BFD linker, and building with only one or two processes in parallel. * On amd64, s390x, arm64 and ppc64el, build with -g1 instead of -g. * Set CMAKE_CXX_FLAGS_RELWITHDEBINFO and pass opt_flags.
103 lines
4.1 KiB
Diff
103 lines
4.1 KiB
Diff
# DP; Fix PR sanitizer/81066, taken from the gcc-7-branch.
|
|
|
|
libsanitizer/
|
|
|
|
2017-07-17 Jakub Jelinek <jakub@redhat.com>
|
|
|
|
Backported from mainline
|
|
2017-07-14 Jakub Jelinek <jakub@redhat.com>
|
|
|
|
PR sanitizer/81066
|
|
* sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.
|
|
* sanitizer_common/sanitizer_linux.cc: Likewise.
|
|
* sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.
|
|
* tsan/tsan_platform_linux.cc: Likewise.
|
|
|
|
Index: b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
|
|
===================================================================
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
|
|
@@ -607,8 +607,7 @@ uptr internal_prctl(int option, uptr arg
|
|
}
|
|
#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: b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h
|
|
===================================================================
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.h
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h
|
|
@@ -21,7 +21,6 @@
|
|
#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
|
|
@@ -30,8 +29,7 @@ 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: b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
|
===================================================================
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
|
@@ -273,7 +273,7 @@ static int TracerThread(void* argument)
|
|
|
|
// 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: b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc
|
|
===================================================================
|
|
--- a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc
|
|
+++ b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc
|
|
@@ -282,7 +282,7 @@ void InitializePlatform() {
|
|
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: b/compiler-rt/lib/asan/asan_linux.cc
|
|
===================================================================
|
|
--- a/compiler-rt/lib/asan/asan_linux.cc
|
|
+++ b/compiler-rt/lib/asan/asan_linux.cc
|
|
@@ -31,6 +31,7 @@
|
|
#include <dlfcn.h>
|
|
#include <fcntl.h>
|
|
#include <pthread.h>
|
|
+#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <unwind.h>
|
|
Index: b/compiler-rt/lib/esan/esan_sideline_linux.cpp
|
|
===================================================================
|
|
--- a/compiler-rt/lib/esan/esan_sideline_linux.cpp
|
|
+++ b/compiler-rt/lib/esan/esan_sideline_linux.cpp
|
|
@@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Ar
|
|
|
|
// 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;
|