tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use -fno-sanitize-link-runtime for bionic sanitizers" am: 3e7f5c411d am: 8793c78b35

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1975927

Change-Id: I403bd7772ddf309e3c1e0d963ecbdb2a8f2149d9
This commit is contained in:
Treehugger Robot 2022-02-08 21:01:00 +00:00 committed by Automerger Merge Worker
commit 0959ae13e7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cc/sanitize.go
View file

@ -705,19 +705,22 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
if len(sanitize.Properties.Sanitizers) > 0 {
sanitizeArg := "-fsanitize=" + strings.Join(sanitize.Properties.Sanitizers, ",")
flags.Local.CFlags = append(flags.Local.CFlags, sanitizeArg)
flags.Local.AsFlags = append(flags.Local.AsFlags, sanitizeArg)
if ctx.Host() {
flags.Local.LdFlags = append(flags.Local.LdFlags, sanitizeArg)
if ctx.toolchain().Bionic() {
// Bionic sanitizer runtimes have already been added as dependencies so that
// the right variant of the runtime will be used (with the "-android"
// suffix), so don't let clang the runtime library.
flags.Local.LdFlags = append(flags.Local.LdFlags, "-fno-sanitize-link-runtime")
} else {
// Host sanitizers only link symbols in the final executable, so
// there will always be undefined symbols in intermediate libraries.
_, flags.Global.LdFlags = removeFromList("-Wl,--no-undefined", flags.Global.LdFlags)
flags.Local.LdFlags = append(flags.Local.LdFlags, sanitizeArg)
// non-Bionic toolchain prebuilts are missing UBSan's vptr and function sanitizers
if !ctx.toolchain().Bionic() {
flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=vptr,function")
}
// non-Bionic toolchain prebuilts are missing UBSan's vptr and function san
flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=vptr,function")
}
if enableMinimalRuntime(sanitize) {