aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4global_p.h
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2014-06-12 19:43:56 +0400
committerErik Verbruggen <erik.verbruggen@digia.com>2014-07-07 16:35:33 +0200
commite1e551dabd4efc9cb486322098a072d4e337817c (patch)
tree85f83217b3aade6405f351bd7fbd1b7a354f20d6 /src/qml/jsruntime/qv4global_p.h
parent5494dc7bff733b03eebf73b3da2cff4142c9fc5f (diff)
Make sure JIT architectures lists are in sync
We have two lists: in qv4global_p.h and qv4targetplatform_p.h. This commit blacklists OSes on x86 and x86_64 where JIT is not supported, improves support for FreeBSD and adds cross-references between these two files. Change-Id: Id3715a2ab717186e510a54e5a548dfa22120cd87 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4global_p.h')
-rw-r--r--src/qml/jsruntime/qv4global_p.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index a00231c3a1..b6172a79a5 100644
--- a/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
@@ -74,10 +74,12 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
// Decide whether to enable or disable the JIT
// White list architectures
+//
+// NOTE: This should match the logic in qv4targetplatform_p.h!
-#if defined(Q_PROCESSOR_X86)
+#if defined(Q_PROCESSOR_X86) && (defined(Q_OS_WINDOWS) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
#define V4_ENABLE_JIT
-#elif defined(Q_PROCESSOR_X86_64)
+#elif defined(Q_PROCESSOR_X86_64) && (defined(Q_OS_WINDOWS) || defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD))
#define V4_ENABLE_JIT
#elif defined(Q_PROCESSOR_ARM_32)