build: rename $GOROOT/bin/go-tool to $GOROOT/bin/tool.

The go- is redundant now that the directory is required
to be inside $GOROOT.  Rob LGTMed the idea.

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/5618044

src/Make.ctool

@@ -4,7 +4,7 @@
 
 # Makefile for commands written in C.
 
-# Tools always go into $GOROOT/bin/go-tool
+# Tools always go into $GOROOT/bin/tool
 
 ifeq (windows,$(findstring windows, $(shell uname | tr A-Z a-z | sed 's/mingw/windows/')))
 TARG:=$(TARG).exe
@@ -21,14 +21,14 @@ clean:
 	rm -f *.$(HOST_O) $(TARG) $(CLEANFILES)
 
 nuke: clean
-	rm -f "$(GOROOT)/bin/go-tool/$(TARG)"
+	rm -f "$(GOROOT)/bin/tool/$(TARG)"
 
 ifneq ($(NOINSTALL),1)
-install: $(QUOTED_GOROOT)/bin/go-tool/$(TARG)
+install: $(QUOTED_GOROOT)/bin/tool/$(TARG)
 endif
 
-$(QUOTED_GOROOT)/bin/go-tool/$(TARG): $(TARG)
-	mkdir -p "$(GOROOT)/bin/go-tool" && cp $(TARG) "$(GOROOT)/bin/go-tool/$(TARG)"
+$(QUOTED_GOROOT)/bin/tool/$(TARG): $(TARG)
+	mkdir -p "$(GOROOT)/bin/tool" && cp $(TARG) "$(GOROOT)/bin/tool/$(TARG)"
 
 y.tab.h: $(YFILES)
 	bison -y $(HOST_YFLAGS) $(YFILES)

src/Make.inc

@@ -98,15 +98,15 @@ GOBIN=$(QUOTED_GOROOT)/bin
 endif
 QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN))
 
-AS=$(QUOTED_GOROOT)/bin/go-tool/$(O)a
-CC=$(QUOTED_GOROOT)/bin/go-tool/$(O)c
-GC=$(QUOTED_GOROOT)/bin/go-tool/$(O)g
-LD=$(QUOTED_GOROOT)/bin/go-tool/$(O)l
+AS=$(QUOTED_GOROOT)/bin/tool/$(O)a
+CC=$(QUOTED_GOROOT)/bin/tool/$(O)c
+GC=$(QUOTED_GOROOT)/bin/tool/$(O)g
+LD=$(QUOTED_GOROOT)/bin/tool/$(O)l
 OS=568vq
 CFLAGS=-FVw
 
-HOST_CC=$(QUOTED_GOROOT)/bin/go-tool/quietgcc
-HOST_LD=$(QUOTED_GOROOT)/bin/go-tool/quietgcc
+HOST_CC=$(QUOTED_GOROOT)/bin/tool/quietgcc
+HOST_LD=$(QUOTED_GOROOT)/bin/tool/quietgcc
 HOST_O=o
 HOST_YFLAGS=-d
 HOST_AR?=ar

src/buildscript.sh

@@ -36,8 +36,7 @@ set -e
 		s/\$GOROOT/"$GOROOT"/g
 		s/\$WORK/"$WORK"/g
 		s;"\$GOBIN"/go;&_bootstrap;g
-		s/go_bootstrap-tool/go-tool/g
-		s;"\$GOBIN"/go-tool;"$GOROOT"/bin/go-tool;g
+		s;"\$GOBIN"/tool;"$GOROOT"/bin/tool;g
 		s; \./; ;g
 	'
 	)>$targ

src/buildscript/darwin_386.sh

@@ -17,54 +17,54 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_darwin.go zruntime_defs_darwin_386.go zversion.go
+"$GOROOT"/bin/tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_darwin.go zruntime_defs_darwin_386.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_386.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_darwin_386.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_darwin.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_darwin.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_darwin_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_darwin -DGOARCH_386 alg.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_darwin -DGOARCH_386 atomic_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_darwin -DGOARCH_386 cgocall.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_darwin -DGOARCH_386 chan.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_darwin -DGOARCH_386 closure_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_darwin -DGOARCH_386 complex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_darwin -DGOARCH_386 cpuprof.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_darwin -DGOARCH_386 float.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_darwin -DGOARCH_386 hashmap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_darwin -DGOARCH_386 iface.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_darwin -DGOARCH_386 lock_sema.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_darwin -DGOARCH_386 mcache.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_darwin -DGOARCH_386 mcentral.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mem_darwin.8 -DGOOS_darwin -DGOARCH_386 mem_darwin.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_darwin -DGOARCH_386 mfinal.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_darwin -DGOARCH_386 mfixalloc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_darwin -DGOARCH_386 mgc0.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_darwin -DGOARCH_386 mheap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_darwin -DGOARCH_386 msize.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_darwin -DGOARCH_386 print.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_darwin -DGOARCH_386 proc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_darwin -DGOARCH_386 rune.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_darwin -DGOARCH_386 runtime.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/signal_darwin_386.8 -DGOOS_darwin -DGOARCH_386 signal_darwin_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_darwin -DGOARCH_386 slice.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_darwin -DGOARCH_386 symtab.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/thread_darwin.8 -DGOOS_darwin -DGOARCH_386 thread_darwin.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_darwin -DGOARCH_386 traceback_x86.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_darwin -DGOARCH_386 vlrt_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_darwin -DGOARCH_386 zmalloc_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_darwin -DGOARCH_386 zmprof_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_darwin -DGOARCH_386 zruntime1_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_darwin -DGOARCH_386 zsema_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_darwin -DGOARCH_386 zsigqueue_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_darwin -DGOARCH_386 zstring_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_darwin -DGOARCH_386 ztime_386.c
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_darwin -DGOARCH_386 memmove_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_darwin_386.8 -DGOOS_darwin -DGOARCH_386 rt0_darwin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_darwin_386.8 -DGOOS_darwin -DGOARCH_386 sys_darwin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_darwin -DGOARCH_386 vlop_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_darwin.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_darwin_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_darwin.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_darwin_386.8 "$WORK"/runtime/_obj/sys_darwin_386.8 "$WORK"/runtime/_obj/vlop_386.8
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_darwin -DGOARCH_386 alg.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_darwin -DGOARCH_386 atomic_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_darwin -DGOARCH_386 cgocall.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_darwin -DGOARCH_386 chan.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_darwin -DGOARCH_386 closure_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_darwin -DGOARCH_386 complex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_darwin -DGOARCH_386 cpuprof.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_darwin -DGOARCH_386 float.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_darwin -DGOARCH_386 hashmap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_darwin -DGOARCH_386 iface.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_darwin -DGOARCH_386 lock_sema.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_darwin -DGOARCH_386 mcache.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_darwin -DGOARCH_386 mcentral.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mem_darwin.8 -DGOOS_darwin -DGOARCH_386 mem_darwin.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_darwin -DGOARCH_386 mfinal.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_darwin -DGOARCH_386 mfixalloc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_darwin -DGOARCH_386 mgc0.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_darwin -DGOARCH_386 mheap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_darwin -DGOARCH_386 msize.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_darwin -DGOARCH_386 print.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_darwin -DGOARCH_386 proc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_darwin -DGOARCH_386 rune.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_darwin -DGOARCH_386 runtime.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/signal_darwin_386.8 -DGOOS_darwin -DGOARCH_386 signal_darwin_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_darwin -DGOARCH_386 slice.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_darwin -DGOARCH_386 symtab.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/thread_darwin.8 -DGOOS_darwin -DGOARCH_386 thread_darwin.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_darwin -DGOARCH_386 traceback_x86.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_darwin -DGOARCH_386 vlrt_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_darwin -DGOARCH_386 zmalloc_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_darwin -DGOARCH_386 zmprof_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_darwin -DGOARCH_386 zruntime1_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_darwin -DGOARCH_386 zsema_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_darwin -DGOARCH_386 zsigqueue_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_darwin -DGOARCH_386 zstring_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_darwin -DGOARCH_386 ztime_386.c
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_darwin -DGOARCH_386 memmove_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_darwin_386.8 -DGOOS_darwin -DGOARCH_386 rt0_darwin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_darwin_386.8 -DGOOS_darwin -DGOARCH_386 sys_darwin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_darwin -DGOARCH_386 vlop_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_darwin.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_darwin_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_darwin.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_darwin_386.8 "$WORK"/runtime/_obj/sys_darwin_386.8 "$WORK"/runtime/_obj/vlop_386.8
 mkdir -p "$GOROOT"/pkg/darwin_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_386/runtime.a
 
@@ -74,8 +74,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_386/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/darwin_386/errors.a
 
 #
@@ -84,9 +84,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/darwin_386/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
 mkdir -p "$GOROOT"/pkg/darwin_386/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/darwin_386/sync/atomic.a
 
@@ -96,8 +96,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/darwin_386/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_386/sync.a
 
 #
@@ -106,8 +106,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_386/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/darwin_386/io.a
 
 #
@@ -116,8 +116,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/darwin_386/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_386/unicode.a
 
 #
@@ -126,8 +126,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_386/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/darwin_386/unicode/utf8.a
 
@@ -137,9 +137,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/darwin_386/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
 cp "$WORK"/bytes.a "$GOROOT"/pkg/darwin_386/bytes.a
 
 #
@@ -148,30 +148,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/darwin_386/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_darwin -DGOARCH_386 abs_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_darwin -DGOARCH_386 asin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_darwin -DGOARCH_386 atan2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_darwin -DGOARCH_386 atan_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_darwin -DGOARCH_386 dim_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_darwin -DGOARCH_386 exp2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_darwin -DGOARCH_386 exp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_darwin -DGOARCH_386 expm1_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_darwin -DGOARCH_386 floor_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_darwin -DGOARCH_386 frexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_darwin -DGOARCH_386 hypot_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_darwin -DGOARCH_386 ldexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_darwin -DGOARCH_386 log10_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_darwin -DGOARCH_386 log1p_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_darwin -DGOARCH_386 log_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_darwin -DGOARCH_386 mod_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_darwin -DGOARCH_386 modf_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_darwin -DGOARCH_386 remainder_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_darwin -DGOARCH_386 sin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_darwin -DGOARCH_386 sincos_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_darwin -DGOARCH_386 sqrt_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_darwin -DGOARCH_386 tan_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_darwin -DGOARCH_386 abs_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_darwin -DGOARCH_386 asin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_darwin -DGOARCH_386 atan2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_darwin -DGOARCH_386 atan_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_darwin -DGOARCH_386 dim_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_darwin -DGOARCH_386 exp2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_darwin -DGOARCH_386 exp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_darwin -DGOARCH_386 expm1_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_darwin -DGOARCH_386 floor_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_darwin -DGOARCH_386 frexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_darwin -DGOARCH_386 hypot_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_darwin -DGOARCH_386 ldexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_darwin -DGOARCH_386 log10_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_darwin -DGOARCH_386 log1p_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_darwin -DGOARCH_386 log_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_darwin -DGOARCH_386 mod_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_darwin -DGOARCH_386 modf_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_darwin -DGOARCH_386 remainder_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_darwin -DGOARCH_386 sin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_darwin -DGOARCH_386 sincos_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_darwin -DGOARCH_386 sqrt_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_darwin -DGOARCH_386 tan_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
 cp "$WORK"/math.a "$GOROOT"/pkg/darwin_386/math.a
 
 #
@@ -180,8 +180,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/darwin_386/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_386/strings.a
 
 #
@@ -190,8 +190,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_386/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_386/strconv.a
 
 #
@@ -200,8 +200,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_386/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_386/bufio.a
 
 #
@@ -210,8 +210,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_386/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_386/sort.a
 
 #
@@ -220,8 +220,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_386/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/darwin_386/container/heap.a
 
@@ -231,8 +231,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/darwin_386/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/darwin_386/encoding/base64.a
 
@@ -242,9 +242,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/darwin_386/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_darwin.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_darwin.go syscall_darwin_386.go syscall_unix.go zerrors_darwin_386.go zsyscall_darwin_386.go zsysnum_darwin_386.go ztypes_darwin_386.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_darwin_386.8 -DGOOS_darwin -DGOARCH_386 asm_darwin_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_darwin_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_darwin.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_darwin.go syscall_darwin_386.go syscall_unix.go zerrors_darwin_386.go zsyscall_darwin_386.go zsysnum_darwin_386.go ztypes_darwin_386.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_darwin_386.8 -DGOOS_darwin -DGOARCH_386 asm_darwin_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_darwin_386.8
 cp "$WORK"/syscall.a "$GOROOT"/pkg/darwin_386/syscall.a
 
 #
@@ -253,8 +253,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/darwin_386/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/darwin_386/time.a
 
 #
@@ -263,8 +263,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/darwin_386/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_darwin.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_darwin.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/darwin_386/os.a
 
 #
@@ -273,8 +273,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/darwin_386/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_386/reflect.a
 
 #
@@ -283,8 +283,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_386/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_386/fmt.a
 
 #
@@ -293,8 +293,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_386/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/darwin_386/unicode/utf16.a
 
 #
@@ -303,8 +303,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/darwin_386/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/darwin_386/encoding/json.a
 
 #
@@ -313,8 +313,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/darwin_386/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_386/flag.a
 
 #
@@ -323,8 +323,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_386/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/darwin_386/encoding/gob.a
 
 #
@@ -333,8 +333,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/darwin_386/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/darwin_386/go/token.a
 
@@ -344,8 +344,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/darwin_386/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/darwin_386/path/filepath.a
 
@@ -355,8 +355,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/darwin_386/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/darwin_386/go/scanner.a
 
 #
@@ -365,8 +365,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/darwin_386/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/darwin_386/go/ast.a
 
 #
@@ -375,8 +375,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/darwin_386/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/darwin_386/io/ioutil.a
 
@@ -386,8 +386,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/darwin_386/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/darwin_386/go/parser.a
 
 #
@@ -396,8 +396,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/darwin_386/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/darwin_386/log.a
 
 #
@@ -406,8 +406,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/darwin_386/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/darwin_386/path.a
 
 #
@@ -416,8 +416,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/darwin_386/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
 cp "$WORK"/go/build.a "$GOROOT"/pkg/darwin_386/go/build.a
 
 #
@@ -426,8 +426,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/darwin_386/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/darwin_386/os/exec.a
 
@@ -437,8 +437,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/darwin_386/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/darwin_386/regexp/syntax.a
 
@@ -448,8 +448,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/darwin_386/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_386/regexp.a
 
 #
@@ -458,8 +458,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_386/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/darwin_386/net/url.a
 
@@ -469,8 +469,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/darwin_386/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/darwin_386/text/template/parse.a
 
@@ -480,8 +480,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/darwin_386/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/darwin_386/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_386/text/template.a
 
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
-"$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/darwin_amd64.sh

@@ -17,52 +17,52 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_darwin.go zruntime_defs_darwin_amd64.go zversion.go
+"$GOROOT"/bin/tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_darwin.go zruntime_defs_darwin_amd64.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_amd64.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_darwin_amd64.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_darwin.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_darwin.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_darwin_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_darwin -DGOARCH_amd64 alg.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_darwin -DGOARCH_amd64 atomic_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_darwin -DGOARCH_amd64 cgocall.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_darwin -DGOARCH_amd64 chan.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_darwin -DGOARCH_amd64 closure_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_darwin -DGOARCH_amd64 complex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_darwin -DGOARCH_amd64 cpuprof.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_darwin -DGOARCH_amd64 float.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_darwin -DGOARCH_amd64 hashmap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_darwin -DGOARCH_amd64 iface.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_darwin -DGOARCH_amd64 lock_sema.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_darwin -DGOARCH_amd64 mcache.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_darwin -DGOARCH_amd64 mcentral.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mem_darwin.6 -DGOOS_darwin -DGOARCH_amd64 mem_darwin.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_darwin -DGOARCH_amd64 mfinal.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_darwin -DGOARCH_amd64 mfixalloc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_darwin -DGOARCH_amd64 mgc0.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_darwin -DGOARCH_amd64 mheap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_darwin -DGOARCH_amd64 msize.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_darwin -DGOARCH_amd64 print.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_darwin -DGOARCH_amd64 proc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_darwin -DGOARCH_amd64 rune.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_darwin -DGOARCH_amd64 runtime.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/signal_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 signal_darwin_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_darwin -DGOARCH_amd64 slice.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_darwin -DGOARCH_amd64 symtab.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/thread_darwin.6 -DGOOS_darwin -DGOARCH_amd64 thread_darwin.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_darwin -DGOARCH_amd64 traceback_x86.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zmalloc_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zmprof_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zruntime1_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zsema_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zsigqueue_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zstring_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ztime_amd64.c
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_darwin -DGOARCH_amd64 memmove_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 rt0_darwin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sys_darwin_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_darwin.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_darwin_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_darwin.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_darwin_amd64.6 "$WORK"/runtime/_obj/sys_darwin_amd64.6
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_darwin -DGOARCH_amd64 alg.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_darwin -DGOARCH_amd64 atomic_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_darwin -DGOARCH_amd64 cgocall.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_darwin -DGOARCH_amd64 chan.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_darwin -DGOARCH_amd64 closure_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_darwin -DGOARCH_amd64 complex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_darwin -DGOARCH_amd64 cpuprof.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_darwin -DGOARCH_amd64 float.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_darwin -DGOARCH_amd64 hashmap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_darwin -DGOARCH_amd64 iface.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_darwin -DGOARCH_amd64 lock_sema.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_darwin -DGOARCH_amd64 mcache.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_darwin -DGOARCH_amd64 mcentral.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mem_darwin.6 -DGOOS_darwin -DGOARCH_amd64 mem_darwin.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_darwin -DGOARCH_amd64 mfinal.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_darwin -DGOARCH_amd64 mfixalloc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_darwin -DGOARCH_amd64 mgc0.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_darwin -DGOARCH_amd64 mheap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_darwin -DGOARCH_amd64 msize.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_darwin -DGOARCH_amd64 print.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_darwin -DGOARCH_amd64 proc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_darwin -DGOARCH_amd64 rune.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_darwin -DGOARCH_amd64 runtime.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/signal_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 signal_darwin_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_darwin -DGOARCH_amd64 slice.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_darwin -DGOARCH_amd64 symtab.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/thread_darwin.6 -DGOOS_darwin -DGOARCH_amd64 thread_darwin.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_darwin -DGOARCH_amd64 traceback_x86.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zmalloc_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zmprof_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zruntime1_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zsema_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zsigqueue_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_darwin -DGOARCH_amd64 zstring_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/darwin_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ztime_amd64.c
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_darwin -DGOARCH_amd64 memmove_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 rt0_darwin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sys_darwin_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_darwin.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_darwin_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_darwin.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_darwin_amd64.6 "$WORK"/runtime/_obj/sys_darwin_amd64.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_amd64/runtime.a
 
@@ -72,8 +72,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_amd64/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/darwin_amd64/errors.a
 
 #
@@ -82,9 +82,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/darwin_amd64/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/darwin_amd64/sync/atomic.a
 
@@ -94,8 +94,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/darwin_amd64/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_amd64/sync.a
 
 #
@@ -104,8 +104,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_amd64/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/darwin_amd64/io.a
 
 #
@@ -114,8 +114,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/darwin_amd64/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_amd64/unicode.a
 
 #
@@ -124,8 +124,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_amd64/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/darwin_amd64/unicode/utf8.a
 
@@ -135,9 +135,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/darwin_amd64/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
 cp "$WORK"/bytes.a "$GOROOT"/pkg/darwin_amd64/bytes.a
 
 #
@@ -146,31 +146,31 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/darwin_amd64/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_darwin -DGOARCH_amd64 abs_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_darwin -DGOARCH_amd64 atan2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_darwin -DGOARCH_amd64 atan_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_darwin -DGOARCH_amd64 dim_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_darwin -DGOARCH_amd64 exp2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_darwin -DGOARCH_amd64 exp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_darwin -DGOARCH_amd64 expm1_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_darwin -DGOARCH_amd64 floor_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 fltasm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_darwin -DGOARCH_amd64 frexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_darwin -DGOARCH_amd64 hypot_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ldexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_darwin -DGOARCH_amd64 log10_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_darwin -DGOARCH_amd64 log1p_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_darwin -DGOARCH_amd64 log_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_darwin -DGOARCH_amd64 mod_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_darwin -DGOARCH_amd64 modf_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_darwin -DGOARCH_amd64 remainder_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sincos_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sqrt_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_darwin -DGOARCH_amd64 tan_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_darwin -DGOARCH_amd64 abs_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_darwin -DGOARCH_amd64 atan2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_darwin -DGOARCH_amd64 atan_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_darwin -DGOARCH_amd64 dim_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_darwin -DGOARCH_amd64 exp2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_darwin -DGOARCH_amd64 exp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_darwin -DGOARCH_amd64 expm1_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_darwin -DGOARCH_amd64 floor_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 fltasm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_darwin -DGOARCH_amd64 frexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_darwin -DGOARCH_amd64 hypot_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ldexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_darwin -DGOARCH_amd64 log10_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_darwin -DGOARCH_amd64 log1p_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_darwin -DGOARCH_amd64 log_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_darwin -DGOARCH_amd64 mod_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_darwin -DGOARCH_amd64 modf_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_darwin -DGOARCH_amd64 remainder_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sincos_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_darwin -DGOARCH_amd64 sqrt_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_darwin -DGOARCH_amd64 tan_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
 cp "$WORK"/math.a "$GOROOT"/pkg/darwin_amd64/math.a
 
 #
@@ -179,8 +179,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/darwin_amd64/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_amd64/strings.a
 
 #
@@ -189,8 +189,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_amd64/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_amd64/strconv.a
 
 #
@@ -199,8 +199,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_amd64/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_amd64/bufio.a
 
 #
@@ -209,8 +209,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_amd64/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_amd64/sort.a
 
 #
@@ -219,8 +219,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_amd64/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/darwin_amd64/container/heap.a
 
@@ -230,8 +230,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/darwin_amd64/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/darwin_amd64/encoding/base64.a
 
@@ -241,9 +241,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/darwin_amd64/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_darwin.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go syscall_unix.go zerrors_darwin_amd64.go zsyscall_darwin_amd64.go zsysnum_darwin_amd64.go ztypes_darwin_amd64.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_darwin_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_darwin_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_darwin.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go syscall_unix.go zerrors_darwin_amd64.go zsyscall_darwin_amd64.go zsysnum_darwin_amd64.go ztypes_darwin_amd64.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 asm_darwin_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_darwin_amd64.6
 cp "$WORK"/syscall.a "$GOROOT"/pkg/darwin_amd64/syscall.a
 
 #
@@ -252,8 +252,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/darwin_amd64/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/darwin_amd64/time.a
 
 #
@@ -262,8 +262,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/darwin_amd64/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_darwin.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_darwin.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/darwin_amd64/os.a
 
 #
@@ -272,8 +272,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/darwin_amd64/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_amd64/reflect.a
 
 #
@@ -282,8 +282,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_amd64/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_amd64/fmt.a
 
 #
@@ -292,8 +292,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_amd64/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/darwin_amd64/unicode/utf16.a
 
 #
@@ -302,8 +302,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/darwin_amd64/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/darwin_amd64/encoding/json.a
 
 #
@@ -312,8 +312,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/darwin_amd64/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_amd64/flag.a
 
 #
@@ -322,8 +322,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_amd64/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/darwin_amd64/encoding/gob.a
 
 #
@@ -332,8 +332,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/darwin_amd64/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/darwin_amd64/go/token.a
 
@@ -343,8 +343,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/darwin_amd64/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/darwin_amd64/path/filepath.a
 
@@ -354,8 +354,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/darwin_amd64/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/darwin_amd64/go/scanner.a
 
 #
@@ -364,8 +364,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/darwin_amd64/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/darwin_amd64/go/ast.a
 
 #
@@ -374,8 +374,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/darwin_amd64/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/darwin_amd64/io/ioutil.a
 
@@ -385,8 +385,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/darwin_amd64/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/darwin_amd64/go/parser.a
 
 #
@@ -395,8 +395,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/darwin_amd64/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/darwin_amd64/log.a
 
 #
@@ -405,8 +405,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/darwin_amd64/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/darwin_amd64/path.a
 
 #
@@ -415,8 +415,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/darwin_amd64/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
 cp "$WORK"/go/build.a "$GOROOT"/pkg/darwin_amd64/go/build.a
 
 #
@@ -425,8 +425,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/darwin_amd64/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/darwin_amd64/os/exec.a
 
