diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
| commit | def92d1b8e9d373e2f6f27c366d578d97d8960c6 (patch) | |
| tree | 2ef34b9ad8bb9a9220e05d60352558b15f513894 /xpcom/build/PoisonIOInterposerMac.cpp | |
| parent | Adding debian version 125.0.3-1. (diff) | |
| download | firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.tar.xz firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom/build/PoisonIOInterposerMac.cpp')
| -rw-r--r-- | xpcom/build/PoisonIOInterposerMac.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xpcom/build/PoisonIOInterposerMac.cpp b/xpcom/build/PoisonIOInterposerMac.cpp index 21eca58757..46dc751221 100644 --- a/xpcom/build/PoisonIOInterposerMac.cpp +++ b/xpcom/build/PoisonIOInterposerMac.cpp @@ -328,10 +328,17 @@ void InitPoisonIOInterposer() { if (!d->Function) { continue; } + + // Disable the interposer on arm64 until there's + // a mach_override_ptr implementation. #ifndef __aarch64__ + // Temporarily disable the interposer on macOS x64 + // while dynamic code disablement rides the trains. +# ifdef MOZ_INTERPOSER_FORCE_MACOS_X64 DebugOnly<mach_error_t> t = mach_override_ptr(d->Function, d->Wrapper, &d->Buffer); MOZ_ASSERT(t == err_none); +# endif // MOZ_INTERPOSER_FORCE_MACOS_X64 #endif } } |