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

Merge "Remove Use_clang_lld in lto"

Browse Source
This commit is contained in:
Yi Kong
2023-05-31 00:27:53 +00:00
committed by Gerrit Code Review
parent 0cb8770989 a7a345d55e
commit d5be864f81
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/lto.go
View File

@@ -56,9 +56,6 @@ type LTOProperties struct {
ThinDep bool `blueprint:"mutated"` ThinDep bool `blueprint:"mutated"`
NoLtoDep bool `blueprint:"mutated"` NoLtoDep bool `blueprint:"mutated"`
// Use clang lld instead of gnu ld.
Use_clang_lld *bool
// Use -fwhole-program-vtables cflag. // Use -fwhole-program-vtables cflag.
Whole_program_vtables *bool Whole_program_vtables *bool
} }
@@ -77,13 +74,6 @@ func (lto *lto) begin(ctx BaseModuleContext) {
} }
} }
func (lto *lto) useClangLld(ctx BaseModuleContext) bool {
if lto.Properties.Use_clang_lld != nil {
return Bool(lto.Properties.Use_clang_lld)
}
return true
}
func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags { func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
// TODO(b/131771163): Disable LTO when using explicit fuzzing configurations. // TODO(b/131771163): Disable LTO when using explicit fuzzing configurations.
// LTO breaks fuzzer builds. // LTO breaks fuzzer builds.
@@ -112,7 +102,7 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {
flags.Local.CFlags = append(flags.Local.CFlags, "-fwhole-program-vtables") flags.Local.CFlags = append(flags.Local.CFlags, "-fwhole-program-vtables")
} }
if (lto.DefaultThinLTO(ctx) || lto.ThinLTO()) && ctx.Config().IsEnvTrue("USE_THINLTO_CACHE") && lto.useClangLld(ctx) { if (lto.DefaultThinLTO(ctx) || lto.ThinLTO()) && ctx.Config().IsEnvTrue("USE_THINLTO_CACHE") {
// Set appropriate ThinLTO cache policy // Set appropriate ThinLTO cache policy
cacheDirFormat := "-Wl,--thinlto-cache-dir=" cacheDirFormat := "-Wl,--thinlto-cache-dir="
cacheDir := android.PathForOutput(ctx, "thinlto-cache").String() cacheDir := android.PathForOutput(ctx, "thinlto-cache").String()