Skip to content

Commit ceda47d

Browse files
committed
cmd/link: fix plugin on linux/arm64
The init function and runtime.addmoduledata were not added when building plugin, which caused the runtime could not find the module. Testplugin is still not enabled on linux/arm64 (https://go.googlesource.com/go/+/master/src/cmd/dist/test.go#948) because the gold linker on the builder is too old, which fails with an internal error (see issue #17138). I tested locally and it passes. Fixes #24940. Updates #17138. Change-Id: I26aebca6c38a3443af0949471fa12b6d550e8c6c Reviewed-on: https://go-review.googlesource.com/109917 Run-TryBot: Cherry Zhang <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 2959128 commit ceda47d

File tree

1 file changed

+5
-2
lines changed
  • src/cmd/link/internal/arm64

1 file changed

+5
-2
lines changed

src/cmd/link/internal/arm64/asm.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func gentext(ctxt *ld.Link) {
4646
return
4747
}
4848
addmoduledata := ctxt.Syms.Lookup("runtime.addmoduledata", 0)
49-
if addmoduledata.Type == sym.STEXT {
49+
if addmoduledata.Type == sym.STEXT && ctxt.BuildMode != ld.BuildModePlugin {
5050
// we're linking a module containing the runtime -> no need for
5151
// an init function
5252
return
@@ -72,7 +72,7 @@ func gentext(ctxt *ld.Link) {
7272
rel.Sym = ctxt.Moduledata
7373
rel.Type = objabi.R_ADDRARM64
7474

75-
// 8: 14000000 bl 0 <runtime.addmoduledata>
75+
// 8: 14000000 b 0 <runtime.addmoduledata>
7676
// 8: R_AARCH64_CALL26 runtime.addmoduledata
7777
o(0x14000000)
7878
rel = initfunc.AddRel()
@@ -81,6 +81,9 @@ func gentext(ctxt *ld.Link) {
8181
rel.Sym = ctxt.Syms.Lookup("runtime.addmoduledata", 0)
8282
rel.Type = objabi.R_CALLARM64 // Really should be R_AARCH64_JUMP26 but doesn't seem to make any difference
8383

84+
if ctxt.BuildMode == ld.BuildModePlugin {
85+
ctxt.Textp = append(ctxt.Textp, addmoduledata)
86+
}
8487
ctxt.Textp = append(ctxt.Textp, initfunc)
8588
initarray_entry := ctxt.Syms.Lookup("go.link.addmoduledatainit", 0)
8689
initarray_entry.Attr |= sym.AttrReachable

0 commit comments

Comments
 (0)