diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2019-08-16 19:46:09 +0000 |
|---|---|---|
| committer | Iain Sandoe <iains@gcc.gnu.org> | 2019-08-16 19:46:09 +0000 |
| commit | dea853e840b772575ba78ff1090bc18e7292a566 (patch) | |
| tree | b3b381fa88031ac13837459d4a10633e21c69d00 /libsanitizer | |
| parent | 1f2a3ac34620ab4669f9f32417a7a4496c8f603a (diff) | |
libsanitize, asan - reapply r272406
The entry in LOCAL_PATCHES was accidentally omitted.
2019-08-16 Iain Sandoe <iain@sandoe.co.uk>
* asan/asan_interceptors.h: Reapply r272406.
From-SVN: r274585
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 4 | ||||
| -rw-r--r-- | libsanitizer/asan/asan_interceptors.h | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 3f098a8380b..0a315d83686 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,7 @@ +2019-08-16 Iain Sandoe <iain@sandoe.co.uk> + + * asan/asan_interceptors.h: Reapply r272406. + 2019-08-15 Martin Liska <mliska@suse.cz> * LOCAL_PATCHES: Add r274540 diff --git a/libsanitizer/asan/asan_interceptors.h b/libsanitizer/asan/asan_interceptors.h index 155ea4156ab..035a84e1a42 100644 --- a/libsanitizer/asan/asan_interceptors.h +++ b/libsanitizer/asan/asan_interceptors.h @@ -80,7 +80,12 @@ void InitializePlatformInterceptors(); #if ASAN_HAS_EXCEPTIONS && !SANITIZER_WINDOWS && !SANITIZER_SOLARIS && \ !SANITIZER_NETBSD # define ASAN_INTERCEPT___CXA_THROW 1 -# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 1 +# if ! defined(ASAN_HAS_CXA_RETHROW_PRIMARY_EXCEPTION) \ + || ASAN_HAS_CXA_RETHROW_PRIMARY_EXCEPTION +# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 1 +# else +# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 0 +# endif # if defined(_GLIBCXX_SJLJ_EXCEPTIONS) || (SANITIZER_IOS && defined(__arm__)) # define ASAN_INTERCEPT__UNWIND_SJLJ_RAISEEXCEPTION 1 # else |