]> Cypherpunks.ru repositories - gostls13.git/commit
[dev.link] all: merge branch 'master' into dev.link
authorCherry Zhang <cherryyz@google.com>
Tue, 3 Dec 2019 15:38:43 +0000 (10:38 -0500)
committerCherry Zhang <cherryyz@google.com>
Tue, 3 Dec 2019 15:38:43 +0000 (10:38 -0500)
commitf7672d39ca9eeb05d0605348290335698da98ae8
tree7f5bfe50f6f913ad60c983ad73936dfc8d808567
parent27c0aeee3fc7ed35f9b2eac4725b9147902537da
parent2ac1ca9160f52907ce1cd04738c80b1c055b5ba6
[dev.link] all: merge branch 'master' into dev.link

Bring in Than's fix of #35779.

The only merge conflict is cmd/link/internal/loadelf/ldelf.go,
with a modification-deletion conflict.

Change-Id: Id2fcfd2094a31120966a6ea9c462b4ec76646b10
src/cmd/compile/internal/gc/main.go
src/cmd/link/internal/loadelf/ldelf.go
src/cmd/link/internal/loader/loader.go