]> Cypherpunks.ru repositories - gostls13.git/commit
[dev.link] all: merge branch 'master' into dev.link
authorCherry Zhang <cherryyz@google.com>
Fri, 31 Jan 2020 19:45:52 +0000 (14:45 -0500)
committerCherry Zhang <cherryyz@google.com>
Fri, 31 Jan 2020 19:45:52 +0000 (14:45 -0500)
commitee04d45b8f380c2e3b3b26bc4771cd97fbd9d260
tree5db2e0ca22bb7d54f7c6d8a8d4acc96224b2e85c
parent23c96e9bbd29e3a815e6faabbc40af0d4c4d4353
parent96002cd25c343edfb6c06d2bf1f31ae1e345b81f
[dev.link] all: merge branch 'master' into dev.link

It has been a while we have not done this.

Merge conflict resolution:
- deleted/rewritten code modified on master
  - CL 214286, ported in CL 217317
    (cmd/internal/obj/objfile.go)
  - CL 210678, it already includes a fix to new code
    (cmd/link/internal/ld/deadcode.go)
  - CL 209317, applied in this CL
    (cmd/link/internal/loadelf/ldelf.go)

Change-Id: Ie927ea6a1d69ce49e8d03e56148cb2725e377876
src/cmd/compile/internal/gc/main.go
src/cmd/dist/buildtool.go
src/cmd/link/internal/ld/deadcode2.go
src/cmd/link/internal/loadelf/ldelf.go