@@ -436,8 +436,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/darwin_amd64/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/darwin_amd64/regexp/syntax.a
 
@@ -447,8 +447,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/darwin_amd64/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_amd64/regexp.a
 
 #
@@ -457,8 +457,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_amd64/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/darwin_amd64/net/url.a
 
@@ -468,8 +468,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/darwin_amd64/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/darwin_amd64/text/template/parse.a
 
@@ -479,8 +479,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/darwin_amd64/text/template/parse.
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/darwin_amd64/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_amd64/text/template.a
 
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
-"$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/freebsd_386.sh

@@ -17,54 +17,54 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_freebsd.go zruntime_defs_freebsd_386.go zversion.go
+"$GOROOT"/bin/tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_freebsd.go zruntime_defs_freebsd_386.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_386.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_freebsd_386.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_freebsd.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_freebsd.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_freebsd_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_freebsd -DGOARCH_386 alg.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_freebsd -DGOARCH_386 atomic_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_freebsd -DGOARCH_386 cgocall.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_freebsd -DGOARCH_386 chan.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_freebsd -DGOARCH_386 closure_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_freebsd -DGOARCH_386 complex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_freebsd -DGOARCH_386 cpuprof.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_freebsd -DGOARCH_386 float.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_freebsd -DGOARCH_386 hashmap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_freebsd -DGOARCH_386 iface.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/lock_futex.8 -DGOOS_freebsd -DGOARCH_386 lock_futex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_freebsd -DGOARCH_386 mcache.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_freebsd -DGOARCH_386 mcentral.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mem_freebsd.8 -DGOOS_freebsd -DGOARCH_386 mem_freebsd.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_freebsd -DGOARCH_386 mfinal.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_freebsd -DGOARCH_386 mfixalloc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_freebsd -DGOARCH_386 mgc0.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_freebsd -DGOARCH_386 mheap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_freebsd -DGOARCH_386 msize.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_freebsd -DGOARCH_386 print.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_freebsd -DGOARCH_386 proc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_freebsd -DGOARCH_386 rune.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_freebsd -DGOARCH_386 runtime.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/signal_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 signal_freebsd_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_freebsd -DGOARCH_386 slice.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_freebsd -DGOARCH_386 symtab.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/thread_freebsd.8 -DGOOS_freebsd -DGOARCH_386 thread_freebsd.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_freebsd -DGOARCH_386 traceback_x86.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_freebsd -DGOARCH_386 vlrt_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_freebsd -DGOARCH_386 zmalloc_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_freebsd -DGOARCH_386 zmprof_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_freebsd -DGOARCH_386 zruntime1_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_freebsd -DGOARCH_386 zsema_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_freebsd -DGOARCH_386 zsigqueue_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_freebsd -DGOARCH_386 zstring_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_freebsd -DGOARCH_386 ztime_386.c
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_freebsd -DGOARCH_386 memmove_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 rt0_freebsd_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 sys_freebsd_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_freebsd -DGOARCH_386 vlop_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_futex.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_freebsd.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_freebsd_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_freebsd.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_freebsd_386.8 "$WORK"/runtime/_obj/sys_freebsd_386.8 "$WORK"/runtime/_obj/vlop_386.8
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_freebsd -DGOARCH_386 alg.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_freebsd -DGOARCH_386 atomic_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_freebsd -DGOARCH_386 cgocall.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_freebsd -DGOARCH_386 chan.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_freebsd -DGOARCH_386 closure_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_freebsd -DGOARCH_386 complex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_freebsd -DGOARCH_386 cpuprof.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_freebsd -DGOARCH_386 float.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_freebsd -DGOARCH_386 hashmap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_freebsd -DGOARCH_386 iface.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/lock_futex.8 -DGOOS_freebsd -DGOARCH_386 lock_futex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_freebsd -DGOARCH_386 mcache.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_freebsd -DGOARCH_386 mcentral.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mem_freebsd.8 -DGOOS_freebsd -DGOARCH_386 mem_freebsd.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_freebsd -DGOARCH_386 mfinal.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_freebsd -DGOARCH_386 mfixalloc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_freebsd -DGOARCH_386 mgc0.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_freebsd -DGOARCH_386 mheap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_freebsd -DGOARCH_386 msize.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_freebsd -DGOARCH_386 print.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_freebsd -DGOARCH_386 proc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_freebsd -DGOARCH_386 rune.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_freebsd -DGOARCH_386 runtime.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/signal_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 signal_freebsd_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_freebsd -DGOARCH_386 slice.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_freebsd -DGOARCH_386 symtab.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/thread_freebsd.8 -DGOOS_freebsd -DGOARCH_386 thread_freebsd.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_freebsd -DGOARCH_386 traceback_x86.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_freebsd -DGOARCH_386 vlrt_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_freebsd -DGOARCH_386 zmalloc_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_freebsd -DGOARCH_386 zmprof_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_freebsd -DGOARCH_386 zruntime1_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_freebsd -DGOARCH_386 zsema_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_freebsd -DGOARCH_386 zsigqueue_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_freebsd -DGOARCH_386 zstring_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_freebsd -DGOARCH_386 ztime_386.c
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_freebsd -DGOARCH_386 memmove_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 rt0_freebsd_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 sys_freebsd_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_freebsd -DGOARCH_386 vlop_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_futex.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_freebsd.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_freebsd_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_freebsd.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_freebsd_386.8 "$WORK"/runtime/_obj/sys_freebsd_386.8 "$WORK"/runtime/_obj/vlop_386.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_386/runtime.a
 
@@ -74,8 +74,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_386/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/freebsd_386/errors.a
 
 #
@@ -84,9 +84,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/freebsd_386/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/freebsd_386/sync/atomic.a
 
@@ -96,8 +96,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/freebsd_386/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_386/sync.a
 
 #
@@ -106,8 +106,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_386/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_386/io.a
 
 #
@@ -116,8 +116,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_386/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_386/unicode.a
 
 #
@@ -126,8 +126,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_386/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/freebsd_386/unicode/utf8.a
 
@@ -137,9 +137,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/freebsd_386/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
 cp "$WORK"/bytes.a "$GOROOT"/pkg/freebsd_386/bytes.a
 
 #
@@ -148,30 +148,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/freebsd_386/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_freebsd -DGOARCH_386 abs_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_freebsd -DGOARCH_386 asin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_freebsd -DGOARCH_386 atan2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_freebsd -DGOARCH_386 atan_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_freebsd -DGOARCH_386 dim_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_freebsd -DGOARCH_386 exp2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_freebsd -DGOARCH_386 exp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_freebsd -DGOARCH_386 expm1_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_freebsd -DGOARCH_386 floor_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_freebsd -DGOARCH_386 frexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_freebsd -DGOARCH_386 hypot_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_freebsd -DGOARCH_386 ldexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_freebsd -DGOARCH_386 log10_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_freebsd -DGOARCH_386 log1p_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_freebsd -DGOARCH_386 log_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_freebsd -DGOARCH_386 mod_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_freebsd -DGOARCH_386 modf_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_freebsd -DGOARCH_386 remainder_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_freebsd -DGOARCH_386 sin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_freebsd -DGOARCH_386 sincos_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_freebsd -DGOARCH_386 sqrt_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_freebsd -DGOARCH_386 tan_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_freebsd -DGOARCH_386 abs_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_freebsd -DGOARCH_386 asin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_freebsd -DGOARCH_386 atan2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_freebsd -DGOARCH_386 atan_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_freebsd -DGOARCH_386 dim_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_freebsd -DGOARCH_386 exp2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_freebsd -DGOARCH_386 exp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_freebsd -DGOARCH_386 expm1_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_freebsd -DGOARCH_386 floor_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_freebsd -DGOARCH_386 frexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_freebsd -DGOARCH_386 hypot_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_freebsd -DGOARCH_386 ldexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_freebsd -DGOARCH_386 log10_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_freebsd -DGOARCH_386 log1p_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_freebsd -DGOARCH_386 log_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_freebsd -DGOARCH_386 mod_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_freebsd -DGOARCH_386 modf_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_freebsd -DGOARCH_386 remainder_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_freebsd -DGOARCH_386 sin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_freebsd -DGOARCH_386 sincos_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_freebsd -DGOARCH_386 sqrt_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_freebsd -DGOARCH_386 tan_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
 cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_386/math.a
 
 #
@@ -180,8 +180,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_386/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_386/strings.a
 
 #
@@ -190,8 +190,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_386/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_386/strconv.a
 
 #
@@ -200,8 +200,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_386/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_386/bufio.a
 
 #
@@ -210,8 +210,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_386/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_386/sort.a
 
 #
@@ -220,8 +220,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_386/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/freebsd_386/container/heap.a
 
@@ -231,8 +231,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/freebsd_386/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/freebsd_386/encoding/base64.a
 
@@ -242,9 +242,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/freebsd_386/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_freebsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go syscall_unix.go zerrors_freebsd_386.go zsyscall_freebsd_386.go zsysnum_freebsd_386.go ztypes_freebsd_386.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 asm_freebsd_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_freebsd_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_freebsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go syscall_unix.go zerrors_freebsd_386.go zsyscall_freebsd_386.go zsysnum_freebsd_386.go ztypes_freebsd_386.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 asm_freebsd_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_freebsd_386.8
 cp "$WORK"/syscall.a "$GOROOT"/pkg/freebsd_386/syscall.a
 
 #
@@ -253,8 +253,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/freebsd_386/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_386/time.a
 
 #
@@ -263,8 +263,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_386/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_freebsd.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_freebsd.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_386/os.a
 
 #
@@ -273,8 +273,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_386/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_386/reflect.a
 
 #
@@ -283,8 +283,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_386/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_386/fmt.a
 
 #
@@ -293,8 +293,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_386/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/freebsd_386/unicode/utf16.a
 
 #
@@ -303,8 +303,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/freebsd_386/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/freebsd_386/encoding/json.a
 
 #
@@ -313,8 +313,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/freebsd_386/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_386/flag.a
 
 #
@@ -323,8 +323,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_386/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/freebsd_386/encoding/gob.a
 
 #
@@ -333,8 +333,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/freebsd_386/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/freebsd_386/go/token.a
 
@@ -344,8 +344,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/freebsd_386/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/freebsd_386/path/filepath.a
 
@@ -355,8 +355,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/freebsd_386/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/freebsd_386/go/scanner.a
 
 #
@@ -365,8 +365,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/freebsd_386/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/freebsd_386/go/ast.a
 
 #
@@ -375,8 +375,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/freebsd_386/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/freebsd_386/io/ioutil.a
 
@@ -386,8 +386,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/freebsd_386/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/freebsd_386/go/parser.a
 
 #
@@ -396,8 +396,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/freebsd_386/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_386/log.a
 
 #
@@ -406,8 +406,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_386/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_386/path.a
 
 #
@@ -416,8 +416,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_386/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
 cp "$WORK"/go/build.a "$GOROOT"/pkg/freebsd_386/go/build.a
 
 #
@@ -426,8 +426,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/freebsd_386/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/freebsd_386/os/exec.a
 
@@ -437,8 +437,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/freebsd_386/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/freebsd_386/regexp/syntax.a
 
@@ -448,8 +448,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/freebsd_386/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_386/regexp.a
 
 #
@@ -458,8 +458,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_386/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/freebsd_386/net/url.a
 
@@ -469,8 +469,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/freebsd_386/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/freebsd_386/text/template/parse.a
 
@@ -480,8 +480,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/freebsd_386/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/freebsd_386/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_386/text/template.a
 
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
-"$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/freebsd_amd64.sh

@@ -17,52 +17,52 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_freebsd.go zruntime_defs_freebsd_amd64.go zversion.go
+"$GOROOT"/bin/tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_freebsd.go zruntime_defs_freebsd_amd64.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_amd64.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_freebsd_amd64.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_freebsd.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_freebsd.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_freebsd_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_freebsd -DGOARCH_amd64 alg.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 atomic_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_freebsd -DGOARCH_amd64 cgocall.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_freebsd -DGOARCH_amd64 chan.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 closure_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_freebsd -DGOARCH_amd64 complex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_freebsd -DGOARCH_amd64 cpuprof.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_freebsd -DGOARCH_amd64 float.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_freebsd -DGOARCH_amd64 hashmap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_freebsd -DGOARCH_amd64 iface.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/lock_futex.6 -DGOOS_freebsd -DGOARCH_amd64 lock_futex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_freebsd -DGOARCH_amd64 mcache.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_freebsd -DGOARCH_amd64 mcentral.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mem_freebsd.6 -DGOOS_freebsd -DGOARCH_amd64 mem_freebsd.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_freebsd -DGOARCH_amd64 mfinal.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_freebsd -DGOARCH_amd64 mfixalloc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_freebsd -DGOARCH_amd64 mgc0.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_freebsd -DGOARCH_amd64 mheap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_freebsd -DGOARCH_amd64 msize.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_freebsd -DGOARCH_amd64 print.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_freebsd -DGOARCH_amd64 proc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_freebsd -DGOARCH_amd64 rune.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_freebsd -DGOARCH_amd64 runtime.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/signal_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 signal_freebsd_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_freebsd -DGOARCH_amd64 slice.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_freebsd -DGOARCH_amd64 symtab.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/thread_freebsd.6 -DGOOS_freebsd -DGOARCH_amd64 thread_freebsd.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_freebsd -DGOARCH_amd64 traceback_x86.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zmalloc_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zmprof_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zruntime1_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zsema_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zsigqueue_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zstring_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ztime_amd64.c
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 memmove_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 rt0_freebsd_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sys_freebsd_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_futex.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_freebsd.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_freebsd_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_freebsd.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_freebsd_amd64.6 "$WORK"/runtime/_obj/sys_freebsd_amd64.6
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_freebsd -DGOARCH_amd64 alg.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 atomic_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_freebsd -DGOARCH_amd64 cgocall.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_freebsd -DGOARCH_amd64 chan.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 closure_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_freebsd -DGOARCH_amd64 complex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_freebsd -DGOARCH_amd64 cpuprof.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_freebsd -DGOARCH_amd64 float.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_freebsd -DGOARCH_amd64 hashmap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_freebsd -DGOARCH_amd64 iface.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/lock_futex.6 -DGOOS_freebsd -DGOARCH_amd64 lock_futex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_freebsd -DGOARCH_amd64 mcache.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_freebsd -DGOARCH_amd64 mcentral.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mem_freebsd.6 -DGOOS_freebsd -DGOARCH_amd64 mem_freebsd.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_freebsd -DGOARCH_amd64 mfinal.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_freebsd -DGOARCH_amd64 mfixalloc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_freebsd -DGOARCH_amd64 mgc0.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_freebsd -DGOARCH_amd64 mheap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_freebsd -DGOARCH_amd64 msize.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_freebsd -DGOARCH_amd64 print.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_freebsd -DGOARCH_amd64 proc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_freebsd -DGOARCH_amd64 rune.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_freebsd -DGOARCH_amd64 runtime.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/signal_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 signal_freebsd_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_freebsd -DGOARCH_amd64 slice.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_freebsd -DGOARCH_amd64 symtab.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/thread_freebsd.6 -DGOOS_freebsd -DGOARCH_amd64 thread_freebsd.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_freebsd -DGOARCH_amd64 traceback_x86.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zmalloc_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zmprof_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zruntime1_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zsema_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zsigqueue_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 zstring_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/freebsd_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ztime_amd64.c
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 memmove_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 rt0_freebsd_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sys_freebsd_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_futex.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_freebsd.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_freebsd_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_freebsd.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_freebsd_amd64.6 "$WORK"/runtime/_obj/sys_freebsd_amd64.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_amd64/runtime.a
 
@@ -72,8 +72,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_amd64/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/freebsd_amd64/errors.a
 
 #
@@ -82,9 +82,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/freebsd_amd64/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/freebsd_amd64/sync/atomic.a
 
@@ -94,8 +94,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/freebsd_amd64/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_amd64/sync.a
 
 #
@@ -104,8 +104,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_amd64/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_amd64/io.a
 
 #
@@ -114,8 +114,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_amd64/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_amd64/unicode.a
 
 #
@@ -124,8 +124,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_amd64/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/freebsd_amd64/unicode/utf8.a
 
@@ -135,9 +135,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/freebsd_amd64/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
 cp "$WORK"/bytes.a "$GOROOT"/pkg/freebsd_amd64/bytes.a
 
 #
@@ -146,31 +146,31 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/freebsd_amd64/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 abs_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 atan2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 atan_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 dim_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 exp2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 exp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 expm1_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 floor_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 fltasm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 frexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 hypot_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ldexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 log10_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 log1p_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 log_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 mod_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 modf_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 remainder_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sincos_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sqrt_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 tan_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 abs_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 atan2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 atan_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 dim_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 exp2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 exp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 expm1_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 floor_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 fltasm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 frexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 hypot_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ldexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 log10_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 log1p_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 log_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 mod_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 modf_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 remainder_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sincos_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 sqrt_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 tan_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
 cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_amd64/math.a
 
 #
@@ -179,8 +179,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_amd64/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_amd64/strings.a
 
 #
@@ -189,8 +189,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_amd64/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_amd64/strconv.a
 
 #
@@ -199,8 +199,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_amd64/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_amd64/bufio.a
 
 #
@@ -209,8 +209,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_amd64/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_amd64/sort.a
 
 #
@@ -219,8 +219,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_amd64/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/freebsd_amd64/container/heap.a
 
@@ -230,8 +230,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/freebsd_amd64/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/freebsd_amd64/encoding/base64.a
 
@@ -241,9 +241,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/freebsd_amd64/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_freebsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go syscall_unix.go zerrors_freebsd_amd64.go zsyscall_freebsd_amd64.go zsysnum_freebsd_amd64.go ztypes_freebsd_amd64.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_freebsd_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_freebsd_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_freebsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go syscall_unix.go zerrors_freebsd_amd64.go zsyscall_freebsd_amd64.go zsysnum_freebsd_amd64.go ztypes_freebsd_amd64.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 asm_freebsd_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_freebsd_amd64.6
 cp "$WORK"/syscall.a "$GOROOT"/pkg/freebsd_amd64/syscall.a
 
 #
@@ -252,8 +252,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/freebsd_amd64/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_amd64/time.a
 
 #
@@ -262,8 +262,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_amd64/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_freebsd.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_freebsd.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_amd64/os.a
 
 #
@@ -272,8 +272,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_amd64/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_amd64/reflect.a
 
 #
@@ -282,8 +282,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_amd64/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_amd64/fmt.a
 
 #
@@ -292,8 +292,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_amd64/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/freebsd_amd64/unicode/utf16.a
 
 #
@@ -302,8 +302,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/freebsd_amd64/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/freebsd_amd64/encoding/json.a
 
 #
@@ -312,8 +312,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/freebsd_amd64/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_amd64/flag.a
 
 #
@@ -322,8 +322,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_amd64/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/freebsd_amd64/encoding/gob.a
 
 #
@@ -332,8 +332,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/freebsd_amd64/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/freebsd_amd64/go/token.a
 
@@ -343,8 +343,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/freebsd_amd64/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/freebsd_amd64/path/filepath.a
 
@@ -354,8 +354,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/freebsd_amd64/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/freebsd_amd64/go/scanner.a
 
 #
@@ -364,8 +364,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/freebsd_amd64/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/freebsd_amd64/go/ast.a
 
 #
@@ -374,8 +374,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/freebsd_amd64/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/freebsd_amd64/io/ioutil.a
 
@@ -385,8 +385,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/freebsd_amd64/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/freebsd_amd64/go/parser.a
 
 #
@@ -395,8 +395,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/freebsd_amd64/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_amd64/log.a
 
 #
@@ -405,8 +405,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_amd64/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_amd64/path.a
 
 #
@@ -415,8 +415,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_amd64/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
 cp "$WORK"/go/build.a "$GOROOT"/pkg/freebsd_amd64/go/build.a
 
 #
@@ -425,8 +425,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/freebsd_amd64/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/freebsd_amd64/os/exec.a
 
@@ -436,8 +436,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/freebsd_amd64/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/freebsd_amd64/regexp/syntax.a
 
@@ -447,8 +447,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/freebsd_amd64/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_amd64/regexp.a
 
 #
@@ -457,8 +457,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_amd64/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/freebsd_amd64/net/url.a
 
@@ -468,8 +468,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/freebsd_amd64/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/freebsd_amd64/text/template/parse.a
 
@@ -479,8 +479,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/freebsd_amd64/text/template/parse
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_amd64/text/template.a
 
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
-"$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/linux_386.sh

@@ -17,54 +17,54 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_linux.go zruntime_defs_linux_386.go zversion.go
+"$GOROOT"/bin/tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_linux.go zruntime_defs_linux_386.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_386.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_linux_386.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_linux.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_linux.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_linux_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_linux -DGOARCH_386 alg.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_linux -DGOARCH_386 atomic_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_linux -DGOARCH_386 cgocall.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_linux -DGOARCH_386 chan.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_linux -DGOARCH_386 closure_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_linux -DGOARCH_386 complex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_linux -DGOARCH_386 cpuprof.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_linux -DGOARCH_386 float.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_linux -DGOARCH_386 hashmap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_linux -DGOARCH_386 iface.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/lock_futex.8 -DGOOS_linux -DGOARCH_386 lock_futex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_linux -DGOARCH_386 mcache.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_linux -DGOARCH_386 mcentral.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mem_linux.8 -DGOOS_linux -DGOARCH_386 mem_linux.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_linux -DGOARCH_386 mfinal.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_linux -DGOARCH_386 mfixalloc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_linux -DGOARCH_386 mgc0.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_linux -DGOARCH_386 mheap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_linux -DGOARCH_386 msize.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_linux -DGOARCH_386 print.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_linux -DGOARCH_386 proc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_linux -DGOARCH_386 rune.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_linux -DGOARCH_386 runtime.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/signal_linux_386.8 -DGOOS_linux -DGOARCH_386 signal_linux_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_linux -DGOARCH_386 slice.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_linux -DGOARCH_386 symtab.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/thread_linux.8 -DGOOS_linux -DGOARCH_386 thread_linux.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_linux -DGOARCH_386 traceback_x86.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_linux -DGOARCH_386 vlrt_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_linux -DGOARCH_386 zmalloc_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_linux -DGOARCH_386 zmprof_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_linux -DGOARCH_386 zruntime1_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_linux -DGOARCH_386 zsema_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_linux -DGOARCH_386 zsigqueue_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_linux -DGOARCH_386 zstring_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_linux -DGOARCH_386 ztime_386.c
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_linux -DGOARCH_386 memmove_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_386.8 -DGOOS_linux -DGOARCH_386 rt0_linux_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_386.8 -DGOOS_linux -DGOARCH_386 sys_linux_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_linux -DGOARCH_386 vlop_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_futex.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_linux.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_linux_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_linux.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_linux_386.8 "$WORK"/runtime/_obj/sys_linux_386.8 "$WORK"/runtime/_obj/vlop_386.8
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_linux -DGOARCH_386 alg.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_linux -DGOARCH_386 atomic_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_linux -DGOARCH_386 cgocall.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_linux -DGOARCH_386 chan.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_linux -DGOARCH_386 closure_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_linux -DGOARCH_386 complex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_linux -DGOARCH_386 cpuprof.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_linux -DGOARCH_386 float.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_linux -DGOARCH_386 hashmap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_linux -DGOARCH_386 iface.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/lock_futex.8 -DGOOS_linux -DGOARCH_386 lock_futex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_linux -DGOARCH_386 mcache.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_linux -DGOARCH_386 mcentral.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mem_linux.8 -DGOOS_linux -DGOARCH_386 mem_linux.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_linux -DGOARCH_386 mfinal.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_linux -DGOARCH_386 mfixalloc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_linux -DGOARCH_386 mgc0.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_linux -DGOARCH_386 mheap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_linux -DGOARCH_386 msize.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_linux -DGOARCH_386 print.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_linux -DGOARCH_386 proc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_linux -DGOARCH_386 rune.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_linux -DGOARCH_386 runtime.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/signal_linux_386.8 -DGOOS_linux -DGOARCH_386 signal_linux_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_linux -DGOARCH_386 slice.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_linux -DGOARCH_386 symtab.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/thread_linux.8 -DGOOS_linux -DGOARCH_386 thread_linux.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_linux -DGOARCH_386 traceback_x86.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_linux -DGOARCH_386 vlrt_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_linux -DGOARCH_386 zmalloc_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_linux -DGOARCH_386 zmprof_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_linux -DGOARCH_386 zruntime1_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_linux -DGOARCH_386 zsema_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_linux -DGOARCH_386 zsigqueue_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_linux -DGOARCH_386 zstring_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_linux -DGOARCH_386 ztime_386.c
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_linux -DGOARCH_386 memmove_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_386.8 -DGOOS_linux -DGOARCH_386 rt0_linux_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_386.8 -DGOOS_linux -DGOARCH_386 sys_linux_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_linux -DGOARCH_386 vlop_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_futex.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_linux.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_linux_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_linux.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_linux_386.8 "$WORK"/runtime/_obj/sys_linux_386.8 "$WORK"/runtime/_obj/vlop_386.8
 mkdir -p "$GOROOT"/pkg/linux_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_386/runtime.a
 
