Chromium Code Reviews| Index: build/config/arm.gni |
| diff --git a/build/config/arm.gni b/build/config/arm.gni |
| index d16c0d2a3b798168a2931286583aa333e3dea8b4..c7cc18b89be1285784cff76d2e3f14fa1a5c88bd 100644 |
| --- a/build/config/arm.gni |
| +++ b/build/config/arm.gni |
| @@ -2,12 +2,13 @@ |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| +import("//build/config/v8_target_cpu.gni") |
| + |
| # These are primarily relevant in current_cpu == "arm" contexts, where |
| # ARM code is being compiled. But they can also be relevant in the |
| -# host toolchain context when target_cpu == "arm", where a host-side |
| -# build tool being built will change its behavior depending on the |
| -# details of the target configuration. |
| -if (target_cpu == "arm" || current_cpu == "arm") { |
| +# other contexts when the code will change its behavior based on the |
| +# cpu it wants to generate code for. |
| +if (v8_target_cpu == "arm" || current_cpu == "arm") { |
|
Nico
2016/06/16 08:17:28
ubernit: maybe swap the operands to || to match th
Dirk Pranke
2016/06/16 17:35:05
Acknowledged.
|
| declare_args() { |
| # Version of the ARM processor when compiling on ARM. Ignored on non-ARM |
| # platforms. |
| @@ -86,7 +87,7 @@ if (target_cpu == "arm" || current_cpu == "arm") { |
| arm_fpu = "vfpv3-d16" |
| } |
| } |
| -} else if (current_cpu == "arm64" || target_cpu == "arm64") { |
| +} else if (current_cpu == "arm64" || v8_target_cpu == "arm64") { |
|
Michael Achenbach
2016/06/16 07:49:55
ocd nit: maybe turn the conditions around like for
Dirk Pranke
2016/06/16 17:35:05
Ack.
|
| # arm64 supports only "hard". |
| arm_float_abi = "hard" |
| arm_use_neon = true |