From c7c72378a3b698fb9cb8a8145c8ebd11b8259541 Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Wed, 15 Apr 2020 21:55:35 -0400 Subject: [PATCH] [dev.link] cmd/link: fix buglet in dodata Fix AIX build. Change-Id: I5c0f1390a62c684bb0b162c3309902566cc6b025 Reviewed-on: https://go-review.googlesource.com/c/go/+/228477 Run-TryBot: Cherry Zhang TryBot-Result: Gobot Gobot Reviewed-by: Than McIntosh --- src/cmd/link/internal/ld/data.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index c04bac250b..3979880cf4 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -1444,7 +1444,6 @@ func (ctxt *Link) dodata() { state.makeRelroForSharedLib(ctxt) // Sort symbols. - var dataMaxAlign [sym.SXREF]int32 var wg sync.WaitGroup for symn := range state.data { symn := sym.SymKind(symn) @@ -1459,8 +1458,8 @@ func (ctxt *Link) dodata() { if ctxt.HeadType == objabi.Haix && ctxt.LinkMode == LinkExternal { // These symbols must have the same alignment as their section. // Otherwize, ld might change the layout of Go sections. - ctxt.Syms.ROLookup("runtime.data", 0).Align = dataMaxAlign[sym.SDATA] - ctxt.Syms.ROLookup("runtime.bss", 0).Align = dataMaxAlign[sym.SBSS] + ctxt.Syms.ROLookup("runtime.data", 0).Align = state.dataMaxAlign[sym.SDATA] + ctxt.Syms.ROLookup("runtime.bss", 0).Align = state.dataMaxAlign[sym.SBSS] } state.allocateSections(ctxt) -- 2.48.1