aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jit/qv4targetplatform_p.h
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-05-26 11:18:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-26 13:24:54 +0200
commit54d7d183cde1fab45b0f9a4dd39ffe13edf3b77e (patch)
treeac604be5e0a8abc06033fb57b6d91e88888b4cd6 /src/qml/jit/qv4targetplatform_p.h
parentddb33ee9ba9e1344caa9be5dbf4b534c3ede692e (diff)
V4: Fix compilation failure on BB10 x86 and QNX6 x86
This change amends ddb33ee9ba9e1344caa9be5dbf4b534c3ede692e Task-number: QTBUG-39274 Change-Id: If0c3bc1204433315b9329229304db7ddadc785f2 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/qml/jit/qv4targetplatform_p.h')
-rw-r--r--src/qml/jit/qv4targetplatform_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jit/qv4targetplatform_p.h b/src/qml/jit/qv4targetplatform_p.h
index 654d2f3f52..45afa530f9 100644
--- a/src/qml/jit/qv4targetplatform_p.h
+++ b/src/qml/jit/qv4targetplatform_p.h
@@ -64,7 +64,7 @@ namespace JIT {
class TargetPlatform
{
public:
-#if CPU(X86) && (OS(LINUX) || OS(WINDOWS))
+#if CPU(X86) && (OS(LINUX) || OS(WINDOWS) || OS(QNX))
enum { RegAllocIsSupported = 1 };
static const JSC::MacroAssembler::RegisterID StackFrameRegister = JSC::X86Registers::ebp;
@@ -106,7 +106,7 @@ public:
static void platformEnterStandardStackFrame(JSC::MacroAssembler *as) { Q_UNUSED(as); }
static void platformLeaveStandardStackFrame(JSC::MacroAssembler *as) { Q_UNUSED(as); }
-#if OS(WINDOWS) || \
+#if OS(WINDOWS) || OS(QNX) || \
(OS(LINUX) && (defined(__PIC__) || defined(__PIE__)))
#define RESTORE_EBX_ON_CALL