389 files changed, 12 insertions, 46 deletions

diff --git a/src/clean.bash b/src/clean.bash
index 15a46a76a1..e67fe14035 100755
--- a/src/clean.bash
+++ b/src/clean.bash
@@ -5,7 +5,7 @@
 
 rm -rf $GOROOT/pkg/[0-9a-zA-Z_]*
 rm -f $GOROOT/lib/*.[6a]
-for i in lib9 libbio libmach_amd64 libregexp cmd lib
+for i in lib9 libbio libmach_amd64 libregexp cmd pkg
 do
 	cd $i
 	case $i in
diff --git a/src/cmd/gobuild/gobuild.go b/src/cmd/gobuild/gobuild.go
index c84c7e9277..d7e9de8ffa 100644
--- a/src/cmd/gobuild/gobuild.go
+++ b/src/cmd/gobuild/gobuild.go
@@ -103,14 +103,14 @@ func (a FileArray) Swap(i, j int) {
 	a[i], a[j] = a[j], a[i]
 }
 
-// If current directory is under $GOROOT/src/lib, return the
+// If current directory is under $GOROOT/src/pkg, return the
 // path relative to there.  Otherwise return "".
 func PkgDir() string {
 	goroot, err := os.Getenv("GOROOT");
 	if err != nil || goroot == "" {
 		return ""
 	}
-	srcroot := path.Clean(goroot + "/src/lib/");
+	srcroot := path.Clean(goroot + "/src/pkg/");
 	pwd, err1 := os.Getenv("PWD");	// TODO(rsc): real pwd
 	if err1 != nil || pwd == "" {
 		return ""
diff --git a/src/lib/syscall/types_darwin_386.c b/src/lib/syscall/types_darwin_386.c
deleted file mode 100644
index 71f98e413e..0000000000
--- a/src/lib/syscall/types_darwin_386.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here.
diff --git a/src/lib/syscall/types_darwin_amd64.c b/src/lib/syscall/types_darwin_amd64.c
deleted file mode 100644
index 71f98e413e..0000000000
--- a/src/lib/syscall/types_darwin_amd64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here.
diff --git a/src/lib/syscall/types_linux_386.c b/src/lib/syscall/types_linux_386.c
deleted file mode 100644
index 37ce7d76e9..0000000000
--- a/src/lib/syscall/types_linux_386.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here
diff --git a/src/lib/syscall/types_linux_amd64.c b/src/lib/syscall/types_linux_amd64.c
deleted file mode 100644
index 37ce7d76e9..0000000000
--- a/src/lib/syscall/types_linux_amd64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here
diff --git a/src/make.bash b/src/make.bash
index f6ee91ad07..841a136c7d 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -18,7 +18,7 @@ rm -f $HOME/bin/quietgcc
 cp quietgcc.bash $HOME/bin/quietgcc
 chmod +x $HOME/bin/quietgcc
 
-for i in lib9 libbio libmach_amd64 libregexp cmd lib cmd/gobuild
+for i in lib9 libbio libmach_amd64 libregexp cmd pkg cmd/gobuild
 do
 	echo; echo; echo %%%% making $i %%%%; echo
 	cd $i
diff --git a/src/lib/Make.deps b/src/pkg/Make.deps
index dd83e8b1cb..dd83e8b1cb 100644
--- a/src/lib/Make.deps
+++ b/src/pkg/Make.deps
diff --git a/src/lib/Makefile b/src/pkg/Makefile
index 036a82e38b..036a82e38b 100644
--- a/src/lib/Makefile
+++ b/src/pkg/Makefile
diff --git a/src/lib/archive/tar/Makefile b/src/pkg/archive/tar/Makefile
index 579ed4c351..579ed4c351 100644
--- a/src/lib/archive/tar/Makefile
+++ b/src/pkg/archive/tar/Makefile
diff --git a/src/lib/archive/tar/testdata/small.txt b/src/pkg/archive/tar/testdata/small.txt
index b249bfc518..b249bfc518 100644
--- a/src/lib/archive/tar/testdata/small.txt
+++ b/src/pkg/archive/tar/testdata/small.txt
diff --git a/src/lib/archive/tar/testdata/small2.txt b/src/pkg/archive/tar/testdata/small2.txt
index 394ee3ecd0..394ee3ecd0 100644
--- a/src/lib/archive/tar/testdata/small2.txt
+++ b/src/pkg/archive/tar/testdata/small2.txt
diff --git a/src/lib/archive/tar/testdata/test.tar b/src/pkg/archive/tar/testdata/test.tar
index fc899dc8dc..fc899dc8dc 100644
--- a/src/lib/archive/tar/testdata/test.tar
+++ b/src/pkg/archive/tar/testdata/test.tar
diff --git a/src/lib/archive/tar/untar.go b/src/pkg/archive/tar/untar.go
index 300c0f932c..300c0f932c 100644
--- a/src/lib/archive/tar/untar.go
+++ b/src/pkg/archive/tar/untar.go
diff --git a/src/lib/archive/tar/untar_test.go b/src/pkg/archive/tar/untar_test.go
index a9c92dbf05..a9c92dbf05 100644
--- a/src/lib/archive/tar/untar_test.go
+++ b/src/pkg/archive/tar/untar_test.go
diff --git a/src/lib/bignum/Makefile b/src/pkg/bignum/Makefile
index 098b909753..098b909753 100644
--- a/src/lib/bignum/Makefile
+++ b/src/pkg/bignum/Makefile
diff --git a/src/lib/bignum/bignum.go b/src/pkg/bignum/bignum.go
index b9ea66587a..b9ea66587a 100755
--- a/src/lib/bignum/bignum.go
+++ b/src/pkg/bignum/bignum.go
diff --git a/src/lib/bignum/bignum_test.go b/src/pkg/bignum/bignum_test.go
index 9351c2ebfb..9351c2ebfb 100644
--- a/src/lib/bignum/bignum_test.go
+++ b/src/pkg/bignum/bignum_test.go
diff --git a/src/lib/bufio/Makefile b/src/pkg/bufio/Makefile
index abb826e7fd..abb826e7fd 100644
--- a/src/lib/bufio/Makefile
+++ b/src/pkg/bufio/Makefile
diff --git a/src/lib/bufio/bufio.go b/src/pkg/bufio/bufio.go
index 7bfbb089f7..7bfbb089f7 100644
--- a/src/lib/bufio/bufio.go
+++ b/src/pkg/bufio/bufio.go
diff --git a/src/lib/bufio/bufio_test.go b/src/pkg/bufio/bufio_test.go
index 6e5135df78..6e5135df78 100644
--- a/src/lib/bufio/bufio_test.go
+++ b/src/pkg/bufio/bufio_test.go
diff --git a/src/lib/bytes/Makefile b/src/pkg/bytes/Makefile
index 5220d28800..5220d28800 100644
--- a/src/lib/bytes/Makefile
+++ b/src/pkg/bytes/Makefile
diff --git a/src/lib/bytes/bytes.go b/src/pkg/bytes/bytes.go
index dd299a82ee..dd299a82ee 100644
--- a/src/lib/bytes/bytes.go
+++ b/src/pkg/bytes/bytes.go
diff --git a/src/lib/bytes/bytes_test.go b/src/pkg/bytes/bytes_test.go
index 4e7cdfad65..4e7cdfad65 100644
--- a/src/lib/bytes/bytes_test.go
+++ b/src/pkg/bytes/bytes_test.go
diff --git a/src/lib/compress/flate/Makefile b/src/pkg/compress/flate/Makefile
index 3f73a19328..3f73a19328 100644
--- a/src/lib/compress/flate/Makefile
+++ b/src/pkg/compress/flate/Makefile
diff --git a/src/lib/compress/flate/flate_test.go b/src/pkg/compress/flate/flate_test.go
index 309606ecbc..309606ecbc 100644
--- a/src/lib/compress/flate/flate_test.go
+++ b/src/pkg/compress/flate/flate_test.go
diff --git a/src/lib/compress/flate/inflate.go b/src/pkg/compress/flate/inflate.go
index c07c94c6e1..c07c94c6e1 100644
--- a/src/lib/compress/flate/inflate.go
+++ b/src/pkg/compress/flate/inflate.go
diff --git a/src/lib/compress/gzip/Makefile b/src/pkg/compress/gzip/Makefile
index 514118ae01..514118ae01 100644
--- a/src/lib/compress/gzip/Makefile
+++ b/src/pkg/compress/gzip/Makefile
diff --git a/src/lib/compress/gzip/gunzip.go b/src/pkg/compress/gzip/gunzip.go
index 32cc3ecb0f..32cc3ecb0f 100644
--- a/src/lib/compress/gzip/gunzip.go
+++ b/src/pkg/compress/gzip/gunzip.go
diff --git a/src/lib/compress/gzip/gunzip_test.go b/src/pkg/compress/gzip/gunzip_test.go
index a481de9272..a481de9272 100644
--- a/src/lib/compress/gzip/gunzip_test.go
+++ b/src/pkg/compress/gzip/gunzip_test.go
diff --git a/src/lib/container/list/Makefile b/src/pkg/container/list/Makefile
index 2a647eb2a3..2a647eb2a3 100644
--- a/src/lib/container/list/Makefile
+++ b/src/pkg/container/list/Makefile
diff --git a/src/lib/container/list/list.go b/src/pkg/container/list/list.go
index 7e8daa65a7..7e8daa65a7 100755
--- a/src/lib/container/list/list.go
+++ b/src/pkg/container/list/list.go
diff --git a/src/lib/container/list/list_test.go b/src/pkg/container/list/list_test.go
index d5b2672e05..d5b2672e05 100755
--- a/src/lib/container/list/list_test.go
+++ b/src/pkg/container/list/list_test.go
diff --git a/src/lib/container/vector/Makefile b/src/pkg/container/vector/Makefile
index 20490549d3..20490549d3 100644
--- a/src/lib/container/vector/Makefile
+++ b/src/pkg/container/vector/Makefile
diff --git a/src/lib/container/vector/intvector.go b/src/pkg/container/vector/intvector.go
index c3b62f256a..c3b62f256a 100644
--- a/src/lib/container/vector/intvector.go
+++ b/src/pkg/container/vector/intvector.go
diff --git a/src/lib/container/vector/stringvector.go b/src/pkg/container/vector/stringvector.go
index 18ca11a3f3..18ca11a3f3 100644
--- a/src/lib/container/vector/stringvector.go
+++ b/src/pkg/container/vector/stringvector.go
diff --git a/src/lib/container/vector/vector.go b/src/pkg/container/vector/vector.go
index 5b5cad21cd..5b5cad21cd 100644
--- a/src/lib/container/vector/vector.go
+++ b/src/pkg/container/vector/vector.go
diff --git a/src/lib/container/vector/vector_test.go b/src/pkg/container/vector/vector_test.go
index 2a9819394c..2a9819394c 100644
--- a/src/lib/container/vector/vector_test.go
+++ b/src/pkg/container/vector/vector_test.go
diff --git a/src/lib/crypto/aes/Makefile b/src/pkg/crypto/aes/Makefile
index c62275b3c2..c62275b3c2 100644
--- a/src/lib/crypto/aes/Makefile
+++ b/src/pkg/crypto/aes/Makefile
diff --git a/src/lib/crypto/aes/aes_test.go b/src/pkg/crypto/aes/aes_test.go
index 2f6cb4a923..2f6cb4a923 100644
--- a/src/lib/crypto/aes/aes_test.go
+++ b/src/pkg/crypto/aes/aes_test.go
diff --git a/src/lib/crypto/aes/block.go b/src/pkg/crypto/aes/block.go
index 3c67d1c3c0..3c67d1c3c0 100644
--- a/src/lib/crypto/aes/block.go
+++ b/src/pkg/crypto/aes/block.go
diff --git a/src/lib/crypto/aes/cipher.go b/src/pkg/crypto/aes/cipher.go
index fd8e43e162..fd8e43e162 100644
--- a/src/lib/crypto/aes/cipher.go
+++ b/src/pkg/crypto/aes/cipher.go
diff --git a/src/lib/crypto/aes/const.go b/src/pkg/crypto/aes/const.go
index 9167d602dd..9167d602dd 100644
--- a/src/lib/crypto/aes/const.go
+++ b/src/pkg/crypto/aes/const.go
diff --git a/src/lib/crypto/block/Makefile b/src/pkg/crypto/block/Makefile
index e8bc8e9071..e8bc8e9071 100644
--- a/src/lib/crypto/block/Makefile
+++ b/src/pkg/crypto/block/Makefile
diff --git a/src/lib/crypto/block/cbc.go b/src/pkg/crypto/block/cbc.go
index 85a746b72b..85a746b72b 100644
--- a/src/lib/crypto/block/cbc.go
+++ b/src/pkg/crypto/block/cbc.go
diff --git a/src/lib/crypto/block/cbc_aes_test.go b/src/pkg/crypto/block/cbc_aes_test.go
index 4681c1c071..4681c1c071 100644
--- a/src/lib/crypto/block/cbc_aes_test.go
+++ b/src/pkg/crypto/block/cbc_aes_test.go
diff --git a/src/lib/crypto/block/cfb.go b/src/pkg/crypto/block/cfb.go
index 5c4c09a1b1..5c4c09a1b1 100644
--- a/src/lib/crypto/block/cfb.go
+++ b/src/pkg/crypto/block/cfb.go
diff --git a/src/lib/crypto/block/cfb_aes_test.go b/src/pkg/crypto/block/cfb_aes_test.go
index 6c793dba8e..6c793dba8e 100644
--- a/src/lib/crypto/block/cfb_aes_test.go
+++ b/src/pkg/crypto/block/cfb_aes_test.go
diff --git a/src/lib/crypto/block/cipher.go b/src/pkg/crypto/block/cipher.go
index 7ea035db9a..7ea035db9a 100644
--- a/src/lib/crypto/block/cipher.go
+++ b/src/pkg/crypto/block/cipher.go
diff --git a/src/lib/crypto/block/cmac.go b/src/pkg/crypto/block/cmac.go
index 40697cabdc..40697cabdc 100644
--- a/src/lib/crypto/block/cmac.go
+++ b/src/pkg/crypto/block/cmac.go
diff --git a/src/lib/crypto/block/cmac_aes_test.go b/src/pkg/crypto/block/cmac_aes_test.go
index 9284ac40a0..9284ac40a0 100644
--- a/src/lib/crypto/block/cmac_aes_test.go
+++ b/src/pkg/crypto/block/cmac_aes_test.go
diff --git a/src/lib/crypto/block/ctr.go b/src/pkg/crypto/block/ctr.go
index eecb615ad1..eecb615ad1 100644
--- a/src/lib/crypto/block/ctr.go
+++ b/src/pkg/crypto/block/ctr.go
diff --git a/src/lib/crypto/block/ctr_aes_test.go b/src/pkg/crypto/block/ctr_aes_test.go
index a3da1b5bfd..a3da1b5bfd 100644
--- a/src/lib/crypto/block/ctr_aes_test.go
+++ b/src/pkg/crypto/block/ctr_aes_test.go
diff --git a/src/lib/crypto/block/eax.go b/src/pkg/crypto/block/eax.go
index 7e1d7475cb..7e1d7475cb 100644
--- a/src/lib/crypto/block/eax.go
+++ b/src/pkg/crypto/block/eax.go
diff --git a/src/lib/crypto/block/eax_aes_test.go b/src/pkg/crypto/block/eax_aes_test.go
index f0453be806..f0453be806 100644
--- a/src/lib/crypto/block/eax_aes_test.go
+++ b/src/pkg/crypto/block/eax_aes_test.go
diff --git a/src/lib/crypto/block/ecb.go b/src/pkg/crypto/block/ecb.go
index 141d38cc8d..141d38cc8d 100644
--- a/src/lib/crypto/block/ecb.go
+++ b/src/pkg/crypto/block/ecb.go
diff --git a/src/lib/crypto/block/ecb_aes_test.go b/src/pkg/crypto/block/ecb_aes_test.go
index de8a624b9f..de8a624b9f 100644
--- a/src/lib/crypto/block/ecb_aes_test.go
+++ b/src/pkg/crypto/block/ecb_aes_test.go
diff --git a/src/lib/crypto/block/ecb_test.go b/src/pkg/crypto/block/ecb_test.go
index 968893a9bb..968893a9bb 100644
--- a/src/lib/crypto/block/ecb_test.go
+++ b/src/pkg/crypto/block/ecb_test.go
diff --git a/src/lib/crypto/block/ofb.go b/src/pkg/crypto/block/ofb.go
index 084274a084..084274a084 100644
--- a/src/lib/crypto/block/ofb.go
+++ b/src/pkg/crypto/block/ofb.go
diff --git a/src/lib/crypto/block/ofb_aes_test.go b/src/pkg/crypto/block/ofb_aes_test.go
index 3f5f9f482e..3f5f9f482e 100644
--- a/src/lib/crypto/block/ofb_aes_test.go
+++ b/src/pkg/crypto/block/ofb_aes_test.go
diff --git a/src/lib/crypto/block/xor.go b/src/pkg/crypto/block/xor.go
index 63229dbb40..63229dbb40 100644
--- a/src/lib/crypto/block/xor.go
+++ b/src/pkg/crypto/block/xor.go
diff --git a/src/lib/crypto/block/xor_test.go b/src/pkg/crypto/block/xor_test.go
index 6e6d1a3ce9..6e6d1a3ce9 100644
--- a/src/lib/crypto/block/xor_test.go
+++ b/src/pkg/crypto/block/xor_test.go
diff --git a/src/lib/crypto/hmac/Makefile b/src/pkg/crypto/hmac/Makefile
index 1da3f58dd5..1da3f58dd5 100644
--- a/src/lib/crypto/hmac/Makefile
+++ b/src/pkg/crypto/hmac/Makefile
diff --git a/src/lib/crypto/hmac/hmac.go b/src/pkg/crypto/hmac/hmac.go
index a3f47ccc9f..a3f47ccc9f 100644
--- a/src/lib/crypto/hmac/hmac.go
+++ b/src/pkg/crypto/hmac/hmac.go
diff --git a/src/lib/crypto/hmac/hmac_test.go b/src/pkg/crypto/hmac/hmac_test.go
index 01e532d9fd..01e532d9fd 100644
--- a/src/lib/crypto/hmac/hmac_test.go
+++ b/src/pkg/crypto/hmac/hmac_test.go
diff --git a/src/lib/crypto/md5/Makefile b/src/pkg/crypto/md5/Makefile
index b6c88d45a6..b6c88d45a6 100644
--- a/src/lib/crypto/md5/Makefile
+++ b/src/pkg/crypto/md5/Makefile
diff --git a/src/lib/crypto/md5/md5.go b/src/pkg/crypto/md5/md5.go
index cbc007f013..cbc007f013 100644
--- a/src/lib/crypto/md5/md5.go
+++ b/src/pkg/crypto/md5/md5.go
diff --git a/src/lib/crypto/md5/md5_test.go b/src/pkg/crypto/md5/md5_test.go
index f610f1143b..f610f1143b 100644
--- a/src/lib/crypto/md5/md5_test.go
+++ b/src/pkg/crypto/md5/md5_test.go
diff --git a/src/lib/crypto/md5/md5block.go b/src/pkg/crypto/md5/md5block.go
index 2776c8795c..2776c8795c 100644
--- a/src/lib/crypto/md5/md5block.go
+++ b/src/pkg/crypto/md5/md5block.go
diff --git a/src/lib/crypto/sha1/Makefile b/src/pkg/crypto/sha1/Makefile
index 03ffe4fd75..03ffe4fd75 100644
--- a/src/lib/crypto/sha1/Makefile
+++ b/src/pkg/crypto/sha1/Makefile
diff --git a/src/lib/crypto/sha1/sha1.go b/src/pkg/crypto/sha1/sha1.go
index a4cccd7a37..a4cccd7a37 100644
--- a/src/lib/crypto/sha1/sha1.go
+++ b/src/pkg/crypto/sha1/sha1.go
diff --git a/src/lib/crypto/sha1/sha1_test.go b/src/pkg/crypto/sha1/sha1_test.go
index 381cc76ee5..381cc76ee5 100644
--- a/src/lib/crypto/sha1/sha1_test.go
+++ b/src/pkg/crypto/sha1/sha1_test.go
diff --git a/src/lib/crypto/sha1/sha1block.go b/src/pkg/crypto/sha1/sha1block.go
index 01ddd9506a..01ddd9506a 100644
--- a/src/lib/crypto/sha1/sha1block.go
+++ b/src/pkg/crypto/sha1/sha1block.go
diff --git a/src/lib/datafmt/Makefile b/src/pkg/datafmt/Makefile
index 1546faf7ed..1546faf7ed 100644
--- a/src/lib/datafmt/Makefile
+++ b/src/pkg/datafmt/Makefile
diff --git a/src/lib/datafmt/datafmt.go b/src/pkg/datafmt/datafmt.go
index 0aedbbbb0a..0aedbbbb0a 100644
--- a/src/lib/datafmt/datafmt.go
+++ b/src/pkg/datafmt/datafmt.go
diff --git a/src/lib/datafmt/datafmt_test.go b/src/pkg/datafmt/datafmt_test.go
index 788c013c6e..788c013c6e 100644
--- a/src/lib/datafmt/datafmt_test.go
+++ b/src/pkg/datafmt/datafmt_test.go
diff --git a/src/lib/datafmt/parser.go b/src/pkg/datafmt/parser.go
index 0d597dcb5f..0d597dcb5f 100644
--- a/src/lib/datafmt/parser.go
+++ b/src/pkg/datafmt/parser.go
diff --git a/src/lib/exec/Makefile b/src/pkg/exec/Makefile
index 679cc39c07..679cc39c07 100644
--- a/src/lib/exec/Makefile
+++ b/src/pkg/exec/Makefile
diff --git a/src/lib/exec/exec.go b/src/pkg/exec/exec.go
index c2b7bdd59b..c2b7bdd59b 100644
--- a/src/lib/exec/exec.go
+++ b/src/pkg/exec/exec.go
diff --git a/src/lib/exec/exec_test.go b/src/pkg/exec/exec_test.go
index a1bb1f50e2..a1bb1f50e2 100644
--- a/src/lib/exec/exec_test.go
+++ b/src/pkg/exec/exec_test.go
diff --git a/src/lib/exvar/Makefile b/src/pkg/exvar/Makefile
index a65a1ee6bc..a65a1ee6bc 100644
--- a/src/lib/exvar/Makefile
+++ b/src/pkg/exvar/Makefile
diff --git a/src/lib/exvar/exvar.go b/src/pkg/exvar/exvar.go
index 6473f7af62..6473f7af62 100644
--- a/src/lib/exvar/exvar.go
+++ b/src/pkg/exvar/exvar.go
diff --git a/src/lib/exvar/exvar_test.go b/src/pkg/exvar/exvar_test.go
index 8b028bccb8..8b028bccb8 100644
--- a/src/lib/exvar/exvar_test.go
+++ b/src/pkg/exvar/exvar_test.go
diff --git a/src/lib/flag/Makefile b/src/pkg/flag/Makefile
index 466e19564c..466e19564c 100644
--- a/src/lib/flag/Makefile
+++ b/src/pkg/flag/Makefile
diff --git a/src/lib/flag/flag.go b/src/pkg/flag/flag.go
index 63d649a9bd..63d649a9bd 100644
--- a/src/lib/flag/flag.go
+++ b/src/pkg/flag/flag.go
diff --git a/src/lib/flag/flag_test.go b/src/pkg/flag/flag_test.go
index 0d83fcf81e..0d83fcf81e 100644
--- a/src/lib/flag/flag_test.go
+++ b/src/pkg/flag/flag_test.go
diff --git a/src/lib/fmt/Makefile b/src/pkg/fmt/Makefile
index 5d0281a0c3..5d0281a0c3 100644
--- a/src/lib/fmt/Makefile
+++ b/src/pkg/fmt/Makefile
diff --git a/src/lib/fmt/fmt_test.go b/src/pkg/fmt/fmt_test.go
index e8abc2f0d7..e8abc2f0d7 100644
--- a/src/lib/fmt/fmt_test.go
+++ b/src/pkg/fmt/fmt_test.go
diff --git a/src/lib/fmt/format.go b/src/pkg/fmt/format.go
index 3cd492980d..3cd492980d 100644
--- a/src/lib/fmt/format.go
+++ b/src/pkg/fmt/format.go
diff --git a/src/lib/fmt/print.go b/src/pkg/fmt/print.go
index 66174c74b9..66174c74b9 100644
--- a/src/lib/fmt/print.go
+++ b/src/pkg/fmt/print.go
diff --git a/src/lib/go/ast/Makefile b/src/pkg/go/ast/Makefile
index 1fd22ae71f..1fd22ae71f 100644
--- a/src/lib/go/ast/Makefile
+++ b/src/pkg/go/ast/Makefile
diff --git a/src/lib/go/ast/ast.go b/src/pkg/go/ast/ast.go
index 6cac8ea1ac..6cac8ea1ac 100644
--- a/src/lib/go/ast/ast.go
+++ b/src/pkg/go/ast/ast.go
diff --git a/src/lib/go/ast/format.go b/src/pkg/go/ast/format.go
index caeca19aa6..caeca19aa6 100644
--- a/src/lib/go/ast/format.go
+++ b/src/pkg/go/ast/format.go
diff --git a/src/lib/go/doc/Makefile b/src/pkg/go/doc/Makefile
index d7c6acaac3..d7c6acaac3 100644
--- a/src/lib/go/doc/Makefile
+++ b/src/pkg/go/doc/Makefile
diff --git a/src/lib/go/doc/comment.go b/src/pkg/go/doc/comment.go
index 19a65a2277..19a65a2277 100644
--- a/src/lib/go/doc/comment.go
+++ b/src/pkg/go/doc/comment.go
diff --git a/src/lib/go/doc/doc.go b/src/pkg/go/doc/doc.go
index 03872fd148..03872fd148 100644
--- a/src/lib/go/doc/doc.go
+++ b/src/pkg/go/doc/doc.go
diff --git a/src/lib/go/parser/Makefile b/src/pkg/go/parser/Makefile
index 08d83646f9..08d83646f9 100644
--- a/src/lib/go/parser/Makefile
+++ b/src/pkg/go/parser/Makefile
diff --git a/src/lib/go/parser/parser.go b/src/pkg/go/parser/parser.go
index 0568686956..0568686956 100644
--- a/src/lib/go/parser/parser.go
+++ b/src/pkg/go/parser/parser.go
diff --git a/src/lib/go/parser/parser_test.go b/src/pkg/go/parser/parser_test.go
index 887fcf80fa..887fcf80fa 100644
--- a/src/lib/go/parser/parser_test.go
+++ b/src/pkg/go/parser/parser_test.go
diff --git a/src/lib/go/scanner/Makefile b/src/pkg/go/scanner/Makefile
index d47fecb7c1..d47fecb7c1 100644
--- a/src/lib/go/scanner/Makefile
+++ b/src/pkg/go/scanner/Makefile
diff --git a/src/lib/go/scanner/scanner.go b/src/pkg/go/scanner/scanner.go
index a90e6f2592..a90e6f2592 100644
--- a/src/lib/go/scanner/scanner.go
+++ b/src/pkg/go/scanner/scanner.go
diff --git a/src/lib/go/scanner/scanner_test.go b/src/pkg/go/scanner/scanner_test.go
index 0defece8b0..0defece8b0 100644
--- a/src/lib/go/scanner/scanner_test.go
+++ b/src/pkg/go/scanner/scanner_test.go
diff --git a/src/lib/go/token/Makefile b/src/pkg/go/token/Makefile
index 12ef2a4aa1..12ef2a4aa1 100644
--- a/src/lib/go/token/Makefile
+++ b/src/pkg/go/token/Makefile
diff --git a/src/lib/go/token/token.go b/src/pkg/go/token/token.go
index a70a75a540..a70a75a540 100644
--- a/src/lib/go/token/token.go
+++ b/src/pkg/go/token/token.go
diff --git a/src/lib/hash/Makefile b/src/pkg/hash/Makefile
index bdbb6f347e..bdbb6f347e 100644
--- a/src/lib/hash/Makefile
+++ b/src/pkg/hash/Makefile
diff --git a/src/lib/hash/adler32/Makefile b/src/pkg/hash/adler32/Makefile
index 1341312591..1341312591 100644
--- a/src/lib/hash/adler32/Makefile
+++ b/src/pkg/hash/adler32/Makefile
diff --git a/src/lib/hash/adler32/adler32.go b/src/pkg/hash/adler32/adler32.go
index fbf9177f89..fbf9177f89 100644
--- a/src/lib/hash/adler32/adler32.go
+++ b/src/pkg/hash/adler32/adler32.go
diff --git a/src/lib/hash/adler32/adler32_test.go b/src/pkg/hash/adler32/adler32_test.go
index ce49a110bb..ce49a110bb 100644
--- a/src/lib/hash/adler32/adler32_test.go
+++ b/src/pkg/hash/adler32/adler32_test.go
diff --git a/src/lib/hash/crc32/Makefile b/src/pkg/hash/crc32/Makefile
index 08d4f5e4e0..08d4f5e4e0 100644
--- a/src/lib/hash/crc32/Makefile
+++ b/src/pkg/hash/crc32/Makefile
diff --git a/src/lib/hash/crc32/crc32.go b/src/pkg/hash/crc32/crc32.go
index 22a0f68f6c..22a0f68f6c 100644
--- a/src/lib/hash/crc32/crc32.go
+++ b/src/pkg/hash/crc32/crc32.go
diff --git a/src/lib/hash/crc32/crc32_test.go b/src/pkg/hash/crc32/crc32_test.go
index c037da600e..c037da600e 100644
--- a/src/lib/hash/crc32/crc32_test.go
+++ b/src/pkg/hash/crc32/crc32_test.go
diff --git a/src/lib/hash/hash.go b/src/pkg/hash/hash.go
index a7c08cfed2..a7c08cfed2 100644
--- a/src/lib/hash/hash.go
+++ b/src/pkg/hash/hash.go
diff --git a/src/lib/hash/test_cases.txt b/src/pkg/hash/test_cases.txt
index 26d3ccc052..26d3ccc052 100644
--- a/src/lib/hash/test_cases.txt
+++ b/src/pkg/hash/test_cases.txt
diff --git a/src/lib/hash/test_gen.awk b/src/pkg/hash/test_gen.awk
index 804f786795..804f786795 100644
--- a/src/lib/hash/test_gen.awk
+++ b/src/pkg/hash/test_gen.awk
diff --git a/src/lib/http/Makefile b/src/pkg/http/Makefile
index 0a029497c9..0a029497c9 100644
--- a/src/lib/http/Makefile
+++ b/src/pkg/http/Makefile
diff --git a/src/lib/http/fs.go b/src/pkg/http/fs.go
index 108734c47f..108734c47f 100644
--- a/src/lib/http/fs.go
+++ b/src/pkg/http/fs.go
diff --git a/src/lib/http/request.go b/src/pkg/http/request.go
index 76dd6f30c1..76dd6f30c1 100644
--- a/src/lib/http/request.go
+++ b/src/pkg/http/request.go
diff --git a/src/lib/http/server.go b/src/pkg/http/server.go
index c1de5de789..c1de5de789 100644
--- a/src/lib/http/server.go
+++ b/src/pkg/http/server.go
diff --git a/src/lib/http/status.go b/src/pkg/http/status.go
index 6d1c5ab28a..6d1c5ab28a 100644
--- a/src/lib/http/status.go
+++ b/src/pkg/http/status.go
diff --git a/src/lib/http/triv.go b/src/pkg/http/triv.go
index fc95017697..fc95017697 100644
--- a/src/lib/http/triv.go
+++ b/src/pkg/http/triv.go
diff --git a/src/lib/http/url.go b/src/pkg/http/url.go
index 0325b04eed..0325b04eed 100644
--- a/src/lib/http/url.go
+++ b/src/pkg/http/url.go
diff --git a/src/lib/http/url_test.go b/src/pkg/http/url_test.go
index 8d8fabad5f..8d8fabad5f 100644
--- a/src/lib/http/url_test.go
+++ b/src/pkg/http/url_test.go
diff --git a/src/lib/io/Makefile b/src/pkg/io/Makefile
index 219ea776be..219ea776be 100644
--- a/src/lib/io/Makefile
+++ b/src/pkg/io/Makefile
diff --git a/src/lib/io/bytebuffer.go b/src/pkg/io/bytebuffer.go
index 921ddb17ae..921ddb17ae 100644
--- a/src/lib/io/bytebuffer.go
+++ b/src/pkg/io/bytebuffer.go
diff --git a/src/lib/io/bytebuffer_test.go b/src/pkg/io/bytebuffer_test.go
index 5a54322237..5a54322237 100644
--- a/src/lib/io/bytebuffer_test.go
+++ b/src/pkg/io/bytebuffer_test.go
diff --git a/src/lib/io/io.go b/src/pkg/io/io.go
index ba0449ac17..ba0449ac17 100644
--- a/src/lib/io/io.go
+++ b/src/pkg/io/io.go
diff --git a/src/lib/io/pipe.go b/src/pkg/io/pipe.go
index 1a443ddcec..1a443ddcec 100644
--- a/src/lib/io/pipe.go
+++ b/src/pkg/io/pipe.go
diff --git a/src/lib/io/pipe_test.go b/src/pkg/io/pipe_test.go
index 277f445250..277f445250 100644
--- a/src/lib/io/pipe_test.go
+++ b/src/pkg/io/pipe_test.go
diff --git a/src/lib/io/utils.go b/src/pkg/io/utils.go
index a4cbb2d9aa..a4cbb2d9aa 100644
--- a/src/lib/io/utils.go
+++ b/src/pkg/io/utils.go
diff --git a/src/lib/io/utils_test.go b/src/pkg/io/utils_test.go
index f35dad60c9..f35dad60c9 100644
--- a/src/lib/io/utils_test.go
+++ b/src/pkg/io/utils_test.go
diff --git a/src/lib/json/Makefile b/src/pkg/json/Makefile
index 2d70c2cf8b..2d70c2cf8b 100644
--- a/src/lib/json/Makefile
+++ b/src/pkg/json/Makefile
diff --git a/src/lib/json/generic.go b/src/pkg/json/generic.go
index e3194eb17f..e3194eb17f 100644
--- a/src/lib/json/generic.go
+++ b/src/pkg/json/generic.go
diff --git a/src/lib/json/generic_test.go b/src/pkg/json/generic_test.go
index 68868d7a5a..68868d7a5a 100644
--- a/src/lib/json/generic_test.go
+++ b/src/pkg/json/generic_test.go
diff --git a/src/lib/json/parse.go b/src/pkg/json/parse.go
index e33b9dbc12..e33b9dbc12 100644
--- a/src/lib/json/parse.go
+++ b/src/pkg/json/parse.go
diff --git a/src/lib/json/struct.go b/src/pkg/json/struct.go
index ac26895572..ac26895572 100644
--- a/src/lib/json/struct.go
+++ b/src/pkg/json/struct.go
diff --git a/src/lib/json/struct_test.go b/src/pkg/json/struct_test.go
index 88d9e9ec4d..88d9e9ec4d 100644
--- a/src/lib/json/struct_test.go
+++ b/src/pkg/json/struct_test.go
diff --git a/src/lib/log/Makefile b/src/pkg/log/Makefile
index 4b1c4b5a2f..4b1c4b5a2f 100644
--- a/src/lib/log/Makefile
+++ b/src/pkg/log/Makefile
diff --git a/src/lib/log/log.go b/src/pkg/log/log.go
index 8fcd731900..8fcd731900 100644
--- a/src/lib/log/log.go
+++ b/src/pkg/log/log.go
diff --git a/src/lib/log/log_test.go b/src/pkg/log/log_test.go
index 0cfb2e36f8..0cfb2e36f8 100644
--- a/src/lib/log/log_test.go
+++ b/src/pkg/log/log_test.go
diff --git a/src/lib/malloc/Makefile b/src/pkg/malloc/Makefile
index 61894f71f4..61894f71f4 100644
--- a/src/lib/malloc/Makefile
+++ b/src/pkg/malloc/Makefile
diff --git a/src/lib/malloc/malloc.go b/src/pkg/malloc/malloc.go
index fec53f08fd..fec53f08fd 100644
--- a/src/lib/malloc/malloc.go
+++ b/src/pkg/malloc/malloc.go
diff --git a/src/lib/math/Makefile b/src/pkg/math/Makefile
index 058049072f..058049072f 100644
--- a/src/lib/math/Makefile
+++ b/src/pkg/math/Makefile
diff --git a/src/lib/math/all_test.go b/src/pkg/math/all_test.go
index c5d5c01c41..c5d5c01c41 100644
--- a/src/lib/math/all_test.go
+++ b/src/pkg/math/all_test.go
diff --git a/src/lib/math/asin.go b/src/pkg/math/asin.go
index 23c9a1069b..23c9a1069b 100644
--- a/src/lib/math/asin.go
+++ b/src/pkg/math/asin.go
diff --git a/src/lib/math/atan.go b/src/pkg/math/atan.go
index 4b18f76aaf..4b18f76aaf 100644
--- a/src/lib/math/atan.go
+++ b/src/pkg/math/atan.go
diff --git a/src/lib/math/atan2.go b/src/pkg/math/atan2.go
index 72f2117b37..72f2117b37 100644
--- a/src/lib/math/atan2.go
+++ b/src/pkg/math/atan2.go
diff --git a/src/lib/math/const.go b/src/pkg/math/const.go
index 259660fea6..259660fea6 100644
--- a/src/lib/math/const.go
+++ b/src/pkg/math/const.go
diff --git a/src/lib/math/exp.go b/src/pkg/math/exp.go
index a32c7e1d50..a32c7e1d50 100644
--- a/src/lib/math/exp.go
+++ b/src/pkg/math/exp.go
diff --git a/src/lib/math/fabs.go b/src/pkg/math/fabs.go
index 9427c57262..9427c57262 100644
--- a/src/lib/math/fabs.go
+++ b/src/pkg/math/fabs.go
diff --git a/src/lib/math/floor.go b/src/pkg/math/floor.go
index 48a1003f04..48a1003f04 100644
--- a/src/lib/math/floor.go
+++ b/src/pkg/math/floor.go
diff --git a/src/lib/math/fmod.go b/src/pkg/math/fmod.go
index 617f5408bb..617f5408bb 100644
--- a/src/lib/math/fmod.go
+++ b/src/pkg/math/fmod.go
diff --git a/src/lib/math/hypot.go b/src/pkg/math/hypot.go
index 411f74e4ff..411f74e4ff 100644
--- a/src/lib/math/hypot.go
+++ b/src/pkg/math/hypot.go
diff --git a/src/lib/math/log.go b/src/pkg/math/log.go
index b24175b639..b24175b639 100644
--- a/src/lib/math/log.go
+++ b/src/pkg/math/log.go
diff --git a/src/lib/math/pow.go b/src/pkg/math/pow.go
index 920d210b56..920d210b56 100644
--- a/src/lib/math/pow.go
+++ b/src/pkg/math/pow.go
diff --git a/src/lib/math/pow10.go b/src/pkg/math/pow10.go
index fcdd6e0a11..fcdd6e0a11 100644
--- a/src/lib/math/pow10.go
+++ b/src/pkg/math/pow10.go
diff --git a/src/lib/math/runtime.go b/src/pkg/math/runtime.go
index 69d333825b..69d333825b 100644
--- a/src/lib/math/runtime.go
+++ b/src/pkg/math/runtime.go
diff --git a/src/lib/math/sin.go b/src/pkg/math/sin.go
index 9fc69606cd..9fc69606cd 100644
--- a/src/lib/math/sin.go
+++ b/src/pkg/math/sin.go
diff --git a/src/lib/math/sinh.go b/src/pkg/math/sinh.go
index ef70989fb9..ef70989fb9 100644
--- a/src/lib/math/sinh.go
+++ b/src/pkg/math/sinh.go
diff --git a/src/lib/math/sqrt.go b/src/pkg/math/sqrt.go
index 79384f6481..79384f6481 100644
--- a/src/lib/math/sqrt.go
+++ b/src/pkg/math/sqrt.go
diff --git a/src/lib/math/tan.go b/src/pkg/math/tan.go
index 2d4a044b87..2d4a044b87 100644
--- a/src/lib/math/tan.go
+++ b/src/pkg/math/tan.go
diff --git a/src/lib/math/tanh.go b/src/pkg/math/tanh.go
index 18d38ae8fe..18d38ae8fe 100644
--- a/src/lib/math/tanh.go
+++ b/src/pkg/math/tanh.go
diff --git a/src/lib/net/Makefile b/src/pkg/net/Makefile
index 61c8720892..61c8720892 100644
--- a/src/lib/net/Makefile
+++ b/src/pkg/net/Makefile
diff --git a/src/lib/net/dialgoogle_test.go b/src/pkg/net/dialgoogle_test.go
index 1e0c0aaf06..1e0c0aaf06 100644
--- a/src/lib/net/dialgoogle_test.go
+++ b/src/pkg/net/dialgoogle_test.go
diff --git a/src/lib/net/dnsclient.go b/src/pkg/net/dnsclient.go
index cfd67eabee..cfd67eabee 100644
--- a/src/lib/net/dnsclient.go
+++ b/src/pkg/net/dnsclient.go
diff --git a/src/lib/net/dnsconfig.go b/src/pkg/net/dnsconfig.go
index e56d964f2d..e56d964f2d 100644
--- a/src/lib/net/dnsconfig.go
+++ b/src/pkg/net/dnsconfig.go
diff --git a/src/lib/net/dnsmsg.go b/src/pkg/net/dnsmsg.go
index d7a467fc6d..d7a467fc6d 100644
--- a/src/lib/net/dnsmsg.go
+++ b/src/pkg/net/dnsmsg.go
diff --git a/src/lib/net/fd.go b/src/pkg/net/fd.go
index 9404ed0bd4..9404ed0bd4 100644
--- a/src/lib/net/fd.go
+++ b/src/pkg/net/fd.go
diff --git a/src/lib/net/fd_darwin.go b/src/pkg/net/fd_darwin.go
index 42bf512210..42bf512210 100644
--- a/src/lib/net/fd_darwin.go
+++ b/src/pkg/net/fd_darwin.go
diff --git a/src/lib/net/fd_linux.go b/src/pkg/net/fd_linux.go
index bd822589ee..bd822589ee 100644
--- a/src/lib/net/fd_linux.go
+++ b/src/pkg/net/fd_linux.go
diff --git a/src/lib/net/ip.go b/src/pkg/net/ip.go
index 774f048ca8..774f048ca8 100644
--- a/src/lib/net/ip.go
+++ b/src/pkg/net/ip.go
diff --git a/src/lib/net/ip_test.go b/src/pkg/net/ip_test.go
index fb2ae8216d..fb2ae8216d 100644
--- a/src/lib/net/ip_test.go
+++ b/src/pkg/net/ip_test.go
diff --git a/src/lib/net/net.go b/src/pkg/net/net.go
index 5c442e6a45..5c442e6a45 100644
--- a/src/lib/net/net.go
+++ b/src/pkg/net/net.go
diff --git a/src/lib/net/parse.go b/src/pkg/net/parse.go
index de47cb812d..de47cb812d 100644
--- a/src/lib/net/parse.go
+++ b/src/pkg/net/parse.go
diff --git a/src/lib/net/parse_test.go b/src/pkg/net/parse_test.go
index ce0bb4709c..ce0bb4709c 100644
--- a/src/lib/net/parse_test.go
+++ b/src/pkg/net/parse_test.go
diff --git a/src/lib/net/port.go b/src/pkg/net/port.go
index 21e3b48aa0..21e3b48aa0 100644
--- a/src/lib/net/port.go
+++ b/src/pkg/net/port.go
diff --git a/src/lib/net/port_test.go b/src/pkg/net/port_test.go
index c535d4caa3..c535d4caa3 100644
--- a/src/lib/net/port_test.go
+++ b/src/pkg/net/port_test.go
diff --git a/src/lib/net/server_test.go b/src/pkg/net/server_test.go
index 586b553659..586b553659 100644
--- a/src/lib/net/server_test.go
+++ b/src/pkg/net/server_test.go
diff --git a/src/lib/net/timeout_test.go b/src/pkg/net/timeout_test.go
index e08ce88ce7..e08ce88ce7 100644
--- a/src/lib/net/timeout_test.go
+++ b/src/pkg/net/timeout_test.go
diff --git a/src/lib/once/Makefile b/src/pkg/once/Makefile
index 6350402c2e..6350402c2e 100644
--- a/src/lib/once/Makefile
+++ b/src/pkg/once/Makefile
diff --git a/src/lib/once/once.go b/src/pkg/once/once.go
index 6047df2364..6047df2364 100644
--- a/src/lib/once/once.go
+++ b/src/pkg/once/once.go
diff --git a/src/lib/once/once_test.go b/src/pkg/once/once_test.go
index 9506ff3d79..9506ff3d79 100644
--- a/src/lib/once/once_test.go
+++ b/src/pkg/once/once_test.go
diff --git a/src/lib/os/Makefile b/src/pkg/os/Makefile
index c5f790f15d..c5f790f15d 100644
--- a/src/lib/os/Makefile
+++ b/src/pkg/os/Makefile
diff --git a/src/lib/os/dir_darwin_386.go b/src/pkg/os/dir_darwin_386.go
index 2803ecee27..2803ecee27 100644
--- a/src/lib/os/dir_darwin_386.go
+++ b/src/pkg/os/dir_darwin_386.go
diff --git a/src/lib/os/dir_darwin_amd64.go b/src/pkg/os/dir_darwin_amd64.go
index 2803ecee27..2803ecee27 100644
--- a/src/lib/os/dir_darwin_amd64.go
+++ b/src/pkg/os/dir_darwin_amd64.go
diff --git a/src/lib/os/dir_linux_386.go b/src/pkg/os/dir_linux_386.go
index c4594a52df..c4594a52df 100644
--- a/src/lib/os/dir_linux_386.go
+++ b/src/pkg/os/dir_linux_386.go
diff --git a/src/lib/os/dir_linux_amd64.go b/src/pkg/os/dir_linux_amd64.go
index 05b3d4c65d..05b3d4c65d 100644
--- a/src/lib/os/dir_linux_amd64.go
+++ b/src/pkg/os/dir_linux_amd64.go
diff --git a/src/lib/os/env.go b/src/pkg/os/env.go
index 7487504130..7487504130 100644
--- a/src/lib/os/env.go
+++ b/src/pkg/os/env.go
diff --git a/src/lib/os/error.go b/src/pkg/os/error.go
index 718499b212..718499b212 100644
--- a/src/lib/os/error.go
+++ b/src/pkg/os/error.go
diff --git a/src/lib/os/exec.go b/src/pkg/os/exec.go
index d283c72670..d283c72670 100644
--- a/src/lib/os/exec.go
+++ b/src/pkg/os/exec.go
diff --git a/src/lib/os/file.go b/src/pkg/os/file.go
index 1562b1b0e4..1562b1b0e4 100644
--- a/src/lib/os/file.go
+++ b/src/pkg/os/file.go
diff --git a/src/lib/os/getwd.go b/src/pkg/os/getwd.go
index 2d7b754b51..2d7b754b51 100644
--- a/src/lib/os/getwd.go
+++ b/src/pkg/os/getwd.go
diff --git a/src/lib/os/os_test.go b/src/pkg/os/os_test.go
index 9f3e833f39..9f3e833f39 100644
--- a/src/lib/os/os_test.go
+++ b/src/pkg/os/os_test.go
diff --git a/src/lib/os/path.go b/src/pkg/os/path.go
index 0b86b8f8bd..0b86b8f8bd 100644
--- a/src/lib/os/path.go
+++ b/src/pkg/os/path.go
diff --git a/src/lib/os/path_test.go b/src/pkg/os/path_test.go
index bb6148920e..bb6148920e 100644
--- a/src/lib/os/path_test.go
+++ b/src/pkg/os/path_test.go
diff --git a/src/lib/os/proc.go b/src/pkg/os/proc.go
index d2fd6493eb..d2fd6493eb 100644
--- a/src/lib/os/proc.go
+++ b/src/pkg/os/proc.go
diff --git a/src/lib/os/proc_linux.go b/src/pkg/os/proc_linux.go
index a802284f37..a802284f37 100644
--- a/src/lib/os/proc_linux.go
+++ b/src/pkg/os/proc_linux.go
diff --git a/src/lib/os/stat_darwin_386.go b/src/pkg/os/stat_darwin_386.go
index a6d7b78d15..a6d7b78d15 100644
--- a/src/lib/os/stat_darwin_386.go
+++ b/src/pkg/os/stat_darwin_386.go
diff --git a/src/lib/os/stat_darwin_amd64.go b/src/pkg/os/stat_darwin_amd64.go
index 1771ca160b..1771ca160b 100644
--- a/src/lib/os/stat_darwin_amd64.go
+++ b/src/pkg/os/stat_darwin_amd64.go
diff --git a/src/lib/os/stat_linux_386.go b/src/pkg/os/stat_linux_386.go
index 13ee942c97..13ee942c97 100644
--- a/src/lib/os/stat_linux_386.go
+++ b/src/pkg/os/stat_linux_386.go
diff --git a/src/lib/os/stat_linux_amd64.go b/src/pkg/os/stat_linux_amd64.go
index 9b30181784..9b30181784 100644
--- a/src/lib/os/stat_linux_amd64.go
+++ b/src/pkg/os/stat_linux_amd64.go
diff --git a/src/lib/os/time.go b/src/pkg/os/time.go
index 3eee243cc5..3eee243cc5 100644
--- a/src/lib/os/time.go
+++ b/src/pkg/os/time.go
diff --git a/src/lib/os/types.go b/src/pkg/os/types.go
index b5db866606..b5db866606 100644
--- a/src/lib/os/types.go
+++ b/src/pkg/os/types.go
diff --git a/src/lib/path/Makefile b/src/pkg/path/Makefile
index d9f9fd562b..d9f9fd562b 100644
--- a/src/lib/path/Makefile
+++ b/src/pkg/path/Makefile
diff --git a/src/lib/path/path.go b/src/pkg/path/path.go
index a7e2c26c3e..a7e2c26c3e 100644
--- a/src/lib/path/path.go
+++ b/src/pkg/path/path.go
diff --git a/src/lib/path/path_test.go b/src/pkg/path/path_test.go
index 1238ac1cd2..1238ac1cd2 100644
--- a/src/lib/path/path_test.go
+++ b/src/pkg/path/path_test.go
diff --git a/src/lib/rand/Makefile b/src/pkg/rand/Makefile
index 63d26ac99c..63d26ac99c 100644
--- a/src/lib/rand/Makefile
+++ b/src/pkg/rand/Makefile
diff --git a/src/lib/rand/rand.go b/src/pkg/rand/rand.go
index bc986cbcfb..bc986cbcfb 100644
--- a/src/lib/rand/rand.go
+++ b/src/pkg/rand/rand.go
diff --git a/src/lib/reflect/Makefile b/src/pkg/reflect/Makefile
index d622ffd51e..d622ffd51e 100644
--- a/src/lib/reflect/Makefile
+++ b/src/pkg/reflect/Makefile
diff --git a/src/lib/reflect/all_test.go b/src/pkg/reflect/all_test.go
index 903b0f5260..903b0f5260 100644
--- a/src/lib/reflect/all_test.go
+++ b/src/pkg/reflect/all_test.go
diff --git a/src/lib/reflect/deepequal.go b/src/pkg/reflect/deepequal.go
index 57b52485f7..57b52485f7 100644
--- a/src/lib/reflect/deepequal.go
+++ b/src/pkg/reflect/deepequal.go
diff --git a/src/lib/reflect/tostring.go b/src/pkg/reflect/tostring.go
index 43be4b9e8f..43be4b9e8f 100644
--- a/src/lib/reflect/tostring.go
+++ b/src/pkg/reflect/tostring.go
diff --git a/src/lib/reflect/type.go b/src/pkg/reflect/type.go
index c8542183aa..c8542183aa 100644
--- a/src/lib/reflect/type.go
+++ b/src/pkg/reflect/type.go
diff --git a/src/lib/reflect/typestring.c b/src/pkg/reflect/typestring.c
index 667037bb14..667037bb14 100644
--- a/src/lib/reflect/typestring.c
+++ b/src/pkg/reflect/typestring.c
diff --git a/src/lib/reflect/value.go b/src/pkg/reflect/value.go
index d4783d5467..d4783d5467 100644
--- a/src/lib/reflect/value.go
+++ b/src/pkg/reflect/value.go
diff --git a/src/lib/regexp/Makefile b/src/pkg/regexp/Makefile
index 0312d510ef..0312d510ef 100644
--- a/src/lib/regexp/Makefile
+++ b/src/pkg/regexp/Makefile
diff --git a/src/lib/regexp/all_test.go b/src/pkg/regexp/all_test.go
index a9f275893a..a9f275893a 100644
--- a/src/lib/regexp/all_test.go
+++ b/src/pkg/regexp/all_test.go
diff --git a/src/lib/regexp/regexp.go b/src/pkg/regexp/regexp.go
index b79800dd95..b79800dd95 100644
--- a/src/lib/regexp/regexp.go
+++ b/src/pkg/regexp/regexp.go
diff --git a/src/lib/runtime/386/asm.s b/src/pkg/runtime/386/asm.s
index 5d3c4261ab..5d3c4261ab 100644
--- a/src/lib/runtime/386/asm.s
+++ b/src/pkg/runtime/386/asm.s
diff --git a/src/lib/runtime/386/closure.c b/src/pkg/runtime/386/closure.c
index 6ccbe3b8b6..6ccbe3b8b6 100644
--- a/src/lib/runtime/386/closure.c
+++ b/src/pkg/runtime/386/closure.c
diff --git a/src/lib/runtime/386/traceback.c b/src/pkg/runtime/386/traceback.c
index 05724d9ac9..05724d9ac9 100644
--- a/src/lib/runtime/386/traceback.c
+++ b/src/pkg/runtime/386/traceback.c
diff --git a/src/lib/runtime/386/vlop.s b/src/pkg/runtime/386/vlop.s
index 803276ce2e..803276ce2e 100755
--- a/src/lib/runtime/386/vlop.s
+++ b/src/pkg/runtime/386/vlop.s
diff --git a/src/lib/runtime/386/vlrt.c b/src/pkg/runtime/386/vlrt.c
index 093cca70dd..093cca70dd 100755
--- a/src/lib/runtime/386/vlrt.c
+++ b/src/pkg/runtime/386/vlrt.c
diff --git a/src/lib/runtime/Makefile b/src/pkg/runtime/Makefile
index 5a5ace9c57..5a5ace9c57 100644
--- a/src/lib/runtime/Makefile
+++ b/src/pkg/runtime/Makefile
diff --git a/src/lib/runtime/amd64/asm.s b/src/pkg/runtime/amd64/asm.s
index 6fc01bbc98..6fc01bbc98 100644
--- a/src/lib/runtime/amd64/asm.s
+++ b/src/pkg/runtime/amd64/asm.s
diff --git a/src/lib/runtime/amd64/closure.c b/src/pkg/runtime/amd64/closure.c
index 5717d3c5e8..5717d3c5e8 100644
--- a/src/lib/runtime/amd64/closure.c
+++ b/src/pkg/runtime/amd64/closure.c
diff --git a/src/lib/runtime/amd64/traceback.c b/src/pkg/runtime/amd64/traceback.c
index 16d7bed72e..16d7bed72e 100644
--- a/src/lib/runtime/amd64/traceback.c
+++ b/src/pkg/runtime/amd64/traceback.c
diff --git a/src/lib/runtime/arm/asm.s b/src/pkg/runtime/arm/asm.s
index 232ab4ddf0..232ab4ddf0 100644
--- a/src/lib/runtime/arm/asm.s
+++ b/src/pkg/runtime/arm/asm.s
diff --git a/src/lib/runtime/arm/closure.c b/src/pkg/runtime/arm/closure.c
index 024018d5a4..bfa9df67f0 100644
--- a/src/lib/runtime/arm/closure.c
+++ b/src/pkg/runtime/arm/closure.c
@@ -1,4 +1,3 @@
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-
diff --git a/src/lib/runtime/arm/traceback.s b/src/pkg/runtime/arm/traceback.s
index e69de29bb2..e69de29bb2 100644
--- a/src/lib/runtime/arm/traceback.s
+++ b/src/pkg/runtime/arm/traceback.s
diff --git a/src/lib/runtime/array.c b/src/pkg/runtime/array.c
index bbd57b03e1..bbd57b03e1 100644
--- a/src/lib/runtime/array.c
+++ b/src/pkg/runtime/array.c
diff --git a/src/lib/runtime/cgo2c.c b/src/pkg/runtime/cgo2c.c
index 3905f7e6dc..3905f7e6dc 100644
--- a/src/lib/runtime/cgo2c.c
+++ b/src/pkg/runtime/cgo2c.c
diff --git a/src/lib/runtime/chan.c b/src/pkg/runtime/chan.c
index be65bcbc16..be65bcbc16 100644
--- a/src/lib/runtime/chan.c
+++ b/src/pkg/runtime/chan.c
diff --git a/src/lib/runtime/darwin/386/defs.h b/src/pkg/runtime/darwin/386/defs.h
index b66a5d8b4e..b66a5d8b4e 100644
--- a/src/lib/runtime/darwin/386/defs.h
+++ b/src/pkg/runtime/darwin/386/defs.h
diff --git a/src/lib/runtime/darwin/386/rt0.s b/src/pkg/runtime/darwin/386/rt0.s
index 5b52e912ce..5b52e912ce 100755
--- a/src/lib/runtime/darwin/386/rt0.s
+++ b/src/pkg/runtime/darwin/386/rt0.s
diff --git a/src/lib/runtime/darwin/386/signal.c b/src/pkg/runtime/darwin/386/signal.c
index 3a63c4b382..3a63c4b382 100644
--- a/src/lib/runtime/darwin/386/signal.c
+++ b/src/pkg/runtime/darwin/386/signal.c
diff --git a/src/lib/runtime/darwin/386/sys.s b/src/pkg/runtime/darwin/386/sys.s
index bbcb622d5f..bbcb622d5f 100644
--- a/src/lib/runtime/darwin/386/sys.s
+++ b/src/pkg/runtime/darwin/386/sys.s
diff --git a/src/lib/runtime/darwin/amd64/defs.h b/src/pkg/runtime/darwin/amd64/defs.h
index 1076e4c10a..1076e4c10a 100644
--- a/src/lib/runtime/darwin/amd64/defs.h
+++ b/src/pkg/runtime/darwin/amd64/defs.h
diff --git a/src/lib/runtime/darwin/amd64/rt0.s b/src/pkg/runtime/darwin/amd64/rt0.s
index 0a0011781d..0a0011781d 100644
--- a/src/lib/runtime/darwin/amd64/rt0.s
+++ b/src/pkg/runtime/darwin/amd64/rt0.s
diff --git a/src/lib/runtime/darwin/amd64/signal.c b/src/pkg/runtime/darwin/amd64/signal.c
index 45e5e8d478..45e5e8d478 100644
--- a/src/lib/runtime/darwin/amd64/signal.c
+++ b/src/pkg/runtime/darwin/amd64/signal.c
diff --git a/src/lib/runtime/darwin/amd64/sys.s b/src/pkg/runtime/darwin/amd64/sys.s
index b46c823ae4..b46c823ae4 100644
--- a/src/lib/runtime/darwin/amd64/sys.s
+++ b/src/pkg/runtime/darwin/amd64/sys.s
diff --git a/src/lib/runtime/darwin/defs.c b/src/pkg/runtime/darwin/defs.c
index 1ed662957f..1ed662957f 100644
--- a/src/lib/runtime/darwin/defs.c
+++ b/src/pkg/runtime/darwin/defs.c
diff --git a/src/lib/runtime/darwin/os.h b/src/pkg/runtime/darwin/os.h
index 2a3ca87bd0..2a3ca87bd0 100644
--- a/src/lib/runtime/darwin/os.h
+++ b/src/pkg/runtime/darwin/os.h
diff --git a/src/lib/runtime/darwin/signals.h b/src/pkg/runtime/darwin/signals.h
index 4051dc4dc4..8cca361f75 100644
--- a/src/lib/runtime/darwin/signals.h
+++ b/src/pkg/runtime/darwin/signals.h
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-
 #define C SigCatch
 #define I SigIgnore
 #define R SigRestart
diff --git a/src/lib/runtime/darwin/thread.c b/src/pkg/runtime/darwin/thread.c
index 3a982471ae..3a982471ae 100644
--- a/src/lib/runtime/darwin/thread.c
+++ b/src/pkg/runtime/darwin/thread.c
diff --git a/src/lib/runtime/extern.go b/src/pkg/runtime/extern.go
index 6fb5756d67..6fb5756d67 100644
--- a/src/lib/runtime/extern.go
+++ b/src/pkg/runtime/extern.go
diff --git a/src/lib/runtime/float.c b/src/pkg/runtime/float.c
index 5122f359a7..5122f359a7 100644
--- a/src/lib/runtime/float.c
+++ b/src/pkg/runtime/float.c
diff --git a/src/lib/runtime/float_go.cgo b/src/pkg/runtime/float_go.cgo
index 518d559507..518d559507 100644
--- a/src/lib/runtime/float_go.cgo
+++ b/src/pkg/runtime/float_go.cgo
diff --git a/src/lib/runtime/hashmap.c b/src/pkg/runtime/hashmap.c
index b3022ca149..b3022ca149 100644
--- a/src/lib/runtime/hashmap.c
+++ b/src/pkg/runtime/hashmap.c
diff --git a/src/lib/runtime/hashmap.h b/src/pkg/runtime/hashmap.h
index ff93e9ee30..e8bcfab293 100644
--- a/src/lib/runtime/hashmap.h
+++ b/src/pkg/runtime/hashmap.h
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-
 /* A hash table.
    Example, hashing nul-terminated char*s:
 	hash_hash_t str_hash (void *v) {
diff --git a/src/lib/runtime/iface.c b/src/pkg/runtime/iface.c
index 6c933b1b2a..6c933b1b2a 100644
--- a/src/lib/runtime/iface.c
+++ b/src/pkg/runtime/iface.c
diff --git a/src/lib/runtime/linux/386/defs.h b/src/pkg/runtime/linux/386/defs.h
index 112fc7b094..112fc7b094 100755
--- a/src/lib/runtime/linux/386/defs.h
+++ b/src/pkg/runtime/linux/386/defs.h
diff --git a/src/lib/runtime/linux/386/rt0.s b/src/pkg/runtime/linux/386/rt0.s
index 7717c37e86..7717c37e86 100755
--- a/src/lib/runtime/linux/386/rt0.s
+++ b/src/pkg/runtime/linux/386/rt0.s
diff --git a/src/lib/runtime/linux/386/signal.c b/src/pkg/runtime/linux/386/signal.c
index 7dfca6bb40..7dfca6bb40 100644
--- a/src/lib/runtime/linux/386/signal.c
+++ b/src/pkg/runtime/linux/386/signal.c
diff --git a/src/lib/runtime/linux/386/sys.s b/src/pkg/runtime/linux/386/sys.s
index 419973a5ca..419973a5ca 100755
--- a/src/lib/runtime/linux/386/sys.s
+++ b/src/pkg/runtime/linux/386/sys.s
diff --git a/src/lib/runtime/linux/amd64/defs.h b/src/pkg/runtime/linux/amd64/defs.h
index 43b0475239..43b0475239 100644
--- a/src/lib/runtime/linux/amd64/defs.h
+++ b/src/pkg/runtime/linux/amd64/defs.h
diff --git a/src/lib/runtime/linux/amd64/rt0.s b/src/pkg/runtime/linux/amd64/rt0.s
index 55be5bceef..55be5bceef 100644
--- a/src/lib/runtime/linux/amd64/rt0.s
+++ b/src/pkg/runtime/linux/amd64/rt0.s
diff --git a/src/lib/runtime/linux/amd64/signal.c b/src/pkg/runtime/linux/amd64/signal.c
index 55215176de..55215176de 100644
--- a/src/lib/runtime/linux/amd64/signal.c
+++ b/src/pkg/runtime/linux/amd64/signal.c
diff --git a/src/lib/runtime/linux/amd64/sys.s b/src/pkg/runtime/linux/amd64/sys.s
index f90c704faf..f90c704faf 100644
--- a/src/lib/runtime/linux/amd64/sys.s
+++ b/src/pkg/runtime/linux/amd64/sys.s
diff --git a/src/lib/runtime/linux/arm/defs.h b/src/pkg/runtime/linux/arm/defs.h
index caad669895..caad669895 100644
--- a/src/lib/runtime/linux/arm/defs.h
+++ b/src/pkg/runtime/linux/arm/defs.h
diff --git a/src/lib/runtime/linux/arm/rt0.s b/src/pkg/runtime/linux/arm/rt0.s
index 024547dddb..024547dddb 100644
--- a/src/lib/runtime/linux/arm/rt0.s
+++ b/src/pkg/runtime/linux/arm/rt0.s
diff --git a/src/lib/runtime/linux/arm/signal.c b/src/pkg/runtime/linux/arm/signal.c
index 024018d5a4..024018d5a4 100644
--- a/src/lib/runtime/linux/arm/signal.c
+++ b/src/pkg/runtime/linux/arm/signal.c
diff --git a/src/lib/runtime/linux/arm/sys.s b/src/pkg/runtime/linux/arm/sys.s
index f5db32305b..f5db32305b 100644
--- a/src/lib/runtime/linux/arm/sys.s
+++ b/src/pkg/runtime/linux/arm/sys.s
diff --git a/src/lib/runtime/linux/defs.c b/src/pkg/runtime/linux/defs.c
index 35fa029532..35fa029532 100644
--- a/src/lib/runtime/linux/defs.c
+++ b/src/pkg/runtime/linux/defs.c
diff --git a/src/lib/runtime/linux/defs1.c b/src/pkg/runtime/linux/defs1.c
index 0fe3506ad6..0fe3506ad6 100644
--- a/src/lib/runtime/linux/defs1.c
+++ b/src/pkg/runtime/linux/defs1.c
diff --git a/src/lib/runtime/linux/defs2.c b/src/pkg/runtime/linux/defs2.c
index aa0331a375..aa0331a375 100644
--- a/src/lib/runtime/linux/defs2.c
+++ b/src/pkg/runtime/linux/defs2.c
diff --git a/src/lib/runtime/linux/defs_arm.c b/src/pkg/runtime/linux/defs_arm.c
index eaec051549..eaec051549 100644
--- a/src/lib/runtime/linux/defs_arm.c
+++ b/src/pkg/runtime/linux/defs_arm.c
diff --git a/src/lib/runtime/linux/os.h b/src/pkg/runtime/linux/os.h
index c616193676..c616193676 100644
--- a/src/lib/runtime/linux/os.h
+++ b/src/pkg/runtime/linux/os.h
diff --git a/src/lib/runtime/linux/signals.h b/src/pkg/runtime/linux/signals.h
index 1fb49c5135..8f1112b991 100644
--- a/src/lib/runtime/linux/signals.h
+++ b/src/pkg/runtime/linux/signals.h
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-
 #define C SigCatch
 #define I SigIgnore
 #define R SigRestart
diff --git a/src/lib/runtime/linux/thread.c b/src/pkg/runtime/linux/thread.c
index cc9ba161bf..cc9ba161bf 100644
--- a/src/lib/runtime/linux/thread.c
+++ b/src/pkg/runtime/linux/thread.c
diff --git a/src/lib/runtime/malloc.c b/src/pkg/runtime/malloc.c
index 81cdfb3001..81cdfb3001 100644
--- a/src/lib/runtime/malloc.c
+++ b/src/pkg/runtime/malloc.c
diff --git a/src/lib/runtime/malloc.h b/src/pkg/runtime/malloc.h
index 9b3d6b811c..5b657a4953 100644
--- a/src/lib/runtime/malloc.h
+++ b/src/pkg/runtime/malloc.h
@@ -155,7 +155,7 @@ void	FixAlloc_Free(FixAlloc *f, void *p);
 
 
 // Statistics.
-// Shared with Go: if you edit this structure, also edit ../lib/malloc.go.
+// Shared with Go: if you edit this structure, also edit ../malloc/malloc.go.
 struct MStats
 {
 	uint64	alloc;
diff --git a/src/lib/runtime/malloc_go.cgo b/src/pkg/runtime/malloc_go.cgo
index 6dcdaece20..6dcdaece20 100644
--- a/src/lib/runtime/malloc_go.cgo
+++ b/src/pkg/runtime/malloc_go.cgo
diff --git a/src/lib/runtime/mcache.c b/src/pkg/runtime/mcache.c
index ae25940230..ae25940230 100644
--- a/src/lib/runtime/mcache.c
+++ b/src/pkg/runtime/mcache.c
diff --git a/src/lib/runtime/mcentral.c b/src/pkg/runtime/mcentral.c
index 5c9f720c09..5c9f720c09 100644
--- a/src/lib/runtime/mcentral.c
+++ b/src/pkg/runtime/mcentral.c
diff --git a/src/lib/runtime/mem.c b/src/pkg/runtime/mem.c
index 7ed299eb0e..7ed299eb0e 100644
--- a/src/lib/runtime/mem.c
+++ b/src/pkg/runtime/mem.c
diff --git a/src/lib/runtime/mfixalloc.c b/src/pkg/runtime/mfixalloc.c
index dd4f3f2518..dd4f3f2518 100644
--- a/src/lib/runtime/mfixalloc.c
+++ b/src/pkg/runtime/mfixalloc.c
diff --git a/src/lib/runtime/mgc0.c b/src/pkg/runtime/mgc0.c
index d58d6ce44d..d58d6ce44d 100644
--- a/src/lib/runtime/mgc0.c
+++ b/src/pkg/runtime/mgc0.c
diff --git a/src/lib/runtime/mheap.c b/src/pkg/runtime/mheap.c
index d0cf2237bd..d0cf2237bd 100644
--- a/src/lib/runtime/mheap.c
+++ b/src/pkg/runtime/mheap.c
diff --git a/src/lib/runtime/mheapmap32.c b/src/pkg/runtime/mheapmap32.c
index 420ca2d833..420ca2d833 100644
--- a/src/lib/runtime/mheapmap32.c
+++ b/src/pkg/runtime/mheapmap32.c
diff --git a/src/lib/runtime/mheapmap32.h b/src/pkg/runtime/mheapmap32.h
index 0a16ccd100..0a16ccd100 100644
--- a/src/lib/runtime/mheapmap32.h
+++ b/src/pkg/runtime/mheapmap32.h
diff --git a/src/lib/runtime/mheapmap64.c b/src/pkg/runtime/mheapmap64.c
index 1886ba5297..1886ba5297 100644
--- a/src/lib/runtime/mheapmap64.c
+++ b/src/pkg/runtime/mheapmap64.c
diff --git a/src/lib/runtime/mheapmap64.h b/src/pkg/runtime/mheapmap64.h
index 127b773f74..127b773f74 100644
--- a/src/lib/runtime/mheapmap64.h
+++ b/src/pkg/runtime/mheapmap64.h
diff --git a/src/lib/runtime/msize.c b/src/pkg/runtime/msize.c
index 25e22637d2..25e22637d2 100644
--- a/src/lib/runtime/msize.c
+++ b/src/pkg/runtime/msize.c
diff --git a/src/lib/runtime/print.c b/src/pkg/runtime/print.c
index 5295e338d1..5295e338d1 100644
--- a/src/lib/runtime/print.c
+++ b/src/pkg/runtime/print.c
diff --git a/src/lib/runtime/proc.c b/src/pkg/runtime/proc.c
index 1d065e6d2a..1d065e6d2a 100644
--- a/src/lib/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
diff --git a/src/lib/runtime/rune.c b/src/pkg/runtime/rune.c
index ca4f9ac6aa..652ccdfa66 100644
--- a/src/lib/runtime/rune.c
+++ b/src/pkg/runtime/rune.c
@@ -14,20 +14,6 @@
  */
 
 /*
- * The authors of this software are Rob Pike and Ken Thompson.
- *              Copyright (c) 2002 by Lucent Technologies.
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- */
-
-/*
  * This code is copied, with slight editing due to type differences,
  * from a subset of ../lib9/utf/rune.c
  */
