Also fixes plan9 cross-build. R=rsc, r CC=golang-dev https://golang.org/cl/5675073
Attach a file by drag & drop or click to upload
