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

Merge \"Support global and local sanitizers\"

Browse Source 
am: 2c4841800e

Change-Id: Id0482e0866f235ea97320e66ef5f62cc0a38336d
This commit is contained in:
Colin Cross
2016-07-15 21:27:26 +00:00
committed by android-build-merger
parent 9e6655f84b 2c4841800e
commit 19d8d566c3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/sanitize.go
View File

@@ -170,10 +170,12 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps {
} }
if ctx.Device() { if ctx.Device() {
deps.SharedLibs = append(deps.SharedLibs, "libdl")
if Bool(sanitize.Properties.Sanitize.Address) { if Bool(sanitize.Properties.Sanitize.Address) {
deps.StaticLibs = append(deps.StaticLibs, "libasan") deps.StaticLibs = append(deps.StaticLibs, "libasan")
} }
if Bool(sanitize.Properties.Sanitize.Address) || Bool(sanitize.Properties.Sanitize.Thread) {
deps.SharedLibs = append(deps.SharedLibs, "libdl")
}
} }
return deps return deps
@@ -274,8 +276,9 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
flags.LdFlags = append(flags.LdFlags, sanitizeArg) flags.LdFlags = append(flags.LdFlags, sanitizeArg)
flags.LdFlags = append(flags.LdFlags, "-lrt", "-ldl") flags.LdFlags = append(flags.LdFlags, "-lrt", "-ldl")
} else { } else {
if !Bool(sanitize.Properties.Sanitize.Address) { flags.CFlags = append(flags.CFlags, "-fsanitize-trap=all", "-ftrap-function=abort")
flags.CFlags = append(flags.CFlags, "-fsanitize-trap=all", "-ftrap-function=abort") if Bool(sanitize.Properties.Sanitize.Address) || Bool(sanitize.Properties.Sanitize.Thread) {
flags.CFlags = append(flags.CFlags, "-fno-sanitize-trap=address,thread")
} }
} }
} }