Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 52a633f4148d5f0ea01fbd67ec807674833624ed..b0b90e029c0217c309376c1fe61ec90d079a2ecd 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -689,6 +689,9 @@ |
'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, |
@@ -1224,6 +1227,7 @@ |
'gomadir%': '<(gomadir)', |
'use_lto%': '<(use_lto)', |
'use_lto_o2%': '<(use_lto_o2)', |
+ 'gold_icf_level%': '<(gold_icf_level)', |
'video_hole%': '<(video_hole)', |
'v8_use_external_startup_data%': '<(v8_use_external_startup_data)', |
'cfi_vptr%': '<(cfi_vptr)', |
@@ -2205,19 +2209,6 @@ |
'use_sanitizer_options%': 1, |
}], |
- # Allowed level of identical code folding in the gold linker. |
- ['OS=="linux" and target_arch=="x64"', { |
- # --icf=safe disables much more folding on x86_64 than elsewhere, see |
- # http://crbug.com/492177. Turning it on saves over 12 MB of binary |
- # size, but it seems to regress cold startup time by over a second |
- # (see http://crbug.com/492809). |
- # TODO(thakis): Check if disabling ICF would inmprove android cold start |
- # times by several seconds too. |
- 'gold_icf_level%': 'safe', |
- }, { |
- 'gold_icf_level%': 'all', |
- }], |
- |
['OS=="linux" and asan==0 and msan==0 and lsan==0 and tsan==0', { |
# PNaCl toolchain Non-SFI build only supports linux OS build. |
# Also, it does not support sanitizers. |