diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-06 15:48:12 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-06 14:46:14 +0000 |
commit | 7c709ee4404e737bebd576c4a1782593a6ec7da0 (patch) | |
tree | c136dc3fe169728c7f56055d60e403a678d8b0a0 /src/qml | |
parent | 9b961334cfd81ec5fcc4dc7d2c50154cddd5f230 (diff) | |
download | qtdeclarative-7c709ee4404e737bebd576c4a1782593a6ec7da0.tar.gz |
Fix locals register allocation on ARM when cross-compiling
r11 needs to be saved :). This ammends
ecda87091f290daec34bee6b55dd9cf920ffdcff
Change-Id: Ib69712527e04b9bcec4c9e74dea43a915e2bd0f9
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/jit/qv4targetplatform_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jit/qv4targetplatform_p.h b/src/qml/jit/qv4targetplatform_p.h index ce6156802d..6d788f4a93 100644 --- a/src/qml/jit/qv4targetplatform_p.h +++ b/src/qml/jit/qv4targetplatform_p.h @@ -405,7 +405,7 @@ public: << RI(JSC::ARMRegisters::r9, QStringLiteral("r9"), RI::RegularRegister, RI::CalleeSaved, RI::RegAlloc) #endif << RI(JSC::ARMRegisters::r10, QStringLiteral("r10"), RI::RegularRegister, RI::CalleeSaved, RI::Predefined) -#if CPU(ARM_THUMB2) && !defined(V4_BOOTSTRAP) +#if CPU(ARM_THUMB2) || defined(V4_BOOTSTRAP) << RI(JSC::ARMRegisters::r11, QStringLiteral("r11"), RI::RegularRegister, RI::CalleeSaved, RI::Predefined) #endif << RI(JSC::ARMRegisters::d2, QStringLiteral("d2"), RI::FloatingPointRegister, RI::CallerSaved, RI::RegAlloc) |