From 90f8aff22b047f012d8e1cb4bfbab26effa1c503 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Tue, 19 May 2020 23:42:14 +0800
Subject: [PATCH] build: Support ARM custom builds

---
 src/build/config/arm.gni           | 2 ++
 src/build/config/compiler/BUILD.gn | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/build/config/arm.gni b/src/build/config/arm.gni
index 29434eba92..7b6e40f8ee 100644
--- a/src/build/config/arm.gni
+++ b/src/build/config/arm.gni
@@ -41,6 +41,8 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
     # Thumb is a reduced instruction set available on some ARM processors that
     # has increased code density.
     arm_use_thumb = true
+
+    arm_cpu = ""
   }
 
   assert(arm_float_abi == "" || arm_float_abi == "hard" ||
diff --git a/src/build/config/compiler/BUILD.gn b/src/build/config/compiler/BUILD.gn
index d6f30d29e6..1973ae65f0 100644
--- a/src/build/config/compiler/BUILD.gn
+++ b/src/build/config/compiler/BUILD.gn
@@ -753,21 +753,23 @@ config("compiler_cpu_abi") {
         ]
       }
     } else if (current_cpu == "arm") {
-      if (is_clang && !is_android && !is_nacl) {
+      if (is_clang && !is_android && !is_nacl && custom_toolchain == "") {
         cflags += [ "--target=arm-linux-gnueabihf" ]
         ldflags += [ "--target=arm-linux-gnueabihf" ]
       }
       if (!is_nacl) {
         cflags += [
           "-march=$arm_arch",
+          "-mcpu=$arm_cpu",
           "-mfloat-abi=$arm_float_abi",
         ]
+        ldflags += [ "-mfloat-abi=$arm_float_abi" ]
       }
       if (arm_tune != "") {
         cflags += [ "-mtune=$arm_tune" ]
       }
     } else if (current_cpu == "arm64") {
-      if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
+      if (is_clang && !is_android && !is_nacl && !is_fuchsia && custom_toolchain == "") {
         cflags += [ "--target=aarch64-linux-gnu" ]
         ldflags += [ "--target=aarch64-linux-gnu" ]
       }