Linux: Fix 32-bit build fails with ld.gold: internal error in get_section_contents, at icf.cc:467 (issue #2256)

This commit is contained in:
Marshall Greenblatt
2017-09-12 13:18:00 -04:00
parent b9a2143541
commit 1ec346dc4b
2 changed files with 17 additions and 0 deletions

View File

@@ -1,3 +1,16 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index b5d6d8fdb443..3cb6a0a719c2 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -406,7 +406,7 @@ config("compiler") {
# chromeos binutils has been patched with the fix, so always use icf there.
# The bug only affects x86 and x64, so we can still use ICF when targeting
# other architectures.
- if ((!is_android && linux_use_bundled_binutils) || is_chromeos ||
+ if ((!is_android && linux_use_bundled_binutils && current_cpu != "x86") || is_chromeos ||
!(current_cpu == "x86" || current_cpu == "x64")) {
ldflags += [ "-Wl,--icf=all" ]
}
diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc
index a38c6b806be7..bb4fa59d7612 100644
--- chrome/browser/ui/libgtkui/gtk_ui.cc