diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-17 13:18:30 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-17 15:52:36 +0200 |
| commit | 9c5ff1e673828448d5b7c4c327618e2fb9ce67da (patch) | |
| tree | 67f2812ae0baaafcc9b827000357e06ba7d9c3b7 /src/qml/jsruntime/qv4global_p.h | |
| parent | 2ec14c7b781872859bbc36ac8b2a4ebc2d456859 (diff) | |
Fix ARM thumb2 mode detection
__TARGET_ARCH_THUMB may not always be defined, but __thumb2__ for example
is also a good indicator that we can generated and run thumb2 code and
thus enable the JIT.
Change-Id: I987d0af5883d9bb844c4c99a0691a12aedc94ff5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4global_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 2050ccd746..e7b5a6778a 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -72,10 +72,14 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } #define V4_ENABLE_JIT #elif defined(Q_PROCESSOR_X86_64) #define V4_ENABLE_JIT -#elif defined(Q_PROCESSOR_ARM_32) && __TARGET_ARCH_THUMB-0 == 4 +#elif defined(Q_PROCESSOR_ARM_32) + +#if defined(thumb2) || defined(__thumb2__) || ((defined(__thumb) || defined(__thumb__)) && __TARGET_ARCH_THUMB-0 == 4) #define V4_ENABLE_JIT #endif +#endif + // Black list some platforms #if defined(V4_ENABLE_JIT) #if defined(Q_OS_WINCE) || defined(Q_OS_IOS) || defined(Q_OS_WIN64) |