Index: third_party/boringssl/BUILD.gn |
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn |
index 9b9badaa78099f08779fc50bee12906e33e37062..a52007e4ca4406153979ecaf7b48a8b96cfab1db 100644 |
--- a/third_party/boringssl/BUILD.gn |
+++ b/third_party/boringssl/BUILD.gn |
@@ -67,9 +67,9 @@ if (is_win && !is_msan) { |
asmflags = [] |
include_dirs = [ "src/include" ] |
- if (current_cpu == "arm" && is_clang) { |
+ if ((current_cpu == "arm" || current_cpu == "arm64") && is_clang) { |
# TODO(hans) Enable integrated-as (crbug.com/124610). |
- asmflags += [ "-fno-integrated-as" ] |
+ # asmflags += [ "-fno-integrated-as" ] |
if (is_android) { |
rebased_android_toolchain_root = |
rebase_path(android_toolchain_root, root_build_dir) |