Bug 921130 - Fix --disable-ion build. r=luke
authorJan de Mooij <jdemooij@mozilla.com>
Mon, 30 Sep 2013 17:27:37 +0200
changeset 149376 e43f1bac03c150e327352f6a80ce0e30562128ca
parent 149375 8ee9a40710b7b754d32c765581ff9fb82a29272c
child 149377 2cda3246c311be3fafb5fb1ff958eafef1b08ebd
push id25386
push useremorley@mozilla.com
push dateTue, 01 Oct 2013 09:29:22 +0000
treeherdermozilla-central@6856c45f3688 [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
@@ -5499,17 +5499,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
@@ -409,16 +408,20 @@ InParallelSection()
 
 bool InExclusiveParallelSection();
 
 bool ParallelTestsShouldPass(JSContext *cx);
 
 ///////////////////////////////////////////////////////////////////////////
 // Debug Spew
 
+namespace jit {
+    class MDefinition;
+}
+
 namespace parallel {
 
 enum ExecutionStatus {
     // Parallel or seq execution terminated in a fatal way, operation failed
     ExecutionFatal,
 
     // Parallel exec failed and so we fell back to sequential
     ExecutionSequential,