tree 7f5bfe50f6f913ad60c983ad73936dfc8d808567
parent 27c0aeee3fc7ed35f9b2eac4725b9147902537da
parent 2ac1ca9160f52907ce1cd04738c80b1c055b5ba6
author Cherry Zhang <cherryyz@google.com> 1575387523 -0500
committer Cherry Zhang <cherryyz@google.com> 1575387523 -0500

[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