Merge inbound to m-c.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 27 Jul 2013 21:52:40 -0400
changeset 140267 73b69c146ca6926b4a72bb484550e5afe04b93cc
parent 140264 015135250e0635af3b4ef2d65f2391c6476a3833 (current diff)
parent 140266 823c58cdd7230bb3e979193526ed1f0477a0ee0f (diff)
child 140268 3bc8a3f77169b8060a69383af8578e5f9d16ab3e
child 140319 9726ea53fed6efb49f4f89921a64e5466bb536de
child 140340 91c8657b0fa98c32d036b9ab52a34c85588e1aff
child 143466 c183395271416d3b96ebcded68fac6c31f9dc3a8
child 155605 b0549e859d2201b8f079b12c2b16256594adb34b
push id25022
push userryanvm@gmail.com
push dateSun, 28 Jul 2013 01:52:42 +0000
treeherdermozilla-central@73b69c146ca6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone25.0a1
first release with
nightly linux32
73b69c146ca6 / 25.0a1 / 20130728030204 / files
nightly linux64
73b69c146ca6 / 25.0a1 / 20130728030204 / files
nightly mac
73b69c146ca6 / 25.0a1 / 20130728030204 / files
nightly win32
73b69c146ca6 / 25.0a1 / 20130728030204 / files
nightly win64
73b69c146ca6 / 25.0a1 / 20130728030204 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to m-c.
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -2830,20 +2830,20 @@ static const JSFunctionSpec array_static
          {"lastIndexOf",        {NULL, NULL},       2,0, "ArrayStaticLastIndexOf"},
          {"indexOf",            {NULL, NULL},       2,0, "ArrayStaticIndexOf"},
          {"forEach",            {NULL, NULL},       2,0, "ArrayStaticForEach"},
          {"map",                {NULL, NULL},       2,0, "ArrayStaticMap"},
          {"every",              {NULL, NULL},       2,0, "ArrayStaticEvery"},
          {"some",               {NULL, NULL},       2,0, "ArrayStaticSome"},
          {"reduce",             {NULL, NULL},       2,0, "ArrayStaticReduce"},
          {"reduceRight",        {NULL, NULL},       2,0, "ArrayStaticReduceRight"},
-         {"build",              {NULL, NULL},       2,0, "ArrayStaticBuild"},
     JS_FN("of",                 array_of,           0,0),
 
 #ifdef ENABLE_PARALLEL_JS
+         {"build",              {NULL, NULL},       2,0, "ArrayStaticBuild"},
     /* Parallelizable and pure static methods. */
          {"buildPar",           {NULL, NULL},       3,0, "ArrayStaticBuildPar"},
 #endif
 
     JS_FS_END
 };
 
 /* ES5 15.4.2 */
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@@ -13,16 +13,17 @@ include $(DEPTH)/config/autoconf.mk
 #DEFINES += -DDISABLE_UPDATER_AUTHENTICODE_CHECK
 
 DIST_PROGRAM = maintenanceservice$(BIN_SUFFIX)
 
 # Don't link the maintenanceservice against mozglue.dll. See bug 687139 and
 # bug 725876
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
+STL_FLAGS=
 
 LIBS += \
   ../../mozapps/update/common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \
   $(NULL)
 
 USE_STATIC_LIBS = 1
 HAVE_PROGRESSUI = 1
 RCINCLUDE = maintenanceservice.rc