From 3fa90e359bf40c35d48faccfefd9a136fc0223ff Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 14 Dec 2023 13:28:26 +0000 Subject: [PATCH] disable conflicting include. --- debian/changelog | 3 +++ js/src/jit/shared/AtomicOperations-shared-jit.cpp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae33cf640ca..12679ff36cc 100644 --- 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 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 df7c049dfac..d580387efdc 100644 --- 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 -- 2.30.2