@@ -71,7 +57,7 @@ enum
  * Modified by Wei-Hwa Huang, Google Inc., on 2004-09-24
  * This is a slower but "safe" version of the old chartorune
  * that works on strings that are not necessarily null-terminated.
- * 
+ *
  * If you know for sure that your string is null-terminated,
  * chartorune will be a bit faster.
  *
diff --git a/src/lib/runtime/runtime.c b/src/pkg/runtime/runtime.c
index c5ba3e6a5e..c5ba3e6a5e 100644
--- a/src/lib/runtime/runtime.c
+++ b/src/pkg/runtime/runtime.c
diff --git a/src/lib/runtime/runtime.h b/src/pkg/runtime/runtime.h
index 749364f954..749364f954 100644
--- a/src/lib/runtime/runtime.h
+++ b/src/pkg/runtime/runtime.h
diff --git a/src/lib/runtime/sema.c b/src/pkg/runtime/sema.c
index 5e5b07aa6f..5e5b07aa6f 100644
--- a/src/lib/runtime/sema.c
+++ b/src/pkg/runtime/sema.c
diff --git a/src/lib/runtime/sema_go.cgo b/src/pkg/runtime/sema_go.cgo
index eb4082a0d1..eb4082a0d1 100644
--- a/src/lib/runtime/sema_go.cgo
+++ b/src/pkg/runtime/sema_go.cgo
diff --git a/src/lib/runtime/string.c b/src/pkg/runtime/string.c
index 5bfe8196f7..5bfe8196f7 100644
--- a/src/lib/runtime/string.c
+++ b/src/pkg/runtime/string.c
diff --git a/src/lib/runtime/symtab.c b/src/pkg/runtime/symtab.c
index b4802715e1..b4802715e1 100644
--- a/src/lib/runtime/symtab.c
+++ b/src/pkg/runtime/symtab.c
diff --git a/src/lib/sort/Makefile b/src/pkg/sort/Makefile
index 4d193f8597..4d193f8597 100644
--- a/src/lib/sort/Makefile
+++ b/src/pkg/sort/Makefile
diff --git a/src/lib/sort/sort.go b/src/pkg/sort/sort.go
index 99ba0a0ef1..99ba0a0ef1 100644
--- a/src/lib/sort/sort.go
+++ b/src/pkg/sort/sort.go
diff --git a/src/lib/sort/sort_test.go b/src/pkg/sort/sort_test.go
index 1747daca6c..1747daca6c 100644
--- a/src/lib/sort/sort_test.go
+++ b/src/pkg/sort/sort_test.go
diff --git a/src/lib/strconv/Makefile b/src/pkg/strconv/Makefile
index 499f8c1c14..499f8c1c14 100644
--- a/src/lib/strconv/Makefile
+++ b/src/pkg/strconv/Makefile
diff --git a/src/lib/strconv/atof.go b/src/pkg/strconv/atof.go
index c257b2a33e..c257b2a33e 100644
--- a/src/lib/strconv/atof.go
+++ b/src/pkg/strconv/atof.go
diff --git a/src/lib/strconv/atof_test.go b/src/pkg/strconv/atof_test.go
index 6782f274a2..6782f274a2 100644
--- a/src/lib/strconv/atof_test.go
+++ b/src/pkg/strconv/atof_test.go
diff --git a/src/lib/strconv/atoi.go b/src/pkg/strconv/atoi.go
index a5d896a05e..a5d896a05e 100644
--- a/src/lib/strconv/atoi.go
+++ b/src/pkg/strconv/atoi.go
diff --git a/src/lib/strconv/atoi_test.go b/src/pkg/strconv/atoi_test.go
index e4a9f955d9..e4a9f955d9 100644
--- a/src/lib/strconv/atoi_test.go
+++ b/src/pkg/strconv/atoi_test.go
diff --git a/src/lib/strconv/decimal.go b/src/pkg/strconv/decimal.go
index 38d9c47fb1..38d9c47fb1 100644
--- a/src/lib/strconv/decimal.go
+++ b/src/pkg/strconv/decimal.go
diff --git a/src/lib/strconv/decimal_test.go b/src/pkg/strconv/decimal_test.go
index bc82861bdd..bc82861bdd 100644
--- a/src/lib/strconv/decimal_test.go
+++ b/src/pkg/strconv/decimal_test.go
diff --git a/src/lib/strconv/fp_test.go b/src/pkg/strconv/fp_test.go
index 60d7ce6cfb..60d7ce6cfb 100644
--- a/src/lib/strconv/fp_test.go
+++ b/src/pkg/strconv/fp_test.go
diff --git a/src/lib/strconv/ftoa.go b/src/pkg/strconv/ftoa.go
index b171151758..b171151758 100644
--- a/src/lib/strconv/ftoa.go
+++ b/src/pkg/strconv/ftoa.go
diff --git a/src/lib/strconv/ftoa_test.go b/src/pkg/strconv/ftoa_test.go
index 0f0baa5145..0f0baa5145 100644
--- a/src/lib/strconv/ftoa_test.go
+++ b/src/pkg/strconv/ftoa_test.go
diff --git a/src/lib/strconv/itoa.go b/src/pkg/strconv/itoa.go
index 7f693ea8cf..7f693ea8cf 100644
--- a/src/lib/strconv/itoa.go
+++ b/src/pkg/strconv/itoa.go
diff --git a/src/lib/strconv/itoa_test.go b/src/pkg/strconv/itoa_test.go
index 34caf9a325..34caf9a325 100644
--- a/src/lib/strconv/itoa_test.go
+++ b/src/pkg/strconv/itoa_test.go
diff --git a/src/lib/strconv/quote.go b/src/pkg/strconv/quote.go
index 8d7900d1d7..8d7900d1d7 100644
--- a/src/lib/strconv/quote.go
+++ b/src/pkg/strconv/quote.go
diff --git a/src/lib/strconv/quote_test.go b/src/pkg/strconv/quote_test.go
index 0fc01ebae3..0fc01ebae3 100644
--- a/src/lib/strconv/quote_test.go
+++ b/src/pkg/strconv/quote_test.go
diff --git a/src/lib/strconv/testfp.txt b/src/pkg/strconv/testfp.txt
index 08d3c4ef09..08d3c4ef09 100644
--- a/src/lib/strconv/testfp.txt
+++ b/src/pkg/strconv/testfp.txt
diff --git a/src/lib/strings/Makefile b/src/pkg/strings/Makefile
index b6660cfc70..b6660cfc70 100644
--- a/src/lib/strings/Makefile
+++ b/src/pkg/strings/Makefile
diff --git a/src/lib/strings/strings.go b/src/pkg/strings/strings.go
index 2e3dc0215e..2e3dc0215e 100644
--- a/src/lib/strings/strings.go
+++ b/src/pkg/strings/strings.go
diff --git a/src/lib/strings/strings_test.go b/src/pkg/strings/strings_test.go
index 05e6620321..05e6620321 100644
--- a/src/lib/strings/strings_test.go
+++ b/src/pkg/strings/strings_test.go
diff --git a/src/lib/sync/Makefile b/src/pkg/sync/Makefile
index 566853d576..566853d576 100644
--- a/src/lib/sync/Makefile
+++ b/src/pkg/sync/Makefile
diff --git a/src/lib/sync/asm_386.s b/src/pkg/sync/asm_386.s
index f71182b753..f71182b753 100644
--- a/src/lib/sync/asm_386.s
+++ b/src/pkg/sync/asm_386.s
diff --git a/src/lib/sync/asm_amd64.s b/src/pkg/sync/asm_amd64.s
index 07389dd3b5..07389dd3b5 100644
--- a/src/lib/sync/asm_amd64.s
+++ b/src/pkg/sync/asm_amd64.s
diff --git a/src/lib/sync/mutex.go b/src/pkg/sync/mutex.go
index 5a6311a837..5a6311a837 100644
--- a/src/lib/sync/mutex.go
+++ b/src/pkg/sync/mutex.go
diff --git a/src/lib/sync/mutex_test.go b/src/pkg/sync/mutex_test.go
index 819dbb9de5..819dbb9de5 100644
--- a/src/lib/sync/mutex_test.go
+++ b/src/pkg/sync/mutex_test.go
diff --git a/src/lib/syscall/Makefile b/src/pkg/syscall/Makefile
index a5cc042d7b..a5cc042d7b 100644
--- a/src/lib/syscall/Makefile
+++ b/src/pkg/syscall/Makefile
diff --git a/src/lib/syscall/PORT b/src/pkg/syscall/PORT
index f3addcdb07..f3addcdb07 100755
--- a/src/lib/syscall/PORT
+++ b/src/pkg/syscall/PORT
diff --git a/src/lib/syscall/asm_darwin_386.s b/src/pkg/syscall/asm_darwin_386.s
index a8ec5b00cf..a8ec5b00cf 100644
--- a/src/lib/syscall/asm_darwin_386.s
+++ b/src/pkg/syscall/asm_darwin_386.s
diff --git a/src/lib/syscall/asm_darwin_amd64.s b/src/pkg/syscall/asm_darwin_amd64.s
index e1527977f4..e1527977f4 100644
--- a/src/lib/syscall/asm_darwin_amd64.s
+++ b/src/pkg/syscall/asm_darwin_amd64.s
diff --git a/src/lib/syscall/asm_linux_386.s b/src/pkg/syscall/asm_linux_386.s
index c6b01792d7..c6b01792d7 100644
--- a/src/lib/syscall/asm_linux_386.s
+++ b/src/pkg/syscall/asm_linux_386.s
diff --git a/src/lib/syscall/asm_linux_amd64.s b/src/pkg/syscall/asm_linux_amd64.s
index cb93b481ab..cb93b481ab 100644
--- a/src/lib/syscall/asm_linux_amd64.s
+++ b/src/pkg/syscall/asm_linux_amd64.s
diff --git a/src/lib/syscall/errstr.go b/src/pkg/syscall/errstr.go
index 67a529d347..67a529d347 100644
--- a/src/lib/syscall/errstr.go
+++ b/src/pkg/syscall/errstr.go
diff --git a/src/lib/syscall/exec.go b/src/pkg/syscall/exec.go
index 58fb058635..58fb058635 100644
--- a/src/lib/syscall/exec.go
+++ b/src/pkg/syscall/exec.go
diff --git a/src/lib/syscall/mkerrors b/src/pkg/syscall/mkerrors
index 015f021457..015f021457 100755
--- a/src/lib/syscall/mkerrors
+++ b/src/pkg/syscall/mkerrors
diff --git a/src/lib/syscall/mksyscall b/src/pkg/syscall/mksyscall
index 850fc1e3fa..850fc1e3fa 100755
--- a/src/lib/syscall/mksyscall
+++ b/src/pkg/syscall/mksyscall
diff --git a/src/lib/syscall/mksysnum_darwin b/src/pkg/syscall/mksysnum_darwin
index 74e2dfde97..74e2dfde97 100755
--- a/src/lib/syscall/mksysnum_darwin
+++ b/src/pkg/syscall/mksysnum_darwin
diff --git a/src/lib/syscall/mksysnum_linux b/src/pkg/syscall/mksysnum_linux
index 2252bfd7cc..2252bfd7cc 100755
--- a/src/lib/syscall/mksysnum_linux
+++ b/src/pkg/syscall/mksysnum_linux
diff --git a/src/lib/syscall/syscall.go b/src/pkg/syscall/syscall.go
index 5ee44e3e84..5ee44e3e84 100644
--- a/src/lib/syscall/syscall.go
+++ b/src/pkg/syscall/syscall.go
diff --git a/src/lib/syscall/syscall_darwin.go b/src/pkg/syscall/syscall_darwin.go
index 011fc7a0fe..011fc7a0fe 100644
--- a/src/lib/syscall/syscall_darwin.go
+++ b/src/pkg/syscall/syscall_darwin.go
diff --git a/src/lib/syscall/syscall_darwin_386.go b/src/pkg/syscall/syscall_darwin_386.go
index 5633d7c034..5633d7c034 100644
--- a/src/lib/syscall/syscall_darwin_386.go
+++ b/src/pkg/syscall/syscall_darwin_386.go
diff --git a/src/lib/syscall/syscall_darwin_amd64.go b/src/pkg/syscall/syscall_darwin_amd64.go
index f7a93f1216..f7a93f1216 100644
--- a/src/lib/syscall/syscall_darwin_amd64.go
+++ b/src/pkg/syscall/syscall_darwin_amd64.go
diff --git a/src/lib/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index 50f3938d7f..50f3938d7f 100644
--- a/src/lib/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
diff --git a/src/lib/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go
index 9bf3f9cf00..9bf3f9cf00 100644
--- a/src/lib/syscall/syscall_linux_386.go
+++ b/src/pkg/syscall/syscall_linux_386.go
diff --git a/src/lib/syscall/syscall_linux_amd64.go b/src/pkg/syscall/syscall_linux_amd64.go
index a2a58c35ba..a2a58c35ba 100644
--- a/src/lib/syscall/syscall_linux_amd64.go
+++ b/src/pkg/syscall/syscall_linux_amd64.go
diff --git a/src/lib/syscall/types_darwin.c b/src/pkg/syscall/types_darwin.c
index 65afd6ca6c..65afd6ca6c 100644
--- a/src/lib/syscall/types_darwin.c
+++ b/src/pkg/syscall/types_darwin.c
diff --git a/src/pkg/syscall/types_darwin_386.c b/src/pkg/syscall/types_darwin_386.c
new file mode 100644
index 0000000000..dd53569443
--- /dev/null
+++ b/src/pkg/syscall/types_darwin_386.c
@@ -0,0 +1 @@
+// Nothing to see here.
diff --git a/src/pkg/syscall/types_darwin_amd64.c b/src/pkg/syscall/types_darwin_amd64.c
new file mode 100644
index 0000000000..dd53569443
--- /dev/null
+++ b/src/pkg/syscall/types_darwin_amd64.c
@@ -0,0 +1 @@
+// Nothing to see here.
diff --git a/src/lib/syscall/types_linux.c b/src/pkg/syscall/types_linux.c
index 261772eac2..261772eac2 100644
--- a/src/lib/syscall/types_linux.c
+++ b/src/pkg/syscall/types_linux.c
diff --git a/src/pkg/syscall/types_linux_386.c b/src/pkg/syscall/types_linux_386.c
new file mode 100644
index 0000000000..3b5481af42
--- /dev/null
+++ b/src/pkg/syscall/types_linux_386.c
@@ -0,0 +1 @@
+// Nothing to see here
diff --git a/src/pkg/syscall/types_linux_amd64.c b/src/pkg/syscall/types_linux_amd64.c
new file mode 100644
index 0000000000..3b5481af42
--- /dev/null
+++ b/src/pkg/syscall/types_linux_amd64.c
@@ -0,0 +1 @@
+// Nothing to see here
diff --git a/src/lib/syscall/zerrors_darwin_386.go b/src/pkg/syscall/zerrors_darwin_386.go
index bc2d17656f..bc2d17656f 100644
--- a/src/lib/syscall/zerrors_darwin_386.go
+++ b/src/pkg/syscall/zerrors_darwin_386.go
diff --git a/src/lib/syscall/zerrors_darwin_amd64.go b/src/pkg/syscall/zerrors_darwin_amd64.go
index bc2d17656f..bc2d17656f 100644
--- a/src/lib/syscall/zerrors_darwin_amd64.go
+++ b/src/pkg/syscall/zerrors_darwin_amd64.go
diff --git a/src/lib/syscall/zerrors_linux_386.go b/src/pkg/syscall/zerrors_linux_386.go
index f1e7e011da..f1e7e011da 100644
--- a/src/lib/syscall/zerrors_linux_386.go
+++ b/src/pkg/syscall/zerrors_linux_386.go
diff --git a/src/lib/syscall/zerrors_linux_amd64.go b/src/pkg/syscall/zerrors_linux_amd64.go
index f1e7e011da..f1e7e011da 100644
--- a/src/lib/syscall/zerrors_linux_amd64.go
+++ b/src/pkg/syscall/zerrors_linux_amd64.go
diff --git a/src/lib/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go
index 61f7c01db4..61f7c01db4 100644
--- a/src/lib/syscall/zsyscall_darwin_386.go
+++ b/src/pkg/syscall/zsyscall_darwin_386.go
diff --git a/src/lib/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go
index c8a0b10a7a..c8a0b10a7a 100644
--- a/src/lib/syscall/zsyscall_darwin_amd64.go
+++ b/src/pkg/syscall/zsyscall_darwin_amd64.go
diff --git a/src/lib/syscall/zsyscall_linux_386.go b/src/pkg/syscall/zsyscall_linux_386.go
index ef323b0885..ef323b0885 100644
--- a/src/lib/syscall/zsyscall_linux_386.go
+++ b/src/pkg/syscall/zsyscall_linux_386.go
diff --git a/src/lib/syscall/zsyscall_linux_amd64.go b/src/pkg/syscall/zsyscall_linux_amd64.go
index 490ffc3926..490ffc3926 100644
--- a/src/lib/syscall/zsyscall_linux_amd64.go
+++ b/src/pkg/syscall/zsyscall_linux_amd64.go
diff --git a/src/lib/syscall/zsysnum_darwin_386.go b/src/pkg/syscall/zsysnum_darwin_386.go
index c4c48c2a20..c4c48c2a20 100644
--- a/src/lib/syscall/zsysnum_darwin_386.go
+++ b/src/pkg/syscall/zsysnum_darwin_386.go
diff --git a/src/lib/syscall/zsysnum_darwin_amd64.go b/src/pkg/syscall/zsysnum_darwin_amd64.go
index c4c48c2a20..c4c48c2a20 100644
--- a/src/lib/syscall/zsysnum_darwin_amd64.go
+++ b/src/pkg/syscall/zsysnum_darwin_amd64.go
diff --git a/src/lib/syscall/zsysnum_linux_386.go b/src/pkg/syscall/zsysnum_linux_386.go
index 46c1112f8c..46c1112f8c 100644
--- a/src/lib/syscall/zsysnum_linux_386.go
+++ b/src/pkg/syscall/zsysnum_linux_386.go
diff --git a/src/lib/syscall/zsysnum_linux_amd64.go b/src/pkg/syscall/zsysnum_linux_amd64.go
index 94424f3f34..94424f3f34 100644
--- a/src/lib/syscall/zsysnum_linux_amd64.go
+++ b/src/pkg/syscall/zsysnum_linux_amd64.go
diff --git a/src/lib/syscall/ztypes_darwin_386.go b/src/pkg/syscall/ztypes_darwin_386.go
index 29d0d96763..29d0d96763 100644
--- a/src/lib/syscall/ztypes_darwin_386.go
+++ b/src/pkg/syscall/ztypes_darwin_386.go
diff --git a/src/lib/syscall/ztypes_darwin_amd64.go b/src/pkg/syscall/ztypes_darwin_amd64.go
index 0523c50a4b..0523c50a4b 100644
--- a/src/lib/syscall/ztypes_darwin_amd64.go
+++ b/src/pkg/syscall/ztypes_darwin_amd64.go
diff --git a/src/lib/syscall/ztypes_linux_386.go b/src/pkg/syscall/ztypes_linux_386.go
index c3a0837621..c3a0837621 100644
--- a/src/lib/syscall/ztypes_linux_386.go
+++ b/src/pkg/syscall/ztypes_linux_386.go
diff --git a/src/lib/syscall/ztypes_linux_amd64.go b/src/pkg/syscall/ztypes_linux_amd64.go
index f17ebe1397..f17ebe1397 100644
--- a/src/lib/syscall/ztypes_linux_amd64.go
+++ b/src/pkg/syscall/ztypes_linux_amd64.go
diff --git a/src/lib/tabwriter/Makefile b/src/pkg/tabwriter/Makefile
index 1c45180661..1c45180661 100644
--- a/src/lib/tabwriter/Makefile
+++ b/src/pkg/tabwriter/Makefile
diff --git a/src/lib/tabwriter/tabwriter.go b/src/pkg/tabwriter/tabwriter.go
index 6799f72d10..6799f72d10 100644
--- a/src/lib/tabwriter/tabwriter.go
+++ b/src/pkg/tabwriter/tabwriter.go
diff --git a/src/lib/tabwriter/tabwriter_test.go b/src/pkg/tabwriter/tabwriter_test.go
index 7026446e62..7026446e62 100644
--- a/src/lib/tabwriter/tabwriter_test.go
+++ b/src/pkg/tabwriter/tabwriter_test.go
diff --git a/src/lib/template/Makefile b/src/pkg/template/Makefile
index e91c088186..e91c088186 100644
--- a/src/lib/template/Makefile
+++ b/src/pkg/template/Makefile
diff --git a/src/lib/template/format.go b/src/pkg/template/format.go
index 4fb5393b94..4fb5393b94 100644
--- a/src/lib/template/format.go
+++ b/src/pkg/template/format.go
diff --git a/src/lib/template/template.go b/src/pkg/template/template.go
index a5e9b0c7da..a5e9b0c7da 100644
--- a/src/lib/template/template.go
+++ b/src/pkg/template/template.go
diff --git a/src/lib/template/template_test.go b/src/pkg/template/template_test.go
index 9a81d274c9..9a81d274c9 100644
--- a/src/lib/template/template_test.go
+++ b/src/pkg/template/template_test.go
diff --git a/src/lib/testing/Makefile b/src/pkg/testing/Makefile
index 493eba6f28..493eba6f28 100644
--- a/src/lib/testing/Makefile
+++ b/src/pkg/testing/Makefile
diff --git a/src/lib/testing/iotest/Makefile b/src/pkg/testing/iotest/Makefile
index 1d01041f53..1d01041f53 100644
--- a/src/lib/testing/iotest/Makefile
+++ b/src/pkg/testing/iotest/Makefile
diff --git a/src/lib/testing/iotest/logger.go b/src/pkg/testing/iotest/logger.go
index 8ee574080d..8ee574080d 100644
--- a/src/lib/testing/iotest/logger.go
+++ b/src/pkg/testing/iotest/logger.go
diff --git a/src/lib/testing/iotest/reader.go b/src/pkg/testing/iotest/reader.go
index 0bb8633388..0bb8633388 100644
--- a/src/lib/testing/iotest/reader.go
+++ b/src/pkg/testing/iotest/reader.go
diff --git a/src/lib/testing/testing.go b/src/pkg/testing/testing.go
index 330fadd3ab..330fadd3ab 100644
--- a/src/lib/testing/testing.go
+++ b/src/pkg/testing/testing.go
diff --git a/src/lib/time/Makefile b/src/pkg/time/Makefile
index 8d3c3b65f6..8d3c3b65f6 100644
--- a/src/lib/time/Makefile
+++ b/src/pkg/time/Makefile
diff --git a/src/lib/time/sleep.go b/src/pkg/time/sleep.go
index 3bb76cf475..3bb76cf475 100644
--- a/src/lib/time/sleep.go
+++ b/src/pkg/time/sleep.go
diff --git a/src/lib/time/tick.go b/src/pkg/time/tick.go
index 53e2234f89..53e2234f89 100644
--- a/src/lib/time/tick.go
+++ b/src/pkg/time/tick.go
diff --git a/src/lib/time/tick_test.go b/src/pkg/time/tick_test.go
index 0667be679b..0667be679b 100644
--- a/src/lib/time/tick_test.go
+++ b/src/pkg/time/tick_test.go
diff --git a/src/lib/time/time.go b/src/pkg/time/time.go
index ea9b66cbc7..ea9b66cbc7 100644
--- a/src/lib/time/time.go
+++ b/src/pkg/time/time.go
diff --git a/src/lib/time/time_test.go b/src/pkg/time/time_test.go
index 41e6736e83..41e6736e83 100644
--- a/src/lib/time/time_test.go
+++ b/src/pkg/time/time_test.go
diff --git a/src/lib/time/zoneinfo.go b/src/pkg/time/zoneinfo.go
index 751afc9314..751afc9314 100644
--- a/src/lib/time/zoneinfo.go
+++ b/src/pkg/time/zoneinfo.go
diff --git a/src/lib/unicode/Makefile b/src/pkg/unicode/Makefile
index de1677b8de..de1677b8de 100644
--- a/src/lib/unicode/Makefile
+++ b/src/pkg/unicode/Makefile
diff --git a/src/lib/unicode/decimaldigit.go b/src/pkg/unicode/decimaldigit.go
index 1165e3ae15..1165e3ae15 100644
--- a/src/lib/unicode/decimaldigit.go
+++ b/src/pkg/unicode/decimaldigit.go
diff --git a/src/lib/unicode/decimaldigit_test.go b/src/pkg/unicode/decimaldigit_test.go
index f7b470c676..f7b470c676 100644
--- a/src/lib/unicode/decimaldigit_test.go
+++ b/src/pkg/unicode/decimaldigit_test.go
diff --git a/src/lib/unicode/letter.go b/src/pkg/unicode/letter.go
index d7aa678c9d..d7aa678c9d 100644
--- a/src/lib/unicode/letter.go
+++ b/src/pkg/unicode/letter.go
diff --git a/src/lib/unicode/letter_test.go b/src/pkg/unicode/letter_test.go
index d39d74e6b9..d39d74e6b9 100644
--- a/src/lib/unicode/letter_test.go
+++ b/src/pkg/unicode/letter_test.go
diff --git a/src/lib/unsafe/unsafe.go b/src/pkg/unsafe/unsafe.go
index b19af405b6..b19af405b6 100644
--- a/src/lib/unsafe/unsafe.go
+++ b/src/pkg/unsafe/unsafe.go
diff --git a/src/lib/utf8/Makefile b/src/pkg/utf8/Makefile
index b5ad083b2d..b5ad083b2d 100644
--- a/src/lib/utf8/Makefile
+++ b/src/pkg/utf8/Makefile
diff --git a/src/lib/utf8/utf8.go b/src/pkg/utf8/utf8.go
index 9c2ac790d0..9c2ac790d0 100644
--- a/src/lib/utf8/utf8.go
+++ b/src/pkg/utf8/utf8.go
diff --git a/src/lib/utf8/utf8_test.go b/src/pkg/utf8/utf8_test.go
index f60b0b17ee..f60b0b17ee 100644
--- a/src/lib/utf8/utf8_test.go
+++ b/src/pkg/utf8/utf8_test.go
diff --git a/src/lib/xml/xml.go b/src/pkg/xml/xml.go
index bd944337e9..bd944337e9 100644
--- a/src/lib/xml/xml.go
+++ b/src/pkg/xml/xml.go
diff --git a/src/run.bash b/src/run.bash
index 85bd286555..1de6aafc27 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -24,13 +24,13 @@ maketest() {
 }
 
 maketest \
-	lib \
+	pkg \
 
 # all of these are subtly different
 # from what maketest does.
 
 
-(xcd lib/sync;
+(xcd pkg/sync;
 make clean;
 time make
 GOMAXPROCS=10 make test