3 files changed, 34 insertions, 12 deletions
diff --git a/build/config/arm.gni b/build/config/arm.gni
index d9d2eae..4fd4006 100644
--- a/build/config/arm.gni
+++ b/build/config/arm.gni
@@ -23,11 +23,6 @@ if (current_cpu == "arm") {
 
     # Whether to enable optional NEON code paths.
     arm_optionally_use_neon = false
-
-    if (is_ios) {
-      arm_use_neon = false
-      arm_optionally_use_neon = false
-    }
   }
 
   assert(arm_float_abi == "" || arm_float_abi == "hard" ||
diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn
index af1fbbc..56e101c 100644
--- a/build/config/mac/BUILD.gn
+++ b/build/config/mac/BUILD.gn
@@ -24,16 +24,16 @@ config("compiler") {
       "-arch",
       "i386",
     ]
-  } else if (current_cpu == "arm") {
-    # TODO(GYP): we may need to distinguish between "arm64", "armv7",
-    # and "armv7s" for iOS, and hence need multiple current_cpu values
-    # rather than just "arm".
+  } else if (current_cpu == "armv7" || current_cpu == "arm") {
     common_mac_flags += [
       "-arch",
-      "arm64",
-      "-arch",
       "armv7",
     ]
+  } else if (current_cpu == "arm64") {
+    common_mac_flags += [
+      "-arch",
+      "arm64",
+    ]
   }
 
   asmflags = common_mac_flags
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index 423de77..d198299 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -289,7 +289,6 @@ mac_toolchain("clang_arm") {
 }
 
 mac_toolchain("ios_clang_arm") {
-  # TODO(GYP): Do we need ios_clang_armv7 and ios_clang_arm64 ?
   toolchain_cpu = "arm"
   toolchain_os = "mac"
 
@@ -303,6 +302,34 @@ mac_toolchain("ios_clang_arm") {
   is_clang = true
 }
 
+mac_toolchain("ios_clang_armv7") {
+  toolchain_cpu = "armv7"
+  toolchain_os = "mac"
+
+  # TODO(GYP): We need to support being able to use the version of clang
+  # shipped w/ XCode instead of the one pulled from upstream.
+  prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+                       root_build_dir)
+  cc = "${goma_prefix}$prefix/clang"
+  cxx = "${goma_prefix}$prefix/clang++"
+  ld = cxx
+  is_clang = true
+}
+
+mac_toolchain("ios_clang_arm64") {
+  toolchain_cpu = "arm64"
+  toolchain_os = "mac"
+
+  # TODO(GYP): We need to support being able to use the version of clang
+  # shipped w/ XCode instead of the one pulled from upstream.
+  prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+                       root_build_dir)
+  cc = "${goma_prefix}$prefix/clang"
+  cxx = "${goma_prefix}$prefix/clang++"
+  ld = cxx
+  is_clang = true
+}
+
 mac_toolchain("arm") {
   toolchain_cpu = "arm"
   toolchain_os = "mac"