]> Cypherpunks repositories - gostls13.git/commitdiff
[dev.link] cmd/link: fix buglet in dodata
authorCherry Zhang <cherryyz@google.com>
Thu, 16 Apr 2020 01:55:35 +0000 (21:55 -0400)
committerCherry Zhang <cherryyz@google.com>
Thu, 16 Apr 2020 14:33:53 +0000 (14:33 +0000)
Fix AIX build.

Change-Id: I5c0f1390a62c684bb0b162c3309902566cc6b025
Reviewed-on: https://go-review.googlesource.com/c/go/+/228477
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
src/cmd/link/internal/ld/data.go

index c04bac250bf178d3e0f5b19b7a0a97f8eaf8b603..3979880cf4d7a7ad3e6ad69e75f3df3edc3e455c 100644 (file)
@@ -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)