[dev.ssa] Merge branch 'master' into dev.ssa

Change-Id: Iabc80b6e0734efbd234d998271e110d2eaad41dd
golang · May 27, 2016 · 31e13c8 · 31e13c8
2 parents d108bc0 + 496cf21
commit 31e13c8
Show file tree

Hide file tree

Showing 507 changed files with 31,560 additions and 5,829 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ misc/cgo/stdio/run.out
 misc/cgo/testso/main
 src/cmd/cgo/zdefaultcc.go
 src/cmd/go/zdefaultcc.go
+src/cmd/go/zosarch.go
 src/cmd/internal/obj/zbootstrap.go
 src/go/build/zcgo.go
 src/go/doc/headscan