diff options
| author | vabr <vabr@chromium.org> | 2015-09-18 01:07:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 08:08:24 +0000 |
| commit | d08578ef643313509b6db4400c73b9e8b6c227c9 (patch) | |
| tree | 41de1461ef555637941caa1543be2c3c299f1001 /build | |
| parent | 8e082786591eb26be1b9fce496ffcb19fb01df98 (diff) | |
| download | chromium_src-d08578ef643313509b6db4400c73b9e8b6c227c9.zip chromium_src-d08578ef643313509b6db4400c73b9e8b6c227c9.tar.gz chromium_src-d08578ef643313509b6db4400c73b9e8b6c227c9.tar.bz2 | |
Revert of Turn on -fstack-protector-strong for Clang. (patchset #1 id:1 of https://codereview.chromium.org/1352073002/ )
Reason for revert:
This seems to have broken "sizes" on Linux.
BUG=533294
Original issue's description:
> Turn on -fstack-protector-strong for Clang.
>
> Committed: https://crrev.com/a7b7aab6f62caf1873183afcc4eb59c6812e06b5
> Cr-Commit-Position: refs/heads/master@{#349569}
TBR=thakis@chromium.org,thestig@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1352683004
Cr-Commit-Position: refs/heads/master@{#349630}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/build/common.gypi b/build/common.gypi index 11e81a3..78e8eff 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3679,23 +3679,13 @@ # Chrome OS enables -fstack-protector-strong via its build wrapper, # and we want to avoid overriding this, so stack-protector is only # enabled when not building on Chrome OS. + # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc + # supports it. 'target_defaults': { 'cflags': [ + '-fstack-protector', '--param=ssp-buffer-size=4', ], - 'conditions': [ - ['clang==1', { - 'cflags': [ - '-fstack-protector-strong', - ], - }, { - # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc - # supports it. - 'cflags': [ - '-fstack-protector', - ], - }], - ], }, }], ['os_posix==1 and OS=="linux"', { |