Disable jit.

diff --git a/debian/changelog b/debian/changelog
index 8d10fb00d392671650ee6a89ade3e901e404b9e4..03f4905cbc1852db09a84941b595d290cab8bf2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,11 @@ thunderbird (1:102.9.0-1~deb11u1+rpi1) bullseye-staging; urgency=medium
   * Don't build rust code with Clto to avoid out of memory errors.
   * Disable more armv7/neon stuff.
 
+  [changes brought over from firefox-esr 102.2.0esr-1+rpi1 by Peter Michael Green]
+  * Disable jit (or at least try to)
+    + Pass disable-jit from debian/rules
+    + Nerf jit detection in s/moz.configure
+
  -- Raspbian forward porter <root@raspbian.org>  Thu, 30 Mar 2023 12:39:04 +0000
 
 thunderbird (1:102.9.0-1~deb11u1) bullseye-security; urgency=medium

diff --git a/debian/rules b/debian/rules
index c5924a1c4cb6a55333ca147eace9f1c10ec10df1..b6b54995a0f996c6c52264eeb69e6fb487ce4339 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,7 @@ override_dh_auto_configure:
        # space, and b) the linker can't deal with it in the available address
        # space either.
 ifeq (32,$(DEB_BUILD_ARCH_BITS))
-       echo 'ac_add_options --disable-debug-symbols' >> mozconfig.default
+       echo 'ac_add_options --disable-debug-symbols --disable-jit' >> mozconfig.default
 endif
        echo 'mk_add_options MOZ_OBJDIR=$(CURDIR)/obj-thunderbird' >> mozconfig.thunderbird
        echo 'ac_add_options --prefix=$(CURDIR)/debian/tmp/usr' >> mozconfig.default

diff --git a/js/moz.configure b/js/moz.configure
index 7a241cac76d81c25ddd46b901d525f5c39e36b91..a040b58407f94d2c25b6408ce7691a3a0f90621d 100644 (file)
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -154,18 +154,18 @@ set_define("ENABLE_RECORD_TUPLE", enable_record_tuple)
 # =======================================================
 @depends(target, "--enable-record-tuple")
 def jit_default(target, enable_record_tuple):
-    if enable_record_tuple:
-        return False
-    if target.cpu in (
-        "x86",
-        "x86_64",
-        "arm",
-        "aarch64",
-        "mips32",
-        "mips64",
-        "loongarch64",
-    ):
-        return True
+    #if enable_record_tuple:
+    #    return False
+    #if target.cpu in (
+    #    "x86",
+    #    "x86_64",
+    #    "arm",
+    #    "aarch64",
+    #    "mips32",
+    #    "mips64",
+    #    "loongarch64",
+    #):
+    #    return True
     return False