diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:51 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:51 +0100 |
| commit | 47c78dea382da032f7baace418e06388c056c820 (patch) | |
| tree | 0e6b1c8ba2a60828f1ad77288341b843244e9c6c /Source/JavaScriptCore/assembler/MacroAssemblerARM.h | |
| parent | d75f99832922079640818fae49a92bb0cf45dfb8 (diff) | |
| parent | ba4c0fc7927b0fd6d2fa71aceda8136094581e2d (diff) | |
| download | qtwebkit-47c78dea382da032f7baace418e06388c056c820.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I80322f19cc94708fa424ee44fdcc04ede82ecd24
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.h')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h index 9058514dc..d9093413f 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h @@ -393,7 +393,7 @@ public: m_assembler.baseIndexTransfer32(ARMAssembler::LoadUint32, dest, address.base, address.index, static_cast<int>(address.scale), address.offset); } -#if CPU(ARMV5_OR_LOWER) +#if !CPU(ARM_FEATURE_UNALIGNED) void load32WithUnalignedHalfWords(BaseIndex address, RegisterID dest); #else void load32WithUnalignedHalfWords(BaseIndex address, RegisterID dest) |