From e73a3d4f4778a902223698addb8564a04fc28cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <oleavr@gmail.com>
Date: Sun, 15 Nov 2020 18:02:32 +0100
Subject: [PATCH] [arm64] Allow cross-compiling arm64 -> arm

---
 gni/snapshot_toolchain.gni | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gni/snapshot_toolchain.gni b/gni/snapshot_toolchain.gni
index b5fb1823b38..5a3c5a09d62 100644
--- a/gni/snapshot_toolchain.gni
+++ b/gni/snapshot_toolchain.gni
@@ -101,6 +101,12 @@ if (v8_snapshot_toolchain == "") {
       # cross compile Windows arm64 with host toolchain.
       v8_snapshot_toolchain = host_toolchain
     }
+  } else if (current_os == host_os && current_cpu == "arm" &&
+             host_cpu == "arm64") {
+    # This is an arm64 -> arm cross-compile, but arm64 hosts can usually run arm
+    # binaries built for the same OS, so build the snapshot with the current
+    # toolchain here, too.
+    v8_snapshot_toolchain = current_toolchain
   }
 }