@@ -74,8 +74,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_386/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/linux_386/errors.a
 
 #
@@ -84,9 +84,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/linux_386/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
 mkdir -p "$GOROOT"/pkg/linux_386/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_386/sync/atomic.a
 
@@ -96,8 +96,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_386/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/linux_386/sync.a
 
 #
@@ -106,8 +106,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/linux_386/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/linux_386/io.a
 
 #
@@ -116,8 +116,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/linux_386/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_386/unicode.a
 
 #
@@ -126,8 +126,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_386/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/linux_386/unicode/utf8.a
 
@@ -137,9 +137,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/linux_386/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
 cp "$WORK"/bytes.a "$GOROOT"/pkg/linux_386/bytes.a
 
 #
@@ -148,30 +148,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/linux_386/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_linux -DGOARCH_386 abs_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_linux -DGOARCH_386 asin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_linux -DGOARCH_386 atan2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_linux -DGOARCH_386 atan_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_linux -DGOARCH_386 dim_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_linux -DGOARCH_386 exp2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_linux -DGOARCH_386 exp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_linux -DGOARCH_386 expm1_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_linux -DGOARCH_386 floor_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_linux -DGOARCH_386 frexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_linux -DGOARCH_386 hypot_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_linux -DGOARCH_386 ldexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_linux -DGOARCH_386 log10_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_linux -DGOARCH_386 log1p_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_linux -DGOARCH_386 log_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_linux -DGOARCH_386 mod_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_linux -DGOARCH_386 modf_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_linux -DGOARCH_386 remainder_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_linux -DGOARCH_386 sin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_linux -DGOARCH_386 sincos_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_linux -DGOARCH_386 sqrt_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_linux -DGOARCH_386 tan_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_linux -DGOARCH_386 abs_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_linux -DGOARCH_386 asin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_linux -DGOARCH_386 atan2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_linux -DGOARCH_386 atan_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_linux -DGOARCH_386 dim_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_linux -DGOARCH_386 exp2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_linux -DGOARCH_386 exp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_linux -DGOARCH_386 expm1_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_linux -DGOARCH_386 floor_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_linux -DGOARCH_386 frexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_linux -DGOARCH_386 hypot_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_linux -DGOARCH_386 ldexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_linux -DGOARCH_386 log10_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_linux -DGOARCH_386 log1p_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_linux -DGOARCH_386 log_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_linux -DGOARCH_386 mod_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_linux -DGOARCH_386 modf_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_linux -DGOARCH_386 remainder_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_linux -DGOARCH_386 sin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_linux -DGOARCH_386 sincos_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_linux -DGOARCH_386 sqrt_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_linux -DGOARCH_386 tan_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
 cp "$WORK"/math.a "$GOROOT"/pkg/linux_386/math.a
 
 #
@@ -180,8 +180,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/linux_386/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/linux_386/strings.a
 
 #
@@ -190,8 +190,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/linux_386/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_386/strconv.a
 
 #
@@ -200,8 +200,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_386/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_386/bufio.a
 
 #
@@ -210,8 +210,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_386/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/linux_386/sort.a
 
 #
@@ -220,8 +220,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/linux_386/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_386/container/heap.a
 
@@ -231,8 +231,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_386/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/linux_386/encoding/base64.a
 
@@ -242,9 +242,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/linux_386/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" env_unix.go exec_linux.go exec_unix.go lsf_linux.go netlink_linux.go sockcmsg_linux.go sockcmsg_unix.go str.go syscall.go syscall_linux.go syscall_linux_386.go syscall_unix.go zerrors_linux_386.go zsyscall_linux_386.go zsysnum_linux_386.go ztypes_linux_386.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_386.8 -DGOOS_linux -DGOARCH_386 asm_linux_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_linux_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" env_unix.go exec_linux.go exec_unix.go lsf_linux.go netlink_linux.go sockcmsg_linux.go sockcmsg_unix.go str.go syscall.go syscall_linux.go syscall_linux_386.go syscall_unix.go zerrors_linux_386.go zsyscall_linux_386.go zsysnum_linux_386.go ztypes_linux_386.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_386.8 -DGOOS_linux -DGOARCH_386 asm_linux_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_linux_386.8
 cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_386/syscall.a
 
 #
@@ -253,8 +253,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_386/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/linux_386/time.a
 
 #
@@ -263,8 +263,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/linux_386/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_linux.go sys_linux.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_linux.go sys_linux.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/linux_386/os.a
 
 #
@@ -273,8 +273,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/linux_386/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_386/reflect.a
 
 #
@@ -283,8 +283,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_386/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_386/fmt.a
 
 #
@@ -293,8 +293,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_386/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_386/unicode/utf16.a
 
 #
@@ -303,8 +303,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_386/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_386/encoding/json.a
 
 #
@@ -313,8 +313,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_386/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/linux_386/flag.a
 
 #
@@ -323,8 +323,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/linux_386/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_386/encoding/gob.a
 
 #
@@ -333,8 +333,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_386/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_386/go/token.a
 
@@ -344,8 +344,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_386/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_386/path/filepath.a
 
@@ -355,8 +355,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_386/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_386/go/scanner.a
 
 #
@@ -365,8 +365,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_386/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_386/go/ast.a
 
 #
@@ -375,8 +375,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_386/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_386/io/ioutil.a
 
@@ -386,8 +386,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_386/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_386/go/parser.a
 
 #
@@ -396,8 +396,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_386/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/linux_386/log.a
 
 #
@@ -406,8 +406,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/linux_386/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/linux_386/path.a
 
 #
@@ -416,8 +416,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/linux_386/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
 cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_386/go/build.a
 
 #
@@ -426,8 +426,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_386/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_386/os/exec.a
 
@@ -437,8 +437,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_386/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_386/regexp/syntax.a
 
@@ -448,8 +448,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_386/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_386/regexp.a
 
 #
@@ -458,8 +458,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_386/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/linux_386/net/url.a
 
@@ -469,8 +469,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/linux_386/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/linux_386/text/template/parse.a
 
@@ -480,8 +480,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/linux_386/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/linux_386/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_386/text/template.a
 
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
-"$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/linux_amd64.sh

@@ -17,52 +17,52 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_linux.go zruntime_defs_linux_amd64.go zversion.go
+"$GOROOT"/bin/tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_linux.go zruntime_defs_linux_amd64.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_amd64.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_linux_amd64.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_linux.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_linux.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_linux_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_linux -DGOARCH_amd64 alg.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_linux -DGOARCH_amd64 atomic_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_linux -DGOARCH_amd64 cgocall.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_linux -DGOARCH_amd64 chan.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_linux -DGOARCH_amd64 closure_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_linux -DGOARCH_amd64 complex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_linux -DGOARCH_amd64 cpuprof.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_linux -DGOARCH_amd64 float.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_linux -DGOARCH_amd64 hashmap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_linux -DGOARCH_amd64 iface.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/lock_futex.6 -DGOOS_linux -DGOARCH_amd64 lock_futex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_linux -DGOARCH_amd64 mcache.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_linux -DGOARCH_amd64 mcentral.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mem_linux.6 -DGOOS_linux -DGOARCH_amd64 mem_linux.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_linux -DGOARCH_amd64 mfinal.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_linux -DGOARCH_amd64 mfixalloc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_linux -DGOARCH_amd64 mgc0.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_linux -DGOARCH_amd64 mheap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_linux -DGOARCH_amd64 msize.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_linux -DGOARCH_amd64 print.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_linux -DGOARCH_amd64 proc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_linux -DGOARCH_amd64 rune.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_linux -DGOARCH_amd64 runtime.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/signal_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 signal_linux_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_linux -DGOARCH_amd64 slice.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_linux -DGOARCH_amd64 symtab.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/thread_linux.6 -DGOOS_linux -DGOARCH_amd64 thread_linux.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_linux -DGOARCH_amd64 traceback_x86.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_linux -DGOARCH_amd64 zmalloc_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_linux -DGOARCH_amd64 zmprof_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_linux -DGOARCH_amd64 zruntime1_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_linux -DGOARCH_amd64 zsema_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_linux -DGOARCH_amd64 zsigqueue_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_linux -DGOARCH_amd64 zstring_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_linux -DGOARCH_amd64 ztime_amd64.c
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_linux -DGOARCH_amd64 memmove_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 rt0_linux_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 sys_linux_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_futex.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_linux.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_linux_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_linux.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_linux_amd64.6 "$WORK"/runtime/_obj/sys_linux_amd64.6
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_linux -DGOARCH_amd64 alg.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_linux -DGOARCH_amd64 atomic_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_linux -DGOARCH_amd64 cgocall.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_linux -DGOARCH_amd64 chan.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_linux -DGOARCH_amd64 closure_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_linux -DGOARCH_amd64 complex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_linux -DGOARCH_amd64 cpuprof.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_linux -DGOARCH_amd64 float.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_linux -DGOARCH_amd64 hashmap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_linux -DGOARCH_amd64 iface.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/lock_futex.6 -DGOOS_linux -DGOARCH_amd64 lock_futex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_linux -DGOARCH_amd64 mcache.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_linux -DGOARCH_amd64 mcentral.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mem_linux.6 -DGOOS_linux -DGOARCH_amd64 mem_linux.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_linux -DGOARCH_amd64 mfinal.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_linux -DGOARCH_amd64 mfixalloc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_linux -DGOARCH_amd64 mgc0.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_linux -DGOARCH_amd64 mheap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_linux -DGOARCH_amd64 msize.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_linux -DGOARCH_amd64 print.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_linux -DGOARCH_amd64 proc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_linux -DGOARCH_amd64 rune.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_linux -DGOARCH_amd64 runtime.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/signal_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 signal_linux_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_linux -DGOARCH_amd64 slice.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_linux -DGOARCH_amd64 symtab.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/thread_linux.6 -DGOOS_linux -DGOARCH_amd64 thread_linux.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_linux -DGOARCH_amd64 traceback_x86.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_linux -DGOARCH_amd64 zmalloc_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_linux -DGOARCH_amd64 zmprof_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_linux -DGOARCH_amd64 zruntime1_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_linux -DGOARCH_amd64 zsema_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_linux -DGOARCH_amd64 zsigqueue_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_linux -DGOARCH_amd64 zstring_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_linux -DGOARCH_amd64 ztime_amd64.c
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_linux -DGOARCH_amd64 memmove_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 rt0_linux_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 sys_linux_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_futex.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_linux.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_linux_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_linux.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_linux_amd64.6 "$WORK"/runtime/_obj/sys_linux_amd64.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_amd64/runtime.a
 
@@ -72,8 +72,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_amd64/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/linux_amd64/errors.a
 
 #
@@ -82,9 +82,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/linux_amd64/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_amd64/sync/atomic.a
 
@@ -94,8 +94,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_amd64/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/linux_amd64/sync.a
 
 #
@@ -104,8 +104,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/linux_amd64/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/linux_amd64/io.a
 
 #
@@ -114,8 +114,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/linux_amd64/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_amd64/unicode.a
 
 #
@@ -124,8 +124,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_amd64/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/linux_amd64/unicode/utf8.a
 
@@ -135,9 +135,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/linux_amd64/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
 cp "$WORK"/bytes.a "$GOROOT"/pkg/linux_amd64/bytes.a
 
 #
@@ -146,31 +146,31 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/linux_amd64/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_linux -DGOARCH_amd64 abs_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_linux -DGOARCH_amd64 asin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_linux -DGOARCH_amd64 atan2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_linux -DGOARCH_amd64 atan_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_linux -DGOARCH_amd64 dim_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_linux -DGOARCH_amd64 exp2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_linux -DGOARCH_amd64 exp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_linux -DGOARCH_amd64 expm1_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_linux -DGOARCH_amd64 floor_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_linux -DGOARCH_amd64 fltasm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_linux -DGOARCH_amd64 frexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_linux -DGOARCH_amd64 hypot_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_linux -DGOARCH_amd64 ldexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_linux -DGOARCH_amd64 log10_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_linux -DGOARCH_amd64 log1p_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_linux -DGOARCH_amd64 log_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_linux -DGOARCH_amd64 mod_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_linux -DGOARCH_amd64 modf_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_linux -DGOARCH_amd64 remainder_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_linux -DGOARCH_amd64 sin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_linux -DGOARCH_amd64 sincos_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_linux -DGOARCH_amd64 sqrt_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_linux -DGOARCH_amd64 tan_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_linux -DGOARCH_amd64 abs_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_linux -DGOARCH_amd64 asin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_linux -DGOARCH_amd64 atan2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_linux -DGOARCH_amd64 atan_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_linux -DGOARCH_amd64 dim_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_linux -DGOARCH_amd64 exp2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_linux -DGOARCH_amd64 exp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_linux -DGOARCH_amd64 expm1_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_linux -DGOARCH_amd64 floor_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_linux -DGOARCH_amd64 fltasm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_linux -DGOARCH_amd64 frexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_linux -DGOARCH_amd64 hypot_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_linux -DGOARCH_amd64 ldexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_linux -DGOARCH_amd64 log10_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_linux -DGOARCH_amd64 log1p_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_linux -DGOARCH_amd64 log_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_linux -DGOARCH_amd64 mod_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_linux -DGOARCH_amd64 modf_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_linux -DGOARCH_amd64 remainder_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_linux -DGOARCH_amd64 sin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_linux -DGOARCH_amd64 sincos_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_linux -DGOARCH_amd64 sqrt_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_linux -DGOARCH_amd64 tan_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
 cp "$WORK"/math.a "$GOROOT"/pkg/linux_amd64/math.a
 
 #
@@ -179,8 +179,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/linux_amd64/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/linux_amd64/strings.a
 
 #
@@ -189,8 +189,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/linux_amd64/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_amd64/strconv.a
 
 #
@@ -199,8 +199,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_amd64/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_amd64/bufio.a
 
 #
@@ -209,8 +209,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_amd64/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/linux_amd64/sort.a
 
 #
@@ -219,8 +219,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/linux_amd64/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_amd64/container/heap.a
 
@@ -230,8 +230,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_amd64/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/linux_amd64/encoding/base64.a
 
@@ -241,9 +241,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/linux_amd64/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" env_unix.go exec_linux.go exec_unix.go lsf_linux.go netlink_linux.go sockcmsg_linux.go sockcmsg_unix.go str.go syscall.go syscall_linux.go syscall_linux_amd64.go syscall_unix.go zerrors_linux_amd64.go zsyscall_linux_amd64.go zsysnum_linux_amd64.go ztypes_linux_amd64.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_linux_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_linux_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" env_unix.go exec_linux.go exec_unix.go lsf_linux.go netlink_linux.go sockcmsg_linux.go sockcmsg_unix.go str.go syscall.go syscall_linux.go syscall_linux_amd64.go syscall_unix.go zerrors_linux_amd64.go zsyscall_linux_amd64.go zsysnum_linux_amd64.go ztypes_linux_amd64.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 asm_linux_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_linux_amd64.6
 cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_amd64/syscall.a
 
 #
@@ -252,8 +252,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_amd64/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/linux_amd64/time.a
 
 #
@@ -262,8 +262,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/linux_amd64/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_linux.go sys_linux.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_linux.go sys_linux.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/linux_amd64/os.a
 
 #
@@ -272,8 +272,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/linux_amd64/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_amd64/reflect.a
 
 #
@@ -282,8 +282,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_amd64/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_amd64/fmt.a
 
 #
@@ -292,8 +292,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_amd64/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_amd64/unicode/utf16.a
 
 #
@@ -302,8 +302,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_amd64/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_amd64/encoding/json.a
 
 #
@@ -312,8 +312,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_amd64/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/linux_amd64/flag.a
 
 #
@@ -322,8 +322,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/linux_amd64/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_amd64/encoding/gob.a
 
 #
@@ -332,8 +332,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_amd64/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_amd64/go/token.a
 
@@ -343,8 +343,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_amd64/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_amd64/path/filepath.a
 
@@ -354,8 +354,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_amd64/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_amd64/go/scanner.a
 
 #
@@ -364,8 +364,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_amd64/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_amd64/go/ast.a
 
 #
@@ -374,8 +374,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_amd64/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_amd64/io/ioutil.a
 
@@ -385,8 +385,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_amd64/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_amd64/go/parser.a
 
 #
@@ -395,8 +395,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_amd64/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/linux_amd64/log.a
 
 #
@@ -405,8 +405,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/linux_amd64/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/linux_amd64/path.a
 
 #
@@ -415,8 +415,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/linux_amd64/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
 cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_amd64/go/build.a
 
 #
@@ -425,8 +425,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_amd64/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_amd64/os/exec.a
 
@@ -436,8 +436,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_amd64/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_amd64/regexp/syntax.a
 
@@ -447,8 +447,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_amd64/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_amd64/regexp.a
 
 #
@@ -457,8 +457,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_amd64/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/linux_amd64/net/url.a
 
@@ -468,8 +468,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/linux_amd64/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/linux_amd64/text/template/parse.a
 
@@ -479,8 +479,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/linux_amd64/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/linux_amd64/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_amd64/text/template.a
 
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
-"$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/linux_arm.sh

@@ -17,56 +17,56 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/runtime/_obj/_go_.5 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_arm.go zgoos_linux.go zruntime_defs_linux_arm.go zversion.go
+"$GOROOT"/bin/tool/5g -o "$WORK"/runtime/_obj/_go_.5 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_arm.go zgoos_linux.go zruntime_defs_linux_arm.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_arm.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_linux_arm.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_linux.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_linux.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_linux_arm.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/alg.5 -DGOOS_linux -DGOARCH_arm alg.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/atomic_arm.5 -DGOOS_linux -DGOARCH_arm atomic_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/cgocall.5 -DGOOS_linux -DGOARCH_arm cgocall.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/chan.5 -DGOOS_linux -DGOARCH_arm chan.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/closure_arm.5 -DGOOS_linux -DGOARCH_arm closure_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/complex.5 -DGOOS_linux -DGOARCH_arm complex.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/cpuprof.5 -DGOOS_linux -DGOARCH_arm cpuprof.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/float.5 -DGOOS_linux -DGOARCH_arm float.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/hashmap.5 -DGOOS_linux -DGOARCH_arm hashmap.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/iface.5 -DGOOS_linux -DGOARCH_arm iface.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/lock_futex.5 -DGOOS_linux -DGOARCH_arm lock_futex.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mcache.5 -DGOOS_linux -DGOARCH_arm mcache.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mcentral.5 -DGOOS_linux -DGOARCH_arm mcentral.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mem_linux.5 -DGOOS_linux -DGOARCH_arm mem_linux.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mfinal.5 -DGOOS_linux -DGOARCH_arm mfinal.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mfixalloc.5 -DGOOS_linux -DGOARCH_arm mfixalloc.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mgc0.5 -DGOOS_linux -DGOARCH_arm mgc0.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mheap.5 -DGOOS_linux -DGOARCH_arm mheap.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/msize.5 -DGOOS_linux -DGOARCH_arm msize.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/print.5 -DGOOS_linux -DGOARCH_arm print.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/proc.5 -DGOOS_linux -DGOARCH_arm proc.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/rune.5 -DGOOS_linux -DGOARCH_arm rune.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/runtime.5 -DGOOS_linux -DGOARCH_arm runtime.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/signal_linux_arm.5 -DGOOS_linux -DGOARCH_arm signal_linux_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/slice.5 -DGOOS_linux -DGOARCH_arm slice.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/softfloat_arm.5 -DGOOS_linux -DGOARCH_arm softfloat_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/symtab.5 -DGOOS_linux -DGOARCH_arm symtab.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/thread_linux.5 -DGOOS_linux -DGOARCH_arm thread_linux.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/traceback_arm.5 -DGOOS_linux -DGOARCH_arm traceback_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/vlrt_arm.5 -DGOOS_linux -DGOARCH_arm vlrt_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zmalloc_arm.5 -DGOOS_linux -DGOARCH_arm zmalloc_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zmprof_arm.5 -DGOOS_linux -DGOARCH_arm zmprof_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zruntime1_arm.5 -DGOOS_linux -DGOARCH_arm zruntime1_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zsema_arm.5 -DGOOS_linux -DGOARCH_arm zsema_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zsigqueue_arm.5 -DGOOS_linux -DGOARCH_arm zsigqueue_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zstring_arm.5 -DGOOS_linux -DGOARCH_arm zstring_arm.c
-"$GOROOT"/bin/go-tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/ztime_arm.5 -DGOOS_linux -DGOARCH_arm ztime_arm.c
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm asm_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_arm.5 -DGOOS_linux -DGOARCH_arm memmove_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memset_arm.5 -DGOOS_linux -DGOARCH_arm memset_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_arm.5 -DGOOS_linux -DGOARCH_arm rt0_linux_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_arm.5 -DGOOS_linux -DGOARCH_arm sys_linux_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_arm.5 -DGOOS_linux -DGOARCH_arm vlop_arm.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.5 "$WORK"/runtime/_obj/alg.5 "$WORK"/runtime/_obj/atomic_arm.5 "$WORK"/runtime/_obj/cgocall.5 "$WORK"/runtime/_obj/chan.5 "$WORK"/runtime/_obj/closure_arm.5 "$WORK"/runtime/_obj/complex.5 "$WORK"/runtime/_obj/cpuprof.5 "$WORK"/runtime/_obj/float.5 "$WORK"/runtime/_obj/hashmap.5 "$WORK"/runtime/_obj/iface.5 "$WORK"/runtime/_obj/lock_futex.5 "$WORK"/runtime/_obj/mcache.5 "$WORK"/runtime/_obj/mcentral.5 "$WORK"/runtime/_obj/mem_linux.5 "$WORK"/runtime/_obj/mfinal.5 "$WORK"/runtime/_obj/mfixalloc.5 "$WORK"/runtime/_obj/mgc0.5 "$WORK"/runtime/_obj/mheap.5 "$WORK"/runtime/_obj/msize.5 "$WORK"/runtime/_obj/print.5 "$WORK"/runtime/_obj/proc.5 "$WORK"/runtime/_obj/rune.5 "$WORK"/runtime/_obj/runtime.5 "$WORK"/runtime/_obj/signal_linux_arm.5 "$WORK"/runtime/_obj/slice.5 "$WORK"/runtime/_obj/softfloat_arm.5 "$WORK"/runtime/_obj/symtab.5 "$WORK"/runtime/_obj/thread_linux.5 "$WORK"/runtime/_obj/traceback_arm.5 "$WORK"/runtime/_obj/vlrt_arm.5 "$WORK"/runtime/_obj/zmalloc_arm.5 "$WORK"/runtime/_obj/zmprof_arm.5 "$WORK"/runtime/_obj/zruntime1_arm.5 "$WORK"/runtime/_obj/zsema_arm.5 "$WORK"/runtime/_obj/zsigqueue_arm.5 "$WORK"/runtime/_obj/zstring_arm.5 "$WORK"/runtime/_obj/ztime_arm.5 "$WORK"/runtime/_obj/asm_arm.5 "$WORK"/runtime/_obj/memmove_arm.5 "$WORK"/runtime/_obj/memset_arm.5 "$WORK"/runtime/_obj/rt0_linux_arm.5 "$WORK"/runtime/_obj/sys_linux_arm.5 "$WORK"/runtime/_obj/vlop_arm.5
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/alg.5 -DGOOS_linux -DGOARCH_arm alg.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/atomic_arm.5 -DGOOS_linux -DGOARCH_arm atomic_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/cgocall.5 -DGOOS_linux -DGOARCH_arm cgocall.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/chan.5 -DGOOS_linux -DGOARCH_arm chan.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/closure_arm.5 -DGOOS_linux -DGOARCH_arm closure_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/complex.5 -DGOOS_linux -DGOARCH_arm complex.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/cpuprof.5 -DGOOS_linux -DGOARCH_arm cpuprof.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/float.5 -DGOOS_linux -DGOARCH_arm float.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/hashmap.5 -DGOOS_linux -DGOARCH_arm hashmap.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/iface.5 -DGOOS_linux -DGOARCH_arm iface.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/lock_futex.5 -DGOOS_linux -DGOARCH_arm lock_futex.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mcache.5 -DGOOS_linux -DGOARCH_arm mcache.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mcentral.5 -DGOOS_linux -DGOARCH_arm mcentral.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mem_linux.5 -DGOOS_linux -DGOARCH_arm mem_linux.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mfinal.5 -DGOOS_linux -DGOARCH_arm mfinal.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mfixalloc.5 -DGOOS_linux -DGOARCH_arm mfixalloc.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mgc0.5 -DGOOS_linux -DGOARCH_arm mgc0.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/mheap.5 -DGOOS_linux -DGOARCH_arm mheap.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/msize.5 -DGOOS_linux -DGOARCH_arm msize.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/print.5 -DGOOS_linux -DGOARCH_arm print.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/proc.5 -DGOOS_linux -DGOARCH_arm proc.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/rune.5 -DGOOS_linux -DGOARCH_arm rune.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/runtime.5 -DGOOS_linux -DGOARCH_arm runtime.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/signal_linux_arm.5 -DGOOS_linux -DGOARCH_arm signal_linux_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/slice.5 -DGOOS_linux -DGOARCH_arm slice.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/softfloat_arm.5 -DGOOS_linux -DGOARCH_arm softfloat_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/symtab.5 -DGOOS_linux -DGOARCH_arm symtab.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/thread_linux.5 -DGOOS_linux -DGOARCH_arm thread_linux.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/traceback_arm.5 -DGOOS_linux -DGOARCH_arm traceback_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/vlrt_arm.5 -DGOOS_linux -DGOARCH_arm vlrt_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zmalloc_arm.5 -DGOOS_linux -DGOARCH_arm zmalloc_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zmprof_arm.5 -DGOOS_linux -DGOARCH_arm zmprof_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zruntime1_arm.5 -DGOOS_linux -DGOARCH_arm zruntime1_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zsema_arm.5 -DGOOS_linux -DGOARCH_arm zsema_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zsigqueue_arm.5 -DGOOS_linux -DGOARCH_arm zsigqueue_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/zstring_arm.5 -DGOOS_linux -DGOARCH_arm zstring_arm.c
+"$GOROOT"/bin/tool/5c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/linux_arm -o "$WORK"/runtime/_obj/ztime_arm.5 -DGOOS_linux -DGOARCH_arm ztime_arm.c
+"$GOROOT"/bin/tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm asm_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_arm.5 -DGOOS_linux -DGOARCH_arm memmove_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memset_arm.5 -DGOOS_linux -DGOARCH_arm memset_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_arm.5 -DGOOS_linux -DGOARCH_arm rt0_linux_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_arm.5 -DGOOS_linux -DGOARCH_arm sys_linux_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_arm.5 -DGOOS_linux -DGOARCH_arm vlop_arm.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.5 "$WORK"/runtime/_obj/alg.5 "$WORK"/runtime/_obj/atomic_arm.5 "$WORK"/runtime/_obj/cgocall.5 "$WORK"/runtime/_obj/chan.5 "$WORK"/runtime/_obj/closure_arm.5 "$WORK"/runtime/_obj/complex.5 "$WORK"/runtime/_obj/cpuprof.5 "$WORK"/runtime/_obj/float.5 "$WORK"/runtime/_obj/hashmap.5 "$WORK"/runtime/_obj/iface.5 "$WORK"/runtime/_obj/lock_futex.5 "$WORK"/runtime/_obj/mcache.5 "$WORK"/runtime/_obj/mcentral.5 "$WORK"/runtime/_obj/mem_linux.5 "$WORK"/runtime/_obj/mfinal.5 "$WORK"/runtime/_obj/mfixalloc.5 "$WORK"/runtime/_obj/mgc0.5 "$WORK"/runtime/_obj/mheap.5 "$WORK"/runtime/_obj/msize.5 "$WORK"/runtime/_obj/print.5 "$WORK"/runtime/_obj/proc.5 "$WORK"/runtime/_obj/rune.5 "$WORK"/runtime/_obj/runtime.5 "$WORK"/runtime/_obj/signal_linux_arm.5 "$WORK"/runtime/_obj/slice.5 "$WORK"/runtime/_obj/softfloat_arm.5 "$WORK"/runtime/_obj/symtab.5 "$WORK"/runtime/_obj/thread_linux.5 "$WORK"/runtime/_obj/traceback_arm.5 "$WORK"/runtime/_obj/vlrt_arm.5 "$WORK"/runtime/_obj/zmalloc_arm.5 "$WORK"/runtime/_obj/zmprof_arm.5 "$WORK"/runtime/_obj/zruntime1_arm.5 "$WORK"/runtime/_obj/zsema_arm.5 "$WORK"/runtime/_obj/zsigqueue_arm.5 "$WORK"/runtime/_obj/zstring_arm.5 "$WORK"/runtime/_obj/ztime_arm.5 "$WORK"/runtime/_obj/asm_arm.5 "$WORK"/runtime/_obj/memmove_arm.5 "$WORK"/runtime/_obj/memset_arm.5 "$WORK"/runtime/_obj/rt0_linux_arm.5 "$WORK"/runtime/_obj/sys_linux_arm.5 "$WORK"/runtime/_obj/vlop_arm.5
 mkdir -p "$GOROOT"/pkg/linux_arm/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_arm/runtime.a
 
