diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
| commit | b768917f043bd78ac8af125c1993f05776a052b7 (patch) | |
| tree | 754a0eba403a781332f28da087c8493c82a57fd5 /src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h | |
| parent | be63c460b84c694dbae10494e491256bd53a5c0b (diff) | |
| parent | fafec8f2363fd7ab3ce5b81a66cc82001a58c8ed (diff) | |
| download | Qt-b768917f043bd78ac8af125c1993f05776a052b7.zip Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.gz Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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; }; |