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

Unified Diff: build/config/compiler/BUILD.gn

Issue 1925843002: Make the GN build flag 'use_lld' usable on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move use_lld flag to build/toolchain/toolchain.gni Created 4 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/toolchain/toolchain.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 3ee4412ed255fbde3e0b94f81b767bd353851eac..ae65d4ea9055333042d7e73d4a5aac6d3d6ca1e0 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -48,7 +48,8 @@ declare_args() {
# TODO(GYP): We should be using 64-bit gold for linking on both 64-bit Linux
# and 32-bit linux; 32-bit Gold runs out of address-space on 32-bit builds.
# However, something isn't quite working right on the 32-bit builds.
- use_gold = is_linux && (current_cpu == "x64" || current_cpu == "arm")
+ use_gold =
+ is_linux && (current_cpu == "x64" || current_cpu == "arm") && !use_lld
# When we are going to use gold we need to find it.
# This is initialized below, after use_gold might have been overridden.
@@ -292,7 +293,9 @@ config("compiler") {
# Linux-specific compiler flags setup.
# ------------------------------------
- if (use_gold) {
+ if (is_posix && use_lld) {
+ ldflags += [ "-fuse-ld=lld" ]
+ } else if (use_gold) {
ldflags += [
"-B$gold_path",
@@ -316,11 +319,6 @@ config("compiler") {
ldflags += [ "-Wl,--gdb-index" ]
}
- if (!using_sanitizer && !(is_android && use_order_profiling)) {
- # TODO(brettw) common.gypi has this only for target toolset.
- ldflags += [ "-Wl,--icf=all" ]
- }
-
# TODO(thestig): Make this flag work with GN.
#if (!is_official_build && !is_chromeos && !(is_asan || is_lsan || is_tsan || is_msan)) {
# ldflags += [
@@ -333,6 +331,11 @@ config("compiler") {
ldflags += [ "-fuse-ld=bfd" ]
}
+ if (is_posix && (use_gold || use_lld) && !using_sanitizer &&
+ !(is_android && use_order_profiling)) {
+ ldflags += [ "-Wl,--icf=all" ]
+ }
+
if (linux_use_bundled_binutils) {
cflags += [ "-B$binutils_path" ]
}
@@ -413,7 +416,11 @@ config("compiler") {
# Apply a lower LTO optimization level as the default is too slow.
if (is_linux) {
- ldflags += [ "-Wl,-plugin-opt,O1" ]
+ if (use_lld) {
+ ldflags += [ "-Wl,--lto-O1" ]
+ } else {
+ ldflags += [ "-Wl,-plugin-opt,O1" ]
+ }
} else if (is_mac) {
ldflags += [ "-Wl,-mllvm,-O1" ]
}
« no previous file with comments | « no previous file | build/toolchain/toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698