@@ -76,8 +76,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_arm/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/errors/_obj/_go_.5 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/errors/_obj/_go_.5 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.5
 cp "$WORK"/errors.a "$GOROOT"/pkg/linux_arm/errors.a
 
 #
@@ -86,10 +86,10 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/linux_arm/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/sync/atomic/_obj/_go_.5 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm asm_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_linux_arm.5 -DGOOS_linux -DGOARCH_arm asm_linux_arm.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.5 "$WORK"/sync/atomic/_obj/asm_arm.5 "$WORK"/sync/atomic/_obj/asm_linux_arm.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/sync/atomic/_obj/_go_.5 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/5a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm asm_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_linux_arm.5 -DGOOS_linux -DGOARCH_arm asm_linux_arm.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.5 "$WORK"/sync/atomic/_obj/asm_arm.5 "$WORK"/sync/atomic/_obj/asm_linux_arm.5
 mkdir -p "$GOROOT"/pkg/linux_arm/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_arm/sync/atomic.a
 
@@ -99,8 +99,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_arm/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/sync/_obj/_go_.5 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/sync/_obj/_go_.5 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.5
 cp "$WORK"/sync.a "$GOROOT"/pkg/linux_arm/sync.a
 
 #
@@ -109,8 +109,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/linux_arm/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/io/_obj/_go_.5 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/io/_obj/_go_.5 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.5
 cp "$WORK"/io.a "$GOROOT"/pkg/linux_arm/io.a
 
 #
@@ -119,8 +119,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/linux_arm/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/unicode/_obj/_go_.5 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/unicode/_obj/_go_.5 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.5
 cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_arm/unicode.a
 
 #
@@ -129,8 +129,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_arm/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/unicode/utf8/_obj/_go_.5 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/unicode/utf8/_obj/_go_.5 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/linux_arm/unicode/utf8.a
 
@@ -140,9 +140,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/linux_arm/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/bytes/_obj/_go_.5 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm asm_arm.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.5 "$WORK"/bytes/_obj/asm_arm.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/bytes/_obj/_go_.5 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/5a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm asm_arm.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.5 "$WORK"/bytes/_obj/asm_arm.5
 cp "$WORK"/bytes.a "$GOROOT"/pkg/linux_arm/bytes.a
 
 #
@@ -151,30 +151,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/linux_arm/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/math/_obj/_go_.5 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_arm.5 -DGOOS_linux -DGOARCH_arm abs_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_arm.5 -DGOOS_linux -DGOARCH_arm asin_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_arm.5 -DGOOS_linux -DGOARCH_arm atan2_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_arm.5 -DGOOS_linux -DGOARCH_arm atan_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_arm.5 -DGOOS_linux -DGOARCH_arm dim_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_arm.5 -DGOOS_linux -DGOARCH_arm exp2_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_arm.5 -DGOOS_linux -DGOARCH_arm exp_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_arm.5 -DGOOS_linux -DGOARCH_arm expm1_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_arm.5 -DGOOS_linux -DGOARCH_arm floor_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_arm.5 -DGOOS_linux -DGOARCH_arm frexp_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_arm.5 -DGOOS_linux -DGOARCH_arm hypot_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_arm.5 -DGOOS_linux -DGOARCH_arm ldexp_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_arm.5 -DGOOS_linux -DGOARCH_arm log10_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_arm.5 -DGOOS_linux -DGOARCH_arm log1p_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_arm.5 -DGOOS_linux -DGOARCH_arm log_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_arm.5 -DGOOS_linux -DGOARCH_arm mod_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_arm.5 -DGOOS_linux -DGOARCH_arm modf_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_arm.5 -DGOOS_linux -DGOARCH_arm remainder_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_arm.5 -DGOOS_linux -DGOARCH_arm sin_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_arm.5 -DGOOS_linux -DGOARCH_arm sincos_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_arm.5 -DGOOS_linux -DGOARCH_arm sqrt_arm.s
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_arm.5 -DGOOS_linux -DGOARCH_arm tan_arm.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.5 "$WORK"/math/_obj/abs_arm.5 "$WORK"/math/_obj/asin_arm.5 "$WORK"/math/_obj/atan2_arm.5 "$WORK"/math/_obj/atan_arm.5 "$WORK"/math/_obj/dim_arm.5 "$WORK"/math/_obj/exp2_arm.5 "$WORK"/math/_obj/exp_arm.5 "$WORK"/math/_obj/expm1_arm.5 "$WORK"/math/_obj/floor_arm.5 "$WORK"/math/_obj/frexp_arm.5 "$WORK"/math/_obj/hypot_arm.5 "$WORK"/math/_obj/ldexp_arm.5 "$WORK"/math/_obj/log10_arm.5 "$WORK"/math/_obj/log1p_arm.5 "$WORK"/math/_obj/log_arm.5 "$WORK"/math/_obj/mod_arm.5 "$WORK"/math/_obj/modf_arm.5 "$WORK"/math/_obj/remainder_arm.5 "$WORK"/math/_obj/sin_arm.5 "$WORK"/math/_obj/sincos_arm.5 "$WORK"/math/_obj/sqrt_arm.5 "$WORK"/math/_obj/tan_arm.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/math/_obj/_go_.5 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_arm.5 -DGOOS_linux -DGOARCH_arm abs_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_arm.5 -DGOOS_linux -DGOARCH_arm asin_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_arm.5 -DGOOS_linux -DGOARCH_arm atan2_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_arm.5 -DGOOS_linux -DGOARCH_arm atan_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_arm.5 -DGOOS_linux -DGOARCH_arm dim_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_arm.5 -DGOOS_linux -DGOARCH_arm exp2_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_arm.5 -DGOOS_linux -DGOARCH_arm exp_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_arm.5 -DGOOS_linux -DGOARCH_arm expm1_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_arm.5 -DGOOS_linux -DGOARCH_arm floor_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_arm.5 -DGOOS_linux -DGOARCH_arm frexp_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_arm.5 -DGOOS_linux -DGOARCH_arm hypot_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_arm.5 -DGOOS_linux -DGOARCH_arm ldexp_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_arm.5 -DGOOS_linux -DGOARCH_arm log10_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_arm.5 -DGOOS_linux -DGOARCH_arm log1p_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_arm.5 -DGOOS_linux -DGOARCH_arm log_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_arm.5 -DGOOS_linux -DGOARCH_arm mod_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_arm.5 -DGOOS_linux -DGOARCH_arm modf_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_arm.5 -DGOOS_linux -DGOARCH_arm remainder_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_arm.5 -DGOOS_linux -DGOARCH_arm sin_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_arm.5 -DGOOS_linux -DGOARCH_arm sincos_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_arm.5 -DGOOS_linux -DGOARCH_arm sqrt_arm.s
+"$GOROOT"/bin/tool/5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_arm.5 -DGOOS_linux -DGOARCH_arm tan_arm.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.5 "$WORK"/math/_obj/abs_arm.5 "$WORK"/math/_obj/asin_arm.5 "$WORK"/math/_obj/atan2_arm.5 "$WORK"/math/_obj/atan_arm.5 "$WORK"/math/_obj/dim_arm.5 "$WORK"/math/_obj/exp2_arm.5 "$WORK"/math/_obj/exp_arm.5 "$WORK"/math/_obj/expm1_arm.5 "$WORK"/math/_obj/floor_arm.5 "$WORK"/math/_obj/frexp_arm.5 "$WORK"/math/_obj/hypot_arm.5 "$WORK"/math/_obj/ldexp_arm.5 "$WORK"/math/_obj/log10_arm.5 "$WORK"/math/_obj/log1p_arm.5 "$WORK"/math/_obj/log_arm.5 "$WORK"/math/_obj/mod_arm.5 "$WORK"/math/_obj/modf_arm.5 "$WORK"/math/_obj/remainder_arm.5 "$WORK"/math/_obj/sin_arm.5 "$WORK"/math/_obj/sincos_arm.5 "$WORK"/math/_obj/sqrt_arm.5 "$WORK"/math/_obj/tan_arm.5
 cp "$WORK"/math.a "$GOROOT"/pkg/linux_arm/math.a
 
 #
@@ -183,8 +183,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/linux_arm/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/strings/_obj/_go_.5 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/strings/_obj/_go_.5 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.5
 cp "$WORK"/strings.a "$GOROOT"/pkg/linux_arm/strings.a
 
 #
@@ -193,8 +193,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/linux_arm/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/strconv/_obj/_go_.5 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/strconv/_obj/_go_.5 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.5
 cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_arm/strconv.a
 
 #
@@ -203,8 +203,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_arm/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/bufio/_obj/_go_.5 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/bufio/_obj/_go_.5 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.5
 cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_arm/bufio.a
 
 #
@@ -213,8 +213,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_arm/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/sort/_obj/_go_.5 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/sort/_obj/_go_.5 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.5
 cp "$WORK"/sort.a "$GOROOT"/pkg/linux_arm/sort.a
 
 #
@@ -223,8 +223,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/linux_arm/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/container/heap/_obj/_go_.5 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/container/heap/_obj/_go_.5 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_arm/container/heap.a
 
@@ -234,8 +234,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_arm/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/encoding/base64/_obj/_go_.5 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/encoding/base64/_obj/_go_.5 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/linux_arm/encoding/base64.a
 
@@ -245,9 +245,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/linux_arm/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/syscall/_obj/_go_.5 -p syscall -I "$WORK" env_unix.go exec_linux.go exec_unix.go lsf_linux.go netlink_linux.go sockcmsg_linux.go sockcmsg_unix.go str.go syscall.go syscall_linux.go syscall_linux_arm.go syscall_unix.go zerrors_linux_arm.go zsyscall_linux_arm.go zsysnum_linux_arm.go ztypes_linux_arm.go
-"$GOROOT"/bin/go-tool/5a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_arm.5 -DGOOS_linux -DGOARCH_arm asm_linux_arm.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.5 "$WORK"/syscall/_obj/asm_linux_arm.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/syscall/_obj/_go_.5 -p syscall -I "$WORK" env_unix.go exec_linux.go exec_unix.go lsf_linux.go netlink_linux.go sockcmsg_linux.go sockcmsg_unix.go str.go syscall.go syscall_linux.go syscall_linux_arm.go syscall_unix.go zerrors_linux_arm.go zsyscall_linux_arm.go zsysnum_linux_arm.go ztypes_linux_arm.go
+"$GOROOT"/bin/tool/5a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_arm.5 -DGOOS_linux -DGOARCH_arm asm_linux_arm.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.5 "$WORK"/syscall/_obj/asm_linux_arm.5
 cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_arm/syscall.a
 
 #
@@ -256,8 +256,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_arm/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/time/_obj/_go_.5 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/time/_obj/_go_.5 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.5
 cp "$WORK"/time.a "$GOROOT"/pkg/linux_arm/time.a
 
 #
@@ -266,8 +266,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/linux_arm/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/os/_obj/_go_.5 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_linux.go sys_linux.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/os/_obj/_go_.5 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_linux.go sys_linux.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.5
 cp "$WORK"/os.a "$GOROOT"/pkg/linux_arm/os.a
 
 #
@@ -276,8 +276,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/linux_arm/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/reflect/_obj/_go_.5 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/reflect/_obj/_go_.5 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.5
 cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_arm/reflect.a
 
 #
@@ -286,8 +286,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_arm/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/fmt/_obj/_go_.5 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/fmt/_obj/_go_.5 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.5
 cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_arm/fmt.a
 
 #
@@ -296,8 +296,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_arm/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/unicode/utf16/_obj/_go_.5 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/unicode/utf16/_obj/_go_.5 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.5
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_arm/unicode/utf16.a
 
 #
@@ -306,8 +306,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_arm/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/encoding/json/_obj/_go_.5 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/encoding/json/_obj/_go_.5 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.5
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_arm/encoding/json.a
 
 #
@@ -316,8 +316,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_arm/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/flag/_obj/_go_.5 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/flag/_obj/_go_.5 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.5
 cp "$WORK"/flag.a "$GOROOT"/pkg/linux_arm/flag.a
 
 #
@@ -326,8 +326,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/linux_arm/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/encoding/gob/_obj/_go_.5 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/encoding/gob/_obj/_go_.5 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.5
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_arm/encoding/gob.a
 
 #
@@ -336,8 +336,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_arm/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/go/token/_obj/_go_.5 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/go/token/_obj/_go_.5 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_arm/go/token.a
 
@@ -347,8 +347,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_arm/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/path/filepath/_obj/_go_.5 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/path/filepath/_obj/_go_.5 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_arm/path/filepath.a
 
@@ -358,8 +358,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_arm/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/go/scanner/_obj/_go_.5 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/go/scanner/_obj/_go_.5 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.5
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_arm/go/scanner.a
 
 #
@@ -368,8 +368,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_arm/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/go/ast/_obj/_go_.5 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/go/ast/_obj/_go_.5 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.5
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_arm/go/ast.a
 
 #
@@ -378,8 +378,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_arm/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/io/ioutil/_obj/_go_.5 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/io/ioutil/_obj/_go_.5 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_arm/io/ioutil.a
 
@@ -389,8 +389,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_arm/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/go/parser/_obj/_go_.5 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/go/parser/_obj/_go_.5 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.5
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_arm/go/parser.a
 
 #
@@ -399,8 +399,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_arm/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/log/_obj/_go_.5 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/log/_obj/_go_.5 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.5
 cp "$WORK"/log.a "$GOROOT"/pkg/linux_arm/log.a
 
 #
@@ -409,8 +409,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/linux_arm/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/path/_obj/_go_.5 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/path/_obj/_go_.5 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.5
 cp "$WORK"/path.a "$GOROOT"/pkg/linux_arm/path.a
 
 #
@@ -419,8 +419,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/linux_arm/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/go/build/_obj/_go_.5 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/go/build/_obj/_go_.5 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.5
 cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_arm/go/build.a
 
 #
@@ -429,8 +429,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_arm/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/os/exec/_obj/_go_.5 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/os/exec/_obj/_go_.5 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_arm/os/exec.a
 
@@ -440,8 +440,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_arm/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/regexp/syntax/_obj/_go_.5 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/regexp/syntax/_obj/_go_.5 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_arm/regexp/syntax.a
 
@@ -451,8 +451,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_arm/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/regexp/_obj/_go_.5 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/regexp/_obj/_go_.5 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.5
 cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_arm/regexp.a
 
 #
@@ -461,8 +461,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_arm/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/net/url/_obj/_go_.5 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/net/url/_obj/_go_.5 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/linux_arm/net/url.a
 
@@ -472,8 +472,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/linux_arm/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/text/template/parse/_obj/_go_.5 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/text/template/parse/_obj/_go_.5 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/linux_arm/text/template/parse.a
 
@@ -483,8 +483,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/linux_arm/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/text/template/_obj/_go_.5 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.5
+"$GOROOT"/bin/tool/5g -o "$WORK"/text/template/_obj/_go_.5 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.5
 mkdir -p "$GOROOT"/pkg/linux_arm/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_arm/text/template.a
 
@@ -494,8 +494,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_arm/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/cmd/go/_obj/_go_.5 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.5
-"$GOROOT"/bin/go-tool/5l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/5g -o "$WORK"/cmd/go/_obj/_go_.5 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.5
+"$GOROOT"/bin/tool/5l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/netbsd_386.sh

@@ -17,54 +17,54 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_netbsd.go zruntime_defs_netbsd_386.go zversion.go
+"$GOROOT"/bin/tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_netbsd.go zruntime_defs_netbsd_386.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_386.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_netbsd_386.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_netbsd.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_netbsd.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_netbsd_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_netbsd -DGOARCH_386 alg.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_netbsd -DGOARCH_386 atomic_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_netbsd -DGOARCH_386 cgocall.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_netbsd -DGOARCH_386 chan.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_netbsd -DGOARCH_386 closure_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_netbsd -DGOARCH_386 complex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_netbsd -DGOARCH_386 cpuprof.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_netbsd -DGOARCH_386 float.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_netbsd -DGOARCH_386 hashmap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_netbsd -DGOARCH_386 iface.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_netbsd -DGOARCH_386 lock_sema.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_netbsd -DGOARCH_386 mcache.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_netbsd -DGOARCH_386 mcentral.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mem_netbsd.8 -DGOOS_netbsd -DGOARCH_386 mem_netbsd.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_netbsd -DGOARCH_386 mfinal.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_netbsd -DGOARCH_386 mfixalloc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_netbsd -DGOARCH_386 mgc0.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_netbsd -DGOARCH_386 mheap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_netbsd -DGOARCH_386 msize.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_netbsd -DGOARCH_386 print.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_netbsd -DGOARCH_386 proc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_netbsd -DGOARCH_386 rune.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_netbsd -DGOARCH_386 runtime.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/signal_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 signal_netbsd_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_netbsd -DGOARCH_386 slice.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_netbsd -DGOARCH_386 symtab.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/thread_netbsd.8 -DGOOS_netbsd -DGOARCH_386 thread_netbsd.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_netbsd -DGOARCH_386 traceback_x86.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_netbsd -DGOARCH_386 vlrt_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_netbsd -DGOARCH_386 zmalloc_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_netbsd -DGOARCH_386 zmprof_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_netbsd -DGOARCH_386 zruntime1_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_netbsd -DGOARCH_386 zsema_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_netbsd -DGOARCH_386 zsigqueue_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_netbsd -DGOARCH_386 zstring_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_netbsd -DGOARCH_386 ztime_386.c
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_netbsd -DGOARCH_386 memmove_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 rt0_netbsd_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 sys_netbsd_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_netbsd -DGOARCH_386 vlop_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_netbsd.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_netbsd_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_netbsd.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_netbsd_386.8 "$WORK"/runtime/_obj/sys_netbsd_386.8 "$WORK"/runtime/_obj/vlop_386.8
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_netbsd -DGOARCH_386 alg.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_netbsd -DGOARCH_386 atomic_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_netbsd -DGOARCH_386 cgocall.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_netbsd -DGOARCH_386 chan.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_netbsd -DGOARCH_386 closure_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_netbsd -DGOARCH_386 complex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_netbsd -DGOARCH_386 cpuprof.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_netbsd -DGOARCH_386 float.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_netbsd -DGOARCH_386 hashmap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_netbsd -DGOARCH_386 iface.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_netbsd -DGOARCH_386 lock_sema.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_netbsd -DGOARCH_386 mcache.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_netbsd -DGOARCH_386 mcentral.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mem_netbsd.8 -DGOOS_netbsd -DGOARCH_386 mem_netbsd.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_netbsd -DGOARCH_386 mfinal.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_netbsd -DGOARCH_386 mfixalloc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_netbsd -DGOARCH_386 mgc0.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_netbsd -DGOARCH_386 mheap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_netbsd -DGOARCH_386 msize.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_netbsd -DGOARCH_386 print.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_netbsd -DGOARCH_386 proc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_netbsd -DGOARCH_386 rune.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_netbsd -DGOARCH_386 runtime.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/signal_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 signal_netbsd_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_netbsd -DGOARCH_386 slice.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_netbsd -DGOARCH_386 symtab.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/thread_netbsd.8 -DGOOS_netbsd -DGOARCH_386 thread_netbsd.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_netbsd -DGOARCH_386 traceback_x86.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_netbsd -DGOARCH_386 vlrt_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_netbsd -DGOARCH_386 zmalloc_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_netbsd -DGOARCH_386 zmprof_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_netbsd -DGOARCH_386 zruntime1_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_netbsd -DGOARCH_386 zsema_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_netbsd -DGOARCH_386 zsigqueue_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_netbsd -DGOARCH_386 zstring_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_netbsd -DGOARCH_386 ztime_386.c
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_netbsd -DGOARCH_386 memmove_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 rt0_netbsd_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 sys_netbsd_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_netbsd -DGOARCH_386 vlop_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_netbsd.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_netbsd_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_netbsd.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_netbsd_386.8 "$WORK"/runtime/_obj/sys_netbsd_386.8 "$WORK"/runtime/_obj/vlop_386.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_386/runtime.a
 
