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 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
778 if (current_cpu == "arm" && arm_use_thumb && is_posix && | 778 if (current_cpu == "arm" && arm_use_thumb && is_posix && |
779 !(is_mac || is_ios || is_nacl)) { | 779 !(is_mac || is_ios || is_nacl)) { |
780 cflags = [ "-mthumb" ] | 780 cflags = [ "-mthumb" ] |
781 if (is_android && !is_clang) { | 781 if (is_android && !is_clang) { |
782 # Clang doesn't support this option. | 782 # Clang doesn't support this option. |
783 cflags += [ "-mthumb-interwork" ] | 783 cflags += [ "-mthumb-interwork" ] |
784 } | 784 } |
785 } | 785 } |
786 } | 786 } |
787 | 787 |
| 788 config("compiler_arm") { |
| 789 if (current_cpu == "arm" && is_chromeos) { |
| 790 # arm is normally the default mode for clang, but on chromeos a wrapper |
| 791 # is used to pass -mthumb, and therefor change the default. |
| 792 cflags = [ "-marm" ] |
| 793 } |
| 794 } |
| 795 |
788 # runtime_library ------------------------------------------------------------- | 796 # runtime_library ------------------------------------------------------------- |
789 # | 797 # |
790 # Sets the runtime library and associated options. | 798 # Sets the runtime library and associated options. |
791 # | 799 # |
792 # How do you determine what should go in here vs. "compiler" above? Consider if | 800 # How do you determine what should go in here vs. "compiler" above? Consider if |
793 # a target might choose to use a different runtime library (ignore for a moment | 801 # a target might choose to use a different runtime library (ignore for a moment |
794 # if this is possible or reasonable on your system). If such a target would want | 802 # if this is possible or reasonable on your system). If such a target would want |
795 # to change or remove your option, put it in the runtime_library config. If a | 803 # to change or remove your option, put it in the runtime_library config. If a |
796 # target wants the option regardless, put it in the compiler config. | 804 # target wants the option regardless, put it in the compiler config. |
797 | 805 |
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1639 | 1647 |
1640 if (is_ios || is_mac) { | 1648 if (is_ios || is_mac) { |
1641 # On Mac and iOS, this enables support for ARC (automatic ref-counting). | 1649 # On Mac and iOS, this enables support for ARC (automatic ref-counting). |
1642 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. | 1650 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. |
1643 config("enable_arc") { | 1651 config("enable_arc") { |
1644 common_flags = [ "-fobjc-arc" ] | 1652 common_flags = [ "-fobjc-arc" ] |
1645 cflags_objc = common_flags | 1653 cflags_objc = common_flags |
1646 cflags_objcc = common_flags | 1654 cflags_objcc = common_flags |
1647 } | 1655 } |
1648 } | 1656 } |
OLD | NEW |