This fixes the 386 builds. R=golang-dev, adg, r CC=golang-dev https://golang.org/cl/5293043
Attach a file by drag & drop or click to upload
