summaryrefslogtreecommitdiffstats
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
commite9d957de8de7bdedacba4b2c8b85fe4f944b5581 (patch)
treecf799b0eac81ad764648c74b131e4285ba77b7f0
parentde872a697a9e41b0ee6ddece18dc33ff0d3f721c (diff)
downloadbcm5719-llvm-e9d957de8de7bdedacba4b2c8b85fe4f944b5581.tar.gz
bcm5719-llvm-e9d957de8de7bdedacba4b2c8b85fe4f944b5581.zip
[asan] Enable ASAN_INTERCEPT___CXA_THROW for x86 Android
llvm-svn: 326160
-rw-r--r--compiler-rt/lib/asan/asan_interceptors.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler-rt/lib/asan/asan_interceptors.h b/compiler-rt/lib/asan/asan_interceptors.h
index 11b62041c2e..51a58b91d69 100644
--- a/compiler-rt/lib/asan/asan_interceptors.h
+++ b/compiler-rt/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__))
OpenPOWER on IntegriCloud