Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index ef9ecb71cc91850f0f4a756a8c9c5753a0fdc1cf..bae43e1046742c0964eb51b7101cb876731b598c 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -689,9 +689,6 @@ |
'use_lto%': 0, |
'use_lto_o2%': 0, |
- # Allowed level of identical code folding in the gold linker. |
- 'gold_icf_level%': 'all', |
- |
# Libxkbcommon usage. |
'use_xkbcommon%': 0, |
@@ -917,14 +914,20 @@ |
# linux_use_bundled_gold: whether to use the gold linker binary checked |
# into third_party/binutils. Force this off via GYP_DEFINES when you |
# are using a custom toolchain and need to control -B in ldflags. |
- # Do not use 32-bit gold on 32-bit hosts as it runs out address space |
- # for component=static_library builds. |
Nico
2016/05/05 16:25:21
This comment is obsolete, we switched to 64-bit ho
|
- ['(OS=="linux" or OS=="android") and (target_arch=="x64" or target_arch=="arm" or (target_arch=="ia32" and host_arch=="x64"))', { |
+ ['(OS=="linux" or OS=="android") and (target_arch=="x64" or target_arch=="arm" or target_arch=="ia32")', { |
'linux_use_bundled_gold%': 1, |
}, { |
'linux_use_bundled_gold%': 0, |
}], |
+ # Allowed level of identical code folding in the gold linker. |
+ # icf=all is buggy on ia32, so disabled by default. |
Nico
2016/05/05 16:25:21
Where is this from? I can't see evidence of this,
|
+ ['(OS=="linux" and (target_arch=="ia32"))', { |
+ 'gold_icf_level%': 'none', |
+ }, { |
+ 'gold_icf_level%': 'all', |
+ }], |
+ |
# linux_use_bundled_binutils: whether to use the binary binutils |
# checked into third_party/binutils. These are not multi-arch so cannot |
# be used except on x86 and x86-64 (the only two architectures which |
@@ -937,8 +940,7 @@ |
}], |
# linux_use_gold_flags: whether to use build flags that rely on gold. |
- # On by default for x64 Linux. |
- ['OS=="linux" and target_arch=="x64"', { |
+ ['OS=="linux" and (target_arch=="x64" or target_arch=="ia32" or target_arch=="arm")', { |
'linux_use_gold_flags%': 1, |
}, { |
'linux_use_gold_flags%': 0, |