[dev.cc] all: merge master (48469a2) into dev.cc

Change-Id: I10f7950d173b302151f2a31daebce297b4306ebe

diff --cc src/cmd/go/pkg.go
index 45de849ec5b877ad13cffb451ffdbc6ba12f50b1,fd6b056fc138a3fde954e02e3471039f567ce860..0d6e913334296176e283b8ac34f16579821a6148
--- 1/src/cmd/go/pkg.go
--- 2/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go
@@@ -393,24 -393,14 +393,25 @@@ const 
  var goTools = map[string]targetDir{
        "cmd/addr2line":                        toTool,
        "cmd/api":                              toTool,
 +      "cmd/asm":                              toTool,
        "cmd/cgo":                              toTool,
 +      "cmd/dist":                             toTool,
        "cmd/fix":                              toTool,
        "cmd/link":                             toTool,
 +      "cmd/new5a":                            toTool,
 +      "cmd/new6a":                            toTool,
 +      "cmd/new8a":                            toTool,
 +      "cmd/new9a":                            toTool,
 +      "cmd/new5g":                            toTool,
 +      "cmd/new6g":                            toTool,
 +      "cmd/new8g":                            toTool,
 +      "cmd/new9g":                            toTool,
        "cmd/nm":                               toTool,
        "cmd/objdump":                          toTool,
 +      "cmd/objwriter":                        toTool,
        "cmd/pack":                             toTool,
        "cmd/pprof":                            toTool,
+       "cmd/trace":                            toTool,
        "cmd/yacc":                             toTool,
        "golang.org/x/tools/cmd/cover":         toTool,
        "golang.org/x/tools/cmd/godoc":         toBin,

diff --cc src/runtime/asm_amd64.s
Simple merge