Split linux_use_gold_binary into linux_use_bundled_gold and linux_use_bundled_binutils.

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 714 matching lines @@
         }, {
           'enable_plugin_installation%': 1,
         }],
 
         ['OS=="android" or OS=="ios" or embedded==1', {
           'enable_plugins%': 0,
         }, {
           '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.
         # On by default for x64 Linux.  Temporarily off for ChromeOS as
         # it failed on a buildbot.
         ['OS=="linux" and target_arch=="x64" and chromeos==0', {
           'linux_use_gold_flags%': 1,
         }, {
           'linux_use_gold_flags%': 0,
         }],
@@ skipping 237 matching lines @@
     'clang_type_profiler%': '<(clang_type_profiler)',
     'order_profiling%': '<(order_profiling)',
     'order_text_section%': '<(order_text_section)',
     'enable_extensions%': '<(enable_extensions)',
     'enable_plugin_installation%': '<(enable_plugin_installation)',
     'enable_plugins%': '<(enable_plugins)',
     'enable_session_service%': '<(enable_session_service)',
     '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)',
     'test_isolation_outdir%': '<(test_isolation_outdir)',
     'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)',
     'enable_printing%': '<(enable_printing)',
     'enable_spellcheck%': '<(enable_spellcheck)',
     'enable_google_now%': '<(enable_google_now)',
     'cld_version%': '<(cld_version)',
     'cld2_table_size%': '<(cld2_table_size)',
@@ skipping 347 matching lines @@
           # compiler_version works with clang.
           # TODO(glider): set clang to 1 earlier for ASan and TSan builds so
           # that it takes effect here.
           ['clang==0 and asan==0 and lsan==0 and tsan==0 and msan==0', {
             'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)',
           }],
           # On Android we know the binutils version in the toolchain.
           ['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',
-              }],
-            ],
           }],
         ],
       }, {
         'binutils_version%': 0,
       }],
       # The version of GCC in use, set later in platforms that use GCC and have
       # not explicitly chosen to build with clang. Currently, this means all
       # platforms except Windows, Mac and iOS.
       # TODO(glider): set clang to 1 earlier for ASan and TSan builds so that
       # it takes effect here.
@@ skipping 2430 matching lines @@
                   # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant"
                   '-finstrument-functions-exclude-file-list=arm_neon.h',
                 ],
               }],
             ],
           }],
           ['linux_dump_symbols==1', {
             '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': [
                       # Workarounds for linker OOM.
                       '-Wl,--no-keep-memory',
                       '-Wl,--reduce-memory-overheads',
                     ],
                   }],
                 ],
               }],
@@ skipping 42 matching lines @@
               ['gcc_version>=48', {
                 'cflags': [
                   '-fuse-ld=gold',
                 ],
                 'ldflags': [
                   '-fuse-ld=gold',
                 ],
               }]
             ],
           }],
-          ['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)',
             ],
           }],
           ['binutils_version>=224', {
             # Newer binutils don't set DT_RPATH unless you disable "new" dtags
             # and the new DT_RUNPATH doesn't work without --no-as-needed flag.
             # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags
             # inside this file to allow usage of --no-as-needed and removal of
             # this flag.
@@ skipping 1318 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }