From 2c50d79c91f48e2f2695e625f11d21bee28a00f6 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 20 Aug 2018 17:22:44 -0400
Subject: [PATCH] Bug 1481864 - disable the sandbox on aarch64 windows by
 default; r=gps

The Chromium sandbox doesn't have the necessary arch-specific support.
---
 old-configure.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/old-configure.in b/old-configure.in
index 2f25f74cacac..4b0660a41a8f 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -3099,6 +3099,13 @@ if test -n "$MOZ_TSAN" -o -n "$MOZ_ASAN"; then
     esac
 fi
 
+case "$OS_TARGET:$CPU_ARCH" in
+WINNT:aarch64)
+    # No sandbox support on AArch64 Windows.
+    MOZ_SANDBOX=
+    ;;
+esac
+
 MOZ_ARG_DISABLE_BOOL(sandbox,
 [  --disable-sandbox        Disable sandboxing support],
     MOZ_SANDBOX=,