diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-16 17:18:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-17 11:36:32 +0200 |
| commit | 3cbc607b74a1fc410689472d8821771377fcc786 (patch) | |
| tree | 1a6343905f21b2ef4164fb1be6c91a85ec14a854 /src/qml/compiler/qv4isel_masm.cpp | |
| parent | a443af35591224667fd681462b3446fad834a6ef (diff) | |
Fix build on ARM in ARM mode (instead of thumb2)
We don't support the traditional ARM assembler (yet), only JIT on thumb2. In
order for us to reliably check that, we have to wait until the pre-processor
runs, which this patch achieves by moving all JIT enable/disable decisions into
qv4global_p.h
Change-Id: I7eff5b4fbf1cd26297a08dee16984ad867358113
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4isel_masm.cpp')
| -rw-r--r-- | src/qml/compiler/qv4isel_masm.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp index 1155322df2..888d11a6c5 100644 --- a/src/qml/compiler/qv4isel_masm.cpp +++ b/src/qml/compiler/qv4isel_masm.cpp @@ -56,6 +56,8 @@ #include <iostream> #include <cassert> +#if ENABLE(ASSEMBLER) + #if USE(UDIS86) # include <udis86.h> #endif @@ -2566,3 +2568,5 @@ bool InstructionSelection::int32Binop(V4IR::AluOp oper, V4IR::Expr *leftSource, return false; } } + +#endif // ENABLE(ASSEMBLER) |