Bug 550527 - QEMU segfaults when processing imacro_asm.js. Disabling js shell on versions of sbox that are known to fail. r=jimb

--HG--
extra : rebase_source : fcd4e9aa4f2a2c9af01f764ecf7aff54339b00d8

js/src/Makefile.in

@@ -650,6 +650,7 @@ endif
 
 ifdef GNU_CC
 ifndef CROSS_COMPILE
+ifndef QEMU_CANT_RUN_JS_SHELL
 # If we don't have run-mozilla.sh *and* we're linking against NSPR, we don't
 # know how to run the JS binary. Oh well
 
@@ -699,3 +700,4 @@ update-nanojit:
 endif
 endif
 endif
+endif

js/src/config/autoconf.mk.in

@@ -329,6 +329,8 @@ MOZ_MAPINFO	= @MOZ_MAPINFO@
 WINCE		= @WINCE@
 WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
 
+QEMU_CANT_RUN_JS_SHELL = @QEMU_CANT_RUN_JS_SHELL@
+
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
 NEXT_ROOT	= @NEXT_ROOT@
 GCC_VERSION	= @GCC_VERSION@

js/src/configure.in

@@ -644,6 +644,20 @@ else
     CROSS_COMPILE=
 fi
 
+# Check to see if we are running in a broken QEMU scratchbox.
+# We know that anything below 1.0.16 is broken.
+AC_CHECK_PROGS(SBCONF, sb-conf ve, "")
+if test -n "SBCONF"; then
+    _sb_version=`$SBCONF ve`
+    _sb_version_major=`echo $_sb_version | cut -f1 -d.`
+    _sb_version_minor=`echo $_sb_version | cut -f2 -d.`
+    _sb_version_point=`echo $_sb_version | cut -f3 -d.`
+    if test $_sb_version_major -eq 1 && test $_sb_version_minor -eq 0 && test $_sb_version_point -le 16; then
+        QEMU_CANT_RUN_JS_SHELL=1
+    fi
+fi
+AC_SUBST(QEMU_CANT_RUN_JS_SHELL)
+
 AC_SUBST(_MSC_VER)
 
 AC_SUBST(GNU_AS)