From: Matthew Dempsky Date: Mon, 6 Mar 2017 18:51:37 +0000 (-0800) Subject: cmd/internal/obj, cmd/link: bump magic string to go19ld X-Git-Tag: go1.9beta1~1278 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7c84dc79fdd1e26fc117e170ada81444694e6bed;p=gostls13.git cmd/internal/obj, cmd/link: bump magic string to go19ld golang.org/cl/37231 changed the object file format, but forgot to bump the version string. Change-Id: I8351ec8ed55e65479006e7c0df20254d0e31015f Reviewed-on: https://go-review.googlesource.com/37798 Run-TryBot: Matthew Dempsky Reviewed-by: Austin Clements TryBot-Result: Gobot Gobot --- diff --git a/src/cmd/internal/obj/objfile.go b/src/cmd/internal/obj/objfile.go index 9e0ce59691..a30fe39fc2 100644 --- a/src/cmd/internal/obj/objfile.go +++ b/src/cmd/internal/obj/objfile.go @@ -15,7 +15,7 @@ // // The file format is: // -// - magic header: "\x00\x00go17ld" +// - magic header: "\x00\x00go19ld" // - byte 1 - version number // - sequence of strings giving dependencies (imported packages) // - empty string (marks end of sequence) @@ -31,7 +31,7 @@ // - data, the content of the defined symbols // - sequence of defined symbols // - byte 0xff (marks end of sequence) -// - magic footer: "\xff\xffgo17ld" +// - magic footer: "\xff\xffgo19ld" // // All integers are stored in a zigzag varint format. // See golang.org/s/go12symtab for a definition. @@ -198,7 +198,7 @@ func WriteObjFile(ctxt *Link, b *bufio.Writer) { w := newObjWriter(ctxt, b) // Magic header - w.wr.WriteString("\x00\x00go17ld") + w.wr.WriteString("\x00\x00go19ld") // Version w.wr.WriteByte(1) @@ -249,7 +249,7 @@ func WriteObjFile(ctxt *Link, b *bufio.Writer) { } // Magic footer - w.wr.WriteString("\xff\xffgo17ld") + w.wr.WriteString("\xff\xffgo19ld") } // Symbols are prefixed so their content doesn't get confused with the magic footer. diff --git a/src/cmd/link/internal/ld/objfile.go b/src/cmd/link/internal/ld/objfile.go index c036acbd77..2124e3f814 100644 --- a/src/cmd/link/internal/ld/objfile.go +++ b/src/cmd/link/internal/ld/objfile.go @@ -17,7 +17,7 @@ package ld // // The file format is: // -// - magic header: "\x00\x00go17ld" +// - magic header: "\x00\x00go19ld" // - byte 1 - version number // - sequence of strings giving dependencies (imported packages) // - empty string (marks end of sequence) @@ -33,7 +33,7 @@ package ld // - data, the content of the defined symbols // - sequence of defined symbols // - byte 0xff (marks end of sequence) -// - magic footer: "\xff\xffgo17ld" +// - magic footer: "\xff\xffgo19ld" // // All integers are stored in a zigzag varint format. // See golang.org/s/go12symtab for a definition. @@ -127,8 +127,8 @@ import ( ) const ( - startmagic = "\x00\x00go17ld" - endmagic = "\xff\xffgo17ld" + startmagic = "\x00\x00go19ld" + endmagic = "\xff\xffgo19ld" ) var emptyPkg = []byte(`"".`)