openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "rust: Drop libgcc dependency"

This commit is contained in:
Thiébaud Weksteen 2021-03-24 12:44:09 +00:00 committed by Gerrit Code Review
parent 8ef5b4f95f f1ff54a10b
commit 70204f9fc9
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/binary.go
View File

@ -87,7 +87,7 @@ func (binary *binaryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps = binary.baseCompiler.compilerDeps(ctx, deps)
if ctx.toolchain().Bionic() {
deps = bionicDeps(deps, Bool(binary.Properties.Static_executable))
deps = bionicDeps(ctx, deps, Bool(binary.Properties.Static_executable))
if Bool(binary.Properties.Static_executable) {
deps.CrtBegin = "crtbegin_static"
} else {

2
rust/bindgen.go
View File

@ -260,7 +260,7 @@ func NewRustBindgen(hod android.HostOrDeviceSupported) (*Module, *bindgenDecorat
func (b *bindgenDecorator) SourceProviderDeps(ctx DepsContext, deps Deps) Deps {
deps = b.BaseSourceProvider.SourceProviderDeps(ctx, deps)
if ctx.toolchain().Bionic() {
deps = bionicDeps(deps, false)
deps = bionicDeps(ctx, deps, false)
}
deps.SharedLibs = append(deps.SharedLibs, b.ClangProperties.Shared_libs...)

8
rust/compiler.go
View File

@ -281,7 +281,7 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
return deps
}
func bionicDeps(deps Deps, static bool) Deps {
func bionicDeps(ctx DepsContext, deps Deps, static bool) Deps {
bionicLibs := []string{}
bionicLibs = append(bionicLibs, "liblog")
bionicLibs = append(bionicLibs, "libc")
@ -294,9 +294,9 @@ func bionicDeps(deps Deps, static bool) Deps {
deps.SharedLibs = append(deps.SharedLibs, bionicLibs...)
}
//TODO(b/141331117) libstd requires libgcc on Android
deps.StaticLibs = append(deps.StaticLibs, "libgcc")
if libRuntimeBuiltins := config.BuiltinsRuntimeLibrary(ctx.toolchain()); libRuntimeBuiltins != "" {
deps.StaticLibs = append(deps.StaticLibs, libRuntimeBuiltins)
}
return deps
}

3
rust/config/global.go
View File

@ -53,6 +53,7 @@ var (
deviceGlobalRustFlags = []string{
"-C panic=abort",
"-Z link-native-libraries=no",
}
deviceGlobalLinkFlags = []string{
@ -62,7 +63,7 @@ var (
// Override cc's --no-undefined-version to allow rustc's generated alloc functions
"-Wl,--undefined-version",
"-Bdynamic",
"-Wl,-Bdynamic",
"-nostdlib",
"-Wl,--pack-dyn-relocs=android+relr",
"-Wl,--use-android-relr-tags",

4
rust/config/toolchain.go
View File

@ -112,6 +112,10 @@ func (toolchainBase) LibclangRuntimeLibraryArch() string {
return ""
}
func BuiltinsRuntimeLibrary(t Toolchain) string {
return LibclangRuntimeLibrary(t, "builtins")
}
func LibFuzzerRuntimeLibrary(t Toolchain) string {
return LibclangRuntimeLibrary(t, "fuzzer")
}

2
rust/library.go
View File

@ -404,7 +404,7 @@ func (library *libraryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps = library.baseCompiler.compilerDeps(ctx, deps)
if ctx.toolchain().Bionic() && (library.dylib() || library.shared()) {
deps = bionicDeps(deps, false)
deps = bionicDeps(ctx, deps, false)
deps.CrtBegin = "crtbegin_so"
deps.CrtEnd = "crtend_so"
}