diff options
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 9 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 14 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 71ab6e8..f42e69d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -37,14 +37,7 @@ #include <unistd.h> #include <elf.h> # if OS(ANDROID) && PLATFORM(QT) -typedef struct -{ - uint32_t a_type; - union - { - uint32_t a_val; - } a_un; -} Elf32_auxv_t; +# include <asm/procinfo.h> # else # include <asm/hwcap.h> # endif diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index 3d6d271..85ed8a7 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -202,6 +202,11 @@ #if defined(__x86_64__) \ || defined(_M_X64) #define WTF_CPU_X86_64 1 + +#if defined(__ILP32__) +#define WTF_CPU_X32 1 +#endif + #endif /* 64-bit mode on AIX */ @@ -509,6 +514,7 @@ #define WTF_PLATFORM_WIN 1 #endif +#if !PLATFORM(QT) /* PLATFORM(IPHONE) */ /* FIXME: this is sometimes used as an OS switch and sometimes for higher-level things */ #if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) @@ -526,6 +532,7 @@ #if !defined(WTF_PLATFORM_IPHONE) #define WTF_PLATFORM_IPHONE 0 #endif +#endif /* PLATFORM(ANDROID) */ /* FIXME: this is sometimes used as an OS() switch, and other times to drive @@ -904,7 +911,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) +#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) #define WTF_USE_JSVALUE64 1 #elif CPU(ARM) || CPU(PPC64) #define WTF_USE_JSVALUE32 1 @@ -921,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #define ENABLE_REPAINT_THROTTLING 0 #endif +/* Disable JIT on x32 */ +#if CPU(X32) +#define ENABLE_JIT 0 +#endif + #if !defined(ENABLE_JIT) /* The JIT is tested & working on x86_64 Mac */ |