diff options
| author | Martin Storsjö <martin@martin.st> | 2019-04-15 13:36:46 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2019-04-16 18:47:24 +0000 |
| commit | 259c958e21c63f227a1bb678867210e0f6af0991 (patch) | |
| tree | 50bc002527ba8a7ef908af5bb3c9c3676a402dee /src/qml/jsruntime | |
| parent | 19484ca22f5cf653d48e496cef16298f049b3a96 (diff) | |
V4: Only enable the JIT on ARM on specific known OSes
On all other architectures, the JIT is only enabled for explicitly
mentioned OSes.
This fixes build errors for Windows on 32 bit ARM, about the
cacheFlush function being unimplemented for that target.
This keeps all other OSes enabled that are mentioned in conditionals
for other architectures, except for windows.
Change-Id: I8c29a9399a05a57d23b4fee506c3d04859a08a76
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 162fb66cba..58bffdf2d1 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -94,7 +94,8 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } #elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)) # define V4_ENABLE_JIT -#elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4) +#elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4) \ + && (defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_INTEGRITY)) # if defined(thumb2) || defined(__thumb2__) || ((defined(__thumb) || defined(__thumb__)) && __TARGET_ARCH_THUMB-0 == 4) # define V4_ENABLE_JIT # elif defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH_ISA_THUMB == 2 // clang 3.5 and later will set this if the core supports the Thumb-2 ISA. |