From: Cherry Zhang Date: Wed, 25 Mar 2020 16:26:32 +0000 (-0400) Subject: [dev.link] cmd/internal/goobj2: bump up version number X-Git-Tag: go1.15beta1~679^2~30 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6652a6cccccfa3facec8ed45e4e7bacb20622add;p=gostls13.git [dev.link] cmd/internal/goobj2: bump up version number As we now have -go115newobj flag, it is better to use go115 in the object file as well. And it already diverges from the go114 "new" object file format. Change-Id: I315edf7524158b5c354393fe9a7ab9f6d7cc9808 Reviewed-on: https://go-review.googlesource.com/c/go/+/225458 Run-TryBot: Cherry Zhang Reviewed-by: Than McIntosh TryBot-Result: Gobot Gobot --- diff --git a/src/cmd/internal/goobj/read.go b/src/cmd/internal/goobj/read.go index e61e95dcc8..027c77e725 100644 --- a/src/cmd/internal/goobj/read.go +++ b/src/cmd/internal/goobj/read.go @@ -11,6 +11,7 @@ package goobj import ( "bufio" "bytes" + "cmd/internal/goobj2" "cmd/internal/objabi" "errors" "fmt" @@ -506,7 +507,7 @@ func (r *objReader) parseObject(prefix []byte) error { if err != nil { return err } - if bytes.Equal(p, []byte("\x00go114LD")) { + if bytes.Equal(p, []byte(goobj2.Magic)) { r.readNew() return nil } diff --git a/src/cmd/internal/goobj2/objfile.go b/src/cmd/internal/goobj2/objfile.go index 3336f6cfff..2f275f3258 100644 --- a/src/cmd/internal/goobj2/objfile.go +++ b/src/cmd/internal/goobj2/objfile.go @@ -19,7 +19,7 @@ import ( // New object file format. // // Header struct { -// Magic [...]byte // "\x00go114LD" +// Magic [...]byte // "\x00go115ld" // Flags uint32 // // TODO: Fingerprint // Offsets [...]uint32 // byte offset of each block below @@ -153,7 +153,7 @@ type Header struct { Offsets [NBlk]uint32 } -const Magic = "\x00go114LD" +const Magic = "\x00go115ld" func (h *Header) Write(w *Writer) { w.RawString(h.Magic)