@@ -74,8 +74,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_386/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/netbsd_386/errors.a
 
 #
@@ -84,9 +84,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/netbsd_386/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/netbsd_386/sync/atomic.a
 
@@ -96,8 +96,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/netbsd_386/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_386/sync.a
 
 #
@@ -106,8 +106,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_386/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_386/io.a
 
 #
@@ -116,8 +116,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_386/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_386/unicode.a
 
 #
@@ -126,8 +126,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_386/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/netbsd_386/unicode/utf8.a
 
@@ -137,9 +137,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/netbsd_386/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
 cp "$WORK"/bytes.a "$GOROOT"/pkg/netbsd_386/bytes.a
 
 #
@@ -148,30 +148,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/netbsd_386/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_netbsd -DGOARCH_386 abs_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_netbsd -DGOARCH_386 asin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_netbsd -DGOARCH_386 atan2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_netbsd -DGOARCH_386 atan_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_netbsd -DGOARCH_386 dim_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_netbsd -DGOARCH_386 exp2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_netbsd -DGOARCH_386 exp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_netbsd -DGOARCH_386 expm1_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_netbsd -DGOARCH_386 floor_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_netbsd -DGOARCH_386 frexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_netbsd -DGOARCH_386 hypot_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_netbsd -DGOARCH_386 ldexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_netbsd -DGOARCH_386 log10_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_netbsd -DGOARCH_386 log1p_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_netbsd -DGOARCH_386 log_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_netbsd -DGOARCH_386 mod_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_netbsd -DGOARCH_386 modf_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_netbsd -DGOARCH_386 remainder_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_netbsd -DGOARCH_386 sin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_netbsd -DGOARCH_386 sincos_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_netbsd -DGOARCH_386 sqrt_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_netbsd -DGOARCH_386 tan_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_netbsd -DGOARCH_386 abs_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_netbsd -DGOARCH_386 asin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_netbsd -DGOARCH_386 atan2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_netbsd -DGOARCH_386 atan_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_netbsd -DGOARCH_386 dim_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_netbsd -DGOARCH_386 exp2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_netbsd -DGOARCH_386 exp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_netbsd -DGOARCH_386 expm1_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_netbsd -DGOARCH_386 floor_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_netbsd -DGOARCH_386 frexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_netbsd -DGOARCH_386 hypot_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_netbsd -DGOARCH_386 ldexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_netbsd -DGOARCH_386 log10_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_netbsd -DGOARCH_386 log1p_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_netbsd -DGOARCH_386 log_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_netbsd -DGOARCH_386 mod_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_netbsd -DGOARCH_386 modf_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_netbsd -DGOARCH_386 remainder_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_netbsd -DGOARCH_386 sin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_netbsd -DGOARCH_386 sincos_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_netbsd -DGOARCH_386 sqrt_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_netbsd -DGOARCH_386 tan_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
 cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_386/math.a
 
 #
@@ -180,8 +180,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_386/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_386/strings.a
 
 #
@@ -190,8 +190,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_386/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_386/strconv.a
 
 #
@@ -200,8 +200,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_386/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_386/bufio.a
 
 #
@@ -210,8 +210,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_386/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_386/sort.a
 
 #
@@ -220,8 +220,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_386/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/netbsd_386/container/heap.a
 
@@ -231,8 +231,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/netbsd_386/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/netbsd_386/encoding/base64.a
 
@@ -242,9 +242,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/netbsd_386/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_netbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go syscall_unix.go zerrors_netbsd_386.go zsyscall_netbsd_386.go zsysnum_netbsd_386.go ztypes_netbsd_386.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 asm_netbsd_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_netbsd_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_netbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go syscall_unix.go zerrors_netbsd_386.go zsyscall_netbsd_386.go zsysnum_netbsd_386.go ztypes_netbsd_386.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 asm_netbsd_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_netbsd_386.8
 cp "$WORK"/syscall.a "$GOROOT"/pkg/netbsd_386/syscall.a
 
 #
@@ -253,8 +253,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/netbsd_386/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_386/time.a
 
 #
@@ -263,8 +263,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_386/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_netbsd.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_netbsd.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_386/os.a
 
 #
@@ -273,8 +273,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_386/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_386/reflect.a
 
 #
@@ -283,8 +283,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_386/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_386/fmt.a
 
 #
@@ -293,8 +293,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_386/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/netbsd_386/unicode/utf16.a
 
 #
@@ -303,8 +303,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/netbsd_386/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/netbsd_386/encoding/json.a
 
 #
@@ -313,8 +313,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/netbsd_386/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_386/flag.a
 
 #
@@ -323,8 +323,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_386/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/netbsd_386/encoding/gob.a
 
 #
@@ -333,8 +333,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/netbsd_386/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/netbsd_386/go/token.a
 
@@ -344,8 +344,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/netbsd_386/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/netbsd_386/path/filepath.a
 
@@ -355,8 +355,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/netbsd_386/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/netbsd_386/go/scanner.a
 
 #
@@ -365,8 +365,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/netbsd_386/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/netbsd_386/go/ast.a
 
 #
@@ -375,8 +375,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/netbsd_386/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/netbsd_386/io/ioutil.a
 
@@ -386,8 +386,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/netbsd_386/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/netbsd_386/go/parser.a
 
 #
@@ -396,8 +396,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/netbsd_386/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_386/log.a
 
 #
@@ -406,8 +406,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_386/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_386/path.a
 
 #
@@ -416,8 +416,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_386/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
 cp "$WORK"/go/build.a "$GOROOT"/pkg/netbsd_386/go/build.a
 
 #
@@ -426,8 +426,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/netbsd_386/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/netbsd_386/os/exec.a
 
@@ -437,8 +437,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/netbsd_386/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/netbsd_386/regexp/syntax.a
 
@@ -448,8 +448,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/netbsd_386/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_386/regexp.a
 
 #
@@ -458,8 +458,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_386/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/netbsd_386/net/url.a
 
@@ -469,8 +469,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/netbsd_386/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/netbsd_386/text/template/parse.a
 
@@ -480,8 +480,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/netbsd_386/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/netbsd_386/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_386/text/template.a
 
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
-"$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/netbsd_amd64.sh

@@ -17,52 +17,52 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_netbsd.go zruntime_defs_netbsd_amd64.go zversion.go
+"$GOROOT"/bin/tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_netbsd.go zruntime_defs_netbsd_amd64.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_amd64.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_netbsd_amd64.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_netbsd.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_netbsd.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_netbsd_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_netbsd -DGOARCH_amd64 alg.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 atomic_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_netbsd -DGOARCH_amd64 cgocall.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_netbsd -DGOARCH_amd64 chan.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 closure_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_netbsd -DGOARCH_amd64 complex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_netbsd -DGOARCH_amd64 cpuprof.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_netbsd -DGOARCH_amd64 float.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_netbsd -DGOARCH_amd64 hashmap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_netbsd -DGOARCH_amd64 iface.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_netbsd -DGOARCH_amd64 lock_sema.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_netbsd -DGOARCH_amd64 mcache.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_netbsd -DGOARCH_amd64 mcentral.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mem_netbsd.6 -DGOOS_netbsd -DGOARCH_amd64 mem_netbsd.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_netbsd -DGOARCH_amd64 mfinal.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_netbsd -DGOARCH_amd64 mfixalloc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_netbsd -DGOARCH_amd64 mgc0.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_netbsd -DGOARCH_amd64 mheap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_netbsd -DGOARCH_amd64 msize.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_netbsd -DGOARCH_amd64 print.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_netbsd -DGOARCH_amd64 proc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_netbsd -DGOARCH_amd64 rune.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_netbsd -DGOARCH_amd64 runtime.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/signal_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 signal_netbsd_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_netbsd -DGOARCH_amd64 slice.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_netbsd -DGOARCH_amd64 symtab.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/thread_netbsd.6 -DGOOS_netbsd -DGOARCH_amd64 thread_netbsd.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_netbsd -DGOARCH_amd64 traceback_x86.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zmalloc_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zmprof_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zruntime1_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zsema_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zsigqueue_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zstring_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ztime_amd64.c
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 memmove_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 rt0_netbsd_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sys_netbsd_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_netbsd.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_netbsd_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_netbsd.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_netbsd_amd64.6 "$WORK"/runtime/_obj/sys_netbsd_amd64.6
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_netbsd -DGOARCH_amd64 alg.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 atomic_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_netbsd -DGOARCH_amd64 cgocall.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_netbsd -DGOARCH_amd64 chan.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 closure_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_netbsd -DGOARCH_amd64 complex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_netbsd -DGOARCH_amd64 cpuprof.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_netbsd -DGOARCH_amd64 float.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_netbsd -DGOARCH_amd64 hashmap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_netbsd -DGOARCH_amd64 iface.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_netbsd -DGOARCH_amd64 lock_sema.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_netbsd -DGOARCH_amd64 mcache.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_netbsd -DGOARCH_amd64 mcentral.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mem_netbsd.6 -DGOOS_netbsd -DGOARCH_amd64 mem_netbsd.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_netbsd -DGOARCH_amd64 mfinal.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_netbsd -DGOARCH_amd64 mfixalloc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_netbsd -DGOARCH_amd64 mgc0.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_netbsd -DGOARCH_amd64 mheap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_netbsd -DGOARCH_amd64 msize.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_netbsd -DGOARCH_amd64 print.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_netbsd -DGOARCH_amd64 proc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_netbsd -DGOARCH_amd64 rune.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_netbsd -DGOARCH_amd64 runtime.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/signal_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 signal_netbsd_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_netbsd -DGOARCH_amd64 slice.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_netbsd -DGOARCH_amd64 symtab.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/thread_netbsd.6 -DGOOS_netbsd -DGOARCH_amd64 thread_netbsd.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_netbsd -DGOARCH_amd64 traceback_x86.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zmalloc_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zmprof_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zruntime1_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zsema_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zsigqueue_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 zstring_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/netbsd_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ztime_amd64.c
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 memmove_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 rt0_netbsd_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sys_netbsd_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_netbsd.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_netbsd_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_netbsd.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_netbsd_amd64.6 "$WORK"/runtime/_obj/sys_netbsd_amd64.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_amd64/runtime.a
 
@@ -72,8 +72,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_amd64/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/netbsd_amd64/errors.a
 
 #
@@ -82,9 +82,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/netbsd_amd64/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/netbsd_amd64/sync/atomic.a
 
@@ -94,8 +94,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/netbsd_amd64/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_amd64/sync.a
 
 #
@@ -104,8 +104,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_amd64/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_amd64/io.a
 
 #
@@ -114,8 +114,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_amd64/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_amd64/unicode.a
 
 #
@@ -124,8 +124,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_amd64/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/netbsd_amd64/unicode/utf8.a
 
@@ -135,9 +135,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/netbsd_amd64/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
 cp "$WORK"/bytes.a "$GOROOT"/pkg/netbsd_amd64/bytes.a
 
 #
@@ -146,31 +146,31 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/netbsd_amd64/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 abs_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 atan2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 atan_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 dim_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 exp2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 exp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 expm1_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 floor_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 fltasm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 frexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 hypot_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ldexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 log10_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 log1p_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 log_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 mod_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 modf_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 remainder_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sincos_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sqrt_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 tan_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 abs_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 atan2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 atan_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 dim_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 exp2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 exp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 expm1_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 floor_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 fltasm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 frexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 hypot_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ldexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 log10_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 log1p_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 log_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 mod_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 modf_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 remainder_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sincos_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 sqrt_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 tan_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
 cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_amd64/math.a
 
 #
@@ -179,8 +179,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_amd64/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_amd64/strings.a
 
 #
@@ -189,8 +189,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_amd64/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_amd64/strconv.a
 
 #
@@ -199,8 +199,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_amd64/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_amd64/bufio.a
 
 #
@@ -209,8 +209,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_amd64/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_amd64/sort.a
 
 #
@@ -219,8 +219,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_amd64/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/netbsd_amd64/container/heap.a
 
@@ -230,8 +230,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/netbsd_amd64/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/netbsd_amd64/encoding/base64.a
 
@@ -241,9 +241,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/netbsd_amd64/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_netbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go syscall_unix.go zerrors_netbsd_amd64.go zsyscall_netbsd_amd64.go zsysnum_netbsd_amd64.go ztypes_netbsd_amd64.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_netbsd_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_netbsd_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_netbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go syscall_unix.go zerrors_netbsd_amd64.go zsyscall_netbsd_amd64.go zsysnum_netbsd_amd64.go ztypes_netbsd_amd64.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 asm_netbsd_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_netbsd_amd64.6
 cp "$WORK"/syscall.a "$GOROOT"/pkg/netbsd_amd64/syscall.a
 
 #
@@ -252,8 +252,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/netbsd_amd64/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_amd64/time.a
 
 #
@@ -262,8 +262,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_amd64/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_netbsd.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_netbsd.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_amd64/os.a
 
 #
@@ -272,8 +272,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_amd64/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_amd64/reflect.a
 
 #
@@ -282,8 +282,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_amd64/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_amd64/fmt.a
 
 #
@@ -292,8 +292,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_amd64/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/netbsd_amd64/unicode/utf16.a
 
 #
@@ -302,8 +302,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/netbsd_amd64/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/netbsd_amd64/encoding/json.a
 
 #
@@ -312,8 +312,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/netbsd_amd64/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_amd64/flag.a
 
 #
@@ -322,8 +322,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_amd64/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/netbsd_amd64/encoding/gob.a
 
 #
@@ -332,8 +332,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/netbsd_amd64/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/netbsd_amd64/go/token.a
 
@@ -343,8 +343,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/netbsd_amd64/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/netbsd_amd64/path/filepath.a
 
@@ -354,8 +354,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/netbsd_amd64/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/netbsd_amd64/go/scanner.a
 
 #
@@ -364,8 +364,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/netbsd_amd64/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/netbsd_amd64/go/ast.a
 
 #
@@ -374,8 +374,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/netbsd_amd64/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/netbsd_amd64/io/ioutil.a
 
@@ -385,8 +385,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/netbsd_amd64/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/netbsd_amd64/go/parser.a
 
 #
@@ -395,8 +395,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/netbsd_amd64/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_amd64/log.a
 
 #
@@ -405,8 +405,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_amd64/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_amd64/path.a
 
 #
@@ -415,8 +415,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_amd64/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
 cp "$WORK"/go/build.a "$GOROOT"/pkg/netbsd_amd64/go/build.a
 
 #
@@ -425,8 +425,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/netbsd_amd64/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/netbsd_amd64/os/exec.a
 
@@ -436,8 +436,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/netbsd_amd64/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/netbsd_amd64/regexp/syntax.a
 
@@ -447,8 +447,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/netbsd_amd64/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_amd64/regexp.a
 
 #
@@ -457,8 +457,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_amd64/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/netbsd_amd64/net/url.a
 
@@ -468,8 +468,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/netbsd_amd64/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/netbsd_amd64/text/template/parse.a
 
@@ -479,8 +479,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/netbsd_amd64/text/template/parse.
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_amd64/text/template.a
 
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
-"$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/openbsd_386.sh

@@ -17,54 +17,54 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_openbsd.go zruntime_defs_openbsd_386.go zversion.go
+"$GOROOT"/bin/tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_openbsd.go zruntime_defs_openbsd_386.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_386.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_openbsd_386.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_openbsd.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_openbsd.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_openbsd_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_openbsd -DGOARCH_386 alg.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_openbsd -DGOARCH_386 atomic_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_openbsd -DGOARCH_386 cgocall.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_openbsd -DGOARCH_386 chan.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_openbsd -DGOARCH_386 closure_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_openbsd -DGOARCH_386 complex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_openbsd -DGOARCH_386 cpuprof.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_openbsd -DGOARCH_386 float.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_openbsd -DGOARCH_386 hashmap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_openbsd -DGOARCH_386 iface.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_openbsd -DGOARCH_386 lock_sema.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_openbsd -DGOARCH_386 mcache.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_openbsd -DGOARCH_386 mcentral.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mem_openbsd.8 -DGOOS_openbsd -DGOARCH_386 mem_openbsd.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_openbsd -DGOARCH_386 mfinal.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_openbsd -DGOARCH_386 mfixalloc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_openbsd -DGOARCH_386 mgc0.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_openbsd -DGOARCH_386 mheap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_openbsd -DGOARCH_386 msize.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_openbsd -DGOARCH_386 print.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_openbsd -DGOARCH_386 proc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_openbsd -DGOARCH_386 rune.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_openbsd -DGOARCH_386 runtime.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/signal_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 signal_openbsd_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_openbsd -DGOARCH_386 slice.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_openbsd -DGOARCH_386 symtab.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/thread_openbsd.8 -DGOOS_openbsd -DGOARCH_386 thread_openbsd.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_openbsd -DGOARCH_386 traceback_x86.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_openbsd -DGOARCH_386 vlrt_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_openbsd -DGOARCH_386 zmalloc_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_openbsd -DGOARCH_386 zmprof_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_openbsd -DGOARCH_386 zruntime1_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_openbsd -DGOARCH_386 zsema_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_openbsd -DGOARCH_386 zsigqueue_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_openbsd -DGOARCH_386 zstring_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_openbsd -DGOARCH_386 ztime_386.c
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_openbsd -DGOARCH_386 memmove_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 rt0_openbsd_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 sys_openbsd_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_openbsd -DGOARCH_386 vlop_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_openbsd.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_openbsd_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_openbsd.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_openbsd_386.8 "$WORK"/runtime/_obj/sys_openbsd_386.8 "$WORK"/runtime/_obj/vlop_386.8
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_openbsd -DGOARCH_386 alg.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_openbsd -DGOARCH_386 atomic_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_openbsd -DGOARCH_386 cgocall.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_openbsd -DGOARCH_386 chan.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_openbsd -DGOARCH_386 closure_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_openbsd -DGOARCH_386 complex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_openbsd -DGOARCH_386 cpuprof.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_openbsd -DGOARCH_386 float.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_openbsd -DGOARCH_386 hashmap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_openbsd -DGOARCH_386 iface.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_openbsd -DGOARCH_386 lock_sema.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_openbsd -DGOARCH_386 mcache.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_openbsd -DGOARCH_386 mcentral.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mem_openbsd.8 -DGOOS_openbsd -DGOARCH_386 mem_openbsd.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_openbsd -DGOARCH_386 mfinal.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_openbsd -DGOARCH_386 mfixalloc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_openbsd -DGOARCH_386 mgc0.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_openbsd -DGOARCH_386 mheap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_openbsd -DGOARCH_386 msize.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_openbsd -DGOARCH_386 print.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_openbsd -DGOARCH_386 proc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_openbsd -DGOARCH_386 rune.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_openbsd -DGOARCH_386 runtime.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/signal_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 signal_openbsd_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_openbsd -DGOARCH_386 slice.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_openbsd -DGOARCH_386 symtab.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/thread_openbsd.8 -DGOOS_openbsd -DGOARCH_386 thread_openbsd.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_openbsd -DGOARCH_386 traceback_x86.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_openbsd -DGOARCH_386 vlrt_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_openbsd -DGOARCH_386 zmalloc_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_openbsd -DGOARCH_386 zmprof_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_openbsd -DGOARCH_386 zruntime1_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_openbsd -DGOARCH_386 zsema_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_openbsd -DGOARCH_386 zsigqueue_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_openbsd -DGOARCH_386 zstring_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_openbsd -DGOARCH_386 ztime_386.c
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_openbsd -DGOARCH_386 memmove_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 rt0_openbsd_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 sys_openbsd_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_openbsd -DGOARCH_386 vlop_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_openbsd.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_openbsd_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_openbsd.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_openbsd_386.8 "$WORK"/runtime/_obj/sys_openbsd_386.8 "$WORK"/runtime/_obj/vlop_386.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_386/runtime.a
 
@@ -74,8 +74,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_386/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/openbsd_386/errors.a
 
 #
@@ -84,9 +84,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/openbsd_386/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/openbsd_386/sync/atomic.a
 
@@ -96,8 +96,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/openbsd_386/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_386/sync.a
 
 #
@@ -106,8 +106,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_386/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_386/io.a
 
 #
@@ -116,8 +116,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_386/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_386/unicode.a
 
 #
@@ -126,8 +126,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_386/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/openbsd_386/unicode/utf8.a
 
@@ -137,9 +137,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/openbsd_386/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
 cp "$WORK"/bytes.a "$GOROOT"/pkg/openbsd_386/bytes.a
 
 #
@@ -148,30 +148,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/openbsd_386/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_openbsd -DGOARCH_386 abs_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_openbsd -DGOARCH_386 asin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_openbsd -DGOARCH_386 atan2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_openbsd -DGOARCH_386 atan_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_openbsd -DGOARCH_386 dim_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_openbsd -DGOARCH_386 exp2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_openbsd -DGOARCH_386 exp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_openbsd -DGOARCH_386 expm1_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_openbsd -DGOARCH_386 floor_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_openbsd -DGOARCH_386 frexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_openbsd -DGOARCH_386 hypot_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_openbsd -DGOARCH_386 ldexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_openbsd -DGOARCH_386 log10_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_openbsd -DGOARCH_386 log1p_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_openbsd -DGOARCH_386 log_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_openbsd -DGOARCH_386 mod_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_openbsd -DGOARCH_386 modf_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_openbsd -DGOARCH_386 remainder_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_openbsd -DGOARCH_386 sin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_openbsd -DGOARCH_386 sincos_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_openbsd -DGOARCH_386 sqrt_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_openbsd -DGOARCH_386 tan_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_openbsd -DGOARCH_386 abs_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_openbsd -DGOARCH_386 asin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_openbsd -DGOARCH_386 atan2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_openbsd -DGOARCH_386 atan_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_openbsd -DGOARCH_386 dim_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_openbsd -DGOARCH_386 exp2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_openbsd -DGOARCH_386 exp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_openbsd -DGOARCH_386 expm1_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_openbsd -DGOARCH_386 floor_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_openbsd -DGOARCH_386 frexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_openbsd -DGOARCH_386 hypot_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_openbsd -DGOARCH_386 ldexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_openbsd -DGOARCH_386 log10_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_openbsd -DGOARCH_386 log1p_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_openbsd -DGOARCH_386 log_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_openbsd -DGOARCH_386 mod_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_openbsd -DGOARCH_386 modf_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_openbsd -DGOARCH_386 remainder_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_openbsd -DGOARCH_386 sin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_openbsd -DGOARCH_386 sincos_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_openbsd -DGOARCH_386 sqrt_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_openbsd -DGOARCH_386 tan_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
 cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_386/math.a
 
 #
@@ -180,8 +180,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_386/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_386/strings.a
 
 #
@@ -190,8 +190,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_386/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_386/strconv.a
 
 #
@@ -200,8 +200,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_386/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_386/bufio.a
 
 #
@@ -210,8 +210,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_386/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_386/sort.a
 
 #
@@ -220,8 +220,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_386/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/openbsd_386/container/heap.a
 
@@ -231,8 +231,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/openbsd_386/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/openbsd_386/encoding/base64.a
 
@@ -242,9 +242,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/openbsd_386/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_openbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go syscall_unix.go zerrors_openbsd_386.go zsyscall_openbsd_386.go zsysctl_openbsd.go zsysnum_openbsd_386.go ztypes_openbsd_386.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 asm_openbsd_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_openbsd_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_openbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go syscall_unix.go zerrors_openbsd_386.go zsyscall_openbsd_386.go zsysctl_openbsd.go zsysnum_openbsd_386.go ztypes_openbsd_386.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 asm_openbsd_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_openbsd_386.8
 cp "$WORK"/syscall.a "$GOROOT"/pkg/openbsd_386/syscall.a
 
 #
