Bug 998596 - Add ARM simulator status to getBuildConfiguration. r=terrence
authorJan de Mooij <jdemooij@mozilla.com>
Mon, 21 Apr 2014 15:36:33 -0700
changeset 197972 5ad5f92387a2887c6681a631d66a538e94d1a92b
parent 197971 988725fe5c1cc3986221e7a379ff00fcf31f8dcc
child 197973 1a2d8d974ca737603f8344aee07d2fb9634bafc8
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs998596
milestone31.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 998596 - Add ARM simulator status to getBuildConfiguration. r=terrence
js/src/builtin/TestingFunctions.cpp
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -84,16 +84,24 @@ GetBuildConfiguration(JSContext *cx, uns
 #ifdef JS_CPU_X64
     value = BooleanValue(true);
 #else
     value = BooleanValue(false);
 #endif
     if (!JS_SetProperty(cx, info, "x64", value))
         return false;
 
+#ifdef JS_ARM_SIMULATOR
+    value = BooleanValue(true);
+#else
+    value = BooleanValue(false);
+#endif
+    if (!JS_SetProperty(cx, info, "arm-simulator", value))
+        return false;
+
 #ifdef MOZ_ASAN
     value = BooleanValue(true);
 #else
     value = BooleanValue(false);
 #endif
     if (!JS_SetProperty(cx, info, "asan", value))
         return false;