[dev.ssa] Merge remote-tracking branch 'origin/master' into mergebranch

Semi-regular merge from tip into ssa branch

Change-Id: Ida553b5c504058347c0bdcb1a987727bdcea456b

diff --cc src/cmd/compile/internal/gc/go.go
Simple merge

diff --cc src/cmd/compile/internal/gc/sinit.go
Simple merge

diff --cc src/cmd/dist/buildtool.go
index 9b37bd97d239a3dba858aae804d3bd4f0fb4583a,8a55b5da7011368853999fd4232d9fa5e74c3755..b231b5ce6179fe2d01d6660c1353b74b83bbe21b
--- 1/src/cmd/dist/buildtool.go
--- 2/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@@ -35,9 -35,7 +35,8 @@@ var bootstrapDirs = []string
        "compile/internal/big",
        "compile/internal/gc",
        "compile/internal/ppc64",
 +      "compile/internal/ssa",
        "compile/internal/x86",
-       "internal/asm",
        "internal/gcprog",
        "internal/obj",
        "internal/obj/arm",

diff --cc src/cmd/internal/obj/x86/a.out.go
Simple merge