| Index: build/config/compiler/BUILD.gn
|
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
| index 121c73a71f4c556ef2a3acc22f4e1e52d307b74a..5429f9ff2467a2ee38bab7db19e6fa606b3d4627 100644
|
| --- a/build/config/compiler/BUILD.gn
|
| +++ b/build/config/compiler/BUILD.gn
|
| @@ -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.
|
|
|