Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: ld

Issue 9402039: Prevent a possible deadlock in the linker script when using goma. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/gold/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ld
===================================================================
--- ld (revision 120645)
+++ ld (working copy)
@@ -10,8 +10,8 @@
# while this binary will also fail on 64-bit kernels with 32-bit userlands.
base_dir=$(dirname "$0")
-machine=$(gcc -dumpmachine)
-if [ "$machine" = "x86_64-linux-gnu" ]; then
+machine=$(getconf LONG_BIT)
+if [ "$machine" = "64" ]; then
exec $base_dir/gold64 "$@"
else
# Fall back on the ld found in $PATH.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698