]> Cypherpunks.ru repositories - gostls13.git/commit
[dev.link] all: merge branch 'master' into dev.link
authorCherry Zhang <cherryyz@google.com>
Fri, 5 Jun 2020 20:55:43 +0000 (16:55 -0400)
committerCherry Zhang <cherryyz@google.com>
Fri, 5 Jun 2020 20:55:43 +0000 (16:55 -0400)
commit6bf51c340666b2552b9c73c34ff1e1757d8d8489
treeed5dd3e7e19425d8d974b11ee89832501ad5e5b0
parent78b96db04ec9937de53c6bba0db3aeb9fff470db
parentd282b0f1121c475c3b435843a722a47172c20e7e
[dev.link] all: merge branch 'master' into dev.link

Merge conflicts are mostly recently changed nm/objdump output
format and its tests. Resolved easily (mostly just using the
format on master branch).

Change-Id: I99d8410a9a02947ecf027d9cae5762861562baf5
33 files changed:
src/cmd/internal/goobj/readnew.go
src/cmd/internal/goobj2/objfile.go
src/cmd/internal/obj/link.go
src/cmd/internal/obj/objfile2.go
src/cmd/internal/obj/sym.go
src/cmd/internal/objabi/symkind.go
src/cmd/link/internal/amd64/asm.go
src/cmd/link/internal/amd64/obj.go
src/cmd/link/internal/arm/asm.go
src/cmd/link/internal/arm/obj.go
src/cmd/link/internal/arm64/asm.go
src/cmd/link/internal/arm64/obj.go
src/cmd/link/internal/ld/data.go
src/cmd/link/internal/ld/dwarf.go
src/cmd/link/internal/ld/ld.go
src/cmd/link/internal/ld/lib.go
src/cmd/link/internal/ld/link.go
src/cmd/link/internal/ld/main.go
src/cmd/link/internal/ld/sym.go
src/cmd/link/internal/ld/symtab.go
src/cmd/link/internal/loader/loader.go
src/cmd/link/internal/mips/asm.go
src/cmd/link/internal/mips/obj.go
src/cmd/link/internal/mips64/asm.go
src/cmd/link/internal/mips64/obj.go
src/cmd/link/internal/ppc64/asm.go
src/cmd/link/internal/ppc64/obj.go
src/cmd/link/internal/s390x/asm.go
src/cmd/link/internal/s390x/obj.go
src/cmd/link/internal/sym/segment.go
src/cmd/link/internal/sym/symkind.go
src/cmd/link/internal/x86/asm.go
src/cmd/link/internal/x86/obj.go