Split linux_use_gold_binary into linux_use_bundled_gold and linux_use_bundled_binutils.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 8e48115a01d20f9fe91015a39b49b502f36dc59e..ef23be351d5ef883e261e5aa4d25024d4c633108 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -732,13 +732,23 @@
           'enable_plugins%': 1,
         }],
 
-        # linux_use_gold_binary: whether to use the binary checked into
+        # linux_use_bundled_gold: whether to use the binary checked into

[Lei Zhang, 2014/04/15 21:40:31]

Since we are here, let's make this a bit clearer. WDYT?

# linux_use_bundled_gold: Whether to use the gold linker binary checked
# into third_party/binutils.
# Force this off via GYP_DEFINES when you are using a custom toolchain
# and need to control -B in ldflags.
# Gold is not used for 32-bit linux builds as it runs out of address 
# space.

[Sam Clegg, 2014/04/15 21:54:55]

Done.

         # third_party/binutils.  Gold is not used for 32-bit linux builds
         # as it runs out of address space.
         ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
-          'linux_use_gold_binary%': 1,
+          'linux_use_bundled_gold%': 1,
         }, {
-          'linux_use_gold_binary%': 0,
+          'linux_use_bundled_gold%': 0,
+        }],
+
+        # linux_use_bundled_binutils: whether to use the binary binutils

[Lei Zhang, 2014/04/15 21:40:31]

Similar to above, mention one can force this off for -B in cflags.

[Sam Clegg, 2014/04/15 21:54:55]

Done.

+        # from third_party/binutils.  These are not multi-arch so cannot
+        # be used except on x86 and x86-64 (the only two achitectures

[Lei Zhang, 2014/04/15 21:40:31]

achitectures -> architectures

[Sam Clegg, 2014/04/15 21:54:55]

Done.

+        # which are currently supplied)
+        ['OS=="linux" and (target_arch=="x64")', {
+          'linux_use_bundled_binutils%': 1,
+        }, {
+          'linux_use_bundled_binutils%': 0,
         }],
 
         # linux_use_gold_flags: whether to use build flags that rely on gold.
@@ -996,7 +1006,8 @@
     'enable_themes%': '<(enable_themes)',
     'enable_autofill_dialog%': '<(enable_autofill_dialog)',
     'enable_background%': '<(enable_background)',
-    'linux_use_gold_binary%': '<(linux_use_gold_binary)',
+    'linux_use_bundled_gold%': '<(linux_use_bundled_gold)',
+    'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)',
     'linux_use_gold_flags%': '<(linux_use_gold_flags)',
     'use_canvas_skia%': '<(use_canvas_skia)',
     'test_isolation_mode%': '<(test_isolation_mode)',
@@ -1364,17 +1375,15 @@
           ['OS=="android"', {
             'binutils_version%': 222,
           }],
+          ['host_arch=="x64"', {

[Lei Zhang, 2014/04/15 21:40:31]

Why set this when linux_use_bundled_binutils=0?

[Sam Clegg, 2014/04/15 21:54:55]

Its needed when linux_use_bundled_binutils=1 or linux_use_bundled_gold=1... 
what me to add the extra conditional?
No harm in having this set is there?

+            'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin',
+          }],
+          ['host_arch=="ia32"', {
+            'binutils_dir%': 'third_party/binutils/Linux_ia32/Release/bin',
+          }],
           # Our version of binutils in third_party/binutils
-          ['linux_use_gold_binary==1', {
+          ['linux_use_bundled_binutils==1', {
             'binutils_version%': 224,
-            'conditions': [
-              ['host_arch=="x64"', {
-                'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin',
-              }],
-              ['host_arch=="ia32"', {
-                'binutils_dir%': 'third_party/binutils/Linux_ia32/Release/bin',
-              }],
-            ],
           }],
         ],
       }, {
@@ -3825,9 +3834,9 @@
             'cflags': [ '-g' ],
             'conditions': [
               # TODO(thestig) We should not need to specify chromeos==0 here,
-              # but somehow ChromeOS uses gold despite linux_use_gold_binary==0.
+              # but somehow ChromeOS uses gold despite linux_use_bundled_gold==0.
               # http://crbug.com./360082
-              ['linux_use_gold_binary==0 and chromeos==0 and OS!="android"', {
+              ['linux_use_bundled_gold==0 and chromeos==0 and OS!="android"', {
                 'target_conditions': [
                   ['_toolset=="target"', {
                     'ldflags': [
@@ -3890,14 +3899,16 @@
               }]
             ],
           }],
-          ['linux_use_gold_binary==1', {
+          ['linux_use_bundled_binutils==1', {
+            'cflags': [
+              '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
+            ],
+          }],
+          ['linux_use_bundled_gold==1', {
 	    # Put our binutils, which contains gold in the search path. We pass
 	    # the path to gold to the compiler. gyp leaves unspecified what the
 	    # cwd is when running the compiler, so the normal gyp path-munging
 	    # fails us. This hack gets the right path.
-            'cflags': [
-              '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
-            ],
             'ldflags': [
               '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
             ],