@@ -253,8 +253,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/openbsd_386/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_386/time.a
 
 #
@@ -263,8 +263,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_386/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_openbsd.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_openbsd.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_386/os.a
 
 #
@@ -273,8 +273,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_386/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_386/reflect.a
 
 #
@@ -283,8 +283,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_386/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_386/fmt.a
 
 #
@@ -293,8 +293,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_386/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/openbsd_386/unicode/utf16.a
 
 #
@@ -303,8 +303,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/openbsd_386/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/openbsd_386/encoding/json.a
 
 #
@@ -313,8 +313,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/openbsd_386/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_386/flag.a
 
 #
@@ -323,8 +323,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_386/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/openbsd_386/encoding/gob.a
 
 #
@@ -333,8 +333,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/openbsd_386/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/openbsd_386/go/token.a
 
@@ -344,8 +344,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/openbsd_386/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/openbsd_386/path/filepath.a
 
@@ -355,8 +355,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/openbsd_386/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/openbsd_386/go/scanner.a
 
 #
@@ -365,8 +365,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/openbsd_386/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/openbsd_386/go/ast.a
 
 #
@@ -375,8 +375,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/openbsd_386/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/openbsd_386/io/ioutil.a
 
@@ -386,8 +386,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/openbsd_386/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/openbsd_386/go/parser.a
 
 #
@@ -396,8 +396,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/openbsd_386/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_386/log.a
 
 #
@@ -406,8 +406,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_386/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_386/path.a
 
 #
@@ -416,8 +416,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_386/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
 cp "$WORK"/go/build.a "$GOROOT"/pkg/openbsd_386/go/build.a
 
 #
@@ -426,8 +426,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/openbsd_386/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/openbsd_386/os/exec.a
 
@@ -437,8 +437,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/openbsd_386/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/openbsd_386/regexp/syntax.a
 
@@ -448,8 +448,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/openbsd_386/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_386/regexp.a
 
 #
@@ -458,8 +458,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_386/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/openbsd_386/net/url.a
 
@@ -469,8 +469,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/openbsd_386/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/openbsd_386/text/template/parse.a
 
@@ -480,8 +480,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/openbsd_386/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/openbsd_386/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_386/text/template.a
 
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
-"$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/openbsd_amd64.sh

@@ -17,52 +17,52 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_openbsd.go zruntime_defs_openbsd_amd64.go zversion.go
+"$GOROOT"/bin/tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_openbsd.go zruntime_defs_openbsd_amd64.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_amd64.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_openbsd_amd64.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_openbsd.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_openbsd.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_openbsd_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_openbsd -DGOARCH_amd64 alg.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 atomic_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_openbsd -DGOARCH_amd64 cgocall.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_openbsd -DGOARCH_amd64 chan.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 closure_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_openbsd -DGOARCH_amd64 complex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_openbsd -DGOARCH_amd64 cpuprof.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_openbsd -DGOARCH_amd64 float.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_openbsd -DGOARCH_amd64 hashmap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_openbsd -DGOARCH_amd64 iface.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_openbsd -DGOARCH_amd64 lock_sema.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_openbsd -DGOARCH_amd64 mcache.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_openbsd -DGOARCH_amd64 mcentral.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mem_openbsd.6 -DGOOS_openbsd -DGOARCH_amd64 mem_openbsd.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_openbsd -DGOARCH_amd64 mfinal.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_openbsd -DGOARCH_amd64 mfixalloc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_openbsd -DGOARCH_amd64 mgc0.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_openbsd -DGOARCH_amd64 mheap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_openbsd -DGOARCH_amd64 msize.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_openbsd -DGOARCH_amd64 print.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_openbsd -DGOARCH_amd64 proc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_openbsd -DGOARCH_amd64 rune.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_openbsd -DGOARCH_amd64 runtime.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/signal_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 signal_openbsd_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_openbsd -DGOARCH_amd64 slice.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_openbsd -DGOARCH_amd64 symtab.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/thread_openbsd.6 -DGOOS_openbsd -DGOARCH_amd64 thread_openbsd.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_openbsd -DGOARCH_amd64 traceback_x86.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zmalloc_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zmprof_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zruntime1_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zsema_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zsigqueue_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zstring_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ztime_amd64.c
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 memmove_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 rt0_openbsd_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sys_openbsd_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_openbsd.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_openbsd_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_openbsd.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_openbsd_amd64.6 "$WORK"/runtime/_obj/sys_openbsd_amd64.6
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_openbsd -DGOARCH_amd64 alg.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 atomic_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_openbsd -DGOARCH_amd64 cgocall.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_openbsd -DGOARCH_amd64 chan.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 closure_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_openbsd -DGOARCH_amd64 complex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_openbsd -DGOARCH_amd64 cpuprof.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_openbsd -DGOARCH_amd64 float.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_openbsd -DGOARCH_amd64 hashmap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_openbsd -DGOARCH_amd64 iface.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_openbsd -DGOARCH_amd64 lock_sema.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_openbsd -DGOARCH_amd64 mcache.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_openbsd -DGOARCH_amd64 mcentral.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mem_openbsd.6 -DGOOS_openbsd -DGOARCH_amd64 mem_openbsd.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_openbsd -DGOARCH_amd64 mfinal.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_openbsd -DGOARCH_amd64 mfixalloc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_openbsd -DGOARCH_amd64 mgc0.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_openbsd -DGOARCH_amd64 mheap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_openbsd -DGOARCH_amd64 msize.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_openbsd -DGOARCH_amd64 print.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_openbsd -DGOARCH_amd64 proc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_openbsd -DGOARCH_amd64 rune.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_openbsd -DGOARCH_amd64 runtime.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/signal_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 signal_openbsd_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_openbsd -DGOARCH_amd64 slice.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_openbsd -DGOARCH_amd64 symtab.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/thread_openbsd.6 -DGOOS_openbsd -DGOARCH_amd64 thread_openbsd.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_openbsd -DGOARCH_amd64 traceback_x86.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zmalloc_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zmprof_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zruntime1_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zsema_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zsigqueue_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 zstring_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/openbsd_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ztime_amd64.c
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 memmove_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 rt0_openbsd_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sys_openbsd_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_openbsd.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_openbsd_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_openbsd.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_openbsd_amd64.6 "$WORK"/runtime/_obj/sys_openbsd_amd64.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_amd64/runtime.a
 
@@ -72,8 +72,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_amd64/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/openbsd_amd64/errors.a
 
 #
@@ -82,9 +82,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/openbsd_amd64/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/openbsd_amd64/sync/atomic.a
 
@@ -94,8 +94,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/openbsd_amd64/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_amd64/sync.a
 
 #
@@ -104,8 +104,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_amd64/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_amd64/io.a
 
 #
@@ -114,8 +114,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_amd64/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_amd64/unicode.a
 
 #
@@ -124,8 +124,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_amd64/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/openbsd_amd64/unicode/utf8.a
 
@@ -135,9 +135,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/openbsd_amd64/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
 cp "$WORK"/bytes.a "$GOROOT"/pkg/openbsd_amd64/bytes.a
 
 #
@@ -146,31 +146,31 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/openbsd_amd64/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 abs_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 atan2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 atan_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 dim_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 exp2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 exp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 expm1_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 floor_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 fltasm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 frexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 hypot_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ldexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 log10_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 log1p_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 log_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 mod_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 modf_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 remainder_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sincos_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sqrt_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 tan_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 abs_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 atan2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 atan_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 dim_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 exp2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 exp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 expm1_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 floor_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 fltasm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 frexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 hypot_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ldexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 log10_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 log1p_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 log_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 mod_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 modf_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 remainder_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sincos_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 sqrt_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 tan_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
 cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_amd64/math.a
 
 #
@@ -179,8 +179,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_amd64/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_amd64/strings.a
 
 #
@@ -189,8 +189,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_amd64/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_amd64/strconv.a
 
 #
@@ -199,8 +199,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_amd64/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_amd64/bufio.a
 
 #
@@ -209,8 +209,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_amd64/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_amd64/sort.a
 
 #
@@ -219,8 +219,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_amd64/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/openbsd_amd64/container/heap.a
 
@@ -230,8 +230,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/openbsd_amd64/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/openbsd_amd64/encoding/base64.a
 
@@ -241,9 +241,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/openbsd_amd64/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_openbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go syscall_unix.go zerrors_openbsd_amd64.go zsyscall_openbsd_amd64.go zsysctl_openbsd.go zsysnum_openbsd_amd64.go ztypes_openbsd_amd64.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_openbsd_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_openbsd_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" bpf_bsd.go env_unix.go exec_bsd.go exec_unix.go route_bsd.go route_openbsd.go sockcmsg_unix.go str.go syscall.go syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go syscall_unix.go zerrors_openbsd_amd64.go zsyscall_openbsd_amd64.go zsysctl_openbsd.go zsysnum_openbsd_amd64.go ztypes_openbsd_amd64.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 asm_openbsd_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_openbsd_amd64.6
 cp "$WORK"/syscall.a "$GOROOT"/pkg/openbsd_amd64/syscall.a
 
 #
@@ -252,8 +252,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/openbsd_amd64/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_unix.go tick.go time.go zoneinfo.go zoneinfo_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_amd64/time.a
 
 #
@@ -262,8 +262,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_amd64/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_openbsd.go sys_bsd.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_unix.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_unix.go file.go file_posix.go file_unix.go getwd.go path.go path_unix.go proc.go stat_openbsd.go sys_bsd.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_amd64/os.a
 
 #
@@ -272,8 +272,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_amd64/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_amd64/reflect.a
 
 #
@@ -282,8 +282,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_amd64/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_amd64/fmt.a
 
 #
@@ -292,8 +292,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_amd64/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/openbsd_amd64/unicode/utf16.a
 
 #
@@ -302,8 +302,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/openbsd_amd64/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/openbsd_amd64/encoding/json.a
 
 #
@@ -312,8 +312,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/openbsd_amd64/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_amd64/flag.a
 
 #
@@ -322,8 +322,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_amd64/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/openbsd_amd64/encoding/gob.a
 
 #
@@ -332,8 +332,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/openbsd_amd64/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/openbsd_amd64/go/token.a
 
@@ -343,8 +343,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/openbsd_amd64/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/openbsd_amd64/path/filepath.a
 
@@ -354,8 +354,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/openbsd_amd64/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/openbsd_amd64/go/scanner.a
 
 #
@@ -364,8 +364,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/openbsd_amd64/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/openbsd_amd64/go/ast.a
 
 #
@@ -374,8 +374,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/openbsd_amd64/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/openbsd_amd64/io/ioutil.a
 
@@ -385,8 +385,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/openbsd_amd64/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/openbsd_amd64/go/parser.a
 
 #
@@ -395,8 +395,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/openbsd_amd64/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_amd64/log.a
 
 #
@@ -405,8 +405,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_amd64/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_amd64/path.a
 
 #
@@ -415,8 +415,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_amd64/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
 cp "$WORK"/go/build.a "$GOROOT"/pkg/openbsd_amd64/go/build.a
 
 #
@@ -425,8 +425,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/openbsd_amd64/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_unix.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/openbsd_amd64/os/exec.a
 
@@ -436,8 +436,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/openbsd_amd64/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/openbsd_amd64/regexp/syntax.a
 
@@ -447,8 +447,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/openbsd_amd64/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_amd64/regexp.a
 
 #
@@ -457,8 +457,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_amd64/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/openbsd_amd64/net/url.a
 
@@ -468,8 +468,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/openbsd_amd64/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/openbsd_amd64/text/template/parse.a
 
@@ -479,8 +479,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/openbsd_amd64/text/template/parse
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_amd64/text/template.a
 
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
-"$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/plan9_386.sh

@@ -17,54 +17,54 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_plan9.go zruntime_defs_plan9_386.go zversion.go
+"$GOROOT"/bin/tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_plan9.go zruntime_defs_plan9_386.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_386.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_plan9_386.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_plan9.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_plan9.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_plan9_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_plan9 -DGOARCH_386 alg.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_plan9 -DGOARCH_386 atomic_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_plan9 -DGOARCH_386 cgocall.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_plan9 -DGOARCH_386 chan.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_plan9 -DGOARCH_386 closure_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_plan9 -DGOARCH_386 complex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_plan9 -DGOARCH_386 cpuprof.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_plan9 -DGOARCH_386 float.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_plan9 -DGOARCH_386 hashmap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_plan9 -DGOARCH_386 iface.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_plan9 -DGOARCH_386 lock_sema.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_plan9 -DGOARCH_386 mcache.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_plan9 -DGOARCH_386 mcentral.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mem_plan9.8 -DGOOS_plan9 -DGOARCH_386 mem_plan9.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_plan9 -DGOARCH_386 mfinal.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_plan9 -DGOARCH_386 mfixalloc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_plan9 -DGOARCH_386 mgc0.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_plan9 -DGOARCH_386 mheap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_plan9 -DGOARCH_386 msize.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_plan9 -DGOARCH_386 print.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_plan9 -DGOARCH_386 proc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_plan9 -DGOARCH_386 rune.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_plan9 -DGOARCH_386 runtime.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/signal_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 signal_plan9_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_plan9 -DGOARCH_386 slice.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_plan9 -DGOARCH_386 symtab.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/thread_plan9.8 -DGOOS_plan9 -DGOARCH_386 thread_plan9.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_plan9 -DGOARCH_386 traceback_x86.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_plan9 -DGOARCH_386 vlrt_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_plan9 -DGOARCH_386 zmalloc_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_plan9 -DGOARCH_386 zmprof_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_plan9 -DGOARCH_386 zruntime1_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_plan9 -DGOARCH_386 zsema_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_plan9 -DGOARCH_386 zsigqueue_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_plan9 -DGOARCH_386 zstring_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_plan9 -DGOARCH_386 ztime_386.c
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_plan9 -DGOARCH_386 memmove_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 rt0_plan9_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 sys_plan9_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_plan9 -DGOARCH_386 vlop_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_plan9.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_plan9_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_plan9.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_plan9_386.8 "$WORK"/runtime/_obj/sys_plan9_386.8 "$WORK"/runtime/_obj/vlop_386.8
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_plan9 -DGOARCH_386 alg.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_plan9 -DGOARCH_386 atomic_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_plan9 -DGOARCH_386 cgocall.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_plan9 -DGOARCH_386 chan.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_plan9 -DGOARCH_386 closure_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_plan9 -DGOARCH_386 complex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_plan9 -DGOARCH_386 cpuprof.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_plan9 -DGOARCH_386 float.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_plan9 -DGOARCH_386 hashmap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_plan9 -DGOARCH_386 iface.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_plan9 -DGOARCH_386 lock_sema.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_plan9 -DGOARCH_386 mcache.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_plan9 -DGOARCH_386 mcentral.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mem_plan9.8 -DGOOS_plan9 -DGOARCH_386 mem_plan9.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_plan9 -DGOARCH_386 mfinal.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_plan9 -DGOARCH_386 mfixalloc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_plan9 -DGOARCH_386 mgc0.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_plan9 -DGOARCH_386 mheap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_plan9 -DGOARCH_386 msize.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_plan9 -DGOARCH_386 print.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_plan9 -DGOARCH_386 proc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_plan9 -DGOARCH_386 rune.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_plan9 -DGOARCH_386 runtime.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/signal_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 signal_plan9_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_plan9 -DGOARCH_386 slice.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_plan9 -DGOARCH_386 symtab.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/thread_plan9.8 -DGOOS_plan9 -DGOARCH_386 thread_plan9.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_plan9 -DGOARCH_386 traceback_x86.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_plan9 -DGOARCH_386 vlrt_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_plan9 -DGOARCH_386 zmalloc_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_plan9 -DGOARCH_386 zmprof_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_plan9 -DGOARCH_386 zruntime1_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_plan9 -DGOARCH_386 zsema_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_plan9 -DGOARCH_386 zsigqueue_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_plan9 -DGOARCH_386 zstring_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/plan9_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_plan9 -DGOARCH_386 ztime_386.c
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_plan9 -DGOARCH_386 memmove_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 rt0_plan9_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 sys_plan9_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_plan9 -DGOARCH_386 vlop_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_plan9.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_plan9_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_plan9.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_plan9_386.8 "$WORK"/runtime/_obj/sys_plan9_386.8 "$WORK"/runtime/_obj/vlop_386.8
 mkdir -p "$GOROOT"/pkg/plan9_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/plan9_386/runtime.a
 
@@ -74,8 +74,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/plan9_386/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/plan9_386/errors.a
 
 #
@@ -84,9 +84,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/plan9_386/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
 mkdir -p "$GOROOT"/pkg/plan9_386/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/plan9_386/sync/atomic.a
 
@@ -96,8 +96,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/plan9_386/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/plan9_386/sync.a
 
 #
@@ -106,8 +106,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/plan9_386/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/plan9_386/io.a
 
 #
@@ -116,8 +116,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/plan9_386/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/plan9_386/unicode.a
 
 #
@@ -126,8 +126,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/plan9_386/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/plan9_386/unicode/utf8.a
 
@@ -137,9 +137,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/plan9_386/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
 cp "$WORK"/bytes.a "$GOROOT"/pkg/plan9_386/bytes.a
 
 #
@@ -148,30 +148,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/plan9_386/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_plan9 -DGOARCH_386 abs_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_plan9 -DGOARCH_386 asin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_plan9 -DGOARCH_386 atan2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_plan9 -DGOARCH_386 atan_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_plan9 -DGOARCH_386 dim_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_plan9 -DGOARCH_386 exp2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_plan9 -DGOARCH_386 exp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_plan9 -DGOARCH_386 expm1_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_plan9 -DGOARCH_386 floor_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_plan9 -DGOARCH_386 frexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_plan9 -DGOARCH_386 hypot_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_plan9 -DGOARCH_386 ldexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_plan9 -DGOARCH_386 log10_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_plan9 -DGOARCH_386 log1p_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_plan9 -DGOARCH_386 log_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_plan9 -DGOARCH_386 mod_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_plan9 -DGOARCH_386 modf_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_plan9 -DGOARCH_386 remainder_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_plan9 -DGOARCH_386 sin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_plan9 -DGOARCH_386 sincos_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_plan9 -DGOARCH_386 sqrt_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_plan9 -DGOARCH_386 tan_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_plan9 -DGOARCH_386 abs_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_plan9 -DGOARCH_386 asin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_plan9 -DGOARCH_386 atan2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_plan9 -DGOARCH_386 atan_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_plan9 -DGOARCH_386 dim_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_plan9 -DGOARCH_386 exp2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_plan9 -DGOARCH_386 exp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_plan9 -DGOARCH_386 expm1_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_plan9 -DGOARCH_386 floor_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_plan9 -DGOARCH_386 frexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_plan9 -DGOARCH_386 hypot_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_plan9 -DGOARCH_386 ldexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_plan9 -DGOARCH_386 log10_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_plan9 -DGOARCH_386 log1p_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_plan9 -DGOARCH_386 log_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_plan9 -DGOARCH_386 mod_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_plan9 -DGOARCH_386 modf_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_plan9 -DGOARCH_386 remainder_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_plan9 -DGOARCH_386 sin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_plan9 -DGOARCH_386 sincos_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_plan9 -DGOARCH_386 sqrt_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_plan9 -DGOARCH_386 tan_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
 cp "$WORK"/math.a "$GOROOT"/pkg/plan9_386/math.a
 
 #
@@ -180,8 +180,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/plan9_386/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/plan9_386/strings.a
 
 #
@@ -190,8 +190,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/plan9_386/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/plan9_386/strconv.a
 
 #
@@ -200,8 +200,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/plan9_386/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/plan9_386/bufio.a
 
 #
@@ -210,8 +210,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/plan9_386/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/plan9_386/sort.a
 
 #
@@ -220,8 +220,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/plan9_386/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/plan9_386/container/heap.a
 
@@ -231,8 +231,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/plan9_386/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/plan9_386/encoding/base64.a
 
@@ -242,9 +242,9 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/plan9_386/encoding/base64.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" env_plan9.go exec_plan9.go str.go syscall.go syscall_plan9.go syscall_plan9_386.go zerrors_plan9_386.go zsyscall_plan9_386.go zsysnum_plan9_386.go ztypes_plan9_386.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 asm_plan9_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_plan9_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" env_plan9.go exec_plan9.go str.go syscall.go syscall_plan9.go syscall_plan9_386.go zerrors_plan9_386.go zsyscall_plan9_386.go zsysnum_plan9_386.go ztypes_plan9_386.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 asm_plan9_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_plan9_386.8
 cp "$WORK"/syscall.a "$GOROOT"/pkg/plan9_386/syscall.a
 
 #
@@ -253,8 +253,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/plan9_386/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_plan9.go tick.go time.go zoneinfo.go zoneinfo_plan9.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_plan9.go tick.go time.go zoneinfo.go zoneinfo_plan9.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/plan9_386/time.a
 
 #
@@ -263,8 +263,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/plan9_386/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_plan9.go doc.go env.go error.go error_plan9.go exec.go exec_plan9.go file.go file_plan9.go getwd.go path.go path_plan9.go proc.go stat_plan9.go str.go sys_plan9.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_plan9.go doc.go env.go error.go error_plan9.go exec.go exec_plan9.go file.go file_plan9.go getwd.go path.go path_plan9.go proc.go stat_plan9.go str.go sys_plan9.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/plan9_386/os.a
 
 #
@@ -273,8 +273,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/plan9_386/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/plan9_386/reflect.a
 
 #
@@ -283,8 +283,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/plan9_386/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/plan9_386/fmt.a
 
 #
@@ -293,8 +293,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/plan9_386/fmt.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/plan9_386/unicode/utf16.a
 
 #
@@ -303,8 +303,8 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/plan9_386/unicode/utf16.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/plan9_386/encoding/json.a
 
 #
@@ -313,8 +313,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/plan9_386/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/plan9_386/flag.a
 
 #
@@ -323,8 +323,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/plan9_386/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/plan9_386/encoding/gob.a
 
 #
@@ -333,8 +333,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/plan9_386/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/plan9_386/go/token.a
 
@@ -344,8 +344,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/plan9_386/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_plan9.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_plan9.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/plan9_386/path/filepath.a
 
@@ -355,8 +355,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/plan9_386/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/plan9_386/go/scanner.a
 
 #
@@ -365,8 +365,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/plan9_386/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/plan9_386/go/ast.a
 
 #
@@ -375,8 +375,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/plan9_386/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/plan9_386/io/ioutil.a
 
@@ -386,8 +386,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/plan9_386/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/plan9_386/go/parser.a
 
 #
@@ -396,8 +396,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/plan9_386/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/plan9_386/log.a
 
 #
@@ -406,8 +406,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/plan9_386/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/plan9_386/path.a
 
 #
@@ -416,8 +416,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/plan9_386/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
 cp "$WORK"/go/build.a "$GOROOT"/pkg/plan9_386/go/build.a
 
 #
@@ -426,8 +426,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/plan9_386/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_plan9.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_plan9.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/plan9_386/os/exec.a
 
@@ -437,8 +437,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/plan9_386/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/plan9_386/regexp/syntax.a
 
@@ -448,8 +448,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/plan9_386/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/plan9_386/regexp.a
 
 #
@@ -458,8 +458,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/plan9_386/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/plan9_386/net/url.a
 
@@ -469,8 +469,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/plan9_386/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/plan9_386/text/template/parse.a
 
@@ -480,8 +480,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/plan9_386/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/plan9_386/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/plan9_386/text/template.a
 
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/plan9_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
-"$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

src/buildscript/windows_386.sh

