diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-11 12:45:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 12:37:24 +0200 |
| commit | 54435e420671b5f77e724260516d4154aef245ac (patch) | |
| tree | 70ba0b7dd83d9a9c2634a18f0af71fb0ff009f59 /src | |
| parent | 8cfba7d01567f0c37afb98573a6505e187986a7a (diff) | |
Fix exception handling with MinGW on ia32
MinGW on ia32 uses dwarf2 tables and provides __register_frame, so let's use that.
Change-Id: If68598686ff03c8d3d6b1e0db13b477b469adb71
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/v4/qv4unwindhelper.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4unwindhelper_p-dw2.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/qml/v4/qv4unwindhelper.cpp b/src/qml/qml/v4/qv4unwindhelper.cpp index af7f352f96..beb5132626 100644 --- a/src/qml/qml/v4/qv4unwindhelper.cpp +++ b/src/qml/qml/v4/qv4unwindhelper.cpp @@ -45,7 +45,7 @@ #if CPU(X86_64) && (OS(LINUX) || OS(MAC_OS_X)) # define USE_DW2_HELPER -#elif CPU(X86) && OS(LINUX) +#elif CPU(X86) && COMPILER(GCC) # define USE_DW2_HELPER #elif CPU(ARM) && (OS(LINUX) || OS(QNX)) # define USE_ARM_HELPER diff --git a/src/qml/qml/v4/qv4unwindhelper_p-dw2.h b/src/qml/qml/v4/qv4unwindhelper_p-dw2.h index 1abcfbaade..57615f0999 100644 --- a/src/qml/qml/v4/qv4unwindhelper_p-dw2.h +++ b/src/qml/qml/v4/qv4unwindhelper_p-dw2.h @@ -52,9 +52,6 @@ #include <QMap> #include <QMutex> -#define __USE_GNU -#include <dlfcn.h> - QT_BEGIN_NAMESPACE namespace QV4 { @@ -75,7 +72,7 @@ static const unsigned char cie_fde_data[] = { static const int fde_offset = 20; static const int initial_location_offset = 28; static const int address_range_offset = 36; -#elif CPU(X86) && OS(LINUX) +#elif CPU(X86) static const unsigned char cie_fde_data[] = { 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x4, 0x7c, 0x8, 0xc, 0x4, 0x4, |