cmd/go: c tools not used during compilation

cov, nm, pprof, prof

R=rsc, r, rsc
CC=golang-dev
https://golang.org/cl/5576067

5 files changed, 12 insertions, 14 deletions

diff --git a/src/cmd/cov/Makefile b/src/cmd/cov/Makefile
index c080f4a284..616e94f647 100644
--- a/src/cmd/cov/Makefile
+++ b/src/cmd/cov/Makefile
@@ -9,7 +9,7 @@ O:=$(HOST_O)
 # We call the binary 6cov to avoid confusion and because this binary
 # is linked only with amd64 and x86 support.
 
-TARG=6cov
+TARG=cov
 OFILES=\
 	main.$O\
 	tree.$O\
@@ -18,7 +18,7 @@ HFILES=\
 	tree.h\
 
 NOINSTALL=1
-include ../../Make.ccmd
+include ../../Make.ctool
 
 ifeq ($(GOOS),windows)
 NAME=windows
@@ -38,4 +38,4 @@ install-darwin: $(TARG)
 	@true
 
 install-default: $(TARG)
-	cp $(TARG) "$(GOBIN)"/$(TARG)
+	cp $(TARG) "$(GOBIN)"/go-tool/$(TARG)
diff --git a/src/cmd/go/tool.go b/src/cmd/go/tool.go
index 24ed78bdab..12be9a8036 100644
--- a/src/cmd/go/tool.go
+++ b/src/cmd/go/tool.go
@@ -87,7 +87,7 @@ func listTools() {
 		exitStatus = 2
 		return
 	}
-	sort.StringSlice(names).Sort()
+	sort.Strings(names)
 	for _, name := range names {
 		// Unify presentation by going to lower case.
 		name = strings.ToLower(name)
diff --git a/src/cmd/nm/Makefile b/src/cmd/nm/Makefile
index 81bc348deb..f2a89d83f5 100644
--- a/src/cmd/nm/Makefile
+++ b/src/cmd/nm/Makefile
@@ -8,8 +8,8 @@ O:=$(HOST_O)
 # The directory is nm because the source is portable and general.
 # We call the binary 6nm to avoid confusion with the host nm.
 
-TARG=6nm
+TARG=nm
 OFILES=\
 	nm.$O\
 
-include ../../Make.ccmd
+include ../../Make.ctool
diff --git a/src/cmd/prof/Makefile b/src/cmd/prof/Makefile
index 292a6482a2..9266814a0a 100644
--- a/src/cmd/prof/Makefile
+++ b/src/cmd/prof/Makefile
@@ -5,16 +5,14 @@
 include ../../Make.inc
 O:=$(HOST_O)
 
-# The directory is prof because the source is portable and general.
-# We call the binary 6prof to avoid confusion and because this binary
-# is linked only with amd64 and x86 support.
+# This binary is linked only with amd64 and x86 support.
 
-TARG=6prof
+TARG=prof
 OFILES=\
 	main.$O\
 
 NOINSTALL=1
-include ../../Make.ccmd
+include ../../Make.ctool
 
 ifeq ($(GOOS),windows)
 NAME=windows
@@ -34,7 +32,7 @@ install-darwin: $(TARG)
 	@true
 
 install-default: $(TARG)
-	cp $(TARG) "$(GOBIN)"/$(TARG)
+	cp $(TARG) "$(GOBIN)"/go-tool/$(TARG)
 
-install-pprof: gopprof
-	cp gopprof "$(GOBIN)"/gopprof
+install-pprof: pprof
+	cp pprof "$(GOBIN)"/go-tool/pprof
diff --git a/src/cmd/prof/gopprof b/src/cmd/prof/pprof
index 49052ac064..49052ac064 100755
--- a/src/cmd/prof/gopprof
+++ b/src/cmd/prof/pprof