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

Merge "Use --dependency-file when linking elf files."

Browse Source
This commit is contained in:
Treehugger Robot
2022-04-28 22:14:54 +00:00
committed by Gerrit Code Review
parent fb14b52747 97d87760b4
commit ff22afa704
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cc/builder.go
View File

@@ -855,13 +855,24 @@ func transformObjToDynamicBinary(ctx android.ModuleContext,
deps = append(deps, crtBegin...) deps = append(deps, crtBegin...)
deps = append(deps, crtEnd...) deps = append(deps, crtEnd...)
var depFile android.WritablePath
var depFileLdFlags string
depsType := blueprint.DepsNone
if !ctx.Windows() && !ctx.Darwin() {
// lld only supports --dependency-file for elf files
depFile = outputFile.ReplaceExtension(ctx, "d")
depFileLdFlags = " -Wl,--dependency-file=" + depFile.String()
depsType = blueprint.DepsGCC
implicitOutputs = append(implicitOutputs, depFile)
}
rule := ld rule := ld
args := map[string]string{ args := map[string]string{
"ldCmd": ldCmd, "ldCmd": ldCmd,
"crtBegin": strings.Join(crtBegin.Strings(), " "), "crtBegin": strings.Join(crtBegin.Strings(), " "),
"libFlags": strings.Join(libFlagsList, " "), "libFlags": strings.Join(libFlagsList, " "),
"extraLibFlags": flags.extraLibFlags, "extraLibFlags": flags.extraLibFlags,
"ldFlags": flags.globalLdFlags + " " + flags.localLdFlags, "ldFlags": flags.globalLdFlags + " " + flags.localLdFlags + depFileLdFlags,
"crtEnd": strings.Join(crtEnd.Strings(), " "), "crtEnd": strings.Join(crtEnd.Strings(), " "),
} }
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
@@ -872,6 +883,8 @@ func transformObjToDynamicBinary(ctx android.ModuleContext,
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rule, Rule: rule,
Deps: depsType,
Depfile: depFile,
Description: "link " + outputFile.Base(), Description: "link " + outputFile.Base(),
Output: outputFile, Output: outputFile,
ImplicitOutputs: implicitOutputs, ImplicitOutputs: implicitOutputs,
@@ -1025,18 +1038,33 @@ func transformObjsToObj(ctx android.ModuleContext, objFiles android.Paths,
ldCmd := "${config.ClangBin}/clang++" ldCmd := "${config.ClangBin}/clang++"
var implicitOutputs android.WritablePaths
var depFile android.WritablePath
var depFileLdFlags string
depsType := blueprint.DepsNone
if !ctx.Windows() && !ctx.Darwin() {
// lld only supports --dependency-file for elf files
depFile = outputFile.ReplaceExtension(ctx, "d")
depFileLdFlags = " -Wl,--dependency-file=" + depFile.String()
depsType = blueprint.DepsGCC
implicitOutputs = append(implicitOutputs, depFile)
}
rule := partialLd rule := partialLd
args := map[string]string{ args := map[string]string{
"ldCmd": ldCmd, "ldCmd": ldCmd,
"ldFlags": flags.globalLdFlags + " " + flags.localLdFlags, "ldFlags": flags.globalLdFlags + " " + flags.localLdFlags + depFileLdFlags,
} }
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
rule = partialLdRE rule = partialLdRE
args["inCommaList"] = strings.Join(objFiles.Strings(), ",") args["inCommaList"] = strings.Join(objFiles.Strings(), ",")
args["implicitInputs"] = strings.Join(deps.Strings(), ",") args["implicitInputs"] = strings.Join(deps.Strings(), ",")
args["implicitOutputs"] = strings.Join(implicitOutputs.Strings(), ",")
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rule, Rule: rule,
Deps: depsType,
Depfile: depFile,
Description: "link " + outputFile.Base(), Description: "link " + outputFile.Base(),
Output: outputFile, Output: outputFile,
Inputs: objFiles, Inputs: objFiles,