aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-10-23 11:03:29 -0700
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-10-23 11:03:29 -0700
commit7486fd3bda93a4e5c4c19584982d3da57c6b1044 (patch)
tree65fc0d54238a7c4686dca359ce073073ab1da904 /gcc-4.6
parent1dfda5810c52c30aa6197e7dc3fd44885af380e4 (diff)
parentc3e4e5654d02106a19f315b736d56acb581246f9 (diff)
downloadtoolchain_gcc-7486fd3bda93a4e5c4c19584982d3da57c6b1044.tar.gz
toolchain_gcc-7486fd3bda93a4e5c4c19584982d3da57c6b1044.tar.bz2
toolchain_gcc-7486fd3bda93a4e5c4c19584982d3da57c6b1044.zip
Merge "Workaround for Android __cxa_finalize bug"
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/libstdc++-v3/libsupc++/eh_globals.cc8
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;