diff --git a/src/Make.cmd b/src/Make.cmd
index d663edbffcf..b8c45ec8ad9 100644
--- a/src/Make.cmd
+++ b/src/Make.cmd
@@ -41,7 +41,7 @@ testpackage-clean:
 _test/main.a: _gotest_.$O
 	@mkdir -p _test
 	rm -f $@
-	gopack grc $@ _gotest_.$O
+	"$(GOROOT)/bin/go-tool/pack" grc $@ _gotest_.$O
 
 _gotest_.$O: $(GOFILES) $(GOTESTFILES)
 	$(GC) $(GCFLAGS) $(GCIMPORTS) -o $@ $(GOFILES) $(GOTESTFILES)
diff --git a/src/Make.pkg b/src/Make.pkg
index 4a61cf98c6f..8bd708e3403 100644
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -91,12 +91,12 @@ _gotest_.$O: $(GOFILES) $(GOTESTFILES) $(PREREQ)
 _obj/$(TARG).a: _go_.$O $(OFILES)
 	@mkdir -p _obj/$(dir)
 	rm -f _obj/$(TARG).a
-	gopack grc $@ _go_.$O $(OFILES)
+	"$(GOROOT)/bin/go-tool/pack" grc $@ _go_.$O $(OFILES)
 
 _test/$(TARG).a: _gotest_.$O $(OFILES)
 	@mkdir -p _test/$(dir)
 	rm -f _test/$(TARG).a
-	gopack grc $@ _gotest_.$O $(OFILES)
+	"$(GOROOT)/bin/go-tool/pack" grc $@ _gotest_.$O $(OFILES)
 
 importpath:
 	@echo $(TARG)
diff --git a/src/Make.tool b/src/Make.tool
index fdbb4dd0470..0e942d0c9e6 100644
--- a/src/Make.tool
+++ b/src/Make.tool
@@ -40,7 +40,7 @@ testpackage-clean:
 _test/main.a: _gotest_.$O
 	@mkdir -p _test
 	rm -f $@
-	gopack grc $@ _gotest_.$O
+	"$(GOROOT)/bin/go-tool/pack" grc $@ _gotest_.$O
 
 _gotest_.$O: $(GOFILES) $(GOTESTFILES)
 	$(GC) $(GCFLAGS) $(GCIMPORTS) -o $@ $(GOFILES) $(GOTESTFILES)
diff --git a/src/buildscript/darwin_386.sh b/src/buildscript/darwin_386.sh
index 38feafd0634..5cb63aec769 100755
--- a/src/buildscript/darwin_386.sh
+++ b/src/buildscript/darwin_386.sh
@@ -64,7 +64,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_darwin_386.h "$WORK"/runtime/_obj/zasm_GOOS_GO
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_darwin_386.8 -DGOOS_darwin -DGOARCH_386 ./rt0_darwin_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_darwin_386.8 -DGOOS_darwin -DGOARCH_386 ./sys_darwin_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_darwin -DGOARCH_386 ./vlop_386.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/darwin_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_386/runtime.a
 
@@ -75,7 +75,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_386/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/darwin_386/errors.a
 
 #
@@ -86,7 +86,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" ./doc.go
 8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
@@ -97,7 +97,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/darwin_386/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_386/sync.a
 
 #
@@ -107,7 +107,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_386/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/darwin_386/io.a
 
 #
@@ -117,7 +117,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/darwin_386/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_386/unicode.a
 
 #
@@ -127,7 +127,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_386/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -139,7 +139,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_darwin -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -171,7 +171,7 @@ cd "$GOROOT"/src/pkg/math
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_darwin -DGOARCH_386 ./sincos_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_darwin -DGOARCH_386 ./sqrt_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_darwin -DGOARCH_386 ./tan_386.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/darwin_386/math.a
 
 #
@@ -181,7 +181,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/darwin_386/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_386/sort.a
 
 #
@@ -191,7 +191,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_386/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -202,7 +202,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/darwin_386/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_386/strings.a
 
 #
@@ -212,7 +212,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_386/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_386/strconv.a
 
 #
@@ -222,7 +222,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_386/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -234,7 +234,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_darwin_386.8 -DGOOS_darwin -DGOARCH_386 ./asm_darwin_386.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_darwin_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -244,7 +244,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/darwin_386/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/darwin_386/time.a
 
 #
@@ -254,7 +254,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/darwin_386/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/darwin_386/os.a
 
 #
@@ -264,7 +264,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/darwin_386/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_386/reflect.a
 
 #
@@ -274,7 +274,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_386/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_386/fmt.a
 
 #
@@ -284,7 +284,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_386/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -294,7 +294,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/darwin_386/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -304,7 +304,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/darwin_386/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_386/flag.a
 
 #
@@ -314,7 +314,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_386/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_386/bufio.a
 
 #
@@ -324,7 +324,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_386/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -334,7 +334,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/darwin_386/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -345,7 +345,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/darwin_386/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -356,7 +356,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/darwin_386/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -366,7 +366,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/darwin_386/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -376,7 +376,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/darwin_386/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -387,7 +387,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/darwin_386/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -397,7 +397,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/darwin_386/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/darwin_386/log.a
 
 #
@@ -407,7 +407,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/darwin_386/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/darwin_386/path.a
 
 #
@@ -417,7 +417,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/darwin_386/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -427,7 +427,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/darwin_386/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -438,7 +438,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/darwin_386/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -449,7 +449,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/darwin_386/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_386/regexp.a
 
 #
@@ -459,7 +459,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_386/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -470,7 +470,7 @@ 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
 8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -481,7 +481,7 @@ 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
 8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -492,7 +492,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_386/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 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
diff --git a/src/buildscript/darwin_amd64.sh b/src/buildscript/darwin_amd64.sh
index 200279dba9b..c8682bde413 100755
--- a/src/buildscript/darwin_amd64.sh
+++ b/src/buildscript/darwin_amd64.sh
@@ -62,7 +62,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_darwin_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./memmove_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./rt0_darwin_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./sys_darwin_amd64.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/darwin_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_amd64/runtime.a
 
@@ -73,7 +73,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/darwin_amd64/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/darwin_amd64/errors.a
 
 #
@@ -84,7 +84,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" ./doc.go
 6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
@@ -95,7 +95,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/darwin_amd64/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_amd64/sync.a
 
 #
@@ -105,7 +105,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/darwin_amd64/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/darwin_amd64/io.a
 
 #
@@ -115,7 +115,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/darwin_amd64/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_amd64/unicode.a
 
 #
@@ -125,7 +125,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/darwin_amd64/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -137,7 +137,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -170,7 +170,7 @@ cd "$GOROOT"/src/pkg/math
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./sincos_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./sqrt_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./tan_amd64.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/darwin_amd64/math.a
 
 #
@@ -180,7 +180,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/darwin_amd64/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_amd64/sort.a
 
 #
@@ -190,7 +190,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/darwin_amd64/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -201,7 +201,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/darwin_amd64/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_amd64/strings.a
 
 #
@@ -211,7 +211,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/darwin_amd64/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_amd64/strconv.a
 
 #
@@ -221,7 +221,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/darwin_amd64/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -233,7 +233,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_darwin_amd64.6 -DGOOS_darwin -DGOARCH_amd64 ./asm_darwin_amd64.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_darwin_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -243,7 +243,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/darwin_amd64/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/darwin_amd64/time.a
 
 #
@@ -253,7 +253,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/darwin_amd64/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/darwin_amd64/os.a
 
 #
@@ -263,7 +263,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/darwin_amd64/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_amd64/reflect.a
 
 #
@@ -273,7 +273,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/darwin_amd64/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_amd64/fmt.a
 
 #
@@ -283,7 +283,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/darwin_amd64/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -293,7 +293,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/darwin_amd64/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -303,7 +303,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/darwin_amd64/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_amd64/flag.a
 
 #
@@ -313,7 +313,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/darwin_amd64/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_amd64/bufio.a
 
 #
@@ -323,7 +323,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/darwin_amd64/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -333,7 +333,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/darwin_amd64/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -344,7 +344,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/darwin_amd64/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -355,7 +355,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/darwin_amd64/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -365,7 +365,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/darwin_amd64/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -375,7 +375,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/darwin_amd64/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -386,7 +386,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/darwin_amd64/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -396,7 +396,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/darwin_amd64/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/darwin_amd64/log.a
 
 #
@@ -406,7 +406,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/darwin_amd64/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/darwin_amd64/path.a
 
 #
@@ -416,7 +416,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/darwin_amd64/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -426,7 +426,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/darwin_amd64/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -437,7 +437,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/darwin_amd64/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -448,7 +448,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/darwin_amd64/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_amd64/regexp.a
 
 #
@@ -458,7 +458,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/darwin_amd64/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -469,7 +469,7 @@ 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
 6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -480,7 +480,7 @@ 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
 6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -491,7 +491,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_amd64/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 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
diff --git a/src/buildscript/freebsd_386.sh b/src/buildscript/freebsd_386.sh
index 85e2af8baca..bebbd319e86 100755
--- a/src/buildscript/freebsd_386.sh
+++ b/src/buildscript/freebsd_386.sh
@@ -64,7 +64,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_freebsd_386.h "$WORK"/runtime/_obj/zasm_GOOS_G
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 ./rt0_freebsd_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 ./sys_freebsd_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_freebsd -DGOARCH_386 ./vlop_386.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/freebsd_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_386/runtime.a
 
