diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-19 12:45:54 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-19 12:45:54 +0000 |
| commit | a1095d589e8e81fd010723034d511e8b3102908f (patch) | |
| tree | a089fe710732f033039c7c2feaee2d118fb5792f /libsanitizer | |
| parent | 7a3cf64d1c7e20a388744ef929a805d33c7cd07e (diff) | |
PR sanitizer/68824
* tsan/tsan_interceptors.cc (NEED_TLS_GET_ADDR, __tls_get_addr,
InitializeInterceptors): Cherry pick upstream r258119.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232555 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/tsan/tsan_interceptors.cc | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 5d25590ae7cc..c6cdc09badcf 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2016-01-19 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/68824 + * tsan/tsan_interceptors.cc (NEED_TLS_GET_ADDR, __tls_get_addr, + InitializeInterceptors): Cherry pick upstream r258119. + 2016-01-14 Andreas Tobler <andreast@gcc.gnu.org> * configure.ac: Replace the hard-coded -ldl requirement for diff --git a/libsanitizer/tsan/tsan_interceptors.cc b/libsanitizer/tsan/tsan_interceptors.cc index 90c1d7bf2436..0c71c008d704 100644 --- a/libsanitizer/tsan/tsan_interceptors.cc +++ b/libsanitizer/tsan/tsan_interceptors.cc @@ -2227,6 +2227,11 @@ static void HandleRecvmsg(ThreadState *thr, uptr pc, // Since the interceptor only initializes memory for msan, the simplest solution // is to disable the interceptor in tsan (other sanitizers do not call // signal handlers from COMMON_INTERCEPTOR_ENTER). +// As __tls_get_addr has been intercepted in the past, to avoid breaking +// libtsan ABI, keep it around, but just call the real function. +#if SANITIZER_INTERCEPT_TLS_GET_ADDR +#define NEED_TLS_GET_ADDR +#endif #undef SANITIZER_INTERCEPT_TLS_GET_ADDR #define COMMON_INTERCEPT_FUNCTION(name) INTERCEPT_FUNCTION(name) @@ -2446,6 +2451,12 @@ static void syscall_post_fork(uptr pc, int pid) { #include "sanitizer_common/sanitizer_common_syscalls.inc" +#ifdef NEED_TLS_GET_ADDR +TSAN_INTERCEPTOR(void *, __tls_get_addr, void *arg) { + return REAL(__tls_get_addr)(arg); +} +#endif + namespace __tsan { static void finalize(void *arg) { @@ -2627,6 +2638,10 @@ void InitializeInterceptors() { TSAN_INTERCEPT(__cxa_atexit); TSAN_INTERCEPT(_exit); +#ifdef NEED_TLS_GET_ADDR + TSAN_INTERCEPT(__tls_get_addr); +#endif + #if !SANITIZER_MAC // Need to setup it, because interceptors check that the function is resolved. // But atexit is emitted directly into the module, so can't be resolved. |