Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 491348 Details for
Bug 629502
<sys-devel/gcc-7.2 fails to build with sys-libs/glibc-2.26
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
second patch for gcc-4.9 (backported by me from gcc-7 branch)
gcc-4.9-asan-glibc226.patch (text/plain), 4.17 KB, created by
Andreas K. Hüttel
on 2017-09-01 21:04:16 UTC
(
hide
)
Description:
second patch for gcc-4.9 (backported by me from gcc-7 branch)
Filename:
MIME Type:
Creator:
Andreas K. Hüttel
Created:
2017-09-01 21:04:16 UTC
Size:
4.17 KB
patch
obsolete
>From d9eadf25fee0425a78e41bd645423b3aa4c4e823 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] ASAN fix for glibc-2.26 > >Backported from mainline 2017-07-14 Jakub Jelinek <jakub@redhat.com> >Backported from gcc-7-branch Andreas K. Huettel <dilfridge@gentoo.org> > > 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 >--- > 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 69c9c1063f0..8e5367355d1 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 6422df142e7..8e111d11313 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 6ee63ec3168..50c21a38a14 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 fe69430b711..49f5270122c 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.14.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 629502
:
491290
|
491292
|
491294
|
491346
| 491348 |
492194