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

Merge "Switch to clang-r346389." am: 89dbee61ff

Browse source 
am: 644df40b33

Change-Id: I929e08b8da5863abe41a814f06fb3c4400635438
This commit is contained in:
Chih-hung Hsieh 2018-12-05 11:07:26 -08:00 committed by android-build-merger
commit 022595785e
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/config/clang.go
View file

@ -91,7 +91,9 @@ var ClangUnknownLldflags = sorted([]string{
"-Wl,-m,aarch64_elf64_le_vec",
})
var ClangLibToolingUnknownCflags []string = nil
var ClangLibToolingUnknownCflags = sorted([]string{
"-fno-sanitize=implicit-integer-sign-change",
})
func init() {
pctx.StaticVariable("ClangExtraCflags", strings.Join([]string{

4
cc/config/global.go
View file

@ -120,8 +120,8 @@ var (
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r344140b"
ClangDefaultShortVersion = "8.0.4"
ClangDefaultVersion = "clang-r346389"
ClangDefaultShortVersion = "8.0.5"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{

20
cc/sanitize.go
View file

@ -376,6 +376,22 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps {
return deps
}
func toDisableImplicitIntegerChange(flags []string) bool {
// Returns true if any flag is fsanitize*integer, and there is
// no explicit flag about sanitize=implicit-integer-sign-change.
for _, f := range flags {
if strings.Contains(f, "sanitize=implicit-integer-sign-change") {
return false
}
}
for _, f := range flags {
if strings.HasPrefix(f, "-fsanitize") && strings.Contains(f, "integer") {
return true
}
}
return false
}
func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
minimalRuntimeLib := config.UndefinedBehaviorSanitizerMinimalRuntimeLibrary(ctx.toolchain()) + ".a"
minimalRuntimePath := "${config.ClangAsanLibDir}/" + minimalRuntimeLib
@ -533,6 +549,10 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
flags.LdFlags = append(flags.LdFlags, "-Wl,--exclude-libs,"+minimalRuntimeLib)
}
}
// http://b/119329758, Android core does not boot up with this sanitizer yet.
if toDisableImplicitIntegerChange(flags.CFlags) {
flags.CFlags = append(flags.CFlags, "-fno-sanitize=implicit-integer-sign-change")
}
}
if len(diagSanitizers) > 0 {