Backed out changeset d3867bfc10e5 (bug 921130) for Android compilation failures on a CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Mon, 30 Sep 2013 17:03:43 +0100
changeset 149293 210167f25955dd5ca92c136e4ec5ab24516647ef
parent 149292 ea609cf06b4e4f3db464d64437e818b966590c9a
child 149294 b51341f1ac292837fd60525bfd652b75ad7590dd
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)
bugs921130
milestone27.0a1
backs outd3867bfc10e5195a0cba275d7b2a50c94cf48152
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
Backed out changeset d3867bfc10e5 (bug 921130) for Android compilation failures on a CLOSED TREE
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) && defined(JS_ION)
+#if defined(JS_CPU_X86)
     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,16 +5,17 @@
  * 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