diff options
| author | Peter Collingbourne <pcc@google.com> | 2019-03-06 10:38:48 -0800 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2019-03-06 10:48:36 -0800 |
| commit | bd19db0da667ebde8f8425ba51d81dc7c13ad3ee (patch) | |
| tree | 0a69972be832b643694ff3943ba3fbe55db29323 /cc | |
| parent | 7aa5a56bbc66180d15fdd68245b591229344d835 (diff) | |
| download | build_soong-bd19db0da667ebde8f8425ba51d81dc7c13ad3ee.tar.gz build_soong-bd19db0da667ebde8f8425ba51d81dc7c13ad3ee.tar.bz2 build_soong-bd19db0da667ebde8f8425ba51d81dc7c13ad3ee.zip | |
Remove workarounds for old compiler versions.
LLVM r349610 was released, so these workarounds are no longer required.
Bug: 112907825
Change-Id: Ia6ba0034881f2ab657d8420df3047c21757c7d9b
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/sanitize.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index 72977183..e6df44f3 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -50,12 +50,7 @@ var ( intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"} - // Pass -Xclang before -fsanitize-minimal-runtime to work around a driver - // check which rejects -fsanitize-minimal-runtime together with - // -fsanitize=shadow-call-stack even though this combination of flags - // is valid. - // TODO(pcc): Remove the -Xclang once LLVM r346526 is rolled into the compiler. - minimalRuntimeFlags = []string{"-Xclang", "-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined", + minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined", "-fno-sanitize-recover=integer,undefined"} hwasanGlobalOptions = []string{"heap_history_size=1023,stack_history_size=512"} ) @@ -312,10 +307,7 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { } // SCS is only implemented on AArch64. - // We also disable SCS if ASAN, TSAN or HWASAN are enabled because Clang considers - // them to be incompatible, although they are in fact compatible. - // TODO(pcc): Remove these checks once r347282 is rolled into the compiler. - if ctx.Arch().ArchType != android.Arm64 || Bool(s.Address) || Bool(s.Thread) || Bool(s.Hwaddress) { + if ctx.Arch().ArchType != android.Arm64 { s.Scs = nil } |