@@ -75,7 +75,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_386/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/freebsd_386/errors.a
 
 #
@@ -86,7 +86,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" ./doc.go
 8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
@@ -97,7 +97,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/freebsd_386/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_386/sync.a
 
 #
@@ -107,7 +107,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_386/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_386/io.a
 
 #
@@ -117,7 +117,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_386/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_386/unicode.a
 
 #
@@ -127,7 +127,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_386/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -139,7 +139,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_freebsd -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -171,7 +171,7 @@ cd "$GOROOT"/src/pkg/math
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_freebsd -DGOARCH_386 ./sincos_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_freebsd -DGOARCH_386 ./sqrt_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_freebsd -DGOARCH_386 ./tan_386.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_386/math.a
 
 #
@@ -181,7 +181,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_386/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_386/sort.a
 
 #
@@ -191,7 +191,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_386/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -202,7 +202,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/freebsd_386/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_386/strings.a
 
 #
@@ -212,7 +212,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_386/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_386/strconv.a
 
 #
@@ -222,7 +222,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_386/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -234,7 +234,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_freebsd_386.8 -DGOOS_freebsd -DGOARCH_386 ./asm_freebsd_386.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_freebsd_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -244,7 +244,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/freebsd_386/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_386/time.a
 
 #
@@ -254,7 +254,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_386/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_386/os.a
 
 #
@@ -264,7 +264,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_386/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_386/reflect.a
 
 #
@@ -274,7 +274,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_386/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_386/fmt.a
 
 #
@@ -284,7 +284,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_386/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -294,7 +294,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/freebsd_386/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -304,7 +304,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/freebsd_386/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_386/flag.a
 
 #
@@ -314,7 +314,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_386/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_386/bufio.a
 
 #
@@ -324,7 +324,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_386/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -334,7 +334,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/freebsd_386/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -345,7 +345,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/freebsd_386/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -356,7 +356,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/freebsd_386/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -366,7 +366,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/freebsd_386/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -376,7 +376,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/freebsd_386/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -387,7 +387,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/freebsd_386/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -397,7 +397,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/freebsd_386/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_386/log.a
 
 #
@@ -407,7 +407,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_386/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_386/path.a
 
 #
@@ -417,7 +417,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_386/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -427,7 +427,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/freebsd_386/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -438,7 +438,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/freebsd_386/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -449,7 +449,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/freebsd_386/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_386/regexp.a
 
 #
@@ -459,7 +459,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_386/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -470,7 +470,7 @@ 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
 8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -481,7 +481,7 @@ 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
 8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -492,7 +492,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_386/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 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
diff --git a/src/buildscript/freebsd_amd64.sh b/src/buildscript/freebsd_amd64.sh
index 50c44b882e5..9d2ab28e9f9 100755
--- a/src/buildscript/freebsd_amd64.sh
+++ b/src/buildscript/freebsd_amd64.sh
@@ -62,7 +62,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_freebsd_amd64.h "$WORK"/runtime/_obj/zasm_GOOS
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./memmove_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./rt0_freebsd_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./sys_freebsd_amd64.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/freebsd_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_amd64/runtime.a
 
@@ -73,7 +73,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/freebsd_amd64/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/freebsd_amd64/errors.a
 
 #
@@ -84,7 +84,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" ./doc.go
 6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
@@ -95,7 +95,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/freebsd_amd64/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_amd64/sync.a
 
 #
@@ -105,7 +105,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/freebsd_amd64/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_amd64/io.a
 
 #
@@ -115,7 +115,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/freebsd_amd64/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_amd64/unicode.a
 
 #
@@ -125,7 +125,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/freebsd_amd64/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -137,7 +137,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -170,7 +170,7 @@ cd "$GOROOT"/src/pkg/math
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./sincos_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./sqrt_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./tan_amd64.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_amd64/math.a
 
 #
@@ -180,7 +180,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/freebsd_amd64/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_amd64/sort.a
 
 #
@@ -190,7 +190,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/freebsd_amd64/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -201,7 +201,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/freebsd_amd64/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_amd64/strings.a
 
 #
@@ -211,7 +211,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/freebsd_amd64/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_amd64/strconv.a
 
 #
@@ -221,7 +221,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/freebsd_amd64/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -233,7 +233,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_freebsd_amd64.6 -DGOOS_freebsd -DGOARCH_amd64 ./asm_freebsd_amd64.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_freebsd_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -243,7 +243,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/freebsd_amd64/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_amd64/time.a
 
 #
@@ -253,7 +253,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/freebsd_amd64/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_amd64/os.a
 
 #
@@ -263,7 +263,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/freebsd_amd64/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_amd64/reflect.a
 
 #
@@ -273,7 +273,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/freebsd_amd64/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_amd64/fmt.a
 
 #
@@ -283,7 +283,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/freebsd_amd64/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -293,7 +293,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/freebsd_amd64/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -303,7 +303,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/freebsd_amd64/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_amd64/flag.a
 
 #
@@ -313,7 +313,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/freebsd_amd64/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_amd64/bufio.a
 
 #
@@ -323,7 +323,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/freebsd_amd64/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -333,7 +333,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/freebsd_amd64/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -344,7 +344,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/freebsd_amd64/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -355,7 +355,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/freebsd_amd64/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -365,7 +365,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/freebsd_amd64/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -375,7 +375,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/freebsd_amd64/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -386,7 +386,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/freebsd_amd64/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -396,7 +396,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/freebsd_amd64/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_amd64/log.a
 
 #
@@ -406,7 +406,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/freebsd_amd64/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_amd64/path.a
 
 #
@@ -416,7 +416,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/freebsd_amd64/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -426,7 +426,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/freebsd_amd64/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -437,7 +437,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/freebsd_amd64/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -448,7 +448,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/freebsd_amd64/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_amd64/regexp.a
 
 #
@@ -458,7 +458,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/freebsd_amd64/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -469,7 +469,7 @@ 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
 6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -480,7 +480,7 @@ 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
 6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -491,7 +491,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_amd64/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 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
diff --git a/src/buildscript/linux_386.sh b/src/buildscript/linux_386.sh
index 7cdc5eb7c87..be32a2045e7 100755
--- a/src/buildscript/linux_386.sh
+++ b/src/buildscript/linux_386.sh
@@ -64,7 +64,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_linux_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOA
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_386.8 -DGOOS_linux -DGOARCH_386 ./rt0_linux_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_386.8 -DGOOS_linux -DGOARCH_386 ./sys_linux_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_linux -DGOARCH_386 ./vlop_386.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/linux_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_386/runtime.a
 
@@ -75,7 +75,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_386/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/linux_386/errors.a
 
 #
@@ -86,7 +86,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" ./doc.go
 8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
@@ -97,7 +97,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_386/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/linux_386/sync.a
 
 #
@@ -107,7 +107,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/linux_386/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/linux_386/io.a
 
 #
@@ -117,7 +117,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/linux_386/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_386/unicode.a
 
 #
@@ -127,7 +127,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_386/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -139,7 +139,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_linux -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -171,7 +171,7 @@ cd "$GOROOT"/src/pkg/math
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_linux -DGOARCH_386 ./sincos_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_linux -DGOARCH_386 ./sqrt_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_linux -DGOARCH_386 ./tan_386.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/linux_386/math.a
 
 #
@@ -181,7 +181,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/linux_386/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/linux_386/sort.a
 
 #
@@ -191,7 +191,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/linux_386/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -202,7 +202,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_386/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/linux_386/strings.a
 
 #
@@ -212,7 +212,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/linux_386/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_386/strconv.a
 
 #
@@ -222,7 +222,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_386/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -234,7 +234,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_386.8 -DGOOS_linux -DGOARCH_386 ./asm_linux_386.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_linux_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -244,7 +244,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_386/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/linux_386/time.a
 
 #
@@ -254,7 +254,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/linux_386/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/linux_386/os.a
 
 #
@@ -264,7 +264,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/linux_386/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_386/reflect.a
 
 #
@@ -274,7 +274,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_386/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_386/fmt.a
 
 #
@@ -284,7 +284,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_386/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -294,7 +294,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_386/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -304,7 +304,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_386/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/linux_386/flag.a
 
 #
@@ -314,7 +314,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/linux_386/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_386/bufio.a
 
 #
@@ -324,7 +324,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_386/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -334,7 +334,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_386/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -345,7 +345,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_386/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -356,7 +356,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_386/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -366,7 +366,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_386/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -376,7 +376,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_386/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -387,7 +387,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_386/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -397,7 +397,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_386/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/linux_386/log.a
 
 #
@@ -407,7 +407,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/linux_386/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/linux_386/path.a
 
 #
@@ -417,7 +417,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/linux_386/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -427,7 +427,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_386/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -438,7 +438,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_386/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -449,7 +449,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_386/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_386/regexp.a
 
 #
@@ -459,7 +459,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_386/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -470,7 +470,7 @@ 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
 8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -481,7 +481,7 @@ 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
 8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -492,7 +492,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_386/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 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
diff --git a/src/buildscript/linux_amd64.sh b/src/buildscript/linux_amd64.sh
index 9b059182521..0e9f9803eaa 100755
--- a/src/buildscript/linux_amd64.sh
+++ b/src/buildscript/linux_amd64.sh
@@ -62,7 +62,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_linux_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_G
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./memmove_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./rt0_linux_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./sys_linux_amd64.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/linux_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_amd64/runtime.a
 
