diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-06 11:24:40 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-08 12:20:54 +0000 |
| commit | 32e24c58664f8e864e591fa03ea86418f0cf0674 (patch) | |
| tree | 7ec222f6b89fd89dac35644cf3779d1e82bc64f2 /src/qml/jit/qv4isel_masm.cpp | |
| parent | be92f31b7eb2a689c8a12fc0e193878a84c4532e (diff) | |
Fix ARM64 build
Add the ARM64 assembler to cross-compilation.
Task-number: QTBUG-58568
Change-Id: I91461ebf79fb83e31e8ae2962ab0e155d308281a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jit/qv4isel_masm.cpp')
| -rw-r--r-- | src/qml/jit/qv4isel_masm.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp index 6769b22b77..69d6951bb9 100644 --- a/src/qml/jit/qv4isel_masm.cpp +++ b/src/qml/jit/qv4isel_masm.cpp @@ -1638,15 +1638,16 @@ template class Q_QML_EXPORT ISelFactory<>; Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture) { using ARMv7CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARMv7, NoOperatingSystemSpecialization>>; + using ARM64CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARM64, NoOperatingSystemSpecialization>>; if (architecture == QLatin1String("armv7")) return new ISelFactory<ARMv7CrossAssembler>; + else if (architecture == QLatin1String("armv8")) + return new ISelFactory<ARM64CrossAssembler>; QString hostArch; #if CPU(ARM_THUMB2) hostArch = QStringLiteral("armv7"); -#elif CPU(ARM64) - hostArch = QStringLiteral("armv8"); #elif CPU(MIPS) hostArch = QStringLiteral("mips"); #elif CPU(X86) |