diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2017-10-26 20:55:03 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-10-26 20:55:03 +0000 |
| commit | cb70cf0e8c73f650120600901614c7ba1fd58e76 (patch) | |
| tree | 1081cfb350e0bc1f3cab12f6ba1f5e1a6ac67e02 | |
| parent | gcc/5.4.0: use 'ucontext_t' instead of 'ucontext', bug #629502 (diff) | |
| download | gcc-patches-cb70cf0e8c73f650120600901614c7ba1fd58e76.tar.gz gcc-patches-cb70cf0e8c73f650120600901614c7ba1fd58e76.tar.bz2 gcc-patches-cb70cf0e8c73f650120600901614c7ba1fd58e76.zip | |
gcc/5.4.0: drop 'sigaltstack' usage, bug #629502
Fixes asan build failure against glibc-2.26.
Bug: https://bugs.gentoo.org/629502
| -rw-r--r-- | 5.4.0/gentoo/94_all_no-sigaltstack.patch | 77 | ||||
| -rw-r--r-- | 5.4.0/gentoo/README.history | 2 |
2 files changed, 79 insertions, 0 deletions
diff --git a/5.4.0/gentoo/94_all_no-sigaltstack.patch b/5.4.0/gentoo/94_all_no-sigaltstack.patch new file mode 100644 index 0000000..838c811 --- /dev/null +++ b/5.4.0/gentoo/94_all_no-sigaltstack.patch @@ -0,0 +1,77 @@ +https://bugs.gentoo.org/629502 + +commit 67dce0587409353e1b6e38c4b33ed89d4ccabe5c +Author: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Fri Jul 14 09:10:45 2017 +0000 + + 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/trunk@250200 138bc75d-0d04-0410-961f-82ee72b054a4 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc +index 806fcd5e284..5b6f18602e7 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -605,8 +605,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { + } + #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); + } + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h +index 895bfc18195..a42df576405 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.h ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h +@@ -19,7 +19,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_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); + +diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +index 891386dc0ba..234e8c652c6 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ b/libsanitizer/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; +diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc +index 2ed5718a12e..6f972ab0dd6 100644 +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -287,7 +287,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]; diff --git a/5.4.0/gentoo/README.history b/5.4.0/gentoo/README.history index ef6c8e6..7aec051 100644 --- a/5.4.0/gentoo/README.history +++ b/5.4.0/gentoo/README.history @@ -1,3 +1,5 @@ +1.7 26 Oct 2017 + + 94_all_no-sigaltstack.patch 1.6 26 Oct 2017 + 93_all_ucontext-to-ucontext_t.patch 1.5 24 Oct 2017 |