@@ -73,7 +73,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_amd64/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/linux_amd64/errors.a
 
 #
@@ -84,7 +84,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" ./doc.go
 6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
@@ -95,7 +95,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_amd64/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/linux_amd64/sync.a
 
 #
@@ -105,7 +105,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/linux_amd64/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/linux_amd64/io.a
 
 #
@@ -115,7 +115,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/linux_amd64/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_amd64/unicode.a
 
 #
@@ -125,7 +125,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_amd64/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -137,7 +137,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -170,7 +170,7 @@ cd "$GOROOT"/src/pkg/math
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./sincos_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./sqrt_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./tan_amd64.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/linux_amd64/math.a
 
 #
@@ -180,7 +180,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/linux_amd64/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/linux_amd64/sort.a
 
 #
@@ -190,7 +190,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/linux_amd64/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -201,7 +201,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_amd64/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/linux_amd64/strings.a
 
 #
@@ -211,7 +211,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/linux_amd64/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_amd64/strconv.a
 
 #
@@ -221,7 +221,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_amd64/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -233,7 +233,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_amd64.6 -DGOOS_linux -DGOARCH_amd64 ./asm_linux_amd64.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_linux_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -243,7 +243,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_amd64/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/linux_amd64/time.a
 
 #
@@ -253,7 +253,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/linux_amd64/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/linux_amd64/os.a
 
 #
@@ -263,7 +263,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/linux_amd64/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_amd64/reflect.a
 
 #
@@ -273,7 +273,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_amd64/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_amd64/fmt.a
 
 #
@@ -283,7 +283,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_amd64/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -293,7 +293,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_amd64/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -303,7 +303,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_amd64/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/linux_amd64/flag.a
 
 #
@@ -313,7 +313,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/linux_amd64/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_amd64/bufio.a
 
 #
@@ -323,7 +323,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_amd64/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -333,7 +333,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_amd64/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -344,7 +344,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_amd64/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -355,7 +355,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_amd64/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -365,7 +365,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_amd64/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -375,7 +375,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_amd64/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -386,7 +386,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_amd64/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -396,7 +396,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_amd64/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/linux_amd64/log.a
 
 #
@@ -406,7 +406,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/linux_amd64/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/linux_amd64/path.a
 
 #
@@ -416,7 +416,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/linux_amd64/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -426,7 +426,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_amd64/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -437,7 +437,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_amd64/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -448,7 +448,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_amd64/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_amd64/regexp.a
 
 #
@@ -458,7 +458,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_amd64/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -469,7 +469,7 @@ 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
 6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -480,7 +480,7 @@ 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
 6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -491,7 +491,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_amd64/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 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
diff --git a/src/buildscript/linux_arm.sh b/src/buildscript/linux_arm.sh
index 7113ef376c0..dfce0ce6d66 100755
--- a/src/buildscript/linux_arm.sh
+++ b/src/buildscript/linux_arm.sh
@@ -66,7 +66,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_linux_arm.h "$WORK"/runtime/_obj/zasm_GOOS_GOA
 5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_linux_arm.5 -DGOOS_linux -DGOARCH_arm ./rt0_linux_arm.s
 5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_linux_arm.5 -DGOOS_linux -DGOARCH_arm ./sys_linux_arm.s
 5a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_arm.5 -DGOOS_linux -DGOARCH_arm ./vlop_arm.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/linux_arm/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_arm/runtime.a
 
@@ -77,7 +77,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/linux_arm/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 5g -o "$WORK"/errors/_obj/_go_.5 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.5
 cp "$WORK"/errors.a "$GOROOT"/pkg/linux_arm/errors.a
 
 #
@@ -89,7 +89,7 @@ cd "$GOROOT"/src/pkg/sync/atomic
 5g -o "$WORK"/sync/atomic/_obj/_go_.5 -p sync/atomic -I "$WORK" ./doc.go
 5a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm ./asm_arm.s
 5a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_linux_arm.5 -DGOOS_linux -DGOARCH_arm ./asm_linux_arm.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/linux_arm/sync/
 cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_arm/sync/atomic.a
 
@@ -100,7 +100,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/linux_arm/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 5g -o "$WORK"/sync/_obj/_go_.5 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.5
 cp "$WORK"/sync.a "$GOROOT"/pkg/linux_arm/sync.a
 
 #
@@ -110,7 +110,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/linux_arm/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 5g -o "$WORK"/io/_obj/_go_.5 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.5
 cp "$WORK"/io.a "$GOROOT"/pkg/linux_arm/io.a
 
 #
@@ -120,7 +120,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/linux_arm/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 5g -o "$WORK"/unicode/_obj/_go_.5 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.5
 cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_arm/unicode.a
 
 #
@@ -130,7 +130,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/linux_arm/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 5g -o "$WORK"/unicode/utf8/_obj/_go_.5 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -142,7 +142,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 5g -o "$WORK"/bytes/_obj/_go_.5 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 5a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_arm.5 -DGOOS_linux -DGOARCH_arm ./asm_arm.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.5 "$WORK"/bytes/_obj/asm_arm.5
+"$GOROOT"/bin/go-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
 
 #
@@ -174,7 +174,7 @@ cd "$GOROOT"/src/pkg/math
 5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_arm.5 -DGOOS_linux -DGOARCH_arm ./sincos_arm.s
 5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_arm.5 -DGOOS_linux -DGOARCH_arm ./sqrt_arm.s
 5a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_arm.5 -DGOOS_linux -DGOARCH_arm ./tan_arm.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/linux_arm/math.a
 
 #
@@ -184,7 +184,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/linux_arm/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 5g -o "$WORK"/sort/_obj/_go_.5 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.5
 cp "$WORK"/sort.a "$GOROOT"/pkg/linux_arm/sort.a
 
 #
@@ -194,7 +194,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/linux_arm/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 5g -o "$WORK"/container/heap/_obj/_go_.5 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -205,7 +205,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/linux_arm/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 5g -o "$WORK"/strings/_obj/_go_.5 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.5
 cp "$WORK"/strings.a "$GOROOT"/pkg/linux_arm/strings.a
 
 #
@@ -215,7 +215,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/linux_arm/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.5
 cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_arm/strconv.a
 
 #
@@ -225,7 +225,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/linux_arm/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 5g -o "$WORK"/encoding/base64/_obj/_go_.5 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -237,7 +237,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 5a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_linux_arm.5 -DGOOS_linux -DGOARCH_arm ./asm_linux_arm.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.5 "$WORK"/syscall/_obj/asm_linux_arm.5
+"$GOROOT"/bin/go-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
 
 #
@@ -247,7 +247,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/linux_arm/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.5
 cp "$WORK"/time.a "$GOROOT"/pkg/linux_arm/time.a
 
 #
@@ -257,7 +257,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/linux_arm/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.5
 cp "$WORK"/os.a "$GOROOT"/pkg/linux_arm/os.a
 
 #
@@ -267,7 +267,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/linux_arm/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 5g -o "$WORK"/reflect/_obj/_go_.5 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.5
 cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_arm/reflect.a
 
 #
@@ -277,7 +277,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/linux_arm/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 5g -o "$WORK"/fmt/_obj/_go_.5 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.5
 cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_arm/fmt.a
 
 #
@@ -287,7 +287,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/linux_arm/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 5g -o "$WORK"/unicode/utf16/_obj/_go_.5 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
 #
@@ -297,7 +297,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/linux_arm/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
 #
@@ -307,7 +307,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/linux_arm/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 5g -o "$WORK"/flag/_obj/_go_.5 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.5
 cp "$WORK"/flag.a "$GOROOT"/pkg/linux_arm/flag.a
 
 #
@@ -317,7 +317,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/linux_arm/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 5g -o "$WORK"/bufio/_obj/_go_.5 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.5
 cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_arm/bufio.a
 
 #
@@ -327,7 +327,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/linux_arm/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
 #
@@ -337,7 +337,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/linux_arm/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 5g -o "$WORK"/go/token/_obj/_go_.5 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -348,7 +348,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/linux_arm/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 5g -o "$WORK"/path/filepath/_obj/_go_.5 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -359,7 +359,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/linux_arm/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 5g -o "$WORK"/go/scanner/_obj/_go_.5 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
 #
@@ -369,7 +369,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/linux_arm/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
 #
@@ -379,7 +379,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/linux_arm/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 5g -o "$WORK"/io/ioutil/_obj/_go_.5 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -390,7 +390,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/linux_arm/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 5g -o "$WORK"/go/parser/_obj/_go_.5 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
 #
@@ -400,7 +400,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/linux_arm/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 5g -o "$WORK"/log/_obj/_go_.5 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.5
 cp "$WORK"/log.a "$GOROOT"/pkg/linux_arm/log.a
 
 #
@@ -410,7 +410,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/linux_arm/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 5g -o "$WORK"/path/_obj/_go_.5 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.5
 cp "$WORK"/path.a "$GOROOT"/pkg/linux_arm/path.a
 
 #
@@ -420,7 +420,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/linux_arm/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 5g -o "$WORK"/go/build/_obj/_go_.5 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
 #
@@ -430,7 +430,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/linux_arm/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 5g -o "$WORK"/os/exec/_obj/_go_.5 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -441,7 +441,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/linux_arm/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -452,7 +452,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/linux_arm/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 5g -o "$WORK"/regexp/_obj/_go_.5 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.5
 cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_arm/regexp.a
 
 #
