summaryrefslogtreecommitdiffstats
path: root/contrib/libcxxrt
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2013-08-31 08:56:33 +0000
committertheraven <theraven@FreeBSD.org>2013-08-31 08:56:33 +0000
commitcf2b42293b2be2d2ad87cfcd8b431892a622cae8 (patch)
treeb87b2cb426eb297831ec49d8f84aac7b32e63540 /contrib/libcxxrt
parent3b54dfb62d267ac2575cb243220470aab81f4c4d (diff)
downloadFreeBSD-src-cf2b42293b2be2d2ad87cfcd8b431892a622cae8.zip
FreeBSD-src-cf2b42293b2be2d2ad87cfcd8b431892a622cae8.tar.gz
Don't use _Unwind_Backtrace() on ARM as it's currently missing from our libgcc_s. andrew@ has patches to add it, so this can be reverted and sync'd with upstream later.
Diffstat (limited to 'contrib/libcxxrt')
-rw-r--r--contrib/libcxxrt/exception.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc
index c1cb243..d848905 100644
--- a/contrib/libcxxrt/exception.cc
+++ b/contrib/libcxxrt/exception.cc
@@ -715,7 +715,9 @@ static void report_failure(_Unwind_Reason_Code err, __cxa_exception *thrown_exce
if (status == 0) { free(demangled); }
// Print a back trace if no handler is found.
// TODO: Make this optional
+#ifndef __arm__
_Unwind_Backtrace(trace, 0);
+#endif
break;
}
std::terminate();
OpenPOWER on IntegriCloud