qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 19:40:08 -07:00
Code Releases Activity

cmd/link: only embed runtime.goarm in the module that contains the runtime package

Browse Source 
Change-Id: Ia18984343ca4ced3671d967ff9a5b0e32874430c
Reviewed-on: https://go-review.googlesource.com/14220
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Michael Hudson-Doyle 2015-09-03 09:05:25 +12:00 committed by David Crawshaw
parent 9e6ba37b86
commit bf99d8f843
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/link/internal/arm/obj.go
View File

@ -169,10 +169,4 @@ func archinit() {
if ld.INITDAT != 0 && ld.INITRND != 0 { if ld.INITDAT != 0 && ld.INITRND != 0 {
fmt.Printf("warning: -D0x%x is ignored because of -R0x%x\n", uint64(ld.INITDAT), uint32(ld.INITRND)) fmt.Printf("warning: -D0x%x is ignored because of -R0x%x\n", uint64(ld.INITDAT), uint32(ld.INITRND))
} }
// embed goarm to runtime.goarm
s := ld.Linklookup(ld.Ctxt, "runtime.goarm", 0)
s.Type = obj.SRODATA
ld.Adduint8(ld.Ctxt, s, uint8(ld.Ctxt.Goarm))
} }

31
src/cmd/link/internal/ld/lib.go
View File

@ -558,19 +558,30 @@ func loadlib() {
Ctxt.Tlsg = tlsg Ctxt.Tlsg = tlsg
moduledata := Linklookup(Ctxt, "runtime.firstmoduledata", 0) moduledata := Linklookup(Ctxt, "runtime.firstmoduledata", 0)
if moduledata.Type == 0 || moduledata.Type == obj.SDYNIMPORT { if moduledata.Type != 0 && moduledata.Type != obj.SDYNIMPORT {
// If the module we are linking does not define the // If the module (toolchain-speak for "executable or shared
// runtime.firstmoduledata symbol, create a local symbol for // library") we are linking contains the runtime package, it
// the moduledata. // will define the runtime.firstmoduledata symbol and we
// truncate it back to 0 bytes so we can define its entire
// contents in symtab.go:symtab().
moduledata.Size = 0
// In addition, on ARM, the runtime depends on the linker
// recording the value of GOARM.
if Thearch.Thechar == '5' {
s := Linklookup(Ctxt, "runtime.goarm", 0)
s.Type = obj.SRODATA
Adduint8(Ctxt, s, uint8(Ctxt.Goarm))
}
} else {
// If OTOH the module does not contain the runtime package,
// create a local symbol for the moduledata.
moduledata = Linklookup(Ctxt, "local.moduledata", 0) moduledata = Linklookup(Ctxt, "local.moduledata", 0)
moduledata.Local = true moduledata.Local = true
} else {
// If OTOH the module does define the symbol, we truncate the
// symbol back to 0 bytes so we can define its entire
// contents.
moduledata.Size = 0
} }
// Either way we mark it as noptrdata to hide it from the GC. // In all cases way we mark the moduledata as noptrdata to hide it from
// the GC.
moduledata.Type = obj.SNOPTRDATA moduledata.Type = obj.SNOPTRDATA
moduledata.Reachable = true moduledata.Reachable = true
Ctxt.Moduledata = moduledata Ctxt.Moduledata = moduledata