@@ -462,7 +462,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/linux_arm/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 5g -o "$WORK"/net/url/_obj/_go_.5 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -473,7 +473,7 @@ 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
 5g -o "$WORK"/text/template/parse/_obj/_go_.5 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -484,7 +484,7 @@ 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
 5g -o "$WORK"/text/template/_obj/_go_.5 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.5
+"$GOROOT"/bin/go-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
 
@@ -495,7 +495,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_arm/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 5g -o "$WORK"/cmd/go/_obj/_go_.5 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.5
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.5
 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
diff --git a/src/buildscript/netbsd_386.sh b/src/buildscript/netbsd_386.sh
index 6fbe215a844..e7b8fd6ccc2 100755
--- a/src/buildscript/netbsd_386.sh
+++ b/src/buildscript/netbsd_386.sh
@@ -64,7 +64,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_netbsd_386.h "$WORK"/runtime/_obj/zasm_GOOS_GO
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 ./rt0_netbsd_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 ./sys_netbsd_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_netbsd -DGOARCH_386 ./vlop_386.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/netbsd_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_386/runtime.a
 
@@ -75,7 +75,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_386/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/netbsd_386/errors.a
 
 #
@@ -86,7 +86,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" ./doc.go
 8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
@@ -97,7 +97,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/netbsd_386/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_386/sync.a
 
 #
@@ -107,7 +107,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_386/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_386/io.a
 
 #
@@ -117,7 +117,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_386/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_386/unicode.a
 
 #
@@ -127,7 +127,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_386/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -139,7 +139,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_netbsd -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -171,7 +171,7 @@ cd "$GOROOT"/src/pkg/math
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_netbsd -DGOARCH_386 ./sincos_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_netbsd -DGOARCH_386 ./sqrt_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_netbsd -DGOARCH_386 ./tan_386.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_386/math.a
 
 #
@@ -181,7 +181,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_386/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_386/sort.a
 
 #
@@ -191,7 +191,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_386/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -202,7 +202,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/netbsd_386/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_386/strings.a
 
 #
@@ -212,7 +212,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_386/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_386/strconv.a
 
 #
@@ -222,7 +222,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_386/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -234,7 +234,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_netbsd_386.8 -DGOOS_netbsd -DGOARCH_386 ./asm_netbsd_386.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_netbsd_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -244,7 +244,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/netbsd_386/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_386/time.a
 
 #
@@ -254,7 +254,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_386/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_386/os.a
 
 #
@@ -264,7 +264,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_386/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_386/reflect.a
 
 #
@@ -274,7 +274,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_386/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_386/fmt.a
 
 #
@@ -284,7 +284,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_386/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -294,7 +294,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/netbsd_386/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -304,7 +304,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/netbsd_386/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_386/flag.a
 
 #
@@ -314,7 +314,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_386/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_386/bufio.a
 
 #
@@ -324,7 +324,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_386/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -334,7 +334,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/netbsd_386/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -345,7 +345,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/netbsd_386/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -356,7 +356,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/netbsd_386/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -366,7 +366,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/netbsd_386/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -376,7 +376,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/netbsd_386/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -387,7 +387,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/netbsd_386/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -397,7 +397,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/netbsd_386/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_386/log.a
 
 #
@@ -407,7 +407,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_386/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_386/path.a
 
 #
@@ -417,7 +417,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_386/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -427,7 +427,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/netbsd_386/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -438,7 +438,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/netbsd_386/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -449,7 +449,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/netbsd_386/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_386/regexp.a
 
 #
@@ -459,7 +459,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_386/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -470,7 +470,7 @@ 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
 8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -481,7 +481,7 @@ 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
 8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -492,7 +492,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_386/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 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
diff --git a/src/buildscript/netbsd_amd64.sh b/src/buildscript/netbsd_amd64.sh
index 9b0db555f45..a8474b86574 100755
--- a/src/buildscript/netbsd_amd64.sh
+++ b/src/buildscript/netbsd_amd64.sh
@@ -62,7 +62,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_netbsd_amd64.h "$WORK"/runtime/_obj/zasm_GOOS_
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./memmove_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./rt0_netbsd_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./sys_netbsd_amd64.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/netbsd_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_amd64/runtime.a
 
@@ -73,7 +73,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/netbsd_amd64/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/netbsd_amd64/errors.a
 
 #
@@ -84,7 +84,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" ./doc.go
 6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
@@ -95,7 +95,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/netbsd_amd64/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_amd64/sync.a
 
 #
@@ -105,7 +105,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/netbsd_amd64/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_amd64/io.a
 
 #
@@ -115,7 +115,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/netbsd_amd64/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_amd64/unicode.a
 
 #
@@ -125,7 +125,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/netbsd_amd64/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -137,7 +137,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -170,7 +170,7 @@ cd "$GOROOT"/src/pkg/math
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./sincos_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./sqrt_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./tan_amd64.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_amd64/math.a
 
 #
@@ -180,7 +180,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/netbsd_amd64/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_amd64/sort.a
 
 #
@@ -190,7 +190,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/netbsd_amd64/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -201,7 +201,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/netbsd_amd64/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_amd64/strings.a
 
 #
@@ -211,7 +211,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/netbsd_amd64/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_amd64/strconv.a
 
 #
@@ -221,7 +221,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/netbsd_amd64/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -233,7 +233,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_netbsd_amd64.6 -DGOOS_netbsd -DGOARCH_amd64 ./asm_netbsd_amd64.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_netbsd_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -243,7 +243,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/netbsd_amd64/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_amd64/time.a
 
 #
@@ -253,7 +253,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/netbsd_amd64/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_amd64/os.a
 
 #
@@ -263,7 +263,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/netbsd_amd64/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_amd64/reflect.a
 
 #
@@ -273,7 +273,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/netbsd_amd64/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_amd64/fmt.a
 
 #
@@ -283,7 +283,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/netbsd_amd64/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -293,7 +293,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/netbsd_amd64/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -303,7 +303,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/netbsd_amd64/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_amd64/flag.a
 
 #
@@ -313,7 +313,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/netbsd_amd64/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_amd64/bufio.a
 
 #
@@ -323,7 +323,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/netbsd_amd64/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -333,7 +333,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/netbsd_amd64/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -344,7 +344,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/netbsd_amd64/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -355,7 +355,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/netbsd_amd64/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -365,7 +365,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/netbsd_amd64/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -375,7 +375,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/netbsd_amd64/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -386,7 +386,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/netbsd_amd64/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -396,7 +396,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/netbsd_amd64/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_amd64/log.a
 
 #
@@ -406,7 +406,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/netbsd_amd64/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_amd64/path.a
 
 #
@@ -416,7 +416,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/netbsd_amd64/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -426,7 +426,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/netbsd_amd64/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -437,7 +437,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/netbsd_amd64/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -448,7 +448,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/netbsd_amd64/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_amd64/regexp.a
 
 #
@@ -458,7 +458,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/netbsd_amd64/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -469,7 +469,7 @@ 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
 6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -480,7 +480,7 @@ 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
 6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -491,7 +491,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_amd64/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 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
diff --git a/src/buildscript/openbsd_386.sh b/src/buildscript/openbsd_386.sh
index 192c4366129..c08293c0f36 100755
--- a/src/buildscript/openbsd_386.sh
+++ b/src/buildscript/openbsd_386.sh
@@ -64,7 +64,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_openbsd_386.h "$WORK"/runtime/_obj/zasm_GOOS_G
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 ./rt0_openbsd_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 ./sys_openbsd_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_openbsd -DGOARCH_386 ./vlop_386.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/openbsd_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_386/runtime.a
 
@@ -75,7 +75,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_386/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/openbsd_386/errors.a
 
 #
@@ -86,7 +86,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" ./doc.go
 8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
@@ -97,7 +97,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/openbsd_386/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_386/sync.a
 
 #
@@ -107,7 +107,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_386/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_386/io.a
 
 #
@@ -117,7 +117,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_386/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_386/unicode.a
 
 #
@@ -127,7 +127,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_386/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -139,7 +139,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_openbsd -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -171,7 +171,7 @@ cd "$GOROOT"/src/pkg/math
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_openbsd -DGOARCH_386 ./sincos_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_openbsd -DGOARCH_386 ./sqrt_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_openbsd -DGOARCH_386 ./tan_386.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_386/math.a
 
 #
@@ -181,7 +181,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_386/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_386/sort.a
 
 #
@@ -191,7 +191,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_386/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -202,7 +202,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/openbsd_386/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_386/strings.a
 
 #
@@ -212,7 +212,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_386/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_386/strconv.a
 
 #
@@ -222,7 +222,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_386/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -234,7 +234,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_openbsd_386.8 -DGOOS_openbsd -DGOARCH_386 ./asm_openbsd_386.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_openbsd_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -244,7 +244,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/openbsd_386/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_386/time.a
 
 #
@@ -254,7 +254,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_386/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_386/os.a
 
 #
@@ -264,7 +264,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_386/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_386/reflect.a
 
 #
@@ -274,7 +274,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_386/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_386/fmt.a
 
 #
@@ -284,7 +284,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_386/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -294,7 +294,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/openbsd_386/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -304,7 +304,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/openbsd_386/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_386/flag.a
 
 #
@@ -314,7 +314,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_386/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_386/bufio.a
 
 #
