disable conflicting include.

diff --git a/debian/changelog b/debian/changelog
index ae33cf640ca1905a8ae8f393168f788e9df8f0de..12679ff36cc52d290b8cd5db548f6b8e7434f989 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ firefox-esr (115.3.0esr-1+rpi1) trixie-staging; urgency=medium
     + Pass disable-jit from debian/rules
     + Nerf jit detection in s/moz.configure
 
+  [changes introduced in 115.3.0esr-1+rpi1 by Peter Michael Green]
+  * Disable conflicting include in js/src/jit/shared/AtomicOperations-shared-jit.cpp
+
  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 09 Nov 2023 17:20:43 +0000
 
 firefox-esr (115.3.0esr-1) unstable; urgency=medium

diff --git a/js/src/jit/shared/AtomicOperations-shared-jit.cpp b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
index df7c049dfac333b5b5a7ea288bdcc25368ac81e4..d580387efdc011003215bf0447fdf6764bdfbd6b 100644 (file)
--- a/js/src/jit/shared/AtomicOperations-shared-jit.cpp
+++ b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
@@ -6,9 +6,9 @@
 
 #include "jit/AtomicOperations.h"
 
-#if defined(__arm__)
-#  include "jit/arm/Architecture-arm.h"
-#endif
+//#if defined(__arm__)
+//#  include "jit/arm/Architecture-arm.h"
+//#endif
 
 #ifdef JS_HAVE_GENERATED_ATOMIC_OPS