Disable OdinMonkey on OSX until we can get Breakpad to cooperate (no bug, r=me)
authorLuke Wagner <luke@mozilla.com>
Sun, 17 Mar 2013 15:14:50 -0700
changeset 125127 aa0fc30a3c2e
parent 125126 09f72f45a0b7
child 125128 a9a25781850e
push id24445
push userlwagner@mozilla.com
push date2013-03-17 22:16 +0000
treeherdermozilla-central@aa0fc30a3c2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
milestone22.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
Disable OdinMonkey on OSX until we can get Breakpad to cooperate (no bug, r=me)
js/src/ion/AsmJS.cpp
js/src/ion/AsmJS.h
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -4980,17 +4980,17 @@ js::CompileAsmJS(JSContext *cx, TokenStr
     if (!moduleObj)
         return false;
 
     JS_ASSERT(!script->asmJS);
     script->asmJS.init(moduleObj);
 
     return Warn(cx, JSMSG_USE_ASM_TYPE_OK);
 #else
-    return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Platform not supported");
+    return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Platform not supported (yet)");
 #endif
 }
 
 JSBool
 js::IsAsmJSCompilationAvailable(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
--- a/js/src/ion/AsmJS.h
+++ b/js/src/ion/AsmJS.h
@@ -8,17 +8,17 @@
 #if !defined(jsion_asmjs_h__)
 #define jsion_asmjs_h__
 
 // asm.js compilation is only available on desktop x86/x64 at the moment.
 // Don't panic, mobile support is coming soon.
 #if defined(JS_ION) && \
     !defined(ANDROID) && \
     (defined(JS_CPU_X86) || defined(JS_CPU_X64)) &&  \
-    (defined(__linux__) || defined(XP_WIN) || defined(XP_MACOSX))
+    (defined(__linux__) || defined(XP_WIN))
 # define JS_ASMJS
 #endif
 
 namespace js {
 
 class SPSProfiler;
 class AsmJSModule;
 namespace frontend { struct TokenStream; struct ParseNode; }