@@ -324,7 +324,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_386/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -334,7 +334,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/openbsd_386/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -345,7 +345,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/openbsd_386/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -356,7 +356,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/openbsd_386/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -366,7 +366,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/openbsd_386/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -376,7 +376,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/openbsd_386/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -387,7 +387,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/openbsd_386/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -397,7 +397,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/openbsd_386/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_386/log.a
 
 #
@@ -407,7 +407,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_386/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_386/path.a
 
 #
@@ -417,7 +417,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_386/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -427,7 +427,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/openbsd_386/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -438,7 +438,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/openbsd_386/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -449,7 +449,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/openbsd_386/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_386/regexp.a
 
 #
@@ -459,7 +459,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_386/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -470,7 +470,7 @@ 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
 8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -481,7 +481,7 @@ 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
 8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -492,7 +492,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_386/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 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
diff --git a/src/buildscript/openbsd_amd64.sh b/src/buildscript/openbsd_amd64.sh
index 77979c32219..d6866f623a0 100755
--- a/src/buildscript/openbsd_amd64.sh
+++ b/src/buildscript/openbsd_amd64.sh
@@ -62,7 +62,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_openbsd_amd64.h "$WORK"/runtime/_obj/zasm_GOOS
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./memmove_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./rt0_openbsd_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./sys_openbsd_amd64.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/openbsd_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_amd64/runtime.a
 
@@ -73,7 +73,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/openbsd_amd64/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/openbsd_amd64/errors.a
 
 #
@@ -84,7 +84,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" ./doc.go
 6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
@@ -95,7 +95,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/openbsd_amd64/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_amd64/sync.a
 
 #
@@ -105,7 +105,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/openbsd_amd64/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_amd64/io.a
 
 #
@@ -115,7 +115,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/openbsd_amd64/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_amd64/unicode.a
 
 #
@@ -125,7 +125,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/openbsd_amd64/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -137,7 +137,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -170,7 +170,7 @@ cd "$GOROOT"/src/pkg/math
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./sincos_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./sqrt_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./tan_amd64.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_amd64/math.a
 
 #
@@ -180,7 +180,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/openbsd_amd64/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_amd64/sort.a
 
 #
@@ -190,7 +190,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/openbsd_amd64/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -201,7 +201,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/openbsd_amd64/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_amd64/strings.a
 
 #
@@ -211,7 +211,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/openbsd_amd64/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_amd64/strconv.a
 
 #
@@ -221,7 +221,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/openbsd_amd64/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -233,7 +233,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_openbsd_amd64.6 -DGOOS_openbsd -DGOARCH_amd64 ./asm_openbsd_amd64.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_openbsd_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -243,7 +243,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/openbsd_amd64/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_amd64/time.a
 
 #
@@ -253,7 +253,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/openbsd_amd64/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_amd64/os.a
 
 #
@@ -263,7 +263,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/openbsd_amd64/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_amd64/reflect.a
 
 #
@@ -273,7 +273,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/openbsd_amd64/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_amd64/fmt.a
 
 #
@@ -283,7 +283,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/openbsd_amd64/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -293,7 +293,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/openbsd_amd64/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -303,7 +303,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/openbsd_amd64/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_amd64/flag.a
 
 #
@@ -313,7 +313,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/openbsd_amd64/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_amd64/bufio.a
 
 #
@@ -323,7 +323,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/openbsd_amd64/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -333,7 +333,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/openbsd_amd64/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -344,7 +344,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/openbsd_amd64/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_unix.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -355,7 +355,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/openbsd_amd64/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -365,7 +365,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/openbsd_amd64/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -375,7 +375,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/openbsd_amd64/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -386,7 +386,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/openbsd_amd64/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -396,7 +396,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/openbsd_amd64/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_amd64/log.a
 
 #
@@ -406,7 +406,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/openbsd_amd64/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_amd64/path.a
 
 #
@@ -416,7 +416,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/openbsd_amd64/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -426,7 +426,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/openbsd_amd64/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" ./exec.go ./lp_unix.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -437,7 +437,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/openbsd_amd64/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -448,7 +448,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/openbsd_amd64/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_amd64/regexp.a
 
 #
@@ -458,7 +458,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/openbsd_amd64/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -469,7 +469,7 @@ 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
 6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -480,7 +480,7 @@ 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
 6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -491,7 +491,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_amd64/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 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
diff --git a/src/buildscript/plan9_386.sh b/src/buildscript/plan9_386.sh
index bf454e493c2..34bbddbbc30 100755
--- a/src/buildscript/plan9_386.sh
+++ b/src/buildscript/plan9_386.sh
@@ -64,7 +64,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_plan9_386.h "$WORK"/runtime/_obj/zasm_GOOS_GOA
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 ./rt0_plan9_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 ./sys_plan9_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_plan9 -DGOARCH_386 ./vlop_386.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/plan9_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/plan9_386/runtime.a
 
@@ -75,7 +75,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/plan9_386/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/plan9_386/errors.a
 
 #
@@ -86,7 +86,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" ./doc.go
 8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
@@ -97,7 +97,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/plan9_386/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/plan9_386/sync.a
 
 #
@@ -107,7 +107,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/plan9_386/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/plan9_386/io.a
 
 #
@@ -117,7 +117,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/plan9_386/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/plan9_386/unicode.a
 
 #
@@ -127,7 +127,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/plan9_386/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -139,7 +139,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_plan9 -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -171,7 +171,7 @@ cd "$GOROOT"/src/pkg/math
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_plan9 -DGOARCH_386 ./sincos_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_plan9 -DGOARCH_386 ./sqrt_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_plan9 -DGOARCH_386 ./tan_386.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/plan9_386/math.a
 
 #
@@ -181,7 +181,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/plan9_386/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/plan9_386/sort.a
 
 #
@@ -191,7 +191,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/plan9_386/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -202,7 +202,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/plan9_386/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/plan9_386/strings.a
 
 #
@@ -212,7 +212,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/plan9_386/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/plan9_386/strconv.a
 
 #
@@ -222,7 +222,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/plan9_386/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -234,7 +234,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_plan9_386.8 -DGOOS_plan9 -DGOARCH_386 ./asm_plan9_386.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_plan9_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -244,7 +244,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/plan9_386/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/plan9_386/time.a
 
 #
@@ -254,7 +254,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/plan9_386/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/plan9_386/os.a
 
 #
@@ -264,7 +264,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/plan9_386/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/plan9_386/reflect.a
 
 #
@@ -274,7 +274,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/plan9_386/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/plan9_386/fmt.a
 
 #
@@ -284,7 +284,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/plan9_386/fmt.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -294,7 +294,7 @@ cp "$WORK"/unicode/utf16.a "$GOROOT"/pkg/plan9_386/unicode/utf16.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -304,7 +304,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/plan9_386/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/plan9_386/flag.a
 
 #
@@ -314,7 +314,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/plan9_386/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/plan9_386/bufio.a
 
 #
@@ -324,7 +324,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/plan9_386/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -334,7 +334,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/plan9_386/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -345,7 +345,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/plan9_386/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_plan9.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -356,7 +356,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/plan9_386/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -366,7 +366,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/plan9_386/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -376,7 +376,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/plan9_386/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -387,7 +387,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/plan9_386/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -397,7 +397,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/plan9_386/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/plan9_386/log.a
 
 #
@@ -407,7 +407,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/plan9_386/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/plan9_386/path.a
 
 #
@@ -417,7 +417,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/plan9_386/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -427,7 +427,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/plan9_386/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" ./exec.go ./lp_plan9.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -438,7 +438,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/plan9_386/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -449,7 +449,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/plan9_386/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/plan9_386/regexp.a
 
 #
@@ -459,7 +459,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/plan9_386/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -470,7 +470,7 @@ 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
 8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -481,7 +481,7 @@ 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
 8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -492,7 +492,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/plan9_386/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 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
diff --git a/src/buildscript/windows_386.sh b/src/buildscript/windows_386.sh
index 360c5aa3437..d348414d0d6 100755
--- a/src/buildscript/windows_386.sh
+++ b/src/buildscript/windows_386.sh
@@ -66,7 +66,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_windows_386.h "$WORK"/runtime/_obj/zasm_GOOS_G
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_windows_386.8 -DGOOS_windows -DGOARCH_386 ./rt0_windows_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_windows_386.8 -DGOOS_windows -DGOARCH_386 ./sys_windows_386.s
 8a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/vlop_386.8 -DGOOS_windows -DGOARCH_386 ./vlop_386.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/windows_386/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_386/runtime.a
 
@@ -77,7 +77,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_386/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 8g -o "$WORK"/errors/_obj/_go_.8 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.8
 cp "$WORK"/errors.a "$GOROOT"/pkg/windows_386/errors.a
 
 #
@@ -88,7 +88,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 8g -o "$WORK"/sync/atomic/_obj/_go_.8 -p sync/atomic -I "$WORK" ./doc.go
 8a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.8 "$WORK"/sync/atomic/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
@@ -99,7 +99,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/windows_386/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 8g -o "$WORK"/sync/_obj/_go_.8 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.8
 cp "$WORK"/sync.a "$GOROOT"/pkg/windows_386/sync.a
 
 #
@@ -109,7 +109,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/windows_386/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 8g -o "$WORK"/io/_obj/_go_.8 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.8
 cp "$WORK"/io.a "$GOROOT"/pkg/windows_386/io.a
 
 #
@@ -119,7 +119,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/windows_386/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 8g -o "$WORK"/unicode/_obj/_go_.8 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.8
 cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_386/unicode.a
 
 #
