Make x86 linux use gold by default again after android revert.

The revert of the Android gold change in r393738 also partially
reverted the change to using gold on x86 linux in r393645.

This CL re-lands the x86 linux part.

TBR=mlliu@chromium.org
BUG=590004, 611618,606749
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_chromium_compile_dbg_32_ng,linux_chromium_dbg_32_ng

Review-Url: https://codereview.chromium.org/1985503002
Cr-Original-Commit-Position: refs/heads/master@{#393759}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 665f2abb04029e72a8852a2ecb0959031272ff25
This commit is contained in:
dpranke 2016-05-14 18:24:13 -07:00 коммит произвёл Commit bot
Родитель c48c58d18e
Коммит d4fdf55ba8
1 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -46,11 +46,10 @@ declare_args() {
# Requires profiling to be set to true.
enable_full_stack_frames_for_profiling = false
# TODO: 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.
# Whether to use the gold linker from binutils instead of lld or bfd.
use_gold =
is_linux && (current_cpu == "x64" || current_cpu == "arm") && !use_lld
!use_lld && is_linux &&
(current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm")
# When we are going to use gold we need to find it.
# This is initialized below, after use_gold might have been overridden.