@@ -17,56 +17,56 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_windows.go zruntime_defs_windows_386.go zversion.go
+"$GOROOT"/bin/tool/8g -o "$WORK"/runtime/_obj/_go_.8 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_386.go zgoos_windows.go zruntime_defs_windows_386.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_386.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_windows_386.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_windows.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_windows.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_windows_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_windows -DGOARCH_386 alg.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_windows -DGOARCH_386 atomic_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/callback_windows_386.8 -DGOOS_windows -DGOARCH_386 callback_windows_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_windows -DGOARCH_386 cgocall.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_windows -DGOARCH_386 chan.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_windows -DGOARCH_386 closure_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_windows -DGOARCH_386 complex.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_windows -DGOARCH_386 cpuprof.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_windows -DGOARCH_386 float.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_windows -DGOARCH_386 hashmap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_windows -DGOARCH_386 iface.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_windows -DGOARCH_386 lock_sema.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_windows -DGOARCH_386 mcache.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_windows -DGOARCH_386 mcentral.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mem_windows.8 -DGOOS_windows -DGOARCH_386 mem_windows.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_windows -DGOARCH_386 mfinal.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_windows -DGOARCH_386 mfixalloc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_windows -DGOARCH_386 mgc0.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_windows -DGOARCH_386 mheap.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_windows -DGOARCH_386 msize.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_windows -DGOARCH_386 print.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_windows -DGOARCH_386 proc.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_windows -DGOARCH_386 rune.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_windows -DGOARCH_386 runtime.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/signal_windows_386.8 -DGOOS_windows -DGOARCH_386 signal_windows_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_windows -DGOARCH_386 slice.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_windows -DGOARCH_386 symtab.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/thread_windows.8 -DGOOS_windows -DGOARCH_386 thread_windows.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_windows -DGOARCH_386 traceback_x86.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_windows -DGOARCH_386 vlrt_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_windows -DGOARCH_386 zmalloc_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_windows -DGOARCH_386 zmprof_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_windows -DGOARCH_386 zruntime1_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_windows -DGOARCH_386 zsema_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_windows -DGOARCH_386 zsigqueue_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_windows -DGOARCH_386 zstring_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zsyscall_windows_386.8 -DGOOS_windows -DGOARCH_386 zsyscall_windows_386.c
-"$GOROOT"/bin/go-tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_windows -DGOARCH_386 ztime_386.c
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_windows -DGOARCH_386 memmove_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_windows_386.8 -DGOOS_windows -DGOARCH_386 rt0_windows_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_windows_386.8 -DGOOS_windows -DGOARCH_386 sys_windows_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_windows -DGOARCH_386 vlop_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/callback_windows_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_windows.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_windows_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_windows.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/zsyscall_windows_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_windows_386.8 "$WORK"/runtime/_obj/sys_windows_386.8 "$WORK"/runtime/_obj/vlop_386.8
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/alg.8 -DGOOS_windows -DGOARCH_386 alg.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/atomic_386.8 -DGOOS_windows -DGOARCH_386 atomic_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/callback_windows_386.8 -DGOOS_windows -DGOARCH_386 callback_windows_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/cgocall.8 -DGOOS_windows -DGOARCH_386 cgocall.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/chan.8 -DGOOS_windows -DGOARCH_386 chan.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/closure_386.8 -DGOOS_windows -DGOARCH_386 closure_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/complex.8 -DGOOS_windows -DGOARCH_386 complex.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/cpuprof.8 -DGOOS_windows -DGOARCH_386 cpuprof.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/float.8 -DGOOS_windows -DGOARCH_386 float.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/hashmap.8 -DGOOS_windows -DGOARCH_386 hashmap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/iface.8 -DGOOS_windows -DGOARCH_386 iface.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/lock_sema.8 -DGOOS_windows -DGOARCH_386 lock_sema.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mcache.8 -DGOOS_windows -DGOARCH_386 mcache.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mcentral.8 -DGOOS_windows -DGOARCH_386 mcentral.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mem_windows.8 -DGOOS_windows -DGOARCH_386 mem_windows.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mfinal.8 -DGOOS_windows -DGOARCH_386 mfinal.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mfixalloc.8 -DGOOS_windows -DGOARCH_386 mfixalloc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mgc0.8 -DGOOS_windows -DGOARCH_386 mgc0.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/mheap.8 -DGOOS_windows -DGOARCH_386 mheap.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/msize.8 -DGOOS_windows -DGOARCH_386 msize.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/print.8 -DGOOS_windows -DGOARCH_386 print.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/proc.8 -DGOOS_windows -DGOARCH_386 proc.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/rune.8 -DGOOS_windows -DGOARCH_386 rune.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/runtime.8 -DGOOS_windows -DGOARCH_386 runtime.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/signal_windows_386.8 -DGOOS_windows -DGOARCH_386 signal_windows_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/slice.8 -DGOOS_windows -DGOARCH_386 slice.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/symtab.8 -DGOOS_windows -DGOARCH_386 symtab.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/thread_windows.8 -DGOOS_windows -DGOARCH_386 thread_windows.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/traceback_x86.8 -DGOOS_windows -DGOARCH_386 traceback_x86.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/vlrt_386.8 -DGOOS_windows -DGOARCH_386 vlrt_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zmalloc_386.8 -DGOOS_windows -DGOARCH_386 zmalloc_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zmprof_386.8 -DGOOS_windows -DGOARCH_386 zmprof_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zruntime1_386.8 -DGOOS_windows -DGOARCH_386 zruntime1_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zsema_386.8 -DGOOS_windows -DGOARCH_386 zsema_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zsigqueue_386.8 -DGOOS_windows -DGOARCH_386 zsigqueue_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zstring_386.8 -DGOOS_windows -DGOARCH_386 zstring_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/zsyscall_windows_386.8 -DGOOS_windows -DGOARCH_386 zsyscall_windows_386.c
+"$GOROOT"/bin/tool/8c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_386 -o "$WORK"/runtime/_obj/ztime_386.8 -DGOOS_windows -DGOARCH_386 ztime_386.c
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_386.8 -DGOOS_windows -DGOARCH_386 memmove_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_windows_386.8 -DGOOS_windows -DGOARCH_386 rt0_windows_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_windows_386.8 -DGOOS_windows -DGOARCH_386 sys_windows_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_windows -DGOARCH_386 vlop_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.8 "$WORK"/runtime/_obj/alg.8 "$WORK"/runtime/_obj/atomic_386.8 "$WORK"/runtime/_obj/callback_windows_386.8 "$WORK"/runtime/_obj/cgocall.8 "$WORK"/runtime/_obj/chan.8 "$WORK"/runtime/_obj/closure_386.8 "$WORK"/runtime/_obj/complex.8 "$WORK"/runtime/_obj/cpuprof.8 "$WORK"/runtime/_obj/float.8 "$WORK"/runtime/_obj/hashmap.8 "$WORK"/runtime/_obj/iface.8 "$WORK"/runtime/_obj/lock_sema.8 "$WORK"/runtime/_obj/mcache.8 "$WORK"/runtime/_obj/mcentral.8 "$WORK"/runtime/_obj/mem_windows.8 "$WORK"/runtime/_obj/mfinal.8 "$WORK"/runtime/_obj/mfixalloc.8 "$WORK"/runtime/_obj/mgc0.8 "$WORK"/runtime/_obj/mheap.8 "$WORK"/runtime/_obj/msize.8 "$WORK"/runtime/_obj/print.8 "$WORK"/runtime/_obj/proc.8 "$WORK"/runtime/_obj/rune.8 "$WORK"/runtime/_obj/runtime.8 "$WORK"/runtime/_obj/signal_windows_386.8 "$WORK"/runtime/_obj/slice.8 "$WORK"/runtime/_obj/symtab.8 "$WORK"/runtime/_obj/thread_windows.8 "$WORK"/runtime/_obj/traceback_x86.8 "$WORK"/runtime/_obj/vlrt_386.8 "$WORK"/runtime/_obj/zmalloc_386.8 "$WORK"/runtime/_obj/zmprof_386.8 "$WORK"/runtime/_obj/zruntime1_386.8 "$WORK"/runtime/_obj/zsema_386.8 "$WORK"/runtime/_obj/zsigqueue_386.8 "$WORK"/runtime/_obj/zstring_386.8 "$WORK"/runtime/_obj/zsyscall_windows_386.8 "$WORK"/runtime/_obj/ztime_386.8 "$WORK"/runtime/_obj/asm_386.8 "$WORK"/runtime/_obj/memmove_386.8 "$WORK"/runtime/_obj/rt0_windows_386.8 "$WORK"/runtime/_obj/sys_windows_386.8 "$WORK"/runtime/_obj/vlop_386.8
 mkdir -p "$GOROOT"/pkg/windows_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_386/runtime.a
 
@@ -76,8 +76,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_386/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/windows_386/errors.a
 
 #
@@ -86,9 +86,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/windows_386/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
 mkdir -p "$GOROOT"/pkg/windows_386/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/windows_386/sync/atomic.a
 
@@ -98,8 +98,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/windows_386/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/windows_386/sync.a
 
 #
@@ -108,8 +108,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/windows_386/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/windows_386/io.a
 
 #
@@ -118,8 +118,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/windows_386/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_386/unicode.a
 
 #
@@ -128,8 +128,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_386/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/windows_386/unicode/utf8.a
 
@@ -139,9 +139,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/windows_386/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 asm_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 asm_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
 cp "$WORK"/bytes.a "$GOROOT"/pkg/windows_386/bytes.a
 
 #
@@ -150,30 +150,30 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/windows_386/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_windows -DGOARCH_386 abs_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_windows -DGOARCH_386 asin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_windows -DGOARCH_386 atan2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_windows -DGOARCH_386 atan_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_windows -DGOARCH_386 dim_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_windows -DGOARCH_386 exp2_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_windows -DGOARCH_386 exp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_windows -DGOARCH_386 expm1_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_windows -DGOARCH_386 floor_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_windows -DGOARCH_386 frexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_windows -DGOARCH_386 hypot_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_windows -DGOARCH_386 ldexp_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_windows -DGOARCH_386 log10_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_windows -DGOARCH_386 log1p_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_windows -DGOARCH_386 log_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_windows -DGOARCH_386 mod_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_windows -DGOARCH_386 modf_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_windows -DGOARCH_386 remainder_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_windows -DGOARCH_386 sin_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_windows -DGOARCH_386 sincos_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_windows -DGOARCH_386 sqrt_386.s
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_windows -DGOARCH_386 tan_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/math/_obj/_go_.8 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_386.8 -DGOOS_windows -DGOARCH_386 abs_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_386.8 -DGOOS_windows -DGOARCH_386 asin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_386.8 -DGOOS_windows -DGOARCH_386 atan2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_386.8 -DGOOS_windows -DGOARCH_386 atan_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_386.8 -DGOOS_windows -DGOARCH_386 dim_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_386.8 -DGOOS_windows -DGOARCH_386 exp2_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_386.8 -DGOOS_windows -DGOARCH_386 exp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_386.8 -DGOOS_windows -DGOARCH_386 expm1_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_386.8 -DGOOS_windows -DGOARCH_386 floor_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_386.8 -DGOOS_windows -DGOARCH_386 frexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_386.8 -DGOOS_windows -DGOARCH_386 hypot_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_386.8 -DGOOS_windows -DGOARCH_386 ldexp_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_386.8 -DGOOS_windows -DGOARCH_386 log10_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_386.8 -DGOOS_windows -DGOARCH_386 log1p_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_386.8 -DGOOS_windows -DGOARCH_386 log_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_386.8 -DGOOS_windows -DGOARCH_386 mod_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_386.8 -DGOOS_windows -DGOARCH_386 modf_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_386.8 -DGOOS_windows -DGOARCH_386 remainder_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_386.8 -DGOOS_windows -DGOARCH_386 sin_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_windows -DGOARCH_386 sincos_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_windows -DGOARCH_386 sqrt_386.s
+"$GOROOT"/bin/tool/8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_windows -DGOARCH_386 tan_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.8 "$WORK"/math/_obj/abs_386.8 "$WORK"/math/_obj/asin_386.8 "$WORK"/math/_obj/atan2_386.8 "$WORK"/math/_obj/atan_386.8 "$WORK"/math/_obj/dim_386.8 "$WORK"/math/_obj/exp2_386.8 "$WORK"/math/_obj/exp_386.8 "$WORK"/math/_obj/expm1_386.8 "$WORK"/math/_obj/floor_386.8 "$WORK"/math/_obj/frexp_386.8 "$WORK"/math/_obj/hypot_386.8 "$WORK"/math/_obj/ldexp_386.8 "$WORK"/math/_obj/log10_386.8 "$WORK"/math/_obj/log1p_386.8 "$WORK"/math/_obj/log_386.8 "$WORK"/math/_obj/mod_386.8 "$WORK"/math/_obj/modf_386.8 "$WORK"/math/_obj/remainder_386.8 "$WORK"/math/_obj/sin_386.8 "$WORK"/math/_obj/sincos_386.8 "$WORK"/math/_obj/sqrt_386.8 "$WORK"/math/_obj/tan_386.8
 cp "$WORK"/math.a "$GOROOT"/pkg/windows_386/math.a
 
 #
@@ -182,8 +182,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/windows_386/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/windows_386/strings.a
 
 #
@@ -192,8 +192,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/windows_386/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/strconv/_obj/_go_.8 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_386/strconv.a
 
 #
@@ -202,8 +202,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_386/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_386/bufio.a
 
 #
@@ -212,8 +212,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_386/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/windows_386/sort.a
 
 #
@@ -222,8 +222,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/windows_386/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/windows_386/container/heap.a
 
@@ -233,8 +233,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/windows_386/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/windows_386/encoding/base64.a
 
@@ -244,8 +244,8 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/windows_386/encoding/base64.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/windows_386/unicode/utf16.a
 
 #
@@ -254,9 +254,9 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/windows_386/unicode/utf16.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" dll_windows.go env_windows.go exec_windows.go security_windows.go str.go syscall.go syscall_windows.go syscall_windows_386.go zerrors_windows.go zerrors_windows_386.go zsyscall_windows_386.go zsysnum_windows_386.go ztypes_windows.go ztypes_windows_386.go
-"$GOROOT"/bin/go-tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_windows_386.8 -DGOOS_windows -DGOARCH_386 asm_windows_386.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_windows_386.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/syscall/_obj/_go_.8 -p syscall -I "$WORK" dll_windows.go env_windows.go exec_windows.go security_windows.go str.go syscall.go syscall_windows.go syscall_windows_386.go zerrors_windows.go zerrors_windows_386.go zsyscall_windows_386.go zsysnum_windows_386.go ztypes_windows.go ztypes_windows_386.go
+"$GOROOT"/bin/tool/8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_windows_386.8 -DGOOS_windows -DGOARCH_386 asm_windows_386.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_windows_386.8
 cp "$WORK"/syscall.a "$GOROOT"/pkg/windows_386/syscall.a
 
 #
@@ -265,8 +265,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/windows_386/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_windows.go tick.go time.go zoneinfo.go zoneinfo_windows.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/time/_obj/_go_.8 -p time -I "$WORK" format.go sleep.go sys_windows.go tick.go time.go zoneinfo.go zoneinfo_windows.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/windows_386/time.a
 
 #
@@ -275,8 +275,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/windows_386/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_windows.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_windows.go file.go file_posix.go file_windows.go getwd.go path.go path_windows.go proc.go stat_windows.go sys_windows.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/_obj/_go_.8 -p os -I "$WORK" dir_windows.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_windows.go file.go file_posix.go file_windows.go getwd.go path.go path_windows.go proc.go stat_windows.go sys_windows.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/windows_386/os.a
 
 #
@@ -285,8 +285,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/windows_386/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_386/reflect.a
 
 #
@@ -295,8 +295,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_386/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_386/fmt.a
 
 #
@@ -305,8 +305,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_386/fmt.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/json/_obj/_go_.8 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/windows_386/encoding/json.a
 
 #
@@ -315,8 +315,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/windows_386/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/windows_386/flag.a
 
 #
@@ -325,8 +325,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/windows_386/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/encoding/gob/_obj/_go_.8 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/windows_386/encoding/gob.a
 
 #
@@ -335,8 +335,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/windows_386/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/windows_386/go/token.a
 
@@ -346,8 +346,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/windows_386/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_windows.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" match.go path.go path_windows.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/windows_386/path/filepath.a
 
@@ -357,8 +357,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/windows_386/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/windows_386/go/scanner.a
 
 #
@@ -367,8 +367,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/windows_386/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/ast/_obj/_go_.8 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/windows_386/go/ast.a
 
 #
@@ -377,8 +377,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/windows_386/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/windows_386/io/ioutil.a
 
@@ -388,8 +388,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/windows_386/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/windows_386/go/parser.a
 
 #
@@ -398,8 +398,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/windows_386/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/windows_386/log.a
 
 #
@@ -408,8 +408,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/windows_386/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/windows_386/path.a
 
 #
@@ -418,8 +418,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/windows_386/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
 cp "$WORK"/go/build.a "$GOROOT"/pkg/windows_386/go/build.a
 
 #
@@ -428,8 +428,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/windows_386/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_windows.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" exec.go lp_windows.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/windows_386/os/exec.a
 
@@ -439,8 +439,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/windows_386/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/syntax/_obj/_go_.8 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/windows_386/regexp/syntax.a
 
@@ -450,8 +450,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/windows_386/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_386/regexp.a
 
 #
@@ -460,8 +460,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_386/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/windows_386/net/url.a
 
@@ -471,8 +471,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/windows_386/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/windows_386/text/template/parse.a
 
@@ -482,8 +482,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/windows_386/text/template/parse.a
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/tool/8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
 mkdir -p "$GOROOT"/pkg/windows_386/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_386/text/template.a
 
@@ -493,8 +493,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
-"$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/tool/8l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/go_bootstrap.exe

src/buildscript/windows_amd64.sh

@@ -17,54 +17,54 @@ set -e
 
 mkdir -p "$WORK"/runtime/_obj/
 cd "$GOROOT"/src/pkg/runtime
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_windows.go zruntime_defs_windows_amd64.go zversion.go
+"$GOROOT"/bin/tool/6g -o "$WORK"/runtime/_obj/_go_.6 -p runtime -+ -I "$WORK" debug.go error.go extern.go mem.go sig.go softfloat64.go type.go zgoarch_amd64.go zgoos_windows.go zruntime_defs_windows_amd64.go zversion.go
 cp "$GOROOT"/src/pkg/runtime/arch_amd64.h "$WORK"/runtime/_obj/arch_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/defs_windows_amd64.h "$WORK"/runtime/_obj/defs_GOOS_GOARCH.h
 cp "$GOROOT"/src/pkg/runtime/os_windows.h "$WORK"/runtime/_obj/os_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/signals_windows.h "$WORK"/runtime/_obj/signals_GOOS.h
 cp "$GOROOT"/src/pkg/runtime/zasm_windows_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_GOARCH.h
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_windows -DGOARCH_amd64 alg.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_windows -DGOARCH_amd64 atomic_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/callback_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 callback_windows_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_windows -DGOARCH_amd64 cgocall.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_windows -DGOARCH_amd64 chan.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_windows -DGOARCH_amd64 closure_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_windows -DGOARCH_amd64 complex.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_windows -DGOARCH_amd64 cpuprof.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_windows -DGOARCH_amd64 float.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_windows -DGOARCH_amd64 hashmap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_windows -DGOARCH_amd64 iface.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_windows -DGOARCH_amd64 lock_sema.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_windows -DGOARCH_amd64 mcache.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_windows -DGOARCH_amd64 mcentral.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mem_windows.6 -DGOOS_windows -DGOARCH_amd64 mem_windows.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_windows -DGOARCH_amd64 mfinal.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_windows -DGOARCH_amd64 mfixalloc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_windows -DGOARCH_amd64 mgc0.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_windows -DGOARCH_amd64 mheap.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_windows -DGOARCH_amd64 msize.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_windows -DGOARCH_amd64 print.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_windows -DGOARCH_amd64 proc.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_windows -DGOARCH_amd64 rune.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_windows -DGOARCH_amd64 runtime.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/signal_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 signal_windows_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_windows -DGOARCH_amd64 slice.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_windows -DGOARCH_amd64 symtab.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/thread_windows.6 -DGOOS_windows -DGOARCH_amd64 thread_windows.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_windows -DGOARCH_amd64 traceback_x86.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_windows -DGOARCH_amd64 zmalloc_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_windows -DGOARCH_amd64 zmprof_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_windows -DGOARCH_amd64 zruntime1_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_windows -DGOARCH_amd64 zsema_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_windows -DGOARCH_amd64 zsigqueue_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_windows -DGOARCH_amd64 zstring_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zsyscall_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 zsyscall_windows_amd64.c
-"$GOROOT"/bin/go-tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_windows -DGOARCH_amd64 ztime_amd64.c
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_windows -DGOARCH_amd64 memmove_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 rt0_windows_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 sys_windows_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/callback_windows_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_windows.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_windows_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_windows.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/zsyscall_windows_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_windows_amd64.6 "$WORK"/runtime/_obj/sys_windows_amd64.6
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/alg.6 -DGOOS_windows -DGOARCH_amd64 alg.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/atomic_amd64.6 -DGOOS_windows -DGOARCH_amd64 atomic_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/callback_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 callback_windows_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/cgocall.6 -DGOOS_windows -DGOARCH_amd64 cgocall.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/chan.6 -DGOOS_windows -DGOARCH_amd64 chan.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/closure_amd64.6 -DGOOS_windows -DGOARCH_amd64 closure_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/complex.6 -DGOOS_windows -DGOARCH_amd64 complex.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/cpuprof.6 -DGOOS_windows -DGOARCH_amd64 cpuprof.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/float.6 -DGOOS_windows -DGOARCH_amd64 float.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/hashmap.6 -DGOOS_windows -DGOARCH_amd64 hashmap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/iface.6 -DGOOS_windows -DGOARCH_amd64 iface.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/lock_sema.6 -DGOOS_windows -DGOARCH_amd64 lock_sema.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mcache.6 -DGOOS_windows -DGOARCH_amd64 mcache.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mcentral.6 -DGOOS_windows -DGOARCH_amd64 mcentral.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mem_windows.6 -DGOOS_windows -DGOARCH_amd64 mem_windows.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mfinal.6 -DGOOS_windows -DGOARCH_amd64 mfinal.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mfixalloc.6 -DGOOS_windows -DGOARCH_amd64 mfixalloc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mgc0.6 -DGOOS_windows -DGOARCH_amd64 mgc0.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/mheap.6 -DGOOS_windows -DGOARCH_amd64 mheap.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/msize.6 -DGOOS_windows -DGOARCH_amd64 msize.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/print.6 -DGOOS_windows -DGOARCH_amd64 print.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/proc.6 -DGOOS_windows -DGOARCH_amd64 proc.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/rune.6 -DGOOS_windows -DGOARCH_amd64 rune.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/runtime.6 -DGOOS_windows -DGOARCH_amd64 runtime.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/signal_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 signal_windows_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/slice.6 -DGOOS_windows -DGOARCH_amd64 slice.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/symtab.6 -DGOOS_windows -DGOARCH_amd64 symtab.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/thread_windows.6 -DGOOS_windows -DGOARCH_amd64 thread_windows.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/traceback_x86.6 -DGOOS_windows -DGOARCH_amd64 traceback_x86.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zmalloc_amd64.6 -DGOOS_windows -DGOARCH_amd64 zmalloc_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zmprof_amd64.6 -DGOOS_windows -DGOARCH_amd64 zmprof_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zruntime1_amd64.6 -DGOOS_windows -DGOARCH_amd64 zruntime1_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zsema_amd64.6 -DGOOS_windows -DGOARCH_amd64 zsema_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zsigqueue_amd64.6 -DGOOS_windows -DGOARCH_amd64 zsigqueue_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zstring_amd64.6 -DGOOS_windows -DGOARCH_amd64 zstring_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/zsyscall_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 zsyscall_windows_amd64.c
+"$GOROOT"/bin/tool/6c -FVw -I "$WORK"/runtime/_obj/ -I "$GOROOT"/pkg/windows_amd64 -o "$WORK"/runtime/_obj/ztime_amd64.6 -DGOOS_windows -DGOARCH_amd64 ztime_amd64.c
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_windows -DGOARCH_amd64 memmove_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 rt0_windows_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 sys_windows_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/runtime.a "$WORK"/runtime/_obj/_go_.6 "$WORK"/runtime/_obj/alg.6 "$WORK"/runtime/_obj/atomic_amd64.6 "$WORK"/runtime/_obj/callback_windows_amd64.6 "$WORK"/runtime/_obj/cgocall.6 "$WORK"/runtime/_obj/chan.6 "$WORK"/runtime/_obj/closure_amd64.6 "$WORK"/runtime/_obj/complex.6 "$WORK"/runtime/_obj/cpuprof.6 "$WORK"/runtime/_obj/float.6 "$WORK"/runtime/_obj/hashmap.6 "$WORK"/runtime/_obj/iface.6 "$WORK"/runtime/_obj/lock_sema.6 "$WORK"/runtime/_obj/mcache.6 "$WORK"/runtime/_obj/mcentral.6 "$WORK"/runtime/_obj/mem_windows.6 "$WORK"/runtime/_obj/mfinal.6 "$WORK"/runtime/_obj/mfixalloc.6 "$WORK"/runtime/_obj/mgc0.6 "$WORK"/runtime/_obj/mheap.6 "$WORK"/runtime/_obj/msize.6 "$WORK"/runtime/_obj/print.6 "$WORK"/runtime/_obj/proc.6 "$WORK"/runtime/_obj/rune.6 "$WORK"/runtime/_obj/runtime.6 "$WORK"/runtime/_obj/signal_windows_amd64.6 "$WORK"/runtime/_obj/slice.6 "$WORK"/runtime/_obj/symtab.6 "$WORK"/runtime/_obj/thread_windows.6 "$WORK"/runtime/_obj/traceback_x86.6 "$WORK"/runtime/_obj/zmalloc_amd64.6 "$WORK"/runtime/_obj/zmprof_amd64.6 "$WORK"/runtime/_obj/zruntime1_amd64.6 "$WORK"/runtime/_obj/zsema_amd64.6 "$WORK"/runtime/_obj/zsigqueue_amd64.6 "$WORK"/runtime/_obj/zstring_amd64.6 "$WORK"/runtime/_obj/zsyscall_windows_amd64.6 "$WORK"/runtime/_obj/ztime_amd64.6 "$WORK"/runtime/_obj/asm_amd64.6 "$WORK"/runtime/_obj/memmove_amd64.6 "$WORK"/runtime/_obj/rt0_windows_amd64.6 "$WORK"/runtime/_obj/sys_windows_amd64.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_amd64/runtime.a
 
