diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 19:30:58 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 19:30:58 +0800 |
commit | c3e4e5654d02106a19f315b736d56acb581246f9 (patch) | |
tree | da2a76504b0940b5013c78f6b79c46e2473e06b7 /gcc-4.6/libstdc++-v3/libsupc++ | |
parent | 20c5bf758150dcfc13af1fce22e20256d29e150a (diff) | |
download | toolchain_gcc-c3e4e5654d02106a19f315b736d56acb581246f9.tar.gz toolchain_gcc-c3e4e5654d02106a19f315b736d56acb581246f9.tar.bz2 toolchain_gcc-c3e4e5654d02106a19f315b736d56acb581246f9.zip |
Workaround for Android __cxa_finalize bug
Used to be local NDK patch at $NDK/build/tools/toolchain-patches/
gcc/0003-Work-around-for-Android-__cxa_finalize-bug.patch
Change-Id: I8f8039ba010af169185de6f276a45317ecd42170
Diffstat (limited to 'gcc-4.6/libstdc++-v3/libsupc++')
-rw-r--r-- | gcc-4.6/libstdc++-v3/libsupc++/eh_globals.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gcc-4.6/libstdc++-v3/libsupc++/eh_globals.cc b/gcc-4.6/libstdc++-v3/libsupc++/eh_globals.cc index 63f46a99e..845b6d1ae 100644 --- a/gcc-4.6/libstdc++-v3/libsupc++/eh_globals.cc +++ b/gcc-4.6/libstdc++-v3/libsupc++/eh_globals.cc @@ -101,6 +101,14 @@ struct __eh_globals_init ~__eh_globals_init() { + /* Work-around for an Android-specific bug, where this destructor + * is called with a NULL object pointer. This is due to a bug in the + * __cxa_finalize() implementation that was only fixed in 2.2. + */ +#ifdef __ANDROID__ + if (this == NULL) + return; +#endif if (_M_init) __gthread_key_delete(_M_key); _M_init = false; |