OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: re PR sanitizer/81066 (sanitizer_stoptheworld_linux_libcdep.cc:276:22: error: aggregate ‘sigaltstack handler_stack’ has incomplete type and cannot be defined)

Browse Source 
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.

From-SVN: r250287
This commit is contained in:
Jakub Jelinek 2017-07-17 21:41:08 +02:00 committed by Jakub Jelinek
parent 96a0e28758
commit 77966a0d91
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsanitizer/ChangeLog
View File

@ -1,3 +1,14 @@
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.
2017-05-02 Release Manager 2017-05-02 Release Manager
* GCC 7.1.0 released. * GCC 7.1.0 released.

3
libsanitizer/sanitizer_common/sanitizer_linux.cc
View File

@ -605,8 +605,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
} }
#endif #endif
uptr internal_sigaltstack(const struct sigaltstack *ss, uptr internal_sigaltstack(const void *ss, void *oss) {
struct sigaltstack *oss) {
return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
} }

4
libsanitizer/sanitizer_common/sanitizer_linux.h
View File

@ -19,7 +19,6 @@
#include "sanitizer_platform_limits_posix.h" #include "sanitizer_platform_limits_posix.h"
struct link_map; // Opaque type returned by dlopen(). struct link_map; // Opaque type returned by dlopen().
struct sigaltstack;
namespace __sanitizer { namespace __sanitizer {
// Dirent structure for getdents(). Note that this structure is different from // Dirent structure for getdents(). Note that this structure is different from
@ -28,8 +27,7 @@ struct linux_dirent;
// Syscall wrappers. // Syscall wrappers.
uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
uptr internal_sigaltstack(const struct sigaltstack* ss, uptr internal_sigaltstack(const void* ss, void* oss);
struct sigaltstack* oss);
uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
__sanitizer_sigset_t *oldset); __sanitizer_sigset_t *oldset);

2
libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
View File

@ -273,7 +273,7 @@ static int TracerThread(void* argument) {
// Alternate stack for signal handling. // Alternate stack for signal handling.
InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
struct sigaltstack handler_stack; stack_t handler_stack;
internal_memset(&handler_stack, 0, sizeof(handler_stack)); internal_memset(&handler_stack, 0, sizeof(handler_stack));
handler_stack.ss_sp = handler_stack_memory.data(); handler_stack.ss_sp = handler_stack_memory.data();
handler_stack.ss_size = kHandlerStackSize; handler_stack.ss_size = kHandlerStackSize;

2
libsanitizer/tsan/tsan_platform_linux.cc
View File

@ -287,7 +287,7 @@ void InitializePlatform() {
int ExtractResolvFDs(void *state, int *fds, int nfd) { int ExtractResolvFDs(void *state, int *fds, int nfd) {
#if SANITIZER_LINUX && !SANITIZER_ANDROID #if SANITIZER_LINUX && !SANITIZER_ANDROID
int cnt = 0; 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++) { for (int i = 0; i < MAXNS && cnt < nfd; i++) {
if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
fds[cnt++] = statp->_u._ext.nssocks[i]; fds[cnt++] = statp->_u._ext.nssocks[i];