@@ -74,8 +74,8 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_amd64/runtime.a
 
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" errors.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/windows_amd64/errors.a
 
 #
@@ -84,9 +84,9 @@ cp "$WORK"/errors.a "$GOROOT"/pkg/windows_amd64/errors.a
 
 mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" doc.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/windows_amd64/sync/atomic.a
 
@@ -96,8 +96,8 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/windows_amd64/sync/atomic.a
 
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" cond.go mutex.go once.go rwmutex.go waitgroup.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/windows_amd64/sync.a
 
 #
@@ -106,8 +106,8 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/windows_amd64/sync.a
 
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" io.go multi.go pipe.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/windows_amd64/io.a
 
 #
@@ -116,8 +116,8 @@ cp "$WORK"/io.a "$GOROOT"/pkg/windows_amd64/io.a
 
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" casetables.go digit.go graphic.go letter.go tables.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_amd64/unicode.a
 
 #
@@ -126,8 +126,8 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_amd64/unicode.a
 
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" utf8.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/unicode/
 cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/windows_amd64/unicode/utf8.a
 
@@ -137,9 +137,9 @@ cp "$WORK"/unicode/utf8.a "$GOROOT"/pkg/windows_amd64/unicode/utf8.a
 
 mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" buffer.go bytes.go bytes_decl.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
 cp "$WORK"/bytes.a "$GOROOT"/pkg/windows_amd64/bytes.a
 
 #
@@ -148,31 +148,31 @@ cp "$WORK"/bytes.a "$GOROOT"/pkg/windows_amd64/bytes.a
 
 mkdir -p "$WORK"/math/_obj/
 cd "$GOROOT"/src/pkg/math
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_windows -DGOARCH_amd64 abs_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_windows -DGOARCH_amd64 asin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_windows -DGOARCH_amd64 atan2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_windows -DGOARCH_amd64 atan_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_windows -DGOARCH_amd64 dim_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_windows -DGOARCH_amd64 exp2_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_windows -DGOARCH_amd64 exp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_windows -DGOARCH_amd64 expm1_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_windows -DGOARCH_amd64 floor_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_windows -DGOARCH_amd64 fltasm_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_windows -DGOARCH_amd64 frexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_windows -DGOARCH_amd64 hypot_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_windows -DGOARCH_amd64 ldexp_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_windows -DGOARCH_amd64 log10_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_windows -DGOARCH_amd64 log1p_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_windows -DGOARCH_amd64 log_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_windows -DGOARCH_amd64 mod_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_windows -DGOARCH_amd64 modf_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_windows -DGOARCH_amd64 remainder_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_windows -DGOARCH_amd64 sin_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_windows -DGOARCH_amd64 sincos_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_windows -DGOARCH_amd64 sqrt_amd64.s
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_windows -DGOARCH_amd64 tan_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/math/_obj/_go_.6 -p math -I "$WORK" abs.go acosh.go asin.go asinh.go atan.go atan2.go atanh.go bits.go cbrt.go const.go copysign.go dim.go erf.go exp.go expm1.go floor.go frexp.go gamma.go hypot.go j0.go j1.go jn.go ldexp.go lgamma.go log.go log10.go log1p.go logb.go mod.go modf.go nextafter.go pow.go pow10.go remainder.go signbit.go sin.go sincos.go sinh.go sqrt.go tan.go tanh.go unsafe.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/abs_amd64.6 -DGOOS_windows -DGOARCH_amd64 abs_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/asin_amd64.6 -DGOOS_windows -DGOARCH_amd64 asin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan2_amd64.6 -DGOOS_windows -DGOARCH_amd64 atan2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/atan_amd64.6 -DGOOS_windows -DGOARCH_amd64 atan_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/dim_amd64.6 -DGOOS_windows -DGOARCH_amd64 dim_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp2_amd64.6 -DGOOS_windows -DGOARCH_amd64 exp2_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/exp_amd64.6 -DGOOS_windows -DGOARCH_amd64 exp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/expm1_amd64.6 -DGOOS_windows -DGOARCH_amd64 expm1_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/floor_amd64.6 -DGOOS_windows -DGOARCH_amd64 floor_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/fltasm_amd64.6 -DGOOS_windows -DGOARCH_amd64 fltasm_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/frexp_amd64.6 -DGOOS_windows -DGOARCH_amd64 frexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/hypot_amd64.6 -DGOOS_windows -DGOARCH_amd64 hypot_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/ldexp_amd64.6 -DGOOS_windows -DGOARCH_amd64 ldexp_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log10_amd64.6 -DGOOS_windows -DGOARCH_amd64 log10_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log1p_amd64.6 -DGOOS_windows -DGOARCH_amd64 log1p_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/log_amd64.6 -DGOOS_windows -DGOARCH_amd64 log_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/mod_amd64.6 -DGOOS_windows -DGOARCH_amd64 mod_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/modf_amd64.6 -DGOOS_windows -DGOARCH_amd64 modf_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/remainder_amd64.6 -DGOOS_windows -DGOARCH_amd64 remainder_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sin_amd64.6 -DGOOS_windows -DGOARCH_amd64 sin_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_windows -DGOARCH_amd64 sincos_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_windows -DGOARCH_amd64 sqrt_amd64.s
+"$GOROOT"/bin/tool/6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_windows -DGOARCH_amd64 tan_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/math.a "$WORK"/math/_obj/_go_.6 "$WORK"/math/_obj/abs_amd64.6 "$WORK"/math/_obj/asin_amd64.6 "$WORK"/math/_obj/atan2_amd64.6 "$WORK"/math/_obj/atan_amd64.6 "$WORK"/math/_obj/dim_amd64.6 "$WORK"/math/_obj/exp2_amd64.6 "$WORK"/math/_obj/exp_amd64.6 "$WORK"/math/_obj/expm1_amd64.6 "$WORK"/math/_obj/floor_amd64.6 "$WORK"/math/_obj/fltasm_amd64.6 "$WORK"/math/_obj/frexp_amd64.6 "$WORK"/math/_obj/hypot_amd64.6 "$WORK"/math/_obj/ldexp_amd64.6 "$WORK"/math/_obj/log10_amd64.6 "$WORK"/math/_obj/log1p_amd64.6 "$WORK"/math/_obj/log_amd64.6 "$WORK"/math/_obj/mod_amd64.6 "$WORK"/math/_obj/modf_amd64.6 "$WORK"/math/_obj/remainder_amd64.6 "$WORK"/math/_obj/sin_amd64.6 "$WORK"/math/_obj/sincos_amd64.6 "$WORK"/math/_obj/sqrt_amd64.6 "$WORK"/math/_obj/tan_amd64.6
 cp "$WORK"/math.a "$GOROOT"/pkg/windows_amd64/math.a
 
 #
@@ -181,8 +181,8 @@ cp "$WORK"/math.a "$GOROOT"/pkg/windows_amd64/math.a
 
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" reader.go replace.go strings.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/windows_amd64/strings.a
 
 #
@@ -191,8 +191,8 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/windows_amd64/strings.a
 
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/strconv/_obj/_go_.6 -p strconv -I "$WORK" atob.go atof.go atoi.go decimal.go extfloat.go ftoa.go itoa.go quote.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_amd64/strconv.a
 
 #
@@ -201,8 +201,8 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_amd64/strconv.a
 
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" bufio.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_amd64/bufio.a
 
 #
@@ -211,8 +211,8 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_amd64/bufio.a
 
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" search.go sort.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/windows_amd64/sort.a
 
 #
@@ -221,8 +221,8 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/windows_amd64/sort.a
 
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" heap.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/container/
 cp "$WORK"/container/heap.a "$GOROOT"/pkg/windows_amd64/container/heap.a
 
@@ -232,8 +232,8 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/windows_amd64/container/heap.a
 
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" base64.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/encoding/
 cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/windows_amd64/encoding/base64.a
 
@@ -243,8 +243,8 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/windows_amd64/encoding/base64.a
 
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" utf16.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
 cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/windows_amd64/unicode/utf16.a
 
 #
@@ -253,9 +253,9 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/windows_amd64/unicode/utf16.a
 
 mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" dll_windows.go env_windows.go exec_windows.go security_windows.go str.go syscall.go syscall_windows.go syscall_windows_amd64.go zerrors_windows.go zerrors_windows_amd64.go zsyscall_windows_amd64.go zsysnum_windows_amd64.go ztypes_windows.go ztypes_windows_amd64.go
-"$GOROOT"/bin/go-tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_windows_amd64.s
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_windows_amd64.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/syscall/_obj/_go_.6 -p syscall -I "$WORK" dll_windows.go env_windows.go exec_windows.go security_windows.go str.go syscall.go syscall_windows.go syscall_windows_amd64.go zerrors_windows.go zerrors_windows_amd64.go zsyscall_windows_amd64.go zsysnum_windows_amd64.go ztypes_windows.go ztypes_windows_amd64.go
+"$GOROOT"/bin/tool/6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 asm_windows_amd64.s
+"$GOROOT"/bin/tool/pack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_windows_amd64.6
 cp "$WORK"/syscall.a "$GOROOT"/pkg/windows_amd64/syscall.a
 
 #
@@ -264,8 +264,8 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/windows_amd64/syscall.a
 
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_windows.go tick.go time.go zoneinfo.go zoneinfo_windows.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/time/_obj/_go_.6 -p time -I "$WORK" format.go sleep.go sys_windows.go tick.go time.go zoneinfo.go zoneinfo_windows.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/windows_amd64/time.a
 
 #
@@ -274,8 +274,8 @@ cp "$WORK"/time.a "$GOROOT"/pkg/windows_amd64/time.a
 
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_windows.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_windows.go file.go file_posix.go file_windows.go getwd.go path.go path_windows.go proc.go stat_windows.go sys_windows.go time.go types.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/_obj/_go_.6 -p os -I "$WORK" dir_windows.go doc.go env.go error.go error_posix.go exec.go exec_posix.go exec_windows.go file.go file_posix.go file_windows.go getwd.go path.go path_windows.go proc.go stat_windows.go sys_windows.go time.go types.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/windows_amd64/os.a
 
 #
@@ -284,8 +284,8 @@ cp "$WORK"/os.a "$GOROOT"/pkg/windows_amd64/os.a
 
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" deepequal.go type.go value.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_amd64/reflect.a
 
 #
@@ -294,8 +294,8 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_amd64/reflect.a
 
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" doc.go format.go print.go scan.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_amd64/fmt.a
 
 #
@@ -304,8 +304,8 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_amd64/fmt.a
 
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/json/_obj/_go_.6 -p encoding/json -I "$WORK" decode.go encode.go indent.go scanner.go stream.go tags.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
 cp "$WORK"/encoding/json.a "$GOROOT"/pkg/windows_amd64/encoding/json.a
 
 #
@@ -314,8 +314,8 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/windows_amd64/encoding/json.a
 
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" flag.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/windows_amd64/flag.a
 
 #
@@ -324,8 +324,8 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/windows_amd64/flag.a
 
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/encoding/gob/_obj/_go_.6 -p encoding/gob -I "$WORK" decode.go decoder.go doc.go encode.go encoder.go error.go type.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
 cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/windows_amd64/encoding/gob.a
 
 #
@@ -334,8 +334,8 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/windows_amd64/encoding/gob.a
 
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" position.go serialize.go token.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/go/
 cp "$WORK"/go/token.a "$GOROOT"/pkg/windows_amd64/go/token.a
 
@@ -345,8 +345,8 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/windows_amd64/go/token.a
 
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_windows.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" match.go path.go path_windows.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/path/
 cp "$WORK"/path/filepath.a "$GOROOT"/pkg/windows_amd64/path/filepath.a
 
@@ -356,8 +356,8 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/windows_amd64/path/filepath.a
 
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" errors.go scanner.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
 cp "$WORK"/go/scanner.a "$GOROOT"/pkg/windows_amd64/go/scanner.a
 
 #
@@ -366,8 +366,8 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/windows_amd64/go/scanner.a
 
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/ast/_obj/_go_.6 -p go/ast -I "$WORK" ast.go filter.go import.go print.go resolve.go scope.go walk.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
 cp "$WORK"/go/ast.a "$GOROOT"/pkg/windows_amd64/go/ast.a
 
 #
@@ -376,8 +376,8 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/windows_amd64/go/ast.a
 
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ioutil.go tempfile.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/io/
 cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/windows_amd64/io/ioutil.a
 
@@ -387,8 +387,8 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/windows_amd64/io/ioutil.a
 
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" interface.go parser.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
 cp "$WORK"/go/parser.a "$GOROOT"/pkg/windows_amd64/go/parser.a
 
 #
@@ -397,8 +397,8 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/windows_amd64/go/parser.a
 
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" log.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/windows_amd64/log.a
 
 #
@@ -407,8 +407,8 @@ cp "$WORK"/log.a "$GOROOT"/pkg/windows_amd64/log.a
 
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" match.go path.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/windows_amd64/path.a
 
 #
@@ -417,8 +417,8 @@ cp "$WORK"/path.a "$GOROOT"/pkg/windows_amd64/path.a
 
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" build.go dir.go path.go syslist.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
 cp "$WORK"/go/build.a "$GOROOT"/pkg/windows_amd64/go/build.a
 
 #
@@ -427,8 +427,8 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/windows_amd64/go/build.a
 
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_windows.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" exec.go lp_windows.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/os/
 cp "$WORK"/os/exec.a "$GOROOT"/pkg/windows_amd64/os/exec.a
 
@@ -438,8 +438,8 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/windows_amd64/os/exec.a
 
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/syntax/_obj/_go_.6 -p regexp/syntax -I "$WORK" compile.go parse.go perl_groups.go prog.go regexp.go simplify.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/regexp/
 cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/windows_amd64/regexp/syntax.a
 
@@ -449,8 +449,8 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/windows_amd64/regexp/syntax.a
 
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" exec.go regexp.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_amd64/regexp.a
 
 #
@@ -459,8 +459,8 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_amd64/regexp.a
 
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" url.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/net/
 cp "$WORK"/net/url.a "$GOROOT"/pkg/windows_amd64/net/url.a
 
@@ -470,8 +470,8 @@ cp "$WORK"/net/url.a "$GOROOT"/pkg/windows_amd64/net/url.a
 
 mkdir -p "$WORK"/text/template/parse/_obj/
 cd "$GOROOT"/src/pkg/text/template/parse
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" lex.go node.go parse.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/text/template/
 cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/windows_amd64/text/template/parse.a
 
@@ -481,8 +481,8 @@ cp "$WORK"/text/template/parse.a "$GOROOT"/pkg/windows_amd64/text/template/parse
 
 mkdir -p "$WORK"/text/template/_obj/
 cd "$GOROOT"/src/pkg/text/template
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/tool/6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" doc.go exec.go funcs.go helper.go template.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
 mkdir -p "$GOROOT"/pkg/windows_amd64/text/
 cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_amd64/text/template.a
 
@@ -492,8 +492,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
-"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
-"$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
+"$GOROOT"/bin/tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" bootstrap.go build.go clean.go fix.go fmt.go get.go help.go list.go main.go pkg.go run.go test.go testflag.go tool.go vcs.go version.go vet.go
+"$GOROOT"/bin/tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/tool/6l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
 cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/go_bootstrap.exe

src/cmd/cov/Makefile

@@ -38,4 +38,4 @@ install-darwin: $(TARG)
 	@true
 
 install-default: $(TARG)
-	cp $(TARG) "$(GOROOT)"/bin/go-tool/$(TARG)
+	cp $(TARG) "$(GOROOT)"/bin/tool/$(TARG)

src/cmd/go/pkg.go

@@ -232,7 +232,7 @@ Loop:
 }
 
 // isGoTool is the list of directories for Go programs that are installed in
-// $GOROOT/bin/go-tool.
+// $GOROOT/bin/tool.
 var isGoTool = map[string]bool{
 	"cmd/api":      true,
 	"cmd/cgo":      true,
@@ -300,7 +300,7 @@ func scanPackage(ctxt *build.Context, t *build.Tree, arg, importPath, dir string
 			elem = ctxt.GOOS + "_" + ctxt.GOARCH + "/" + elem
 		}
 		if t.Goroot && isGoTool[p.ImportPath] {
-			p.target = filepath.Join(t.Path, "bin/go-tool", elem)
+			p.target = filepath.Join(t.Path, "bin/tool", elem)
 		} else {
 			p.target = filepath.Join(t.BinDir(), elem)
 		}

src/cmd/go/tool.go

@@ -31,7 +31,7 @@ var (
 	toolGOOS      = runtime.GOOS
 	toolGOARCH    = runtime.GOARCH
 	toolIsWindows = toolGOOS == "windows"
-	toolDir       = filepath.Join(build.Path[0].Path, "bin", "go-tool")
+	toolDir       = filepath.Join(build.Path[0].Path, "bin", "tool")
 )
 
 const toolWindowsExtension = ".exe"
@@ -81,7 +81,7 @@ func runTool(cmd *Command, args []string) {
 	}
 }
 
-// listTools prints a list of the available tools in the go-tools directory.
+// listTools prints a list of the available tools in the tools directory.
 func listTools() {
 	f, err := os.Open(toolDir)
 	if err != nil {

src/cmd/prof/Makefile

@@ -32,7 +32,7 @@ install-darwin: $(TARG)
 	@true
 
 install-default: $(TARG)
-	cp $(TARG) "$(GOROOT)"/bin/go-tool/$(TARG)
+	cp $(TARG) "$(GOROOT)"/bin/tool/$(TARG)
 
 install-pprof: pprof
-	cp pprof "$(GOROOT)"/bin/go-tool/pprof
+	cp pprof "$(GOROOT)"/bin/tool/pprof

src/make.bash

@@ -22,10 +22,11 @@ if ld --version 2>&1 | grep 'gold.* 2\.20' >/dev/null; then
 fi
 
 # Create target directories
-mkdir -p "$GOROOT/bin/go-tool"
+mkdir -p "$GOROOT/bin/tool"
 mkdir -p "$GOROOT/pkg"
 
-# Remove old, pre-go-tool binaries.
+# Remove old, pre-tool binaries.
+rm -rf "$GOROOT"/bin/go-tool
 rm -f "$GOROOT"/bin/[568][acgl]
 rm -f "$GOROOT"/bin/{6cov,6nm,cgo,ebnflint,goapi,gofix,goinstall,gomake,gopack,gopprof,gotest,gotype,govet,goyacc,quietgcc}
 
@@ -44,13 +45,13 @@ export MAKEFLAGS
 unset CDPATH	# in case user has it set
 
 rm -f "$GOBIN"/quietgcc
-rm -f "$GOROOT/bin/go-tool/quietgcc"
+rm -f "$GOROOT/bin/tool/quietgcc"
 CC=${CC:-gcc}
 export CC
-sed -e "s|@CC@|$CC|" < "$GOROOT"/src/quietgcc.bash > "$GOROOT"/bin/go-tool/quietgcc
-chmod +x "$GOROOT"/bin/go-tool/quietgcc
+sed -e "s|@CC@|$CC|" < "$GOROOT"/src/quietgcc.bash > "$GOROOT"/bin/tool/quietgcc
+chmod +x "$GOROOT"/bin/tool/quietgcc
 
-export GOMAKE="$GOROOT"/bin/go-tool/make
+export GOMAKE="$GOROOT"/bin/tool/make
 rm -f "$GOBIN"/gomake
 rm -f "$GOMAKE"
 (

src/pkg/exp/types/gcimporter_test.go

@@ -31,7 +31,7 @@ func init() {
 		gcPath = gcName
 		return
 	}
-	gcPath = filepath.Join(runtime.GOROOT(), "/bin/go-tool/", gcName)
+	gcPath = filepath.Join(runtime.GOROOT(), "/bin/tool/", gcName)
 }
 
 func compile(t *testing.T, dirname, filename string) {

src/pkg/runtime/autogen.sh

@@ -27,7 +27,7 @@ if [ "$GOROOT" = "" ]; then
 fi
 
 # Use goc2c to translate .goc files into arch-specific .c files.
-"$GOROOT"/bin/go-tool/quietgcc -o goc2c -I "$GOROOT/include" goc2c.c "$GOROOT/lib/lib9.a"
+"$GOROOT"/bin/tool/quietgcc -o goc2c -I "$GOROOT/include" goc2c.c "$GOROOT/lib/lib9.a"
 for file in *.goc
 do
 	for arch in $GOARCHES
@@ -39,7 +39,7 @@ do
 done
 
 # Version constants.
-"$GOROOT"/bin/go-tool/quietgcc -o mkversion -I "$GOROOT/include" mkversion.c "$GOROOT/lib/lib9.a"
+"$GOROOT"/bin/tool/quietgcc -o mkversion -I "$GOROOT/include" mkversion.c "$GOROOT/lib/lib9.a"
 GOROOT="$GOROOT_FINAL" ./mkversion >z.tmp
 mv z.tmp zversion.go
 

src/pkg/runtime/mkasmh.sh

@@ -16,7 +16,7 @@ case "$GOARCH" in
 amd64) CC=6c;;
 arm) CC=5c;;
 esac
-CC="$GOROOT/bin/go-tool/$CC"
+CC="$GOROOT/bin/tool/$CC"
 export CC
 
 export CFLAGS="-Dos_$GOOS -Darch_$GOARCH"

src/pkg/runtime/mkgodefs.sh

@@ -15,7 +15,7 @@ case "$GOARCH" in
 amd64) CC=6c;;
 arm) CC=5c;;
 esac
-CC="$GOROOT/bin/go-tool/$CC"
+CC="$GOROOT/bin/tool/$CC"
 export CC
 
 export CFLAGS="-DGOOS_$GOOS -DGOARCH_$GOARCH"

test/fixedbugs/bug302.go

-// $G $D/bug302.dir/p.go && "$GOROOT"/bin/go-tool/pack grc pp.a p.$A && $G $D/bug302.dir/main.go
+// $G $D/bug302.dir/p.go && "$GOROOT"/bin/tool/pack grc pp.a p.$A && $G $D/bug302.dir/main.go
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style

test/run

@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-eval $(../bin/go-tool/make --no-print-directory -f ../src/Make.inc go-env)
+eval $(../bin/tool/make --no-print-directory -f ../src/Make.inc go-env)
 
 export E=
 
@@ -33,8 +33,8 @@ failed=0
 
 PATH=${GOBIN:-$GOROOT/bin}:`pwd`:/bin:/usr/bin:/usr/local/bin
 
-# TODO: We add the go-tools directory to the PATH to avoid thinking about a better way.
-PATH="$GOROOT/bin/go-tool":$PATH
+# TODO: We add the tool directory to the PATH to avoid thinking about a better way.
+PATH="$GOROOT/bin/tool":$PATH
 
 RUNFILE="/tmp/gorun-$$-$USER"
 TMP1FILE="/tmp/gotest1-$$-$USER"