Changeset 181544 in webkit

Timestamp:

Mar 16, 2015, 4:45:11 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r181462 - Disable Yarr JIT for ARMv7k
​https://bugs.webkit.org/show_bug.cgi?id=142645

Reviewed by Oliver Hunt.

Make the setting of ENABLE_YARR_JIT match ENABLE_JIT for ARMv7k.

• wtf/Platform.h:

Location:

releases/WebKitGTK/webkit-2.8/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog

@@ +1 @@
+2015-03-14  Michael Saboff  <msaboff@apple.com>
+
+        Disable Yarr JIT for ARMv7k
+        https://bugs.webkit.org/show_bug.cgi?id=142645
+
+        Rubber stamped by Geoffrey Garen.
+
+        Changed the setting of ENABLE_YARR_JIT to be predicated on ENABLED_JIT.
+
+        * wtf/Platform.h:
+
+2015-03-12  Michael Saboff  <msaboff@apple.com>
+
+        Disable Yarr JIT for ARMv7k
+        https://bugs.webkit.org/show_bug.cgi?id=142645
+
+        Reviewed by Oliver Hunt.
+
+        Make the setting of ENABLE_YARR_JIT match ENABLE_JIT for ARMv7k.
+
+        * wtf/Platform.h:
+
 2015-03-12  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Platform.h

@@ -657 +657 @@
 #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
 
-/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */
+/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */
 #if !defined(ENABLE_JIT) \
     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
@@ -821 +821 @@
 
 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT)
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT)
 #define ENABLE_YARR_JIT 1