summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2018-02-27 02:14:06 +0000
committerVitaly Buka <vitalybuka@google.com>2018-02-27 02:14:06 +0000
commit14d860750b83d8bca83893da003b8cad890344da (patch)
tree8aa27e2e84b3dca512572e2b76ed86741868be3d /lib
parenta7b4abf1dc29877bf5270d82119437442dfccbd4 (diff)
[asan] Enable ASAN_INTERCEPT___CXA_THROW for x86 Android
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@326160 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/asan/asan_interceptors.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/asan/asan_interceptors.h b/lib/asan/asan_interceptors.h
index 11b62041c..51a58b91d 100644
--- a/lib/asan/asan_interceptors.h
+++ b/lib/asan/asan_interceptors.h
@@ -80,10 +80,7 @@ void InitializePlatformInterceptors();
# define ASAN_INTERCEPT___LONGJMP_CHK 0
#endif
-// Android bug: https://code.google.com/p/android/issues/detail?id=61799
-#if ASAN_HAS_EXCEPTIONS && !SANITIZER_WINDOWS && \
- !(SANITIZER_ANDROID && defined(__i386)) && \
- !SANITIZER_SOLARIS
+#if ASAN_HAS_EXCEPTIONS && !SANITIZER_WINDOWS && !SANITIZER_SOLARIS
# define ASAN_INTERCEPT___CXA_THROW 1
# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 1
# if defined(_GLIBCXX_SJLJ_EXCEPTIONS) || (SANITIZER_IOS && defined(__arm__))