From 7296068ce76be5e0c33fd70918688f7ffb24bc72 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 28 Oct 2014 10:04:13 +0100 Subject: Do not use unaligned access when disabled Use the GCC feature defines to check for support for ARMv6 style unaligned access support. This fixes configurations where it was disabled and the ARMv6-M processors where it is not supported. Change-Id: I00c9bb19ba582b64ecb9eaa6da9887ba0df8fd3c Reviewed-by: Julien Brianceau Reviewed-by: Jocelyn Turcotte --- Source/JavaScriptCore/assembler/MacroAssemblerARM.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.h') 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(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) -- cgit v1.2.1