From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 20 Sep 2022 21:54:38 +0000 (+0000)
Subject: Disable jit.
X-Git-Tag: archive/raspbian/102.2.0esr-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e351c33a6ff4b5d2ff37573db2b0b8e6df0a0b8a;p=firefox-esr.git

Disable jit.
---

diff --git a/debian/changelog b/debian/changelog
index 7d29d0d81d2..787c38b1c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,14 @@ firefox-esr (102.2.0esr-1+rpi1) bookworm-staging; urgency=medium
     definitions error.
 
   [changes brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green]
-   * Disable more armv7/neon stuff.
+  * Disable more armv7/neon stuff.
+
+  [changes introduced in 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
+    + Disable arm atomics (which require armv7) in js/src/jit/GenerateAtomicOperations.py
+    + Remove architecture restrictions in jit/shared/AtomicOperations-feeling-lucky-gcc.h
 
  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 16 Sep 2022 18:44:17 +0000
 
diff --git a/debian/rules b/debian/rules
index 6a4d868ea1f..03b9475d17d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,9 +148,9 @@ ifeq (default,$(origin CXX))
 CXX := g++
 endif
 
-ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
+#ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
 CONFIGURE_FLAGS += --disable-jit
-endif
+#endif
 
 CXXFLAGS = $(CFLAGS)
 RUSTFLAGS = --remap-path-prefix=$(CURDIR)=.
diff --git a/js/moz.configure b/js/moz.configure
index 7a241cac76d..a040b58407f 100644
--- 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
 
 
diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
index d8a38a0bbbc..63878e99a74 100644
--- a/js/src/jit/GenerateAtomicOperations.py
+++ b/js/src/jit/GenerateAtomicOperations.py
@@ -32,13 +32,13 @@ def gen_seqcst(fun_name):
             }""" % {
             "fun_name": fun_name,
         }
-    if cpu_arch == "arm":
-        return r"""
-            INLINE_ATTR void %(fun_name)s() {
-                asm volatile ("dmb sy\n\t" ::: "memory");
-            }""" % {
-            "fun_name": fun_name,
-        }
+    #if cpu_arch == "arm":
+    #    return r"""
+    #        INLINE_ATTR void %(fun_name)s() {
+    #            asm volatile ("dmb sy\n\t" ::: "memory");
+    #        }""" % {
+    #        "fun_name": fun_name,
+    #    }
     raise Exception("Unexpected arch")
 
 
@@ -721,7 +721,7 @@ namespace jit {
 
 def generate_atomics_header(c_out):
     contents = ""
-    if cpu_arch in ("x86", "x86_64", "arm", "aarch64"):
+    if cpu_arch in ("x86", "x86_64", "aarch64"):
         contents += "#define JS_HAVE_GENERATED_ATOMIC_OPS 1"
 
         # `fence` performs a full memory barrier.
diff --git a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h
index 2e384337a31..e532d8813dc 100644
--- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h
+++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h
@@ -30,10 +30,10 @@
 
 // Explicitly exclude tier-1 platforms.
 
-#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \
-     defined(_M_IX86) || defined(__arm__) || defined(__aarch64__))
-#  error "Do not use on a tier-1 platform where inline assembly is available"
-#endif
+//#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \
+//     defined(_M_IX86) || defined(__arm__) || defined(__aarch64__))
+//#  error "Do not use on a tier-1 platform where inline assembly is available"
+//#endif
 
 #if !(defined(__clang__) || defined(__GNUC__))
 #  error "This file only for gcc/Clang"