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

Commit 29054fe4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use note in linker.s to place linker" am: b68048e5 am: a57b9883 am:... 

Merge "Use note in linker.s to place linker" am: b68048e5 am: a57b9883 am: 7a5be1a6 am: 47325ed5

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765066

Change-Id: Id4d1c4a7c10eeeeafab36fac4b7c7cbfab8bc688
parents af883f89 47325ed5

cmd/extract_linker/main.go

+4 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ func main() { 


		fmt.Fprintf(asm, ".globl %s\n%s:\n\n", symName, symName)



		fmt.Fprintf(script, "  %s %d : {\n", sectionName, baseLoadAddr+prog.Vaddr)

		fmt.Fprintf(script, "  %s 0x%x : {\n", sectionName, baseLoadAddr+prog.Vaddr)

		fmt.Fprintf(script, "    KEEP(*(%s));\n", sectionName)

		fmt.Fprintln(script, "  }")
@@ -106,8 +106,10 @@ func main() { 
		load += 1

	}



	fmt.Fprintln(asm, `.section .note.android.embedded_linker,"a",%note`)



	fmt.Fprintln(script, "}")

	fmt.Fprintln(script, "INSERT BEFORE .note.android.ident;")

	fmt.Fprintln(script, "INSERT BEFORE .note.android.embedded_linker;")



	if asmPath != "" {

		if err := ioutil.WriteFile(asmPath, asm.Bytes(), 0777); err != nil {