Trying to make the -pie stick for x64 on the main waterfall...

TBR=jeffbailey
Review URL: http://codereview.chromium.org/7206052

git-svn-id: http://src.chromium.org/svn/trunk/src/build@89945 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -1196,11 +1196,15 @@
               # 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=safe',
+                      '-Wl,--icf=none',
                     ]
                   }]
                 ]