Index: build/config/compiler/compiler.gni |
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni |
index bc0a6e41944b7e68b40489bc0894f710a957d13a..4711cd38181f3436ed6b458bdf6bd9b1f2ff25b1 100644 |
--- a/build/config/compiler/compiler.gni |
+++ b/build/config/compiler/compiler.gni |
@@ -35,11 +35,9 @@ declare_args() { |
} |
declare_args() { |
- # 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. |
use_gold = !use_lld && |
- ((is_linux && (current_cpu == "x64" || current_cpu == "arm")) || |
+ ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || |
+ current_cpu == "arm")) || |
(is_android && (current_cpu == "x86" || current_cpu == "x64" || |
current_cpu == "arm"))) |
} |