]> Cypherpunks.ru repositories - gostls13.git/commit
[dev.link] Merge branch 'master' into dev.link
authorJeremy Faller <jeremy@golang.org>
Wed, 30 Sep 2020 21:57:14 +0000 (17:57 -0400)
committerJeremy Faller <jeremy@golang.org>
Wed, 30 Sep 2020 22:00:58 +0000 (18:00 -0400)
commit91e4d2d57bc341dd82c98247117114c851380aef
tree15a2d023cdc63543cf8a6e99f8a561c0a0459000
parentc863e14a6c15e174ac0979ddd7f9530d6a4ec9cc
parent846dce9d05f19a1f53465e62a304dea21b99f910
[dev.link] Merge branch 'master' into dev.link

2 conflicts, that make sense.
src/cmd/internal/obj/objfile.go
src/cmd/link/internal/loader/loader.go

Change-Id: Ib224e2d248cb568fa1e888af79dd908b2f5e05ff
src/cmd/internal/obj/objfile.go
src/cmd/link/internal/ld/data.go
src/cmd/link/internal/ld/lib.go
src/cmd/link/internal/loader/loader.go
src/runtime/runtime2.go