cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 11:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dev.link] cmd/link: remove dependence on dodatastate on symalign2

Browse Source 
Needed for xcoff.

Change-Id: I17d4675a01651b799dfaef92644fdc8267996f10
Reviewed-on: https://go-review.googlesource.com/c/go/+/233339
Run-TryBot: Jeremy Faller <jeremy@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
Jeremy Faller 2020-05-11 12:02:42 -04:00
parent ad91591f34
commit ff1a2d02dc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/link/internal/ld/data.go
View File

@ -1105,9 +1105,8 @@ func addinitarrdata(ctxt *Link, ldr *loader.Loader, s loader.Sym) {
} }
// symalign returns the required alignment for the given symbol s. // symalign returns the required alignment for the given symbol s.
func (state *dodataState) symalign2(s loader.Sym) int32 { func symalign2(ldr *loader.Loader, s loader.Sym) int32 {
min := int32(thearch.Minalign) min := int32(thearch.Minalign)
ldr := state.ctxt.loader
align := ldr.SymAlign(s) align := ldr.SymAlign(s)
if align >= min { if align >= min {
return align return align
@ -1131,7 +1130,7 @@ func (state *dodataState) symalign2(s loader.Sym) int32 {
} }
func aligndatsize2(state *dodataState, datsize int64, s loader.Sym) int64 { func aligndatsize2(state *dodataState, datsize int64, s loader.Sym) int64 {
return Rnd(datsize, int64(state.symalign2(s))) return Rnd(datsize, int64(symalign2(state.ctxt.loader, s)))
} }
const debugGCProg = false const debugGCProg = false
@ -1549,7 +1548,7 @@ func (state *dodataState) allocateDataSectionForSym2(seg *sym.Segment, s loader.
ldr := state.ctxt.loader ldr := state.ctxt.loader
sname := ldr.SymName(s) sname := ldr.SymName(s)
sect := addsection(ldr, state.ctxt.Arch, seg, sname, rwx) sect := addsection(ldr, state.ctxt.Arch, seg, sname, rwx)
sect.Align = state.symalign2(s) sect.Align = symalign2(ldr, s)
state.datsize = Rnd(state.datsize, int64(sect.Align)) state.datsize = Rnd(state.datsize, int64(sect.Align))
sect.Vaddr = uint64(state.datsize) sect.Vaddr = uint64(state.datsize)
return sect return sect
@ -2056,7 +2055,7 @@ func (state *dodataState) dodataSect2(ctxt *Link, symn sym.SymKind, syms []loade
for k := range sl { for k := range sl {
s := sl[k].sym s := sl[k].sym
if s != head && s != tail { if s != head && s != tail {
align := state.symalign2(s) align := symalign2(ldr, s)
if maxAlign < align { if maxAlign < align {
maxAlign = align maxAlign = align
} }