diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-02-24 18:27:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-25 11:37:01 +0100 |
| commit | 6cec10879f382bbd007a5a3819d37e49de2c3c7a (patch) | |
| tree | 0baf5f480d030611a0ba8ff9cda960cfd2584350 | |
| parent | 33a75345e35d3d1a47f0258c39b480dd5e1487d8 (diff) | |
Fix build on x32v5.3.0-alpha1
Recognize x32 and disable JIT and native LLINT in this configuration.
Change-Id: I1576e38ffcff92495c4c108f66f2df17de9a5e9c
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/JavaScriptCore/jit/ExecutableAllocator.h | 2 | ||||
| -rw-r--r-- | Source/WTF/wtf/Platform.h | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.h b/Source/JavaScriptCore/jit/ExecutableAllocator.h index fe63ddf7a..0ec4668fd 100644 --- a/Source/JavaScriptCore/jit/ExecutableAllocator.h +++ b/Source/JavaScriptCore/jit/ExecutableAllocator.h @@ -104,7 +104,7 @@ class DemandExecutableAllocator; #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) #if CPU(ARM) static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; -#elif CPU(X86_64) +#elif CPU(X86_64) && !CPU(X32) static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024; #else static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024; diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index cf80b762c..4594ec854 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -172,6 +172,11 @@ #if defined(__x86_64__) \ || defined(_M_X64) #define WTF_CPU_X86_64 1 + +#if defined(__ILP32__) +#define WTF_CPU_X32 1 +#endif + #endif /* CPU(ARM) - ARM, any version*/ @@ -735,7 +740,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ +#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS)) && !CPU(X32)) \ || (CPU(IA64) && !CPU(IA64_32)) \ || CPU(ALPHA) \ || CPU(SPARC64) \ @@ -754,6 +759,11 @@ #define ENABLE_JIT 0 #endif +/* Disable JIT on x32 */ +#if CPU(X32) +#define ENABLE_JIT 0 +#endif + #if !defined(ENABLE_JIT) && CPU(SH4) && PLATFORM(QT) #define ENABLE_JIT 1 #endif |