Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: third_party/boringssl/BUILD.gn

Issue 1484883002: clang/arm: Push -no-integrated-as into the four targets that need it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/config/compiler/BUILD.gn ('k') | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni")
5 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
6 7
7 # Config for us and everybody else depending on BoringSSL. 8 # Config for us and everybody else depending on BoringSSL.
8 config("openssl_config") { 9 config("openssl_config") {
9 defines = [ "OPENSSL_SMALL" ] 10 defines = [ "OPENSSL_SMALL" ]
10 include_dirs = [ "src/include" ] 11 include_dirs = [ "src/include" ]
11 if (is_component_build) { 12 if (is_component_build) {
12 defines += [ "BORINGSSL_SHARED_LIBRARY" ] 13 defines += [ "BORINGSSL_SHARED_LIBRARY" ]
13 } 14 }
14 } 15 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 "//build/config/compiler:no_chromium_code", 61 "//build/config/compiler:no_chromium_code",
61 62
62 # TODO(davidben): Fix size_t truncations in BoringSSL. 63 # TODO(davidben): Fix size_t truncations in BoringSSL.
63 # https://crbug.com/429039 64 # https://crbug.com/429039
64 "//build/config/compiler:no_size_t_to_int_warning", 65 "//build/config/compiler:no_size_t_to_int_warning",
65 ] 66 ]
66 67
67 # Also gets the include dirs from :openssl_config 68 # Also gets the include dirs from :openssl_config
68 include_dirs = [ "src/include" ] 69 include_dirs = [ "src/include" ]
69 70
71 if (current_cpu == "arm" && is_clang) {
72 # TODO(hans) Enable integrated-as (crbug.com/124610).
73 asmflags = [ "-fno-integrated-as" ]
74 if (is_android) {
75 rebased_android_toolchain_root =
76 rebase_path(android_toolchain_root, root_build_dir)
77 # Else /usr/bin/as gets picked up.
78 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ]
79 }
80 }
81
70 if (is_msan) { 82 if (is_msan) {
71 defines += [ "OPENSSL_NO_ASM" ] 83 defines += [ "OPENSSL_NO_ASM" ]
72 } else if (current_cpu == "x64") { 84 } else if (current_cpu == "x64") {
73 if (is_mac || is_ios) { 85 if (is_mac || is_ios) {
74 sources += gypi_values.boringssl_mac_x86_64_sources 86 sources += gypi_values.boringssl_mac_x86_64_sources
75 } else if (is_linux || is_android) { 87 } else if (is_linux || is_android) {
76 sources += gypi_values.boringssl_linux_x86_64_sources 88 sources += gypi_values.boringssl_linux_x86_64_sources
77 } else if (is_win) { 89 } else if (is_win) {
78 deps += [ ":boringssl_asm" ] 90 deps += [ ":boringssl_asm" ]
79 } else { 91 } else {
(...skipping 14 matching lines...) Expand all
94 } else if (current_cpu == "arm64" && (is_linux || is_android)) { 106 } else if (current_cpu == "arm64" && (is_linux || is_android)) {
95 sources += gypi_values.boringssl_linux_aarch64_sources 107 sources += gypi_values.boringssl_linux_aarch64_sources
96 } else { 108 } else {
97 defines += [ "OPENSSL_NO_ASM" ] 109 defines += [ "OPENSSL_NO_ASM" ]
98 } 110 }
99 111
100 if (is_nacl) { 112 if (is_nacl) {
101 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 113 deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
102 } 114 }
103 } 115 }
OLDNEW
« no previous file with comments | « build/config/compiler/BUILD.gn ('k') | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698