Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile,cmd/internal/objabi: abstract out object header string

Browse source 
Change-Id: Idbbb4cb7127b93afa34a8aa18bbdaad1f206ab6a
Reviewed-on: https://go-review.googlesource.com/c/go/+/308090
Trust: Austin Clements <austin@google.com>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Austin Clements 2021-04-07 09:27:11 -04:00
parent b675e52e95
commit 89ca1ce9a8
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/compile/internal/gc/obj.go
View file

@ -70,7 +70,7 @@ func dumpobj1(outfile string, mode int) {
} }
func printObjHeader(bout *bio.Writer) { func printObjHeader(bout *bio.Writer) {
fmt.Fprintf(bout, "go object %s %s %s %s\n", objabi.GOOS, objabi.GOARCH, objabi.Version, objabi.Expstring()) bout.WriteString(objabi.HeaderString())
if base.Flag.BuildID != "" { if base.Flag.BuildID != "" {
fmt.Fprintf(bout, "build id %q\n", base.Flag.BuildID) fmt.Fprintf(bout, "build id %q\n", base.Flag.BuildID)
} }

6
src/cmd/compile/internal/noder/import.go
View file

@ -243,9 +243,9 @@ func importfile(decl *syntax.ImportDecl) *types.Pkg {
base.Errorf("import %s: not a go object file: %s", file, p) base.Errorf("import %s: not a go object file: %s", file, p)
base.ErrorExit() base.ErrorExit()
} }
q := fmt.Sprintf("%s %s %s %s\n", objabi.GOOS, objabi.GOARCH, objabi.Version, objabi.Expstring()) q := objabi.HeaderString()
if p[10:] != q { if p != q {
base.Errorf("import %s: object is [%s] expected [%s]", file, p[10:], q) base.Errorf("import %s: object is [%s] expected [%s]", file, p, q)
base.ErrorExit() base.ErrorExit()
} }

9
src/cmd/internal/objabi/util.go
View file

@ -5,6 +5,7 @@
package objabi package objabi
import ( import (
"fmt"
"log" "log"
"os" "os"
"strings" "strings"
@ -121,3 +122,11 @@ func gowasm() (f gowasmFeatures) {
func Getgoextlinkenabled() string { func Getgoextlinkenabled() string {
return envOr("GO_EXTLINK_ENABLED", defaultGO_EXTLINK_ENABLED) return envOr("GO_EXTLINK_ENABLED", defaultGO_EXTLINK_ENABLED)
} }
// HeaderString returns the toolchain configuration string written in
// Go object headers. This string ensures we don't attempt to import
// or link object files that are incompatible with each other. This
// string always starts with "go object ".
func HeaderString() string {
return fmt.Sprintf("go object %s %s %s %s\n", GOOS, GOARCH, Version, Expstring())
}