clang/arm: Use integrated assembler for boringssl for arm_version 6.

third_party/boringssl/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
+import("//build/config/arm.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build_overrides/build.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("BUILD.generated.gni")
 import("BUILD.generated_tests.gni")
 
 # Config for us and everybody else depending on BoringSSL.
 config("external_config") {
   include_dirs = [ "src/include" ]
   if (is_component_build) {
@@ skipping 42 matching lines @@
   # This has no sources on some platforms so must be a source_set.
   source_set("boringssl_asm") {
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
 
     defines = [ "BORINGSSL_CLANG_SUPPORTS_DOT_ARCH" ]
     sources = []
     asmflags = []
     include_dirs = [ "src/include" ]
 
     if ((current_cpu == "arm" || current_cpu == "arm64") && is_clang) {
-      if (current_cpu == "arm") {
+      if (current_cpu == "arm" && arm_version != 6) {
         # TODO(hans) Enable integrated-as (crbug.com/124610).
         asmflags += [ "-fno-integrated-as" ]
       }
       if (is_android) {
         rebased_android_toolchain_root =
             rebase_path(android_toolchain_root, root_build_dir)
 
         # Else /usr/bin/as gets picked up.
         asmflags += [ "-B${rebased_android_toolchain_root}/bin" ]
       }
@@ skipping 232 matching lines @@
   fuzzer_test("boringssl_server_no_fuzzer_mode_fuzzer") {
     sources = [
       "src/fuzz/server.cc",
     ]
     deps = [
       ":boringssl_fuzzer_no_fuzzer_mode",
     ]
     seed_corpus = "src/fuzz/server_corpus_no_fuzzer_mode"
   }
 }