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

[gostls13.git] / src / cmd / asm / main.go

diff --git a/src/cmd/asm/main.go b/src/cmd/asm/main.go
index 21c8bd963a437ee9aca98a403f207e8684d4e1a7..a927de854b3e4015ee5511d3e42cce196974d664 100644 (file)
--- a/src/cmd/asm/main.go
+++ b/src/cmd/asm/main.go
@@ -40,7 +40,7 @@ func main() {
        }
        ctxt.Flag_dynlink = *flags.Dynlink
        ctxt.Flag_shared = *flags.Shared || *flags.Dynlink
-       ctxt.Flag_newobj = *flags.Newobj
+       ctxt.Flag_go115newobj = *flags.Go115Newobj
        switch *flags.Spectre {
        default:
                log.Printf("unknown setting -spectre=%s", *flags.Spectre)
@@ -87,7 +87,7 @@ func main() {
                        pList.Firstpc, ok = parser.Parse()
                        // reports errors to parser.Errorf
                        if ok {
-                               obj.Flushplist(ctxt, pList, nil, "")
+                               obj.Flushplist(ctxt, pList, nil, *flags.Importpath)
                        }
                }
                if !ok {