From ffa0c4d8646c4975ef2f738e3e54a84240d34ce4 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Fri, 7 Jul 2023 17:38:09 -0500 Subject: [PATCH] No Issue - Fix debug builds on ARM Mac. mach_override used by the IO Poisoner used in debug mode is not support on ARM. https://bugzilla.mozilla.org/show_bug.cgi?id=1658385 --- xpcom/build/PoisonIOInterposerMac.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xpcom/build/PoisonIOInterposerMac.cpp b/xpcom/build/PoisonIOInterposerMac.cpp index d76b728ade..d76d6af415 100644 --- a/xpcom/build/PoisonIOInterposerMac.cpp +++ b/xpcom/build/PoisonIOInterposerMac.cpp @@ -4,7 +4,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "PoisonIOInterposer.h" +#ifndef __aarch64__ #include "mach_override.h" +#endif #include "mozilla/ArrayUtils.h" #include "mozilla/Assertions.h" @@ -360,9 +362,11 @@ InitPoisonIOInterposer() if (!d->Function) { continue; } +#ifndef __aarch64__ DebugOnly t = mach_override_ptr(d->Function, d->Wrapper, &d->Buffer); MOZ_ASSERT(t == err_none); +#endif } }