@@ -129,7 +129,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_386/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 8g -o "$WORK"/unicode/utf8/_obj/_go_.8 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -141,7 +141,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 8g -o "$WORK"/bytes/_obj/_go_.8 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 8a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_386.8 -DGOOS_windows -DGOARCH_386 ./asm_386.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.8 "$WORK"/bytes/_obj/asm_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -173,7 +173,7 @@ cd "$GOROOT"/src/pkg/math
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_386.8 -DGOOS_windows -DGOARCH_386 ./sincos_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_386.8 -DGOOS_windows -DGOARCH_386 ./sqrt_386.s
 8a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_386.8 -DGOOS_windows -DGOARCH_386 ./tan_386.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/windows_386/math.a
 
 #
@@ -183,7 +183,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/windows_386/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 8g -o "$WORK"/sort/_obj/_go_.8 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.8
 cp "$WORK"/sort.a "$GOROOT"/pkg/windows_386/sort.a
 
 #
@@ -193,7 +193,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/windows_386/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 8g -o "$WORK"/container/heap/_obj/_go_.8 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -204,7 +204,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/windows_386/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 8g -o "$WORK"/strings/_obj/_go_.8 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.8
 cp "$WORK"/strings.a "$GOROOT"/pkg/windows_386/strings.a
 
 #
@@ -214,7 +214,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/windows_386/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.8
 cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_386/strconv.a
 
 #
@@ -224,7 +224,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_386/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 8g -o "$WORK"/encoding/base64/_obj/_go_.8 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -235,7 +235,7 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/windows_386/encoding/base64.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 8g -o "$WORK"/unicode/utf16/_obj/_go_.8 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -246,7 +246,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 8a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_windows_386.8 -DGOOS_windows -DGOARCH_386 ./asm_windows_386.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.8 "$WORK"/syscall/_obj/asm_windows_386.8
+"$GOROOT"/bin/go-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
 
 #
@@ -256,7 +256,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/windows_386/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.8
 cp "$WORK"/time.a "$GOROOT"/pkg/windows_386/time.a
 
 #
@@ -266,7 +266,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/windows_386/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.8
 cp "$WORK"/os.a "$GOROOT"/pkg/windows_386/os.a
 
 #
@@ -276,7 +276,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/windows_386/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 8g -o "$WORK"/reflect/_obj/_go_.8 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.8
 cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_386/reflect.a
 
 #
@@ -286,7 +286,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_386/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 8g -o "$WORK"/fmt/_obj/_go_.8 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.8
 cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_386/fmt.a
 
 #
@@ -296,7 +296,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_386/fmt.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -306,7 +306,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/windows_386/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 8g -o "$WORK"/flag/_obj/_go_.8 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.8
 cp "$WORK"/flag.a "$GOROOT"/pkg/windows_386/flag.a
 
 #
@@ -316,7 +316,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/windows_386/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 8g -o "$WORK"/bufio/_obj/_go_.8 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.8
 cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_386/bufio.a
 
 #
@@ -326,7 +326,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_386/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -336,7 +336,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/windows_386/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 8g -o "$WORK"/go/token/_obj/_go_.8 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -347,7 +347,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/windows_386/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 8g -o "$WORK"/path/filepath/_obj/_go_.8 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_windows.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -358,7 +358,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/windows_386/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 8g -o "$WORK"/go/scanner/_obj/_go_.8 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -368,7 +368,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/windows_386/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -378,7 +378,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/windows_386/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 8g -o "$WORK"/io/ioutil/_obj/_go_.8 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -389,7 +389,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/windows_386/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 8g -o "$WORK"/go/parser/_obj/_go_.8 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -399,7 +399,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/windows_386/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 8g -o "$WORK"/log/_obj/_go_.8 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.8
 cp "$WORK"/log.a "$GOROOT"/pkg/windows_386/log.a
 
 #
@@ -409,7 +409,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/windows_386/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 8g -o "$WORK"/path/_obj/_go_.8 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.8
 cp "$WORK"/path.a "$GOROOT"/pkg/windows_386/path.a
 
 #
@@ -419,7 +419,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/windows_386/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 8g -o "$WORK"/go/build/_obj/_go_.8 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
 #
@@ -429,7 +429,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/windows_386/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 8g -o "$WORK"/os/exec/_obj/_go_.8 -p os/exec -I "$WORK" ./exec.go ./lp_windows.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -440,7 +440,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/windows_386/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -451,7 +451,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/windows_386/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 8g -o "$WORK"/regexp/_obj/_go_.8 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.8
 cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_386/regexp.a
 
 #
@@ -461,7 +461,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_386/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 8g -o "$WORK"/net/url/_obj/_go_.8 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -472,7 +472,7 @@ 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
 8g -o "$WORK"/text/template/parse/_obj/_go_.8 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -483,7 +483,7 @@ 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
 8g -o "$WORK"/text/template/_obj/_go_.8 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.8
+"$GOROOT"/bin/go-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
 
@@ -494,7 +494,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_386/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 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
diff --git a/src/buildscript/windows_amd64.sh b/src/buildscript/windows_amd64.sh
index bf5cd048ca9..6943d83a48b 100755
--- a/src/buildscript/windows_amd64.sh
+++ b/src/buildscript/windows_amd64.sh
@@ -64,7 +64,7 @@ cp "$GOROOT"/src/pkg/runtime/zasm_windows_amd64.h "$WORK"/runtime/_obj/zasm_GOOS
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/memmove_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./memmove_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/rt0_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./rt0_windows_amd64.s
 6a -I "$WORK"/runtime/_obj/ -o "$WORK"/runtime/_obj/sys_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./sys_windows_amd64.s
-gopack 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/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
 mkdir -p "$GOROOT"/pkg/windows_amd64/
 cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_amd64/runtime.a
 
@@ -75,7 +75,7 @@ cp "$WORK"/runtime.a "$GOROOT"/pkg/windows_amd64/runtime.a
 mkdir -p "$WORK"/errors/_obj/
 cd "$GOROOT"/src/pkg/errors
 6g -o "$WORK"/errors/_obj/_go_.6 -p errors -I "$WORK" ./errors.go
-gopack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/errors.a "$WORK"/errors/_obj/_go_.6
 cp "$WORK"/errors.a "$GOROOT"/pkg/windows_amd64/errors.a
 
 #
@@ -86,7 +86,7 @@ mkdir -p "$WORK"/sync/atomic/_obj/
 cd "$GOROOT"/src/pkg/sync/atomic
 6g -o "$WORK"/sync/atomic/_obj/_go_.6 -p sync/atomic -I "$WORK" ./doc.go
 6a -I "$WORK"/sync/atomic/_obj/ -o "$WORK"/sync/atomic/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/sync/atomic.a "$WORK"/sync/atomic/_obj/_go_.6 "$WORK"/sync/atomic/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
@@ -97,7 +97,7 @@ cp "$WORK"/sync/atomic.a "$GOROOT"/pkg/windows_amd64/sync/atomic.a
 mkdir -p "$WORK"/sync/_obj/
 cd "$GOROOT"/src/pkg/sync
 6g -o "$WORK"/sync/_obj/_go_.6 -p sync -I "$WORK" ./cond.go ./mutex.go ./once.go ./rwmutex.go ./waitgroup.go
-gopack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sync.a "$WORK"/sync/_obj/_go_.6
 cp "$WORK"/sync.a "$GOROOT"/pkg/windows_amd64/sync.a
 
 #
@@ -107,7 +107,7 @@ cp "$WORK"/sync.a "$GOROOT"/pkg/windows_amd64/sync.a
 mkdir -p "$WORK"/io/_obj/
 cd "$GOROOT"/src/pkg/io
 6g -o "$WORK"/io/_obj/_go_.6 -p io -I "$WORK" ./io.go ./multi.go ./pipe.go
-gopack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/io.a "$WORK"/io/_obj/_go_.6
 cp "$WORK"/io.a "$GOROOT"/pkg/windows_amd64/io.a
 
 #
@@ -117,7 +117,7 @@ cp "$WORK"/io.a "$GOROOT"/pkg/windows_amd64/io.a
 mkdir -p "$WORK"/unicode/_obj/
 cd "$GOROOT"/src/pkg/unicode
 6g -o "$WORK"/unicode/_obj/_go_.6 -p unicode -I "$WORK" ./casetables.go ./digit.go ./graphic.go ./letter.go ./tables.go
-gopack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/unicode.a "$WORK"/unicode/_obj/_go_.6
 cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_amd64/unicode.a
 
 #
@@ -127,7 +127,7 @@ cp "$WORK"/unicode.a "$GOROOT"/pkg/windows_amd64/unicode.a
 mkdir -p "$WORK"/unicode/utf8/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf8
 6g -o "$WORK"/unicode/utf8/_obj/_go_.6 -p unicode/utf8 -I "$WORK" ./utf8.go
-gopack grc "$WORK"/unicode/utf8.a "$WORK"/unicode/utf8/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -139,7 +139,7 @@ mkdir -p "$WORK"/bytes/_obj/
 cd "$GOROOT"/src/pkg/bytes
 6g -o "$WORK"/bytes/_obj/_go_.6 -p bytes -I "$WORK" ./buffer.go ./bytes.go ./bytes_decl.go
 6a -I "$WORK"/bytes/_obj/ -o "$WORK"/bytes/_obj/asm_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./asm_amd64.s
