89 lines
4.2 KiB
Diff
89 lines
4.2 KiB
Diff
|
From f9a35ba5c150da2e381c4cab01f8f12bcd6af5d2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||
|
|
Date: Mon, 17 Jul 2017 19:41:08 +0000
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
|
||
|
|
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4
|
||
|
|
(cherry picked from commit 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06)
|
||
|
|
[Romain backport to 4.9.4]
|
||
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||
|
|
---
|
||
|
|
libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +--
|
||
|
|
libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +---
|
||
|
|
libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-
|
||
|
|
libsanitizer/tsan/tsan_platform_linux.cc | 2 +-
|
||
|
|
4 files changed, 4 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
|
||
|
|
index 69c9c10..8e53673 100644
|
||
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
|
||
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
|
||
|
|
@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
|
||
|
|
return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5);
|
||
|
|
}
|
||
|
|
|
||
|
|
-uptr internal_sigaltstack(const struct sigaltstack *ss,
|
||
|
|
- struct sigaltstack *oss) {
|
||
|
|
+uptr internal_sigaltstack(const void *ss, void *oss) {
|
||
|
|
return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss);
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h
|
||
|
|
index 6422df1..8e111d1 100644
|
||
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_linux.h
|
||
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h
|
||
|
|
@@ -18,7 +18,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
|
||
|
|
@@ -28,8 +27,7 @@ struct linux_dirent;
|
||
|
|
// Syscall wrappers.
|
||
|
|
uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
|
||
|
|
uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5);
|
||
|
|
-uptr internal_sigaltstack(const struct sigaltstack* ss,
|
||
|
|
- struct sigaltstack* oss);
|
||
|
|
+uptr internal_sigaltstack(const void* ss, void* oss);
|
||
|
|
uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act,
|
||
|
|
__sanitizer_kernel_sigaction_t *oldact);
|
||
|
|
uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set,
|
||
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
||
|
|
index 6ee63ec..50c21a3 100644
|
||
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
||
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
||
|
|
@@ -238,7 +238,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;
|
||
|
|
diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
|
||
|
|
index fe69430..49f5270 100644
|
||
|
|
--- a/libsanitizer/tsan/tsan_platform_linux.cc
|
||
|
|
+++ b/libsanitizer/tsan/tsan_platform_linux.cc
|
||
|
|
@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {
|
||
|
|
// closes within glibc. The code is a pure hack.
|
||
|
|
int ExtractResolvFDs(void *state, int *fds, int nfd) {
|
||
|
|
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];
|
||
|
|
--
|
||
|
|
2.9.5
|
||
|
|
|