[libsanitizer, committed] Reapply r272406.

[Iain Sandoe]

Hi

Somehow, I failed to commit the change to LOCAL_PATCHES for the fix for PR87880 
applied in r272406.

Fixed as below after re-checking on x86_64-linux-gnu, powerpc64-linux-gnu and 
x86_64-darwin.

Also committed the change to LOCAL_PATCHES this time!

thanks
Iain.

libsanitizer/

2019-08-16  Iain Sandoe  <i...@sandoe.co.uk>

        * asan/asan_interceptors.h: Reapply r272406.

 diff --git a/libsanitizer/asan/asan_interceptors.h 
b/libsanitizer/asan/asan_interceptors.h
index 155ea4156a..035a84e1a4 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


libsanitizer/

2019-08-16  Iain Sandoe  <i...@sandoe.co.uk>

        * LOCAL_PATCHES: Add r274585.


diff --git a/libsanitizer/LOCAL_PATCHES b/libsanitizer/LOCAL_PATCHES
index 4f36773022..4fe34f58b7 100644
--- a/libsanitizer/LOCAL_PATCHES
+++ b/libsanitizer/LOCAL_PATCHES
@@ -1,2 +1,3 @@
 r274427
 r274540
+r274585