-gopack grc "$WORK"/bytes.a "$WORK"/bytes/_obj/_go_.6 "$WORK"/bytes/_obj/asm_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -172,7 +172,7 @@ cd "$GOROOT"/src/pkg/math
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sincos_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./sincos_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/sqrt_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./sqrt_amd64.s
 6a -I "$WORK"/math/_obj/ -o "$WORK"/math/_obj/tan_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./tan_amd64.s
-gopack 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/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
 cp "$WORK"/math.a "$GOROOT"/pkg/windows_amd64/math.a
 
 #
@@ -182,7 +182,7 @@ cp "$WORK"/math.a "$GOROOT"/pkg/windows_amd64/math.a
 mkdir -p "$WORK"/sort/_obj/
 cd "$GOROOT"/src/pkg/sort
 6g -o "$WORK"/sort/_obj/_go_.6 -p sort -I "$WORK" ./search.go ./sort.go
-gopack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/sort.a "$WORK"/sort/_obj/_go_.6
 cp "$WORK"/sort.a "$GOROOT"/pkg/windows_amd64/sort.a
 
 #
@@ -192,7 +192,7 @@ cp "$WORK"/sort.a "$GOROOT"/pkg/windows_amd64/sort.a
 mkdir -p "$WORK"/container/heap/_obj/
 cd "$GOROOT"/src/pkg/container/heap
 6g -o "$WORK"/container/heap/_obj/_go_.6 -p container/heap -I "$WORK" ./heap.go
-gopack grc "$WORK"/container/heap.a "$WORK"/container/heap/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -203,7 +203,7 @@ cp "$WORK"/container/heap.a "$GOROOT"/pkg/windows_amd64/container/heap.a
 mkdir -p "$WORK"/strings/_obj/
 cd "$GOROOT"/src/pkg/strings
 6g -o "$WORK"/strings/_obj/_go_.6 -p strings -I "$WORK" ./reader.go ./replace.go ./strings.go
-gopack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strings.a "$WORK"/strings/_obj/_go_.6
 cp "$WORK"/strings.a "$GOROOT"/pkg/windows_amd64/strings.a
 
 #
@@ -213,7 +213,7 @@ cp "$WORK"/strings.a "$GOROOT"/pkg/windows_amd64/strings.a
 mkdir -p "$WORK"/strconv/_obj/
 cd "$GOROOT"/src/pkg/strconv
 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
-gopack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/strconv.a "$WORK"/strconv/_obj/_go_.6
 cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_amd64/strconv.a
 
 #
@@ -223,7 +223,7 @@ cp "$WORK"/strconv.a "$GOROOT"/pkg/windows_amd64/strconv.a
 mkdir -p "$WORK"/encoding/base64/_obj/
 cd "$GOROOT"/src/pkg/encoding/base64
 6g -o "$WORK"/encoding/base64/_obj/_go_.6 -p encoding/base64 -I "$WORK" ./base64.go
-gopack grc "$WORK"/encoding/base64.a "$WORK"/encoding/base64/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -234,7 +234,7 @@ cp "$WORK"/encoding/base64.a "$GOROOT"/pkg/windows_amd64/encoding/base64.a
 mkdir -p "$WORK"/unicode/utf16/_obj/
 cd "$GOROOT"/src/pkg/unicode/utf16
 6g -o "$WORK"/unicode/utf16/_obj/_go_.6 -p unicode/utf16 -I "$WORK" ./utf16.go
-gopack grc "$WORK"/unicode/utf16.a "$WORK"/unicode/utf16/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -245,7 +245,7 @@ mkdir -p "$WORK"/syscall/_obj/
 cd "$GOROOT"/src/pkg/syscall
 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
 6a -I "$WORK"/syscall/_obj/ -o "$WORK"/syscall/_obj/asm_windows_amd64.6 -DGOOS_windows -DGOARCH_amd64 ./asm_windows_amd64.s
-gopack grc "$WORK"/syscall.a "$WORK"/syscall/_obj/_go_.6 "$WORK"/syscall/_obj/asm_windows_amd64.6
+"$GOROOT"/bin/go-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
 
 #
@@ -255,7 +255,7 @@ cp "$WORK"/syscall.a "$GOROOT"/pkg/windows_amd64/syscall.a
 mkdir -p "$WORK"/time/_obj/
 cd "$GOROOT"/src/pkg/time
 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
-gopack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/time.a "$WORK"/time/_obj/_go_.6
 cp "$WORK"/time.a "$GOROOT"/pkg/windows_amd64/time.a
 
 #
@@ -265,7 +265,7 @@ cp "$WORK"/time.a "$GOROOT"/pkg/windows_amd64/time.a
 mkdir -p "$WORK"/os/_obj/
 cd "$GOROOT"/src/pkg/os
 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
-gopack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/os.a "$WORK"/os/_obj/_go_.6
 cp "$WORK"/os.a "$GOROOT"/pkg/windows_amd64/os.a
 
 #
@@ -275,7 +275,7 @@ cp "$WORK"/os.a "$GOROOT"/pkg/windows_amd64/os.a
 mkdir -p "$WORK"/reflect/_obj/
 cd "$GOROOT"/src/pkg/reflect
 6g -o "$WORK"/reflect/_obj/_go_.6 -p reflect -I "$WORK" ./deepequal.go ./type.go ./value.go
-gopack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/reflect.a "$WORK"/reflect/_obj/_go_.6
 cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_amd64/reflect.a
 
 #
@@ -285,7 +285,7 @@ cp "$WORK"/reflect.a "$GOROOT"/pkg/windows_amd64/reflect.a
 mkdir -p "$WORK"/fmt/_obj/
 cd "$GOROOT"/src/pkg/fmt
 6g -o "$WORK"/fmt/_obj/_go_.6 -p fmt -I "$WORK" ./doc.go ./format.go ./print.go ./scan.go
-gopack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/fmt.a "$WORK"/fmt/_obj/_go_.6
 cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_amd64/fmt.a
 
 #
@@ -295,7 +295,7 @@ cp "$WORK"/fmt.a "$GOROOT"/pkg/windows_amd64/fmt.a
 mkdir -p "$WORK"/encoding/json/_obj/
 cd "$GOROOT"/src/pkg/encoding/json
 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
-gopack grc "$WORK"/encoding/json.a "$WORK"/encoding/json/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -305,7 +305,7 @@ cp "$WORK"/encoding/json.a "$GOROOT"/pkg/windows_amd64/encoding/json.a
 mkdir -p "$WORK"/flag/_obj/
 cd "$GOROOT"/src/pkg/flag
 6g -o "$WORK"/flag/_obj/_go_.6 -p flag -I "$WORK" ./flag.go
-gopack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/flag.a "$WORK"/flag/_obj/_go_.6
 cp "$WORK"/flag.a "$GOROOT"/pkg/windows_amd64/flag.a
 
 #
@@ -315,7 +315,7 @@ cp "$WORK"/flag.a "$GOROOT"/pkg/windows_amd64/flag.a
 mkdir -p "$WORK"/bufio/_obj/
 cd "$GOROOT"/src/pkg/bufio
 6g -o "$WORK"/bufio/_obj/_go_.6 -p bufio -I "$WORK" ./bufio.go
-gopack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/bufio.a "$WORK"/bufio/_obj/_go_.6
 cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_amd64/bufio.a
 
 #
@@ -325,7 +325,7 @@ cp "$WORK"/bufio.a "$GOROOT"/pkg/windows_amd64/bufio.a
 mkdir -p "$WORK"/encoding/gob/_obj/
 cd "$GOROOT"/src/pkg/encoding/gob
 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
-gopack grc "$WORK"/encoding/gob.a "$WORK"/encoding/gob/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -335,7 +335,7 @@ cp "$WORK"/encoding/gob.a "$GOROOT"/pkg/windows_amd64/encoding/gob.a
 mkdir -p "$WORK"/go/token/_obj/
 cd "$GOROOT"/src/pkg/go/token
 6g -o "$WORK"/go/token/_obj/_go_.6 -p go/token -I "$WORK" ./position.go ./serialize.go ./token.go
-gopack grc "$WORK"/go/token.a "$WORK"/go/token/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -346,7 +346,7 @@ cp "$WORK"/go/token.a "$GOROOT"/pkg/windows_amd64/go/token.a
 mkdir -p "$WORK"/path/filepath/_obj/
 cd "$GOROOT"/src/pkg/path/filepath
 6g -o "$WORK"/path/filepath/_obj/_go_.6 -p path/filepath -I "$WORK" ./match.go ./path.go ./path_windows.go
-gopack grc "$WORK"/path/filepath.a "$WORK"/path/filepath/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -357,7 +357,7 @@ cp "$WORK"/path/filepath.a "$GOROOT"/pkg/windows_amd64/path/filepath.a
 mkdir -p "$WORK"/go/scanner/_obj/
 cd "$GOROOT"/src/pkg/go/scanner
 6g -o "$WORK"/go/scanner/_obj/_go_.6 -p go/scanner -I "$WORK" ./errors.go ./scanner.go
-gopack grc "$WORK"/go/scanner.a "$WORK"/go/scanner/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -367,7 +367,7 @@ cp "$WORK"/go/scanner.a "$GOROOT"/pkg/windows_amd64/go/scanner.a
 mkdir -p "$WORK"/go/ast/_obj/
 cd "$GOROOT"/src/pkg/go/ast
 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
