diff options
author | Landry Breuil <landry@rhaalovely.net> | 2014-03-07 12:30:57 +0100 |
---|---|---|
committer | Landry Breuil <landry@rhaalovely.net> | 2014-03-07 12:30:57 +0100 |
commit | 14842b32b65c6ff3f93427d5762041acf17c77f4 (patch) | |
tree | ead979553fcc09bd0c3052188fa0e0c3f313fa03 /patches/patch-Source_WTF_wtf_Platform_h |
Initial import of webkit 2.2.4 port
Diffstat (limited to 'patches/patch-Source_WTF_wtf_Platform_h')
-rw-r--r-- | patches/patch-Source_WTF_wtf_Platform_h | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/patches/patch-Source_WTF_wtf_Platform_h b/patches/patch-Source_WTF_wtf_Platform_h new file mode 100644 index 0000000..870a30f --- /dev/null +++ b/patches/patch-Source_WTF_wtf_Platform_h @@ -0,0 +1,74 @@ +$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.3 2013/11/14 16:47:00 ajacoutot Exp $ + +Add defines for mips64*/hppa. +Disable yarr jit on anything not having a jit +https://bugs.webkit.org/show_bug.cgi?id=113638 + +--- Source/WTF/wtf/Platform.h.orig Mon Nov 11 10:21:52 2013 ++++ Source/WTF/wtf/Platform.h Thu Nov 14 09:38:50 2013 +@@ -83,9 +83,14 @@ + + /* CPU(MIPS) - MIPS 32-bit */ + /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */ +-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \ +- && defined(_ABIO32) ++#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) || defined(__mips64__)) ++#if defined(_ABIO32) + #define WTF_CPU_MIPS 1 ++#endif ++#if defined(__mips64__) ++#define WTF_CPU_MIPS64 1 ++#define USE_SYSTEM_MALLOC 1 ++#endif + #if defined(__MIPSEB__) + #define WTF_CPU_BIG_ENDIAN 1 + #endif +@@ -125,6 +130,11 @@ + #define WTF_CPU_SH4 1 + #endif + ++/* CPU(HPPA) - HP-PA */ ++#if defined(__hppa__) ++#define WTF_CPU_HPPA 1 ++#endif ++ + /* CPU(SPARC32) - SPARC 32-bit */ + #if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8) + #define WTF_CPU_SPARC32 1 +@@ -323,7 +333,7 @@ + + #endif /* ARM */ + +-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) ++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(SPARC64) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif + +@@ -689,7 +699,8 @@ + || CPU(ALPHA) \ + || CPU(SPARC64) \ + || CPU(S390X) \ +- || CPU(PPC64) ++ || CPU(PPC64) \ ++ || CPU(MIPS64) + #define WTF_USE_JSVALUE64 1 + #else + #define WTF_USE_JSVALUE32_64 1 +@@ -855,7 +866,7 @@ + #define ENABLE_REGEXP_TRACING 0 + + /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ +-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT)) ++#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT)) && !(OS(QNX) && PLATFORM(QT)) + #define ENABLE_YARR_JIT 1 + + /* Setting this flag compares JIT results with interpreter results. */ +@@ -864,7 +875,7 @@ + + /* If either the JIT or the RegExp JIT is enabled, then the Assembler must be + enabled as well: */ +-#if ENABLE(JIT) || ENABLE(YARR_JIT) ++#if ENABLE(JIT) + #if defined(ENABLE_ASSEMBLER) && !ENABLE_ASSEMBLER + #error "Cannot enable the JIT or RegExp JIT without enabling the Assembler" + #else |