$OpenBSD$

index 314807b..b0f6a69 100644
--- js/src/configure.in.orig	Fri Feb 20 15:40:37 2015
+++ js/src/configure.in	Fri Feb 20 15:40:37 2015
@@ -2784,15 +2784,12 @@ AC_SUBST(GRE_MILESTONE)
 dnl set RELEASE_BUILD and NIGHTLY_BUILD variables depending on the cycle we're in
 dnl The logic works like this:
 dnl - if we have "a1" in GRE_MILESTONE, we're building Nightly (define NIGHTLY_BUILD)
-dnl - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora
 dnl - otherwise, we're building Release/Beta (define RELEASE_BUILD)
 case "$GRE_MILESTONE" in
   *a1*)
       NIGHTLY_BUILD=1
       AC_DEFINE(NIGHTLY_BUILD)
       ;;
-  *a*)
-      ;;
   *)
       RELEASE_BUILD=1
       AC_DEFINE(RELEASE_BUILD)
@@ -3257,14 +3254,10 @@ fi
 dnl ========================================================
 dnl = Use exact stack rooting for GC
 dnl ========================================================
-dnl Use exact rooting by default in all shell builds. The top-level mozilla
-dnl configure.in will configure SpiderMonkey with --disable-exact-rooting as
-dnl needed on a per-platform basis.
-JSGC_USE_EXACT_ROOTING=1
 MOZ_ARG_DISABLE_BOOL(exact-rooting,
-[  --disable-exact-rooting  Enable use of conservative stack scanning for GC],
-    JSGC_USE_EXACT_ROOTING= ,
-    JSGC_USE_EXACT_ROOTING=1 )
+[  --enable-exact-rooting   Enable use of conservative stack scanning for GC],
+    JSGC_USE_EXACT_ROOTING=1 ,
+    JSGC_USE_EXACT_ROOTING= )
 if test -n "$JSGC_USE_EXACT_ROOTING"; then
     AC_DEFINE(JSGC_USE_EXACT_ROOTING)
 fi