From 2a3c695c4b8354c942a5096a85df5d355f4e1718 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 1 Feb 2023 12:18:39 -0500 Subject: [PATCH] cmd/link: remove special cases for relocations in .go.buildinfo .go.buildinfo has no relocations anymore, as of Go 1.18. Change-Id: I98369c6a0ef07ada770eaa12f6f56c210e812abc Reviewed-on: https://go-review.googlesource.com/c/go/+/464436 Run-TryBot: Russ Cox TryBot-Result: Gopher Robot Auto-Submit: Russ Cox Reviewed-by: Than McIntosh Reviewed-by: Cherry Mui --- src/cmd/link/internal/ld/data.go | 8 -------- src/cmd/link/internal/ld/xcoff.go | 5 ----- 2 files changed, 13 deletions(-) diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index 925e554b1d..05c6da3e3b 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -2246,14 +2246,6 @@ func (ctxt *Link) textbuildid() { } func (ctxt *Link) buildinfo() { - if ctxt.linkShared || ctxt.BuildMode == BuildModePlugin { - // -linkshared and -buildmode=plugin get confused - // about the relocations in go.buildinfo - // pointing at the other data sections. - // The version information is only available in executables. - return - } - // Write the buildinfo symbol, which go version looks for. // The code reading this data is in package debug/buildinfo. ldr := ctxt.loader diff --git a/src/cmd/link/internal/ld/xcoff.go b/src/cmd/link/internal/ld/xcoff.go index 1265c458fe..7b8a134221 100644 --- a/src/cmd/link/internal/ld/xcoff.go +++ b/src/cmd/link/internal/ld/xcoff.go @@ -1093,11 +1093,6 @@ func (f *xcoffFile) asmaixsym(ctxt *Link) { } shouldBeInSymbolTable := func(s loader.Sym, name string) bool { - if name == ".go.buildinfo" { - // On AIX, .go.buildinfo must be in the symbol table as - // it has relocations. - return true - } if ldr.AttrNotInSymbolTable(s) { return false } -- 2.48.1