From: Cherry Zhang <cherryyz@google.com>
Date: Fri, 15 Nov 2019 21:33:22 +0000 (-0500)
Subject: [dev.link] all: merge branch 'master' into dev.link
X-Git-Tag: go1.15beta1~679^2~176
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=27c0aeee3fc7ed35f9b2eac4725b9147902537da;p=gostls13.git

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

Clean merge.

Change-Id: I4a73cd4bac2f4d35d2c07c39f2bc01c6075fadab
---

27c0aeee3fc7ed35f9b2eac4725b9147902537da
diff --cc src/cmd/dist/buildtool.go
index 60faedae06,d30529bc5d..12baccbc4f
--- a/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",