From: Keith Randall <khr@golang.org>
Date: Thu, 30 Jul 2015 19:22:02 +0000 (-0700)
Subject: [dev.ssa] Merge remote-tracking branch 'origin/master' into mergebranch
X-Git-Tag: go1.7beta1~1623^2^2~326
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=359747da15b0a933bab2d049ad00f1c4663701ee;p=gostls13.git

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

Semi-regular merge from tip into ssa branch

Change-Id: Ida553b5c504058347c0bdcb1a987727bdcea456b
---

359747da15b0a933bab2d049ad00f1c4663701ee
diff --cc src/cmd/dist/buildtool.go
index 9b37bd97d2,8a55b5da70..b231b5ce61
--- a/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",