summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-23 23:00:59 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-23 23:00:59 +0000
commitf7fb579275c75f31fd9d8c1a5254ccd5adbf7af6 (patch)
tree3b1c4ef0743246399c0307b8002c74d7ffa00b97
parent52c78823e36eeab5d94023c0144a5bd8f7783d4f (diff)
downloadchromium_src-f7fb579275c75f31fd9d8c1a5254ccd5adbf7af6.zip
chromium_src-f7fb579275c75f31fd9d8c1a5254ccd5adbf7af6.tar.gz
chromium_src-f7fb579275c75f31fd9d8c1a5254ccd5adbf7af6.tar.bz2
Revert "linux: enable PIE (ASLR) for chrome executable"
This reverts commit r86333. Apparently it doesn't work on x64 either. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86358 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_exe.gypi18
1 files changed, 4 insertions, 14 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 602384c..a11d90b 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -194,21 +194,11 @@
],
},
],
- # TODO(rkc): Remove disable_pie (and instead always use
- # -pie) once we have a fix for remote gdb and are able to
- # correctly get section header offsets for pie
- # executables. Currently -pie breaks remote debugging.
+ # TODO(rkc): Remove this once we have a fix for remote gdb
+ # and are able to correctly get section header offsets for
+ # pie executables. Currently -pie breaks remote debugging.
['disable_pie==1', {
- 'ldflags': ['-nopie'],
- }, {
- # Building with -fPIE fails on ARM and ia32 bots.
- # http://code.google.com/p/chromium/issues/detail?id=57908
- # Until that is fixed, at least use it on other platforms.
- 'conditions': [
- ['target_arch!="arm" and target_arch!="ia32"', {
- 'ldflags': ['-pie'],
- }],
- ],
+ 'ldflags' : ['-nopie'],
}],
['use_system_xdg_utils==0', {
'copies': [