| Index: third_party/boringssl/BUILD.gn
|
| diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
|
| index ef900bce6a8ae8500611ca76c1898d71c349f081..07ae0bd88f4ad97566d13cf9b2e0c3706ab81965 100644
|
| --- a/third_party/boringssl/BUILD.gn
|
| +++ b/third_party/boringssl/BUILD.gn
|
| @@ -3,6 +3,7 @@
|
| # 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")
|
| @@ -65,7 +66,7 @@ if (is_win && !is_msan) {
|
| 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" ]
|
| }
|
|
|