[dev.link] all: merge branch 'master' into dev.link

Clean merge.

Change-Id: I4a73cd4bac2f4d35d2c07c39f2bc01c6075fadab

diff --cc src/cmd/dist/buildtool.go
index 60faedae06094821710bc0b04a98c8da246644dd,d30529bc5deec10b2466cde90e98660919e3835e..12baccbc4fce8c96fdce85aedd0f0a14269f4251
--- 1/src/cmd/dist/buildtool.go
--- 2/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@@ -80,7 -80,9 +80,8 @@@ var bootstrapDirs = []string
        "cmd/link/internal/loadxcoff",
        "cmd/link/internal/mips",
        "cmd/link/internal/mips64",
 -      "cmd/link/internal/objfile",
        "cmd/link/internal/ppc64",
+       "cmd/link/internal/riscv64",
        "cmd/link/internal/s390x",
        "cmd/link/internal/sym",
        "cmd/link/internal/x86",

diff --cc src/cmd/link/internal/ld/lib.go
Simple merge

diff --cc src/cmd/link/internal/loadpe/ldpe.go
Simple merge