Bug 921130 - Fix --disable-ion build. r=luke
☠☠ backed out by 210167f25955 ☠ ☠
authorJan de Mooij <jdemooij@mozilla.com>
Mon, 30 Sep 2013 17:27:37 +0200
changeset 149283 d3867bfc10e5195a0cba275d7b2a50c94cf48152
parent 149282 8bf84234319ad061159c104c03186ef06b154755
child 149284 c294d0f6d0a52ab5eb770846026cac24c5ed7e3f
push id25380
push userryanvm@gmail.com
push dateMon, 30 Sep 2013 20:16:36 +0000
treeherdermozilla-central@1332fc1c15e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs921130
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 921130 - Fix --disable-ion build. r=luke
js/src/shell/js.cpp
js/src/vm/ForkJoin.h
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -5355,17 +5355,17 @@ main(int argc, char **argv, char **envp)
 #ifdef DEBUG
     /*
      * Process OOM options as early as possible so that we can observe as many
      * allocations as possible.
      */
     if (op.getBoolOption('O'))
         OOM_printAllocationCount = true;
 
-#if defined(JS_CPU_X86)
+#if defined(JS_CPU_X86) && defined(JS_ION)
     if (op.getBoolOption("no-fpu"))
         JSC::MacroAssembler::SetFloatingPointDisabled();
 #endif
 #endif
 
     // Start the engine.
     if (!JS_Init())
         return 1;
--- a/js/src/vm/ForkJoin.h
+++ b/js/src/vm/ForkJoin.h
@@ -5,17 +5,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef vm_ForkJoin_h
 #define vm_ForkJoin_h
 
 #include "jscntxt.h"
 
 #include "jit/Ion.h"
-#include "jit/MIR.h"
 
 ///////////////////////////////////////////////////////////////////////////
 // Read Me First
 //
 // The ForkJoin abstraction:
 // -------------------------
 //
 // This is the building block for executing multi-threaded JavaScript with