From a630783ba0d1816f684bdab18b6f9f03dc93a209 Mon Sep 17 00:00:00 2001 From: Cherry Mui Date: Tue, 21 Sep 2021 14:55:23 -0400 Subject: [PATCH] cmd/internal/obj: remove ABI aliases from object file Change-Id: I8a51f054e017e0116dee4e435b60c08d72e998e9 Reviewed-on: https://go-review.googlesource.com/c/go/+/351331 Trust: Cherry Mui Run-TryBot: Cherry Mui TryBot-Result: Go Bot Reviewed-by: Than McIntosh --- src/cmd/internal/obj/link.go | 10 ---------- src/cmd/internal/obj/sym.go | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go index 28626e6e03..592d2a655b 100644 --- a/src/cmd/internal/obj/link.go +++ b/src/cmd/internal/obj/link.go @@ -902,16 +902,6 @@ type Link struct { Text []*LSym Data []*LSym - // ABIAliases are text symbols that should be aliased to all - // ABIs. These symbols may only be referenced and not defined - // by this object, since the need for an alias may appear in a - // different object than the definition. Hence, this - // information can't be carried in the symbol definition. - // - // TODO(austin): Replace this with ABI wrappers once the ABIs - // actually diverge. - ABIAliases []*LSym - // Constant symbols (e.g. $i64.*) are data symbols created late // in the concurrent phase. To ensure a deterministic order, we // add them to a separate list, sort at the end, and append it diff --git a/src/cmd/internal/obj/sym.go b/src/cmd/internal/obj/sym.go index 9e8b4dd790..3289115439 100644 --- a/src/cmd/internal/obj/sym.go +++ b/src/cmd/internal/obj/sym.go @@ -330,7 +330,7 @@ const ( // Traverse symbols based on flag, call fn for each symbol. func (ctxt *Link) traverseSyms(flag traverseFlag, fn func(*LSym)) { - lists := [][]*LSym{ctxt.Text, ctxt.Data, ctxt.ABIAliases} + lists := [][]*LSym{ctxt.Text, ctxt.Data} for _, list := range lists { for _, s := range list { if flag&traverseDefs != 0 { @@ -410,7 +410,7 @@ func (ctxt *Link) traverseFuncAux(flag traverseFlag, fsym *LSym, fn func(parent // Traverse aux symbols, calling fn for each sym/aux pair. func (ctxt *Link) traverseAuxSyms(flag traverseFlag, fn func(parent *LSym, aux *LSym)) { - lists := [][]*LSym{ctxt.Text, ctxt.Data, ctxt.ABIAliases} + lists := [][]*LSym{ctxt.Text, ctxt.Data} for _, list := range lists { for _, s := range list { if s.Gotype != nil { -- 2.50.0