summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 17:34:03 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 17:34:03 +0000
commit9ec6249b011100c855c479142ea690ec0e0eba5a (patch)
tree4ccc930c0b9ff8663183ebb6333e9ac990f0e491 /build
parent3080d01c5089fe14ffa6d58c259aede482dcd0d1 (diff)
downloadchromium_src-9ec6249b011100c855c479142ea690ec0e0eba5a.zip
chromium_src-9ec6249b011100c855c479142ea690ec0e0eba5a.tar.gz
chromium_src-9ec6249b011100c855c479142ea690ec0e0eba5a.tar.bz2
Revert 84802 - Disable ICF for Valgrind/ThreadSanitizer Release builds
With ICF the linker merges identical functions into one block of assembly, which leads to a) wrong symbols for some functions - which is debugger/Valgrind-unfriendly b) all ThreadSanitizer annotations end up being one function which makes TSan crazy. Since we run release code (with -O1 -g) on Valgrind bots, we have to disable ICF if release_valgrind_build!=0. BUG=82114 TEST=linux_tsan trybot goes green Review URL: http://codereview.chromium.org/6991009 TBR=timurrrr@chromium.org Review URL: http://codereview.chromium.org/6995026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 61d711e..48787ec 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1122,7 +1122,7 @@
# 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 and release_valgrind_build==0', {
+ ['LINKER_SUPPORTS_ICF==1', {
'ldflags': [
'-Wl,--icf=safe',
]