diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4stacktrace.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4stacktrace.cpp b/src/qml/jsruntime/qv4stacktrace.cpp index 7b7060d4c6..905111a23e 100644 --- a/src/qml/jsruntime/qv4stacktrace.cpp +++ b/src/qml/jsruntime/qv4stacktrace.cpp @@ -49,7 +49,11 @@ #include "qv4engine_p.h" #include "qv4unwindhelper_p.h" -#if defined(V4_CXX_ABI_EXCEPTION) || defined(Q_OS_DARWIN) +#if defined(V4_CXX_ABI_EXCEPTION) || (defined(Q_OS_DARWIN) && !defined(Q_PROCESSOR_ARM_32)) +#define USE_UNWIND_BACKTRACE +#endif + +#if defined(USE_UNWIND_BACKTRACE) #include <unwind.h> struct BacktraceHelper @@ -95,7 +99,7 @@ NativeStackTrace::NativeStackTrace(ExecutionContext *context) engine = context->engine; currentNativeFrame = 0; -#if defined(V4_CXX_ABI_EXCEPTION) || defined(Q_OS_DARWIN) +#if defined(USE_UNWIND_BACKTRACE) UnwindHelper::prepareForUnwind(context); nativeFrameCount = get_backtrace_from_libunwind(&trace[0], sizeof(trace) / sizeof(trace[0])); |