Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 30d801789d8a36aeab008f75aeedea2afacebe79..3598e65d5c1adbd9beaad175ff04b69f084d9557 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -356,16 +356,11 @@ config("compiler") { |
if (is_posix && (use_gold || (use_lld && !is_nacl)) && !using_sanitizer && |
!(is_android && use_order_profiling)) { |
- # TODO(crbug.com/576197) - gcc on x86 platforms + gold + icf=all |
- # doesn't currently work. Once it does, use icf=all everywhere. |
- # Additionally, on Android x86 --icf=safe seems to cause issues as well. |
- # Additionally, on cast Android x86, --icf=all causes issues. |
+ # On cast Android x86, --icf=all causes issues. |
if (is_android && current_cpu == "x86") { |
ldflags += [ "-Wl,--icf=none" ] |
- } else if (is_clang || (current_cpu != "x86" && current_cpu != "x64")) { |
+ } else { |
Dirk Pranke
2016/07/15 21:08:42
won't this still break linux/gcc x86? From my read
stevenjb
2016/07/15 21:12:07
I didn't read through all of it, I assumed that si
llozano
2016/07/15 21:12:27
this has been in use by chromeos for a while but i
Dirk Pranke
2016/07/15 21:30:05
I agree that we should update the comment, possibl
stevenjb
2016/07/15 21:36:49
So, I don't really understand the problem or the s
|
ldflags += [ "-Wl,--icf=all" ] |
- } else if (!is_android) { |
- ldflags += [ "-Wl,--icf=safe" ] |
} |
} |