StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove workarounds for old compiler versions."

Browse Source
This commit is contained in:
Peter Collingbourne
2019-03-20 16:33:23 +00:00
committed by Gerrit Code Review
parent d62bfe5604 bd19db0da6
commit 1b781e52e2
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/sanitize.go
View File

@@ -50,12 +50,7 @@ var (
intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"} intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"}
// Pass -Xclang before -fsanitize-minimal-runtime to work around a driver minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined",
// 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",
"-fno-sanitize-recover=integer,undefined"} "-fno-sanitize-recover=integer,undefined"}
hwasanGlobalOptions = []string{"heap_history_size=1023,stack_history_size=512"} 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. // SCS is only implemented on AArch64.
// We also disable SCS if ASAN, TSAN or HWASAN are enabled because Clang considers if ctx.Arch().ArchType != android.Arm64 {
// 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) {
s.Scs = nil s.Scs = nil
} }