[dev.link] all: merge branch 'master' into dev.link

[gostls13.git] / src / cmd / internal / obj / link.go

diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go
index d1cc536a8c1827dc13dc3771ed0f59d2fec5c53e..9dd821d532a84b5f26c28ec17d142b339a6e6503 100644 (file)
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@ -652,7 +652,7 @@ type Link struct {
        Flag_linkshared    bool
        Flag_optimize      bool
        Flag_locationlists bool
-       Flag_newobj        bool // use new object file format
+       Flag_go115newobj   bool // use new object file format
        Retpoline          bool // emit use of retpoline stubs for indirect jmp/call
        Bso                *bufio.Writer
        Pathname           string