Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ff54a1 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen
Browse files

rust: Drop libgcc dependency 

Rustc unstable option "link-native-libraries" is used to prevent the
linkage of other libraries via the #[link] directive. Add a dependency
to libclang_rt.builtins, similarly to cc.

Bug: 141331117
Test: lunch aosp_crosshatch-userdebug; m
Change-Id: I5c232291a5dd08a99e6a12a1295e30bb8e4fcaf1
parent 50e49818

rust/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -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 {

rust/bindgen.go

+1 −1
Original line number Diff line number Diff line
@@ -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...)

rust/compiler.go

+4 −4
Original line number Diff line number Diff line
@@ -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

}

rust/config/global.go

+2 −1
Original line number Diff line number Diff line
@@ -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",

rust/config/toolchain.go

+4 −0
Original line number Diff line number Diff line
@@ -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")

}