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

Side by Side Diff: build/config/compiler/BUILD.gn

Issue 1395573003: Build nacl_helper_nonsfi with GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 1 month 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 | « base/process/BUILD.gn ('k') | build/config/nacl/BUILD.gn » ('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 (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/ccache.gni") 9 import("//build/toolchain/ccache.gni")
10 10
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 "-Wa,-mips64r6", 443 "-Wa,-mips64r6",
444 ] 444 ]
445 ldflags += [ "-mips64r6" ] 445 ldflags += [ "-mips64r6" ]
446 } else if (mips_arch_variant == "r2") { 446 } else if (mips_arch_variant == "r2") {
447 cflags += [ 447 cflags += [
448 "-mips64r2", 448 "-mips64r2",
449 "-Wa,-mips64r2", 449 "-Wa,-mips64r2",
450 ] 450 ]
451 ldflags += [ "-mips64r2" ] 451 ldflags += [ "-mips64r2" ]
452 } 452 }
453 } else if (current_cpu == "pnacl" && is_nacl_nonsfi) {
454 if (target_cpu == "x86" || target_cpu == "x64") {
455 cflags += [
456 "-arch",
457 "x86-32-nonsfi",
458 "--pnacl-bias=x86-32-nonsfi",
459 "--target=i686-unknown-nacl",
460 ]
461 ldflags += [
462 "-arch",
463 "x86-32-nonsfi",
464 "--target=i686-unknown-nacl",
465 ]
466 } else if (target_cpu == "arm") {
467 cflags += [
468 "-arch",
469 "arm-nonsfi",
470 "--pnacl-bias=arm-nonsfi",
471 ]
472 ldflags += [
473 "-arch",
474 "arm-nonsfi",
475 ]
476 }
453 } 477 }
454 } 478 }
455 479
456 asmflags = cflags 480 asmflags = cflags
457 } 481 }
458 482
459 # This provides options to tweak code generation that are necessary 483 # This provides options to tweak code generation that are necessary
460 # for particular Chromium code or for working around particular 484 # for particular Chromium code or for working around particular
461 # compiler bugs (or the combination of the two). 485 # compiler bugs (or the combination of the two).
462 config("compiler_codegen") { 486 config("compiler_codegen") {
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 if (!is_nacl) { 770 if (!is_nacl) {
747 # Flags NaCl (Clang 3.7) does not recognize. 771 # Flags NaCl (Clang 3.7) does not recognize.
748 cflags += [ 772 cflags += [
749 # TODO(thakis): Enable this, crbug.com/507717 773 # TODO(thakis): Enable this, crbug.com/507717
750 "-Wno-shift-negative-value", 774 "-Wno-shift-negative-value",
751 775
752 # TODO(thakis): Consider enabling this? 776 # TODO(thakis): Consider enabling this?
753 "-Wno-bitfield-width", 777 "-Wno-bitfield-width",
754 ] 778 ]
755 } 779 }
780
781 if (is_nacl_nonsfi) {
782 cflags += [
783 # TODO(phosek): Enable after https://codereview.chromium.org/1419373002/
784 # is rolled into Chrome.
785 "-Wno-sign-compare",
786 ]
787 }
756 } 788 }
757 } 789 }
758 790
759 # chromium_code --------------------------------------------------------------- 791 # chromium_code ---------------------------------------------------------------
760 # 792 #
761 # Toggles between higher and lower warnings for code that is (or isn't) 793 # Toggles between higher and lower warnings for code that is (or isn't)
762 # part of Chromium. 794 # part of Chromium.
763 795
764 config("chromium_code") { 796 config("chromium_code") {
765 if (is_win) { 797 if (is_win) {
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 if (symbol_level == 0) { 1210 if (symbol_level == 0) {
1179 configs = [ ":no_symbols" ] 1211 configs = [ ":no_symbols" ]
1180 } else if (symbol_level == 1) { 1212 } else if (symbol_level == 1) {
1181 configs = [ ":minimal_symbols" ] 1213 configs = [ ":minimal_symbols" ]
1182 } else if (symbol_level == 2) { 1214 } else if (symbol_level == 2) {
1183 configs = [ ":symbols" ] 1215 configs = [ ":symbols" ]
1184 } else { 1216 } else {
1185 assert(false) 1217 assert(false)
1186 } 1218 }
1187 } 1219 }
OLDNEW
« no previous file with comments | « base/process/BUILD.gn ('k') | build/config/nacl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698