Reland r84802 with a fix - Disable ICF for Valgrind/ThreadSanitizer Release builds

build/common.gypi

 # Copyright (c) 2011 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 1067 matching lines @@
           'Release_Base': {
             'variables': {
               'release_optimize%': '2',
               # Binaries become big and gold is unable to perform GC
               # and remove unused sections for some of test targets
               # on 32 bit platform.
               # (This is currently observed only in chromeos valgrind bots)
               # The following flag is to disable --gc-sections linker
               # option for these bots.
               'no_gc_sections%': 0,
+
+              # TODO(bradnelson): reexamine how this is done if we change the
+              # expansion of configurations
+              'release_valgrind_build%': 0,
             },
             'cflags': [
               '-O>(release_optimize)',
               # Don't emit the GCC version ident directives, they just end up
               # in the .comment section taking up binary size.
               '-fno-ident',
               # Put data and code in their own sections, so that unused symbols
               # can be removed at link time with --gc-sections.
               '-fdata-sections',
               '-ffunction-sections',
@@ skipping 17 matching lines @@
               }],
               ['profiling==1', {
                 'cflags': [
                   '-fno-omit-frame-pointer',
                   '-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.)
-              ['LINKER_SUPPORTS_ICF==1', {
+              ['LINKER_SUPPORTS_ICF==1 and release_valgrind_build==0', {
                 'ldflags': [
                   '-Wl,--icf=safe',
                 ]
               }],
             ]
           },
         },
         'variants': {
           'coverage': {
             'cflags': ['-fprofile-arcs', '-ftest-coverage'],
@@ skipping 571 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: