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

Merge "[pgo] Do not explicitly link profile runtime" am: 4c0b11a16e

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

Change-Id: Ia3c2d72cf450e1a86671940a198afac669bad45a
This commit is contained in:
Pirama Arumuga Nainar 2021-03-25 18:20:27 +00:00 committed by Automerger Merge Worker
commit a65c8e8172
3 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cc/cc.go
View file

@ -1833,12 +1833,6 @@ func (c *Module) deps(ctx DepsContext) Deps {
if c.compiler != nil {
deps = c.compiler.compilerDeps(ctx, deps)
}
// Add the PGO dependency (the clang_rt.profile runtime library), which
// sometimes depends on symbols from libgcc, before libgcc gets added
// in linkerDeps().
if c.pgo != nil {
deps = c.pgo.deps(ctx, deps)
}
if c.linker != nil {
deps = c.linker.linkerDeps(ctx, deps)
}

4
cc/config/toolchain.go
View file

@ -245,10 +245,6 @@ func ThreadSanitizerRuntimeLibrary(t Toolchain) string {
return LibclangRuntimeLibrary(t, "tsan")
}
func ProfileRuntimeLibrary(t Toolchain) string {
return LibclangRuntimeLibrary(t, "profile")
}
func ScudoRuntimeLibrary(t Toolchain) string {
return LibclangRuntimeLibrary(t, "scudo")
}

9
cc/pgo.go
View file

@ -22,7 +22,6 @@ import (
"github.com/google/blueprint/proptools"
"android/soong/android"
"android/soong/cc/config"
)
var (
@ -271,14 +270,6 @@ func (pgo *pgo) begin(ctx BaseModuleContext) {
}
}
func (pgo *pgo) deps(ctx BaseModuleContext, deps Deps) Deps {
if pgo.Properties.ShouldProfileModule {
runtimeLibrary := config.ProfileRuntimeLibrary(ctx.toolchain())
deps.LateStaticLibs = append(deps.LateStaticLibs, runtimeLibrary)
}
return deps
}
func (pgo *pgo) flags(ctx ModuleContext, flags Flags) Flags {
if ctx.Host() {
return flags