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

Move default crt objects into Toolchain

Browse Source 
Move the crt objects spread around cc/library.go and cc/binary.go
into the Toolchain.  This will simplify adding new toolchains that
have custom crt objects.

Test: m checkbuild
Test: go test ./cc/...
Change-Id: I7fdc1f53769799cb9c10e3e5816dabee0f918768
This commit is contained in:
Colin Cross
2021-06-21 17:34:47 -07:00
parent c85446836d
commit d1a2813063
6 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cc/binary.go
View File

@@ -146,16 +146,17 @@ func (binary *binaryDecorator) getStem(ctx BaseModuleContext) string {
// modules common to most binaries, such as bionic libraries.
func (binary *binaryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps = binary.baseLinker.linkerDeps(ctx, deps)
if ctx.toolchain().Bionic() {
if !Bool(binary.baseLinker.Properties.Nocrt) {
if binary.static() {
deps.CrtBegin = []string{"crtbegin_static"}
} else {
deps.CrtBegin = []string{"crtbegin_dynamic"}
}
deps.CrtEnd = []string{"crtend_android"}
if !Bool(binary.baseLinker.Properties.Nocrt) {
if binary.static() {
deps.CrtBegin = ctx.toolchain().CrtBeginStaticBinary()
deps.CrtEnd = ctx.toolchain().CrtEndStaticBinary()
} else {
deps.CrtBegin = ctx.toolchain().CrtBeginSharedBinary()
deps.CrtEnd = ctx.toolchain().CrtEndSharedBinary()
}
}
if ctx.toolchain().Bionic() {
if binary.static() {
if ctx.selectedStl() == "libc++_static" {
deps.StaticLibs = append(deps.StaticLibs, "libm", "libc")
@@ -169,16 +170,8 @@ func (binary *binaryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.LateStaticLibs = append(groupLibs, deps.LateStaticLibs...)
}
// Embed the linker into host bionic binaries. This is needed to support host bionic,
// as the linux kernel requires that the ELF interpreter referenced by PT_INTERP be
// either an absolute path, or relative from CWD. To work around this, we extract
// the load sections from the runtime linker ELF binary and embed them into each host
// bionic binary, omitting the PT_INTERP declaration. The kernel will treat it as a static
// binary, and then we use a special entry point to fix up the arguments passed by
// the kernel before jumping to the embedded linker.
if ctx.Os() == android.LinuxBionic && !binary.static() {
deps.DynamicLinker = "linker"
deps.CrtBegin = append(deps.CrtBegin, "host_bionic_linker_script")
}
}