diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-28 16:51:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-29 07:05:05 +0000 |
| commit | 1b8c7e72e4467925ecee49d2d66e81692ca9d525 (patch) | |
| tree | cdd3560e5c91d028ae4c3dc0a4a18b517a65c6ea /src/3rdparty/masm/assembler/MacroAssemblerARMv7.h | |
| parent | 05090868b816d2add1c22078a015a6dc19f401ae (diff) | |
Fix pop(RegisterID) on ARMv7 when cross-compiling
This is implemented as ldr instruction that automatically adjusts the
indexing register, which for ARMv7 needs to be always 4-bytes, not
sizeof(void*) which can be 8 on 64-bit hosts.
Change-Id: I66cce2a7388ef12b321db643e8efb002158519aa
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssemblerARMv7.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerARMv7.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h index 806f2e13b6..0d5d42bf71 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h @@ -1242,7 +1242,7 @@ public: void pop(RegisterID dest) { // store postindexed with writeback - m_assembler.ldr(dest, ARMRegisters::sp, sizeof(void*), false, true); + m_assembler.ldr(dest, ARMRegisters::sp, 4 /*sizeof(void*)*/, false, true); } void push(RegisterID src) |