diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-28 09:36:10 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-28 09:36:10 (GMT) |
| commit | 91f5404cdbe7cdf0521a257d6abf662b86c31986 (patch) | |
| tree | e729804589da176c6f6b25f62acb93c25e56c12f /src/3rdparty/webkit/JavaScriptCore | |
| parent | b4a9925dfd3298bae65887dbad767c4a2211310c (diff) | |
| parent | a49ca92bc343e58ec21dd52a933b23f43ecfc0a6 (diff) | |
| download | Qt-91f5404cdbe7cdf0521a257d6abf662b86c31986.zip Qt-91f5404cdbe7cdf0521a257d6abf662b86c31986.tar.gz Qt-91f5404cdbe7cdf0521a257d6abf662b86c31986.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')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index e508f77..bd82d8f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -238,7 +238,8 @@ #define WTF_PLATFORM_MIDDLE_ENDIAN 1 #endif #define ARM_ARCH_VERSION 3 -#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) +#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || defined(ARMV4I) \ + || defined(_ARMV4I_) || defined(armv4i) #undef ARM_ARCH_VERSION #define ARM_ARCH_VERSION 4 #endif |