Skip to content

Commit 7c84dc7

Browse files
committed
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 <[email protected]> Reviewed-by: Austin Clements <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent ad74e45 commit 7c84dc7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/cmd/internal/obj/objfile.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//
1616
// The file format is:
1717
//
18-
// - magic header: "\x00\x00go17ld"
18+
// - magic header: "\x00\x00go19ld"
1919
// - byte 1 - version number
2020
// - sequence of strings giving dependencies (imported packages)
2121
// - empty string (marks end of sequence)
@@ -31,7 +31,7 @@
3131
// - data, the content of the defined symbols
3232
// - sequence of defined symbols
3333
// - byte 0xff (marks end of sequence)
34-
// - magic footer: "\xff\xffgo17ld"
34+
// - magic footer: "\xff\xffgo19ld"
3535
//
3636
// All integers are stored in a zigzag varint format.
3737
// See golang.org/s/go12symtab for a definition.
@@ -198,7 +198,7 @@ func WriteObjFile(ctxt *Link, b *bufio.Writer) {
198198
w := newObjWriter(ctxt, b)
199199

200200
// Magic header
201-
w.wr.WriteString("\x00\x00go17ld")
201+
w.wr.WriteString("\x00\x00go19ld")
202202

203203
// Version
204204
w.wr.WriteByte(1)
@@ -249,7 +249,7 @@ func WriteObjFile(ctxt *Link, b *bufio.Writer) {
249249
}
250250

251251
// Magic footer
252-
w.wr.WriteString("\xff\xffgo17ld")
252+
w.wr.WriteString("\xff\xffgo19ld")
253253
}
254254

255255
// Symbols are prefixed so their content doesn't get confused with the magic footer.

src/cmd/link/internal/ld/objfile.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package ld
1717
//
1818
// The file format is:
1919
//
20-
// - magic header: "\x00\x00go17ld"
20+
// - magic header: "\x00\x00go19ld"
2121
// - byte 1 - version number
2222
// - sequence of strings giving dependencies (imported packages)
2323
// - empty string (marks end of sequence)
@@ -33,7 +33,7 @@ package ld
3333
// - data, the content of the defined symbols
3434
// - sequence of defined symbols
3535
// - byte 0xff (marks end of sequence)
36-
// - magic footer: "\xff\xffgo17ld"
36+
// - magic footer: "\xff\xffgo19ld"
3737
//
3838
// All integers are stored in a zigzag varint format.
3939
// See golang.org/s/go12symtab for a definition.
@@ -127,8 +127,8 @@ import (
127127
)
128128

129129
const (
130-
startmagic = "\x00\x00go17ld"
131-
endmagic = "\xff\xffgo17ld"
130+
startmagic = "\x00\x00go19ld"
131+
endmagic = "\xff\xffgo19ld"
132132
)
133133

134134
var emptyPkg = []byte(`"".`)

0 commit comments

Comments
 (0)