From 44d028c42e9ef83a41006448fe4e90d62313073a Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Wed, 5 Feb 2014 10:04:16 -0800
Subject: [PATCH] Bug 619558 - Enable generational GC on desktop; r=sfink,
 sr=naveed

--HG--
extra : rebase_source : 7234cc03ed04d48d54ac613e25708a1321501f24
---
 browser/confvars.sh |  3 ++-
 configure.in        | 12 ++++++++----
 js/src/configure.in | 12 ++++++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/browser/confvars.sh b/browser/confvars.sh
index 478b70bd079..9ad00848197 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -66,5 +66,6 @@ MOZ_PAY=1
 MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
 MOZ_WEBM_ENCODER=1
-# Enable exact rooting on desktop.
+# Enable exact rooting and generational GC on desktop.
 JSGC_USE_EXACT_ROOTING=1
+JSGC_GENERATIONAL=1
diff --git a/configure.in b/configure.in
index 8dfb4d55382..74f3deaadb0 100644
--- a/configure.in
+++ b/configure.in
@@ -4012,6 +4012,7 @@ NSS_NO_LIBPKIX=
 MOZ_CONTENT_SANDBOX=
 MOZ_CONTENT_SANDBOX_REPORTER=1
 JSGC_USE_EXACT_ROOTING=
+JSGC_GENERATIONAL=
 
 case "$target_os" in
     mingw*)
@@ -7210,10 +7211,10 @@ fi
 dnl ========================================================
 dnl = Use generational GC
 dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(gcgenerational,
-[  --enable-gcgenerational Enable generational GC],
-    JSGC_GENERATIONAL=1,
-    JSGC_GENERATIONAL= )
+MOZ_ARG_DISABLE_BOOL(gcgenerational,
+[  --disable-gcgenerational Disable generational GC],
+    JSGC_GENERATIONAL= ,
+    JSGC_GENERATIONAL=1 )
 if test -n "$JSGC_GENERATIONAL"; then
     AC_DEFINE(JSGC_GENERATIONAL)
 fi
@@ -9228,6 +9229,9 @@ fi
 if test -z "$JSGC_USE_EXACT_ROOTING" ; then
     ac_configure_args="$ac_configure_args --disable-exact-rooting"
 fi
+if test -z "$JSGC_GENERATIONAL" ; then
+    ac_configure_args="$ac_configure_args --disable-gcgenerational"
+fi
 if test -z "$MOZ_NATIVE_NSPR"; then
     ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
     ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
diff --git a/js/src/configure.in b/js/src/configure.in
index dfdae762014..ba8d026efe8 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -3246,10 +3246,14 @@ fi
 dnl ========================================================
 dnl = Use generational GC
 dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(gcgenerational,
-[  --enable-gcgenerational Enable generational GC],
-    JSGC_GENERATIONAL=1,
-    JSGC_GENERATIONAL= )
+dnl Use generational GC by default in all shell builds. The top-level mozilla
+dnl configure.in will configure SpiderMonkey with --disable-gcgenerational as
+dnl needed on a per-platform basis.
+JSGC_GENERATIONAL=1
+MOZ_ARG_DISABLE_BOOL(gcgenerational,
+[  --disable-gcgenerational Disable generational GC],
+    JSGC_GENERATIONAL= ,
+    JSGC_GENERATIONAL=1 )
 if test -n "$JSGC_GENERATIONAL"; then
     AC_DEFINE(JSGC_GENERATIONAL)
 fi