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

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

Issue 1493753004: GN: Make compiler invocations for Non-SFI ARM NaCl consistent with Gyp build (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 | « no previous file | no next file » | 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 ldflags += [ 550 ldflags += [
551 "-arch", 551 "-arch",
552 "x86-32-nonsfi", 552 "x86-32-nonsfi",
553 "--target=i686-unknown-nacl", 553 "--target=i686-unknown-nacl",
554 ] 554 ]
555 } else if (target_cpu == "arm") { 555 } else if (target_cpu == "arm") {
556 cflags += [ 556 cflags += [
557 "-arch", 557 "-arch",
558 "arm-nonsfi", 558 "arm-nonsfi",
559 "--pnacl-bias=arm-nonsfi", 559 "--pnacl-bias=arm-nonsfi",
560 "--target=arm-unknown-nacl", 560 "--target=armv7-unknown-nacl-gnueabihf",
561 ] 561 ]
562 ldflags += [ 562 ldflags += [
563 "-arch", 563 "-arch",
564 "arm-nonsfi", 564 "arm-nonsfi",
565 "--target=armv7-unknown-nacl-gnueabihf",
565 ] 566 ]
566 } 567 }
567 } 568 }
568 } 569 }
569 570
570 asmflags = cflags 571 asmflags = cflags
571 } 572 }
572 573
573 # This provides options to tweak code generation that are necessary 574 # This provides options to tweak code generation that are necessary
574 # for particular Chromium code or for working around particular 575 # for particular Chromium code or for working around particular
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 if (symbol_level == 0) { 1322 if (symbol_level == 0) {
1322 configs = [ ":no_symbols" ] 1323 configs = [ ":no_symbols" ]
1323 } else if (symbol_level == 1) { 1324 } else if (symbol_level == 1) {
1324 configs = [ ":minimal_symbols" ] 1325 configs = [ ":minimal_symbols" ]
1325 } else if (symbol_level == 2) { 1326 } else if (symbol_level == 2) {
1326 configs = [ ":symbols" ] 1327 configs = [ ":symbols" ]
1327 } else { 1328 } else {
1328 assert(false) 1329 assert(false)
1329 } 1330 }
1330 } 1331 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698