| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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/android/config.gni") |
| 6 import("//build/config/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") |
| 7 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") |
| 8 import("//build/config/nacl/config.gni") | 8 import("//build/config/nacl/config.gni") |
| 9 import("//build/toolchain/cc_wrapper.gni") | 9 import("//build/toolchain/cc_wrapper.gni") |
| 10 import("//build/toolchain/toolchain.gni") | 10 import("//build/toolchain/toolchain.gni") |
| (...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 "-mstack-alignment=16", | 721 "-mstack-alignment=16", |
| 722 "-mstackrealign", | 722 "-mstackrealign", |
| 723 ] | 723 ] |
| 724 } | 724 } |
| 725 } | 725 } |
| 726 | 726 |
| 727 config("compiler_arm_fpu") { | 727 config("compiler_arm_fpu") { |
| 728 if (current_cpu == "arm" && !is_ios && !is_nacl) { | 728 if (current_cpu == "arm" && !is_ios && !is_nacl) { |
| 729 cflags = [ "-mfpu=$arm_fpu" ] | 729 cflags = [ "-mfpu=$arm_fpu" ] |
| 730 asmflags = cflags | 730 asmflags = cflags |
| 731 } else if (current_cpu == "arm64" && !is_ios && !is_nacl) { | |
| 732 cflags = [ "-mcpu=$arm_fpu" ] | |
| 733 asmflags = cflags | |
| 734 } | 731 } |
| 735 } | 732 } |
| 736 | 733 |
| 737 # runtime_library ------------------------------------------------------------- | 734 # runtime_library ------------------------------------------------------------- |
| 738 # | 735 # |
| 739 # Sets the runtime library and associated options. | 736 # Sets the runtime library and associated options. |
| 740 # | 737 # |
| 741 # How do you determine what should go in here vs. "compiler" above? Consider if | 738 # How do you determine what should go in here vs. "compiler" above? Consider if |
| 742 # a target might choose to use a different runtime library (ignore for a moment | 739 # a target might choose to use a different runtime library (ignore for a moment |
| 743 # if this is possible or reasonable on your system). If such a target would want | 740 # if this is possible or reasonable on your system). If such a target would want |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1464 | 1461 |
| 1465 if (is_ios || is_mac) { | 1462 if (is_ios || is_mac) { |
| 1466 # On Mac and iOS, this enables support for ARC (automatic ref-counting). | 1463 # On Mac and iOS, this enables support for ARC (automatic ref-counting). |
| 1467 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. | 1464 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. |
| 1468 config("enable_arc") { | 1465 config("enable_arc") { |
| 1469 common_flags = [ "-fobjc-arc" ] | 1466 common_flags = [ "-fobjc-arc" ] |
| 1470 cflags_objc = common_flags | 1467 cflags_objc = common_flags |
| 1471 cflags_objcc = common_flags | 1468 cflags_objcc = common_flags |
| 1472 } | 1469 } |
| 1473 } | 1470 } |
| OLD | NEW |