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

Commit 958c9576 authored by David Brazdil's avatar David Brazdil
Browse files

Add linker_scripts property 

Add a linker_scripts property that is similar to version_script
but uses a -Wl,--script flag and can be passed multiple times.

Test: TestBinaryLinkerScripts
Change-Id: If405cfbcdaf8e99559414ba759734084fae0f7ec
parent 3eb5a74a

cc/binary_test.go

+20 −0
Original line number Diff line number Diff line
@@ -49,3 +49,23 @@ cc_binary { 
	expectedUnStrippedFile := "outputbase/execroot/__main__/foo"

	android.AssertStringEquals(t, "Unstripped output file", expectedUnStrippedFile, unStrippedFilePath.String())

}



func TestBinaryLinkerScripts(t *testing.T) {

	result := PrepareForIntegrationTestWithCc.RunTestWithBp(t, `

		cc_binary {

			name: "foo",

			srcs: ["foo.cc"],

			linker_scripts: ["foo.ld", "bar.ld"],

		}`)



	binFoo := result.ModuleForTests("foo", "android_arm64_armv8-a").Rule("ld")



	android.AssertStringListContains(t, "missing dependency on linker_scripts",

		binFoo.Implicits.Strings(), "foo.ld")

	android.AssertStringListContains(t, "missing dependency on linker_scripts",

		binFoo.Implicits.Strings(), "bar.ld")

	android.AssertStringDoesContain(t, "missing flag for linker_scripts",

		libfoo.Args["ldFlags"], "-Wl,--script,foo.ld")

	android.AssertStringDoesContain(t, "missing flag for linker_scripts",

		libfoo.Args["ldFlags"], "-Wl,--script,bar.ld")

}

cc/check.go

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ func CheckBadLinkerFlags(ctx BaseModuleContext, prop string, flags []string) { 
			ctx.PropertyErrorf(prop, "Bad flag: `%s` is not allowed", flag)

		} else if strings.HasPrefix(flag, "-Wl,--version-script") {

			ctx.PropertyErrorf(prop, "Bad flag: `%s`, use version_script instead", flag)

		} else if flag == "-T" || strings.HasPrefix(flag, "--script") {

			ctx.PropertyErrorf(prop, "Bad flag: `%s`, use linker_scripts instead", flag)

		} else if flag == "--coverage" {

			ctx.PropertyErrorf(prop, "Bad flag: `%s`, use native_coverage instead", flag)

		} else if strings.Contains(flag, " ") {

cc/linker.go

+14 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ type BaseLinkerProperties struct { 
	// local file name to pass to the linker as --dynamic-list

	Dynamic_list *string `android:"path,arch_variant"`



	// local files to pass to the linker as --script

	Linker_scripts []string `android:"path,arch_variant"`



	// list of static libs that should not be used to build this module

	Exclude_static_libs []string `android:"arch_variant"`
@@ -602,6 +605,17 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags { 
				flags.LdFlagsDeps = append(flags.LdFlagsDeps, dynamicList.Path())

			}

		}



		linkerScriptPaths := android.PathsForModuleSrc(ctx, linker.Properties.Linker_scripts)

		if len(linkerScriptPaths) > 0 && (ctx.Darwin() || ctx.Windows()) {

			ctx.PropertyErrorf("linker_scripts", "Only supported for ELF files")

		} else {

			for _, linkerScriptPath := range linkerScriptPaths {

				flags.Local.LdFlags = append(flags.Local.LdFlags,

					"-Wl,--script,"+linkerScriptPath.String())

				flags.LdFlagsDeps = append(flags.LdFlagsDeps, linkerScriptPath)

			}

		}

	}



	return flags