-gopack grc "$WORK"/go/ast.a "$WORK"/go/ast/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -377,7 +377,7 @@ cp "$WORK"/go/ast.a "$GOROOT"/pkg/windows_amd64/go/ast.a
 mkdir -p "$WORK"/io/ioutil/_obj/
 cd "$GOROOT"/src/pkg/io/ioutil
 6g -o "$WORK"/io/ioutil/_obj/_go_.6 -p io/ioutil -I "$WORK" ./ioutil.go ./tempfile.go
-gopack grc "$WORK"/io/ioutil.a "$WORK"/io/ioutil/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -388,7 +388,7 @@ cp "$WORK"/io/ioutil.a "$GOROOT"/pkg/windows_amd64/io/ioutil.a
 mkdir -p "$WORK"/go/parser/_obj/
 cd "$GOROOT"/src/pkg/go/parser
 6g -o "$WORK"/go/parser/_obj/_go_.6 -p go/parser -I "$WORK" ./interface.go ./parser.go
-gopack grc "$WORK"/go/parser.a "$WORK"/go/parser/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -398,7 +398,7 @@ cp "$WORK"/go/parser.a "$GOROOT"/pkg/windows_amd64/go/parser.a
 mkdir -p "$WORK"/log/_obj/
 cd "$GOROOT"/src/pkg/log
 6g -o "$WORK"/log/_obj/_go_.6 -p log -I "$WORK" ./log.go
-gopack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/log.a "$WORK"/log/_obj/_go_.6
 cp "$WORK"/log.a "$GOROOT"/pkg/windows_amd64/log.a
 
 #
@@ -408,7 +408,7 @@ cp "$WORK"/log.a "$GOROOT"/pkg/windows_amd64/log.a
 mkdir -p "$WORK"/path/_obj/
 cd "$GOROOT"/src/pkg/path
 6g -o "$WORK"/path/_obj/_go_.6 -p path -I "$WORK" ./match.go ./path.go
-gopack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/path.a "$WORK"/path/_obj/_go_.6
 cp "$WORK"/path.a "$GOROOT"/pkg/windows_amd64/path.a
 
 #
@@ -418,7 +418,7 @@ cp "$WORK"/path.a "$GOROOT"/pkg/windows_amd64/path.a
 mkdir -p "$WORK"/go/build/_obj/
 cd "$GOROOT"/src/pkg/go/build
 6g -o "$WORK"/go/build/_obj/_go_.6 -p go/build -I "$WORK" ./build.go ./dir.go ./path.go ./syslist.go
-gopack grc "$WORK"/go/build.a "$WORK"/go/build/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
 #
@@ -428,7 +428,7 @@ cp "$WORK"/go/build.a "$GOROOT"/pkg/windows_amd64/go/build.a
 mkdir -p "$WORK"/os/exec/_obj/
 cd "$GOROOT"/src/pkg/os/exec
 6g -o "$WORK"/os/exec/_obj/_go_.6 -p os/exec -I "$WORK" ./exec.go ./lp_windows.go
-gopack grc "$WORK"/os/exec.a "$WORK"/os/exec/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -439,7 +439,7 @@ cp "$WORK"/os/exec.a "$GOROOT"/pkg/windows_amd64/os/exec.a
 mkdir -p "$WORK"/regexp/syntax/_obj/
 cd "$GOROOT"/src/pkg/regexp/syntax
 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
-gopack grc "$WORK"/regexp/syntax.a "$WORK"/regexp/syntax/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -450,7 +450,7 @@ cp "$WORK"/regexp/syntax.a "$GOROOT"/pkg/windows_amd64/regexp/syntax.a
 mkdir -p "$WORK"/regexp/_obj/
 cd "$GOROOT"/src/pkg/regexp
 6g -o "$WORK"/regexp/_obj/_go_.6 -p regexp -I "$WORK" ./exec.go ./regexp.go
-gopack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/regexp.a "$WORK"/regexp/_obj/_go_.6
 cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_amd64/regexp.a
 
 #
@@ -460,7 +460,7 @@ cp "$WORK"/regexp.a "$GOROOT"/pkg/windows_amd64/regexp.a
 mkdir -p "$WORK"/net/url/_obj/
 cd "$GOROOT"/src/pkg/net/url
 6g -o "$WORK"/net/url/_obj/_go_.6 -p net/url -I "$WORK" ./url.go
-gopack grc "$WORK"/net/url.a "$WORK"/net/url/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -471,7 +471,7 @@ 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
 6g -o "$WORK"/text/template/parse/_obj/_go_.6 -p text/template/parse -I "$WORK" ./lex.go ./node.go ./parse.go
-gopack grc "$WORK"/text/template/parse.a "$WORK"/text/template/parse/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -482,7 +482,7 @@ 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
 6g -o "$WORK"/text/template/_obj/_go_.6 -p text/template -I "$WORK" ./doc.go ./exec.go ./funcs.go ./helper.go ./template.go
-gopack grc "$WORK"/text/template.a "$WORK"/text/template/_obj/_go_.6
+"$GOROOT"/bin/go-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
 
@@ -493,7 +493,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_amd64/text/template.a
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
 6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.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
-gopack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
+"$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 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
diff --git a/src/cmd/Makefile b/src/cmd/Makefile
index 2ee585a0f42..dca9f82011a 100644
--- a/src/cmd/Makefile
+++ b/src/cmd/Makefile
@@ -16,8 +16,8 @@ DIRS=\
 	cc\
 	cov\
 	gc\
-	gopack\
 	nm\
+	pack\
 	prof\
 	
 # Clean applies to all directories, even for other architectures or 
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 659e5fce97a..c4bef14e543 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -997,7 +997,7 @@ func (goToolchain) pack(b *builder, p *Package, objDir, afile string, ofiles []s
 	for _, f := range ofiles {
 		absOfiles = append(absOfiles, mkAbs(objDir, f))
 	}
-	return b.run(p.Dir, p.ImportPath, "gopack", "grc", mkAbs(objDir, afile), absOfiles)
+	return b.run(p.Dir, p.ImportPath, filepath.Join(b.goroot, "bin/go-tool/pack"), "grc", mkAbs(objDir, afile), absOfiles)
 }
 
 func (goToolchain) ld(b *builder, p *Package, out string, allactions []*action, mainpkg string, ofiles []string) error {
@@ -1146,9 +1146,6 @@ func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string) (outGo,
 		}
 	}
 
-	// Allows including _cgo_export.h from .[ch] files in the package.
-	cgoCFLAGS = append(cgoCFLAGS, "-I", obj)
-
 	// cgo
 	// TODO: CGOPKGPATH, CGO_FLAGS?
 	gofiles := []string{obj + "_cgo_gotypes.go"}
diff --git a/src/cmd/gopack/Makefile b/src/cmd/pack/Makefile
similarity index 85%
rename from src/cmd/gopack/Makefile
rename to src/cmd/pack/Makefile
index 91a8ac2df27..12909727fc1 100644
--- a/src/cmd/gopack/Makefile
+++ b/src/cmd/pack/Makefile
@@ -5,8 +5,8 @@
 include ../../Make.inc
 O:=$(HOST_O)
 
-TARG=gopack
+TARG=pack
 OFILES=\
 	ar.$O\
 
-include ../../Make.ccmd
+include ../../Make.ctool
diff --git a/src/cmd/gopack/ar.c b/src/cmd/pack/ar.c
similarity index 100%
rename from src/cmd/gopack/ar.c
rename to src/cmd/pack/ar.c
diff --git a/src/cmd/gopack/doc.go b/src/cmd/pack/doc.go
similarity index 64%
rename from src/cmd/gopack/doc.go
rename to src/cmd/pack/doc.go
index 1551a275fd4..6cbc357db96 100644
--- a/src/cmd/gopack/doc.go
+++ b/src/cmd/pack/doc.go
@@ -4,7 +4,7 @@
 
 /*
 
-Gopack is a variant of the Plan 9 ar tool.  The original is documented at
+Pack is a variant of the Plan 9 ar tool.  The original is documented at
 
 	http://plan9.bell-labs.com/magic/man2html/1/ar
 
@@ -12,14 +12,14 @@ It adds a special Go-specific section __.PKGDEF that collects all the
 Go type information from the files in the archive; that section is
 used by the compiler when importing the package during compilation.
 
-Usage: gopack [uvnbailogS][mrxtdpq][P prefix] archive files ...
+Usage: go tool pack [uvnbailogS][mrxtdpq][P prefix] archive files ...
 
-The new option 'g' causes gopack to maintain the __.PKGDEF section
+The new option 'g' causes pack to maintain the __.PKGDEF section
 as files are added to the archive.
 
-The new option 'S' forces gopack to mark the archive as safe.
+The new option 'S' forces pack to mark the archive as safe.
 
-The new option 'P' causes gopack to remove the given prefix
+The new option 'P' causes pack to remove the given prefix
 from file names in the line number information in object files
 that are already stored in or added to the archive.
 */
diff --git a/test/fixedbugs/bug302.go b/test/fixedbugs/bug302.go
index e9edb94ac80..65a91f588f4 100644
--- a/test/fixedbugs/bug302.go
+++ b/test/fixedbugs/bug302.go
@@ -1,4 +1,4 @@
-// $G $D/bug302.dir/p.go && gopack grc pp.a p.$A && $G $D/bug302.dir/main.go
+// $G $D/bug302.dir/p.go && "$GOROOT"/bin/go-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