Use --disable-ion on all ARM and B2G builds (bug 789373, r=aki).

2012-09-10 16:14:07 -07:00 · 2012-09-10 16:14:07 -07:00 · 9390a2d224
--- a/b2g/config/mozconfigs/linux32_gecko/nightly
+++ b/b2g/config/mozconfigs/linux32_gecko/nightly
@ -11,6 +11,9 @@ ac_add_options --enable-signmar
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.
--- a/b2g/config/mozconfigs/linux64_gecko/nightly
+++ b/b2g/config/mozconfigs/linux64_gecko/nightly
@ -11,6 +11,9 @@ ac_add_options --enable-js-diagnostics
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.
--- a/b2g/config/mozconfigs/macosx64_gecko/nightly
+++ b/b2g/config/mozconfigs/macosx64_gecko/nightly
@ -8,6 +8,9 @@ ac_add_options --enable-signmar
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

--- a/b2g/config/mozconfigs/win32_gecko/nightly
+++ b/b2g/config/mozconfigs/win32_gecko/nightly
@ -11,6 +11,9 @@ ac_add_options --enable-signmar
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@ -14,6 +14,9 @@ ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@ -22,6 +22,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1

--- a/mobile/android/config/mozconfigs/android-x86/l10n-release
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-release
@ -18,6 +18,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1

--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@ -14,6 +14,9 @@ ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android-x86/release
+++ b/mobile/android/config/mozconfigs/android-x86/release
@ -15,6 +15,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android/debug
+++ b/mobile/android/config/mozconfigs/android/debug
@ -14,6 +14,9 @@ ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
 ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@ -22,6 +22,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1

--- a/mobile/android/config/mozconfigs/android/l10n-release
+++ b/mobile/android/config/mozconfigs/android/l10n-release
@ -18,6 +18,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1

--- a/mobile/android/config/mozconfigs/android/nightly
+++ b/mobile/android/config/mozconfigs/android/nightly
@ -14,6 +14,9 @@ ac_add_options --with-android-version=5
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
--- a/mobile/android/config/mozconfigs/android/release
+++ b/mobile/android/config/mozconfigs/android/release
@ -15,6 +15,9 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}

+# IonMonkey disabled in bug 789373
+ac_add_options --disable-ion
+
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1