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

Merge "Add sort_bss_symbols_by_size property for shared libs"

Browse Source 
am: 446441fc19

Change-Id: I83344693e2d67721b1fb38eda4d72f993fa419f1
This commit is contained in:
Vic Yang
2019-07-29 20:10:54 -07:00
committed by android-build-merger
parent cb521cb1ca 446441fc19
commit 6f127a7fa3
3 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cc/library.go
View File

@@ -110,6 +110,9 @@ type LibraryProperties struct {
// Symbol tags that should be ignored from the symbol file
Exclude_symbol_tags []string
}
// Order symbols in .bss section by their sizes. Only useful for shared libraries.
Sort_bss_symbols_by_size *bool
}
type LibraryMutatedProperties struct {
@@ -758,6 +761,18 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
linkerDeps = append(linkerDeps, deps.LateSharedLibsDeps...)
linkerDeps = append(linkerDeps, objs.tidyFiles...)
if Bool(library.Properties.Sort_bss_symbols_by_size) {
unsortedOutputFile := android.PathForModuleOut(ctx, "unsorted", fileName)
TransformObjToDynamicBinary(ctx, objs.objFiles, sharedLibs,
deps.StaticLibs, deps.LateStaticLibs, deps.WholeStaticLibs,
linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, unsortedOutputFile, implicitOutputs)
symbolOrderingFile := android.PathForModuleOut(ctx, "unsorted", fileName+".symbol_order")
symbolOrderingFlag := library.baseLinker.sortBssSymbolsBySize(ctx, unsortedOutputFile, symbolOrderingFile, builderFlags)
builderFlags.ldFlags += " " + symbolOrderingFlag
linkerDeps = append(linkerDeps, symbolOrderingFile)
}
TransformObjToDynamicBinary(ctx, objs.objFiles, sharedLibs,
deps.StaticLibs, deps.LateStaticLibs, deps.WholeStaticLibs,
linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, outputFile, implicitOutputs)

39
cc/linker.go
View File

@@ -147,9 +147,6 @@ type BaseLinkerProperties struct {
// local file name to pass to the linker as --version_script
Version_script *string `android:"path,arch_variant"`
// Local file name to pass to the linker as --symbol-ordering-file
Symbol_ordering_file *string `android:"arch_variant"`
}
func NewBaseLinker(sanitize *sanitize) *baseLinker {
@@ -442,16 +439,6 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
}
}
if !linker.dynamicProperties.BuildStubs {
symbolOrderingFile := ctx.ExpandOptionalSource(
linker.Properties.Symbol_ordering_file, "Symbol_ordering_file")
if symbolOrderingFile.Valid() {
flags.LdFlags = append(flags.LdFlags,
"-Wl,--symbol-ordering-file,"+symbolOrderingFile.String())
flags.LdFlagsDeps = append(flags.LdFlagsDeps, symbolOrderingFile.Path())
}
}
return flags
}
@@ -487,3 +474,29 @@ func (linker *baseLinker) injectVersionSymbol(ctx ModuleContext, in android.Path
},
})
}
// Rule to generate .bss symbol ordering file.
var (
_ = pctx.SourcePathVariable("genSortedBssSymbolsPath", "build/soong/scripts/gen_sorted_bss_symbols.sh")
gen_sorted_bss_symbols = pctx.AndroidStaticRule("gen_sorted_bss_symbols",
blueprint.RuleParams{
Command: "CROSS_COMPILE=$crossCompile $genSortedBssSymbolsPath ${in} ${out}",
CommandDeps: []string{"$genSortedBssSymbolsPath"},
},
"crossCompile")
)
func (linker *baseLinker) sortBssSymbolsBySize(ctx ModuleContext, in android.Path, symbolOrderingFile android.ModuleOutPath, flags builderFlags) string {
crossCompile := gccCmd(flags.toolchain, "")
ctx.Build(pctx, android.BuildParams{
Rule: gen_sorted_bss_symbols,
Description: "generate bss symbol order " + symbolOrderingFile.Base(),
Output: symbolOrderingFile,
Input: in,
Args: map[string]string{
"crossCompile": crossCompile,
},
})
return "-Wl,--symbol-ordering-file," + symbolOrderingFile.String()
}