diff options
| author | thakis <thakis@chromium.org> | 2015-12-09 07:38:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-09 15:39:21 +0000 |
| commit | 94ba71d936b63c60eb6b24a1268af559f05d503b (patch) | |
| tree | c0ff585513072219d8a259756e48ad133651ea0a /build | |
| parent | 1be865f6b9edf39aaeba57750b33abc305f8ae0e (diff) | |
| download | chromium_src-94ba71d936b63c60eb6b24a1268af559f05d503b.zip chromium_src-94ba71d936b63c60eb6b24a1268af559f05d503b.tar.gz chromium_src-94ba71d936b63c60eb6b24a1268af559f05d503b.tar.bz2 | |
Reland of ll clang 254049:254793 (patchset #1 id:1 of https://codereview.chromium.org/1508403002/ )
Reason for revert:
Should work with CFI reverted.
Original issue's description:
> Revert of roll clang 254049:254793 (patchset #3 id:40001 of https://codereview.chromium.org/1507873002/ )
>
> Reason for revert:
> Speculative revert to see if this fixes link error on 'Google Chrome Linux x64'. Please see first comment on the revert CL for more info.
>
> Original issue's description:
> > roll clang 254049:254793
> >
> > This switches msan to the new ABI.
> >
> > It's also the first roll that used update.py instead of
> > update.sh to build the packages.
> >
> > It also changes package.py to bundle up libstdc++ on linux
> > unconditionally, and removes the --gcc-toolchain flag from
> > it (the auto-downloaded gcc should be good enough;
> > one fewer thing I can get wrong).
> >
> > BUG=565541
> >
> > Committed: https://crrev.com/3c862a1dff6cbe5f693ba788cdc71770d408e7b7
> > Cr-Commit-Position: refs/heads/master@{#363986}
>
> TBR=hans@chromium.org,thakis@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=565541
>
> Committed: https://crrev.com/af4e20d002ee9acc62854db5bd89f2aa14b2d419
> Cr-Commit-Position: refs/heads/master@{#364051}
TBR=hans@chromium.org,engedy@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=565541
Review URL: https://codereview.chromium.org/1514573002
Cr-Commit-Position: refs/heads/master@{#364069}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | build/config/sanitizers/BUILD.gn | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/build/common.gypi b/build/common.gypi index 565dd17..f937328 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4555,13 +4555,9 @@ '-fsanitize=memory', '-fsanitize-memory-track-origins=<(msan_track_origins)', '-fsanitize-blacklist=<(msan_blacklist)', - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - '-fPIC', ], 'ldflags': [ '-fsanitize=memory', - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - '-pie', ], 'defines': [ 'MEMORY_SANITIZER', diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn index 2adab21..193f19a 100644 --- a/build/config/sanitizers/BUILD.gn +++ b/build/config/sanitizers/BUILD.gn @@ -36,12 +36,7 @@ config("sanitizer_options_link_helper") { ldflags += [ "-fsanitize=thread" ] } if (is_msan) { - ldflags += [ - "-fsanitize=memory", - - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - "-pie", - ] + ldflags += [ "-fsanitize=memory" ] } if (is_ubsan) { ldflags += [ "-fsanitize=undefined" ] @@ -144,9 +139,6 @@ config("default_sanitizer_flags") { "-fsanitize=memory", "-fsanitize-memory-track-origins=$msan_track_origins", "-fsanitize-blacklist=$msan_blacklist_path", - - # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589). - "-fPIC", ] } if (is_ubsan) { |