<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213450] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213450">213450</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-06 07:43:30 -0800 (Mon, 06 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][JSCOnly] Enable WebAssembly on Linux environment
https://bugs.webkit.org/show_bug.cgi?id=164032
Reviewed by Michael Catanzaro.
.:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsJSCOnly.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
Source/JavaScriptCore:
This patch enables WebAssembly on JSCOnly and GTK ports.
Basically, almost all the WASM code is portable to Linux.
One platform-dependent part is faster memory load using SIGBUS
signal handler. This patch ports this part to Linux.
* CMakeLists.txt:
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* wasm/WasmFaultSignalHandler.cpp:
(JSC::Wasm::trapHandler):
(JSC::Wasm::enableFastMemory):
Tools:
* Scripts/run-jsc-stress-tests:
Enable WASM tests.
* Scripts/webkitperl/FeatureList.pm:
Enable WebAssembly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmFaultSignalHandlercpp">trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsJSCOnlycmake">trunk/Source/cmake/OptionsJSCOnly.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/ChangeLog 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [GTK][JSCOnly] Enable WebAssembly on Linux environment
+ https://bugs.webkit.org/show_bug.cgi?id=164032
+
+ Reviewed by Michael Catanzaro.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsJSCOnly.cmake:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
</ins><span class="cx"> 2017-03-04 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, remove stray period from readme
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -928,6 +928,7 @@
</span><span class="cx"> wasm/WasmB3IRGenerator.cpp
</span><span class="cx"> wasm/WasmBinding.cpp
</span><span class="cx"> wasm/WasmCallingConvention.cpp
</span><ins>+ wasm/WasmFaultSignalHandler.cpp
</ins><span class="cx"> wasm/WasmFormat.cpp
</span><span class="cx"> wasm/WasmMemory.cpp
</span><span class="cx"> wasm/WasmMemoryInformation.cpp
</span><span class="lines">@@ -938,6 +939,7 @@
</span><span class="cx"> wasm/WasmValidate.cpp
</span><span class="cx">
</span><span class="cx"> wasm/js/JSWebAssemblyCallee.cpp
</span><ins>+ wasm/js/JSWebAssemblyCodeBlock.cpp
</ins><span class="cx"> wasm/js/JSWebAssemblyCompileError.cpp
</span><span class="cx"> wasm/js/JSWebAssemblyInstance.cpp
</span><span class="cx"> wasm/js/JSWebAssemblyLinkError.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [GTK][JSCOnly] Enable WebAssembly on Linux environment
+ https://bugs.webkit.org/show_bug.cgi?id=164032
+
+ Reviewed by Michael Catanzaro.
+
+ This patch enables WebAssembly on JSCOnly and GTK ports.
+ Basically, almost all the WASM code is portable to Linux.
+ One platform-dependent part is faster memory load using SIGBUS
+ signal handler. This patch ports this part to Linux.
+
+ * CMakeLists.txt:
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * wasm/WasmFaultSignalHandler.cpp:
+ (JSC::Wasm::trapHandler):
+ (JSC::Wasm::enableFastMemory):
+
</ins><span class="cx"> 2017-03-06 Daniel Ehrenberg <littledan@igalia.com>
</span><span class="cx">
</span><span class="cx"> Currency digits calculation in Intl.NumberFormat should call out to ICU
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -1499,6 +1499,7 @@
</span><span class="cx"> LLINT_BEGIN_NO_SET_PC();
</span><span class="cx"> ASSERT(vm.needTrapHandling());
</span><span class="cx"> vm.handleTraps(exec);
</span><ins>+ UNUSED_PARAM(pc);
</ins><span class="cx"> LLINT_RETURN_TWO(throwScope.exception(), exec);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFaultSignalHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "VM.h"
</span><span class="cx"> #include "WasmExceptionType.h"
</span><span class="cx">
</span><ins>+#include <signal.h>
</ins><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -43,21 +44,44 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static struct sigaction oldSigBusHandler;
</span><ins>+static struct sigaction oldSigSegvHandler;
</ins><span class="cx"> static bool fastHandlerInstalled { false };
</span><span class="cx"> static StaticLock codeLocationsLock;
</span><span class="cx"> static LazyNeverDestroyed<HashSet<std::tuple<VM*, void*, void*>>> codeLocations; // (vm, start, end)
</span><span class="cx">
</span><ins>+// FIXME: Clean up mcontext_t handling code since it is scattered in heap/, tools/ and wasm/.
+// https://bugs.webkit.org/show_bug.cgi?id=169180
</ins><span class="cx"> #if CPU(X86_64)
</span><ins>+
+#if OS(DARWIN)
</ins><span class="cx"> #define InstructionPointerGPR context->__ss.__rip
</span><span class="cx"> #define FirstArgumentGPR context->__ss.__rsi
</span><ins>+#elif OS(FREEBSD)
+#define InstructionPointerGPR context.mc_rip
+#define FirstArgumentGPR context.mc_rsi
+#elif defined(__GLIBC__)
+#define InstructionPointerGPR context.gregs[REG_RIP]
+#define FirstArgumentGPR context.gregs[REG_RSI]
+#endif
+
</ins><span class="cx"> #else
</span><ins>+
+#if OS(DARWIN)
</ins><span class="cx"> #define InstructionPointerGPR context->__ss.__pc
</span><span class="cx"> #define FirstArgumentGPR context->__ss.__x[1]
</span><ins>+#elif OS(FREEBSD)
+#define InstructionPointerGPR context.mc_gpregs.gp_elr
+#define FirstArgumentGPR context.mc_gpregs.gp_x[1]
+#elif defined(__GLIBC__)
+#define InstructionPointerGPR context.pc
+#define FirstArgumentGPR context.regs[1]
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> static void trapHandler(int signal, siginfo_t*, void* ucontext)
</span><span class="cx"> {
</span><del>- mcontext_t context = static_cast<ucontext_t*>(ucontext)->uc_mcontext;
</del><ins>+ mcontext_t& context = static_cast<ucontext_t*>(ucontext)->uc_mcontext;
</ins><span class="cx"> void* faultingInstruction = reinterpret_cast<void*>(InstructionPointerGPR);
</span><span class="cx"> dataLogLnIf(verbose, "starting handler for fault at: ", RawPointer(faultingInstruction));
</span><span class="cx">
</span><span class="lines">@@ -89,7 +113,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Since we only use fast memory in processes we control, if we restore we will just fall back to the default handler.
</span><del>- sigaction(signal, &oldSigBusHandler, nullptr);
</del><ins>+ if (signal == SIGBUS)
+ sigaction(signal, &oldSigBusHandler, nullptr);
+ else
+ sigaction(signal, &oldSigSegvHandler, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void registerCode(VM& vm, void* start, void* end)
</span><span class="lines">@@ -126,11 +153,19 @@
</span><span class="cx"> sigfillset(&action.sa_mask);
</span><span class="cx"> action.sa_flags = SA_SIGINFO;
</span><span class="cx">
</span><del>- if (!sigaction(SIGBUS, &action, &oldSigBusHandler)) {
- fastHandlerInstalled = true;
- codeLocations.construct();
- }
</del><ins>+ // Installing signal handlers fails when
+ // 1. specificied sig is incorrect (invalid values or signal numbers which cannot be handled), or
+ // 2. second or third parameter points incorrect pointers.
+ // Thus, we must not fail in the following attempts.
+ int ret = 0;
+ ret = sigaction(SIGBUS, &action, &oldSigBusHandler);
+ ASSERT_UNUSED(ret, !ret);
</ins><span class="cx">
</span><ins>+ ret = sigaction(SIGSEGV, &action, &oldSigSegvHandler);
+ ASSERT_UNUSED(ret, !ret);
+
+ codeLocations.construct();
+ fastHandlerInstalled = true;
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -73,12 +73,6 @@
</span><span class="cx"> set(ENABLE_GLES2_DEFAULT ON)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_CPU_X86_64)
- set(ENABLE_FTL_DEFAULT ON)
-else ()
- set(ENABLE_FTL_DEFAULT OFF)
-endif ()
-
</del><span class="cx"> # Public options specific to the GTK+ port. Do not add any options here unless
</span><span class="cx"> # there is a strong reason we should support changing the value of the option,
</span><span class="cx"> # and the option is not relevant to any other WebKit ports.
</span><span class="lines">@@ -160,7 +154,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ${ENABLE_FTL_DEFAULT})
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsJSCOnlycmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsJSCOnly.cmake (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsJSCOnly.cmake 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_STATIC_JSC "Whether to build JavaScriptCore as a static library." PUBLIC OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ON)
</del><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><span class="cx"> set(ALL_EVENT_LOOP_TYPES
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/cmake/OptionsMac.cmake 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY PRIVATE OFF)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx"> macro(WEBKIT_OPTION_BEGIN)
</span><span class="cx"> set(_SETTING_WEBKIT_OPTIONS TRUE)
</span><span class="cx">
</span><ins>+ set(ENABLE_FTL_DEFAULT ${WTF_CPU_X86_64})
+
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_3D_TRANSFORMS "Toggle 3D transforms support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING "Toggle accelerated scrolling support" PRIVATE OFF)
</span><span class="lines">@@ -106,7 +108,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FILTERS_LEVEL_2 "Toggle Filters Module Level 2" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FTPDIR "Toggle FTP directory support" PRIVATE ON)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" PRIVATE OFF)
</del><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_FTL_JIT "Toggle FTL support for JSC" PRIVATE ${ENABLE_FTL_DEFAULT})
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FULLSCREEN_API "Toggle Fullscreen API support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD_DEPRECATED "Toggle deprecated Gamepad support" PRIVATE OFF)
</span><span class="lines">@@ -181,7 +183,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_VIEW_MODE_CSS_MEDIA "Toggle Track support for the view-mode media Feature" PRIVATE ON)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_WEBASSEMBLY "Toggle WebAssembly support" PRIVATE OFF)
</del><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_WEBASSEMBLY "Toggle WebAssembly support" PRIVATE ${ENABLE_FTL_DEFAULT})
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle WebGL support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEBGL2 "Toggle WebGL 2.0 support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WEBGPU "Toggle WebGPU support" PRIVATE OFF)
</span><span class="lines">@@ -200,6 +202,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_LEGACY_ENCRYPTED_MEDIA ENABLE_VIDEO)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_DFG_JIT ENABLE_JIT)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_FTL_JIT ENABLE_DFG_JIT)
</span><ins>+ WEBKIT_OPTION_DEPEND(ENABLE_WEBASSEMBLY ENABLE_FTL_JIT)
</ins><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_SAMPLING_PROFILER ENABLE_JIT)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_INDEXED_DATABASE_IN_WORKERS ENABLE_INDEXED_DATABASE)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_CONTROLS_SCRIPT ENABLE_VIDEO)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Tools/ChangeLog 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [GTK][JSCOnly] Enable WebAssembly on Linux environment
+ https://bugs.webkit.org/show_bug.cgi?id=164032
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/run-jsc-stress-tests:
+ Enable WASM tests.
+
+ * Scripts/webkitperl/FeatureList.pm:
+ Enable WebAssembly.
+
</ins><span class="cx"> 2017-03-04 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Test commit against svn.webkit.org after SHA-1 cleanup.
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -1176,10 +1176,6 @@
</span><span class="cx"> def runWebAssembly
</span><span class="cx"> return if !$jitTests
</span><span class="cx"> return if !$isFTLPlatform
</span><del>- # FIXME: The current WebAssembly implementation includes Darwin specific things.
- # Once WebAssembly becomes ready to be ported, we will enable it on the other OSes (like Linux) and drop this workaround.
- # https://bugs.webkit.org/show_bug.cgi?id=164032
- return if $hostOS != "darwin"
</del><span class="cx"> modules = Dir[WASMTESTS_PATH + "*.js"].map { |f| File.basename(f) }
</span><span class="cx"> prepareExtraAbsoluteFiles(WASMTESTS_PATH, ["wasm.json"])
</span><span class="cx"> prepareExtraRelativeFiles(modules.map { |f| "../" + f }, $collection)
</span><span class="lines">@@ -1194,10 +1190,6 @@
</span><span class="cx">
</span><span class="cx"> return if !$jitTests
</span><span class="cx"> return if !$isFTLPlatform
</span><del>- # FIXME: The current WebAssembly implementation includes Darwin specific things.
- # Once WebAssembly becomes ready to be ported, we will enable it on the other OSes (like Linux) and drop this workaround.
- # https://bugs.webkit.org/show_bug.cgi?id=164032
- return if $hostOS != "darwin"
</del><span class="cx"> modules = Dir[WASMTESTS_PATH + "*.js"].map { |f| File.basename(f) }
</span><span class="cx"> prepareExtraAbsoluteFiles(WASMTESTS_PATH, ["wasm.json"])
</span><span class="cx"> prepareExtraRelativeFiles(modules.map { |f| "../../" + f }, $collection)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (213449 => 213450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-03-06 15:30:34 UTC (rev 213449)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-03-06 15:43:30 UTC (rev 213450)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> define => "ENABLE_FONT_LOAD_EVENTS", default => 0, value => \$fontLoadEventsSupport },
</span><span class="cx">
</span><span class="cx"> { option => "ftl-jit", desc => "Toggle FTLJIT support",
</span><del>- define => "ENABLE_FTL_JIT", default => (isX86_64() && (isGtk() || isEfl())) , value => \$ftlJITSupport },
</del><ins>+ define => "ENABLE_FTL_JIT", default => (isX86_64() && (isGtk() || isJSCOnly())) , value => \$ftlJITSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "ftpdir", desc => "Toggle FTP Directory support",
</span><span class="cx"> define => "ENABLE_FTPDIR", default => 1, value => \$ftpDirSupport },
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> define => "ENABLE_WEB_TIMING", default => 1, value => \$webTimingSupport },
</span><span class="cx">
</span><span class="cx"> { option => "webassembly", desc => "Toggle WebAssembly support",
</span><del>- define => "ENABLE_WEBASSEMBLY", default => 0, value => \$webAssemblySupport },
</del><ins>+ define => "ENABLE_WEBASSEMBLY", default => (isX86_64() && (isGtk() || isJSCOnly())) , value => \$webAssemblySupport },
</ins><span class="cx">
</span><span class="cx"> { option => "webgl", desc => "Toggle WebGL support",
</span><span class="cx"> define => "ENABLE_WEBGL", default => (isAppleCocoaWebKit() || isGtk() || isEfl()), value => \$webglSupport },
</span></span></pre>
</div>
</div>
</body>
</html>