1 From 939e32d87dff0fd949e54599d376bfae8381001a Mon Sep 17 00:00:00 2001 2 From: Andrew Hsieh <andrewhsieh (a] google.com> 3 Date: Wed, 12 Feb 2014 20:11:53 +0800 4 Subject: [PATCH 05/12] Fix gabi++/stlport/llvm-libc++ build 5 6 --- 7 src/exception.cpp | 2 +- 8 src/new.cpp | 2 +- 9 src/stdexcept.cpp | 2 +- 10 src/typeinfo.cpp | 2 +- 11 4 files changed, 4 insertions(+), 4 deletions(-) 12 13 diff --git a/src/exception.cpp b/src/exception.cpp 14 index 3ce6f2e..bd22133 100644 15 --- a/src/exception.cpp 16 +++ b/src/exception.cpp 17 @@ -29,7 +29,7 @@ 18 #define __terminate_handler __cxxabiapple::__cxa_terminate_handler 19 #define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler 20 #endif // _LIBCPPABI_VERSION 21 -#elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) 22 +#elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) || defined(__ANDROID__) 23 #include <cxxabi.h> 24 using namespace __cxxabiv1; 25 #if defined(LIBCXXRT) || defined(_LIBCPPABI_VERSION) 26 diff --git a/src/new.cpp b/src/new.cpp 27 index 3b7c341..9130ab3 100644 28 --- a/src/new.cpp 29 +++ b/src/new.cpp 30 @@ -27,7 +27,7 @@ 31 #define __new_handler __cxxabiapple::__cxa_new_handler 32 #endif 33 #else // __APPLE__ 34 - #if defined(LIBCXXRT) || __has_include(<cxxabi.h>) 35 + #if defined(LIBCXXRT) || __has_include(<cxxabi.h>) || defined(__ANDROID__) 36 #include <cxxabi.h> 37 #endif // __has_include(<cxxabi.h>) 38 #if !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__) 39 diff --git a/src/stdexcept.cpp b/src/stdexcept.cpp 40 index aff4b18..26de25f 100644 41 --- a/src/stdexcept.cpp 42 +++ b/src/stdexcept.cpp 43 @@ -18,7 +18,7 @@ 44 #endif 45 46 /* For _LIBCPPABI_VERSION */ 47 -#if __has_include(<cxxabi.h>) || defined(__APPLE_) || defined(LIBCXXRT) 48 +#if __has_include(<cxxabi.h>) || defined(__APPLE_) || defined(LIBCXXRT) || defined(__ANDROID__) 49 #include <cxxabi.h> 50 #endif 51 52 diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp 53 index b428120..b1bceb5 100644 54 --- a/src/typeinfo.cpp 55 +++ b/src/typeinfo.cpp 56 @@ -14,7 +14,7 @@ 57 58 #ifdef __APPLE__ 59 #include <cxxabi.h> 60 -#elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) 61 +#elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) || defined(__ANDROID__) 62 #include <cxxabi.h> 63 #endif 64 65 -- 66 1.9.1.423.g4596e3a 67 68
