Revert 121068 - linux: add a use_gold flag that defaults to on

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 121163)
+++ build/common.gypi	(working copy)
@@ -387,16 +387,12 @@
           'enable_plugin_installation%': 1,
         }],
 
-        # linux_use_gold_binary: whether to use the binary checked into
-        # third_party/gold.
-        # linux_use_gold_flags: whether to use build flags that rely on gold.
+        # Set to 0 to not use third_party/gold as the linker.
         # On by default for x64 Linux.
         ['host_arch=="x64"', {
           'linux_use_gold_binary%': 1,
-          'linux_use_gold_flags%': 1,
         }, {
           'linux_use_gold_binary%': 0,
-          'linux_use_gold_flags%': 0,
         }],
 
         # Enable canvas_skia_skia.cc incrementally on different platforms.
@@ -464,7 +460,6 @@
     'enable_web_intents_tag%': '<(enable_web_intents_tag)',
     'enable_plugin_installation%': '<(enable_plugin_installation)',
     'linux_use_gold_binary%': '<(linux_use_gold_binary)',
-    'linux_use_gold_flags%': '<(linux_use_gold_flags)',
     'use_canvas_skia_skia%': '<(use_canvas_skia_skia)',
     # Whether to build for Wayland display server
     'use_wayland%': 0,
@@ -636,8 +631,6 @@
     # whether warnings are treated as errors.
     'chromium_code%': 0,
 
-    'release_valgrind_build%': 0,
-
     # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600
     'enable_wexit_time_destructors%': 0,
 
@@ -1009,9 +1002,8 @@
 
       'release_extra_cflags%': '',
       'debug_extra_cflags%': '',
+      'release_valgrind_build%': 0,
 
-      'release_valgrind_build%': '<(release_valgrind_build)',
-
       # the non-qualified versions are widely assumed to be *nix-only
       'win_release_extra_cflags%': '',
       'win_debug_extra_cflags%': '',
@@ -1733,7 +1725,23 @@
                   '-g',
                 ],
               }],
-            ],
+              # At gyp time, we test the linker for ICF support; this flag
+              # is then provided to us by gyp.  (Currently only gold supports
+              # an --icf flag.)
+              # There seems to be a conflict of --icf and -pie in gold which
+              # can generate crashy binaries. As a security measure, -pie
+              # takes precendence for now.
+              ['LINKER_SUPPORTS_ICF==1 and release_valgrind_build==0', {
+                'target_conditions': [
+                  ['_toolset=="target"', {
+                    'ldflags': [
+                      #'-Wl,--icf=safe',
+                      '-Wl,--icf=none',
+                    ]
+                  }]
+                ]
+              }],
+            ]
           },
         },
         'variants': {
@@ -1999,24 +2007,6 @@
             'defines': ['KEEP_SHADOW_STACKS'],
             'cflags': ['-finstrument-functions'],
           }],
-          ['linux_use_gold_flags==1', {
-            'conditions': [
-              ['release_valgrind_build==0', {
-                'target_conditions': [
-                  ['_toolset=="target"', {
-                    'ldflags': [
-                      # There seems to be a conflict of --icf and -pie
-                      # in gold which can generate crashy binaries. As
-                      # a security measure, -pie takes precendence for
-                      # now.
-                      #'-Wl,--icf=safe',
-                      '-Wl,--icf=none',
-                    ],
-                  }],
-                ],
-              }],
-            ],
-          }],
           ['linux_use_gold_binary==1', {
             'variables': {
               # We pass the path to gold to the compiler.  gyp leaves