commit b68048e5205c83087fde73ad1ad59ac0420a5d64
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 16 19:02:27 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 16 19:02:27 2021 +0000
tree 4f704599f7e3819cf9226944c0805256fc6e9a48
parent fe261473b88a17468e6db2389d7a2689d038b292
parent 1cd80d9b8bbcd48fe0a1df74fbb781067682615e

Merge "Use note in linker.s to place linker"

cmd/extract_linker/main.go

diff --git a/cmd/extract_linker/main.go b/cmd/extract_linker/main.go
index 2dcb894..f1f7bc7 100644
--- a/cmd/extract_linker/main.go
+++ b/cmd/extract_linker/main.go
@@ -85,7 +85,7 @@
 
 		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 @@
 		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 {