diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-24 16:58:05 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-24 16:58:05 (GMT) |
| commit | 90996b73d4f2983d6f721c205b5a0957d3a55aff (patch) | |
| tree | 1ab4215df101422590c7af368cdd22d4f1dc3786 /src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h | |
| parent | 9345d47c3945b61a27724508e8b3d0aaf7b57bcf (diff) | |
| parent | aabd12223bda6260756ab19430082477d5669c0a (diff) | |
| download | Qt-90996b73d4f2983d6f721c205b5a0957d3a55aff.zip Qt-90996b73d4f2983d6f721c205b5a0957d3a55aff.tar.gz Qt-90996b73d4f2983d6f721c205b5a0957d3a55aff.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h index 9e1c5d3..2743ab4 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h @@ -30,11 +30,11 @@ #if ENABLE(ASSEMBLER) -#if PLATFORM_ARM_ARCH(7) +#if PLATFORM(ARM_THUMB2) #include "MacroAssemblerARMv7.h" namespace JSC { typedef MacroAssemblerARMv7 MacroAssemblerBase; }; -#elif PLATFORM(ARM) +#elif PLATFORM(ARM_TRADITIONAL) #include "MacroAssemblerARM.h" namespace JSC { typedef MacroAssemblerARM MacroAssemblerBase; }; |