Title: [232918] trunk
Revision
232918
Author
mcatanz...@igalia.com
Date
2018-06-17 12:16:59 -0700 (Sun, 17 Jun 2018)

Log Message

[CMake] Automatically disable JIT and enable USE_SYSTEM_MALLOC on unfamiliar architectures
https://bugs.webkit.org/show_bug.cgi?id=186722

Reviewed by Darin Adler.

We know that the JSC JIT and bmalloc both work on only a limited set of architectures. In
Fedora, we have to manually disable these when building for s390x, ppc64, and ppc64le. But
it's really easy to do the right thing automatically, so we might as well.

* Source/cmake/WebKitFeatures.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (232917 => 232918)


--- trunk/ChangeLog	2018-06-17 19:12:40 UTC (rev 232917)
+++ trunk/ChangeLog	2018-06-17 19:16:59 UTC (rev 232918)
@@ -1,3 +1,16 @@
+2018-06-17  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        [CMake] Automatically disable JIT and enable USE_SYSTEM_MALLOC on unfamiliar architectures
+        https://bugs.webkit.org/show_bug.cgi?id=186722
+
+        Reviewed by Darin Adler.
+
+        We know that the JSC JIT and bmalloc both work on only a limited set of architectures. In
+        Fedora, we have to manually disable these when building for s390x, ppc64, and ppc64le. But
+        it's really easy to do the right thing automatically, so we might as well.
+
+        * Source/cmake/WebKitFeatures.cmake:
+
 2018-06-13  Thibault Saunier  <tsaun...@igalia.com>
 
         [WPE] Build getUserMedia support

Modified: trunk/Source/cmake/WebKitFeatures.cmake (232917 => 232918)


--- trunk/Source/cmake/WebKitFeatures.cmake	2018-06-17 19:12:40 UTC (rev 232917)
+++ trunk/Source/cmake/WebKitFeatures.cmake	2018-06-17 19:16:59 UTC (rev 232918)
@@ -72,6 +72,14 @@
         set(ENABLE_FTL_DEFAULT OFF)
     endif ()
 
+    if (WTF_CPU_ARM OR WTF_CPU_ARM64 OR WTF_CPU_MIPS OR WTF_CPU_X86_64 OR WTF_CPU_X86)
+        set(ENABLE_JIT_DEFAULT ON)
+        set(USE_SYSTEM_MALLOC_DEFAULT OFF)
+    else ()
+        set(ENABLE_JIT_DEFAULT OFF)
+        set(USE_SYSTEM_MALLOC_DEFAULT ON)
+    endif ()
+
     WEBKIT_OPTION_DEFINE(ENABLE_3D_TRANSFORMS "Toggle 3D transforms support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING "Toggle accelerated scrolling support" PRIVATE OFF)
@@ -100,7 +108,7 @@
     WEBKIT_OPTION_DEFINE(ENABLE_DATACUE_VALUE "Toggle datacue value support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DEVICE_ORIENTATION "Toggle DeviceOrientation support" PRIVATE OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_DFG_JIT "Toggle data flow graph JIT tier" PRIVATE ON)
+    WEBKIT_OPTION_DEFINE(ENABLE_DFG_JIT "Toggle data flow graph JIT tier" PRIVATE ${ENABLE_JIT_DEFAULT})
     WEBKIT_OPTION_DEFINE(ENABLE_DOWNLOAD_ATTRIBUTE "Toggle download attribute support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DRAG_SUPPORT "Toggle support of drag actions (including selection of text with mouse)" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA "Toggle EME support" PRIVATE OFF)
@@ -128,7 +136,7 @@
     WEBKIT_OPTION_DEFINE(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS "Toggle Intl.NumberFormat.prototype.formatToParts support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INTL_PLURAL_RULES "Toggle Intl.PluralRules support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_IOS_AIRPLAY "Toggle iOS airplay support" PRIVATE OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime _javascript_ support" PRIVATE ON)
+    WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime _javascript_ support" PRIVATE ${ENABLE_JIT_DEFAULT})
     WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER "Toggle legacy protocol manager support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES "Toggle legacy css vendor prefix support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_ENCRYPTED_MEDIA "Support legacy EME" PRIVATE OFF)
@@ -187,7 +195,7 @@
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_CRYPTO "Whether to enable support for Web Crypto API." PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_RTC "Toggle WebRTC API support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" PRIVATE ON)
-    WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE OFF)
+    WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE ${USE_SYSTEM_MALLOC_DEFAULT})
 
     WEBKIT_OPTION_DEPEND(ENABLE_WEB_RTC ENABLE_MEDIA_STREAM)
     WEBKIT_OPTION_DEPEND(ENABLE_LEGACY_ENCRYPTED_MEDIA ENABLE_VIDEO)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to