diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-01 13:49:37 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-07 12:11:37 +0000 |
| commit | ff46a4127bbe46d9887457d5740e52ffff4d43d4 (patch) | |
| tree | d98a21e0288df8d91f177f7f34b554209b5cb4cf /src/qml/jit/qv4isel_masm.cpp | |
| parent | 9e926ddbf985f8d41747ae8a89ee3752a11011e4 (diff) | |
Fix assembler cross-compilation on 32-bit hosts
The GOT register restoring logic needs to be done via TargetPLatform
members instead of plain #ifdefs.
Task-number: QTBUG-58569
Change-Id: If00d3f92558361ad5dcb20c3ff7eff78d31d75d3
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp index 11e1c6c726..343062c1be 100644 --- a/src/qml/jit/qv4isel_masm.cpp +++ b/src/qml/jit/qv4isel_masm.cpp @@ -1344,12 +1344,10 @@ void InstructionSelection<JITAssembler>::calculateRegistersToSave(const Register fpRegistersToSave.clear(); for (const RegisterInfo &ri : JITTargetPlatform::getRegisterInfo()) { -#if defined(RESTORE_EBX_ON_CALL) - if (ri.isRegularRegister() && ri.reg<JSC::X86Registers::RegisterID>() == JSC::X86Registers::ebx) { + if (JITTargetPlatform::gotRegister != -1 && ri.isRegularRegister() && ri.reg<RegisterID>() == JITTargetPlatform::gotRegister) { regularRegistersToSave.append(ri); continue; } -#endif // RESTORE_EBX_ON_CALL if (ri.isCallerSaved()) continue; if (ri.isRegularRegister()) { @@ -1636,7 +1634,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { namespace JIT { template class Q_QML_EXPORT InstructionSelection<>; template class Q_QML_EXPORT ISelFactory<>; -#if defined(V4_BOOTSTRAP) && CPU(X86_64) +#if defined(V4_BOOTSTRAP) Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture) { |