diff options
| author | Fathi Boudra <fabo@debian.org> | 2010-05-25 09:52:45 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-25 09:53:12 (GMT) |
| commit | 9a3d28dda6ddc1b275de3e3256462870d9078e21 (patch) | |
| tree | 8376ab89a13f5b028bfb84020ec25be440edf073 /src/3rdparty | |
| parent | 6f6909ac6681ed614f00998a0d43b7b195dbb90b (diff) | |
| download | Qt-9a3d28dda6ddc1b275de3e3256462870d9078e21.zip Qt-9a3d28dda6ddc1b275de3e3256462870d9078e21.tar.gz Qt-9a3d28dda6ddc1b275de3e3256462870d9078e21.tar.bz2 | |
QTBUG-5955: Qt fails to build on alpha architecture
- add alpha platform support based on JavaScriptCore from src/3rdparty/webkit copy.
- fix invalid type conversions on alpha architecture.
Merge-request: 640
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index be74e2a..5e15480 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -317,6 +317,11 @@ #define WTF_PLATFORM_X86_64 1 #endif +/* PLATFORM(ALPHA) */ +#if defined(__alpha__) +#define WTF_PLATFORM_ALPHA 1 +#endif + /* PLATFORM(SH4) */ #if defined(__SH4__) #define WTF_PLATFORM_SH4 1 @@ -720,7 +725,7 @@ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) #if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) #define WTF_USE_JSVALUE64 1 -#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) +#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) #define WTF_USE_JSVALUE64 1 #elif PLATFORM(AIX64) #define WTF_USE_JSVALUE64 1 |