Bug 1146520 - Fix some minor autospider issues on OS X. r=sfink

--HG--
extra : rebase_source : a4c8dcd1c8dd4030bbf4d701d8b2ac4ea4c70b5a

js/src/devtools/automation/autospider.sh

@@ -45,7 +45,7 @@ if [ ! -f "$ABSDIR/variants/$VARIANT" ]; then
     exit 1
 fi
 
-(cd "$SOURCE/js/src"; autoconf-2.13 || autoconf2.13)
+(cd "$SOURCE/js/src"; autoconf-2.13 || autoconf2.13 || autoconf213)
 
 TRY_OVERRIDE=$SOURCE/js/src/config.try
 if [ -r $TRY_OVERRIDE ]; then
@@ -70,6 +70,9 @@ USE_64BIT=false
 
 if [[ "$OSTYPE" == darwin* ]]; then
   USE_64BIT=true
+  if [ "$VARIANT" = "arm-sim-osx" ]; then
+    USE_64BIT=false
+  fi
 elif [ "$OSTYPE" = "linux-gnu" ]; then
   if [ -n "$AUTOMATION" ]; then
       GCCDIR="${GCCDIR:-/tools/gcc-4.7.2-0moz1}"

js/src/devtools/automation/variants/arm-sim

@@ -2,7 +2,6 @@
 --enable-debug
 --enable-stdcxx-compat
 --disable-shared-js
---enable-threadsafe
 --enable-arm-simulator
 --target=i686-pc-linux
 --host=i686-pc-linux

js/src/devtools/automation/variants/arm-sim-osx

@@ -0,0 +1,6 @@
+--enable-optimize
+--enable-debug
+--enable-stdcxx-compat
+--disable-shared-js
+--enable-arm-simulator
+--target=i686-apple-darwin10.0.0