]> Cypherpunks.ru repositories - gostls13.git/commit
[dev.link] all: merge branch 'master' into dev.link
authorCherry Zhang <cherryyz@google.com>
Fri, 27 Mar 2020 17:39:19 +0000 (13:39 -0400)
committerCherry Zhang <cherryyz@google.com>
Fri, 27 Mar 2020 17:39:19 +0000 (13:39 -0400)
commit53a3b600a4fb5d40a29b8bd8c73be43148d703aa
tree1581a1b9e3cee4625e288ace77d8e9aded757be0
parentc7e3d817ab48a6a8a0221d78a54d76bbb4e07e4b
parent0cc1290174751971d282196e21ec9037b217e5a5
[dev.link] all: merge branch 'master' into dev.link

The only merge conflict is the addition of -spectre flag on
master and the addition of -go115newobj flag on dev.link.
Resolved trivially.

Change-Id: I5b46c2b25e140d6c3d8cb129acbd7a248ff03bb9
src/cmd/asm/internal/flags/flags.go
src/cmd/asm/main.go
src/cmd/compile/internal/gc/main.go
src/cmd/internal/obj/link.go