Title: [185110] trunk/Tools
Revision
185110
Author
mark....@apple.com
Date
2015-06-02 10:48:23 -0700 (Tue, 02 Jun 2015)

Log Message

build-jsc's --cloop option is broken.
https://bugs.webkit.org/show_bug.cgi?id=145516

Reviewed by Darin Adler.

* Scripts/build-jsc:
- Make sure to disable the JIT when --cloop is specified.
  Did analogous fix for --ftljit.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (185109 => 185110)


--- trunk/Tools/ChangeLog	2015-06-02 17:36:16 UTC (rev 185109)
+++ trunk/Tools/ChangeLog	2015-06-02 17:48:23 UTC (rev 185110)
@@ -1,3 +1,14 @@
+2015-06-02  Mark Lam  <mark....@apple.com>
+
+        build-jsc's --cloop option is broken.
+        https://bugs.webkit.org/show_bug.cgi?id=145516
+
+        Reviewed by Darin Adler.
+
+        * Scripts/build-jsc:
+        - Make sure to disable the JIT when --cloop is specified.
+          Did analogous fix for --ftljit.
+
 2015-06-02  Daniel Bates  <daba...@apple.com>
 
         Update ATS keys used in MiniBrowser and WebKitTestRunnerApp

Modified: trunk/Tools/Scripts/build-jsc (185109 => 185110)


--- trunk/Tools/Scripts/build-jsc	2015-06-02 17:36:16 UTC (rev 185109)
+++ trunk/Tools/Scripts/build-jsc	2015-06-02 17:48:23 UTC (rev 185110)
@@ -95,8 +95,8 @@
 }
 
 if (cmakeBasedPortName()) {
-    $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=OFF" : " -DENABLE_JIT=ON";
-    $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT=ON" : " -DENABLE_FTL_JIT=OFF";
+    $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=0" : " -DENABLE_JIT";
+    $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT" : " -DENABLE_FTL_JIT=0";
     # By default we build using all of the available CPUs
     $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
 
@@ -107,8 +107,8 @@
 }
 
 if (isAppleMacWebKit()) {
-    push @options, ($forceCLoop ? "ENABLE_JIT=" : "ENABLE_JIT=ENABLE_JIT");
-    push @options, ($ftlJIT ? "ENABLE_FTL_JIT=ENABLE_FTL_JIT" : "ENABLE_FTL_JIT=");
+    push @options, ($forceCLoop ? "ENABLE_JIT=ENABLE_JIT=0" : "ENABLE_JIT=ENABLE_JIT");
+    push @options, ($ftlJIT ? "ENABLE_FTL_JIT=ENABLE_FTL_JIT" : "ENABLE_FTL_JIT=ENABLE_FTL_JIT=0");
 
     if ($copyLibraries) {
         my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to