build: merge the great pkg/ rename into dev.power64

This also removes pkg/runtime/traceback_lr.c, which was ported
to Go in an earlier commit and then moved to
runtime/traceback.go.

Reviewer: rsc@golang.org
          rsc: LGTM

2208 files changed, 402 insertions, 854 deletions

diff --git a/.hgignore b/.hgignore
index 5b90728d4..f28da8460 100644
--- a/.hgignore
+++ b/.hgignore
@@ -42,12 +42,12 @@ src/cmd/gc/mkbuiltin1
 src/cmd/gc/opnames.h
 src/cmd/gc/y.output
 src/cmd/go/zdefaultcc.go
-src/pkg/go/doc/headscan
-src/pkg/runtime/goc2c
-src/pkg/runtime/mkversion
-src/pkg/runtime/z*
-src/pkg/unicode/maketables
-src/pkg/*.*/
+src/go/doc/headscan
+src/runtime/goc2c
+src/runtime/mkversion
+src/runtime/z*
+src/unicode/maketables
+src/*.*/
 test/pass.out
 test/run.out
 test/times.out
diff --git a/doc/articles/go_command.html b/doc/articles/go_command.html
index fddca41e2..246b8c956 100644
--- a/doc/articles/go_command.html
+++ b/doc/articles/go_command.html
@@ -99,7 +99,7 @@ deduce where to obtain the source code.</p>
 in a known way from the import path.  Specifically, the first choice
 is <code>$GOPATH/src/&lt;import-path&gt;</code>.  If <code>$GOPATH</code> is
 unset, the go command will fall back to storing source code alongside the
-standard Go packages, in <code>$GOROOT/src/pkg/&lt;import-path&gt;</code>.
+standard Go packages, in <code>$GOROOT/src/&lt;import-path&gt;</code>.
 If <code>$GOPATH</code> is set to a list of paths, the go command tries
 <code>&lt;dir&gt;/src/&lt;import-path&gt;</code> for each of the directories in
 that list.</p>
diff --git a/doc/articles/race_detector.html b/doc/articles/race_detector.html
index 32ad61de8..6defd98f9 100644
--- a/doc/articles/race_detector.html
+++ b/doc/articles/race_detector.html
@@ -57,35 +57,35 @@ Here is an example:
 WARNING: DATA RACE
 Read by goroutine 185:
   net.(*pollServer).AddFD()
-      src/pkg/net/fd_unix.go:89 +0x398
+      src/net/fd_unix.go:89 +0x398
   net.(*pollServer).WaitWrite()
-      src/pkg/net/fd_unix.go:247 +0x45
+      src/net/fd_unix.go:247 +0x45
   net.(*netFD).Write()
-      src/pkg/net/fd_unix.go:540 +0x4d4
+      src/net/fd_unix.go:540 +0x4d4
   net.(*conn).Write()
-      src/pkg/net/net.go:129 +0x101
+      src/net/net.go:129 +0x101
   net.func·060()
-      src/pkg/net/timeout_test.go:603 +0xaf
+      src/net/timeout_test.go:603 +0xaf
 
 Previous write by goroutine 184:
   net.setWriteDeadline()
-      src/pkg/net/sockopt_posix.go:135 +0xdf
+      src/net/sockopt_posix.go:135 +0xdf
   net.setDeadline()
-      src/pkg/net/sockopt_posix.go:144 +0x9c
+      src/net/sockopt_posix.go:144 +0x9c
   net.(*conn).SetDeadline()
-      src/pkg/net/net.go:161 +0xe3
+      src/net/net.go:161 +0xe3
   net.func·061()
-      src/pkg/net/timeout_test.go:616 +0x3ed
+      src/net/timeout_test.go:616 +0x3ed
 
 Goroutine 185 (running) created at:
   net.func·061()
-      src/pkg/net/timeout_test.go:609 +0x288
+      src/net/timeout_test.go:609 +0x288
 
 Goroutine 184 (running) created at:
   net.TestProlongTimeout()
-      src/pkg/net/timeout_test.go:618 +0x298
+      src/net/timeout_test.go:618 +0x298
   testing.tRunner()
-      src/pkg/testing/testing.go:301 +0xe8
+      src/testing/testing.go:301 +0xe8
 </pre>
 
 <h2 id="Options">Options</h2>
diff --git a/doc/contribute.html b/doc/contribute.html
index 849c1e476..90c3f10a1 100644
--- a/doc/contribute.html
+++ b/doc/contribute.html
@@ -234,9 +234,9 @@ Description:
 	&lt;enter description here&gt;
 
 Files:
-	src/pkg/math/sin.go
-	src/pkg/math/tan.go
-	src/pkg/regexp/regexp.go
+	src/math/sin.go
+	src/math/tan.go
+	src/regexp/regexp.go
 </pre>
 
 <p>
@@ -287,8 +287,8 @@ Description:
 	Fixes issue 159.
 
 Files:
-	src/pkg/math/sin.go
-	src/pkg/math/tan.go
+	src/math/sin.go
+	src/math/tan.go
 </pre>
 
 <p>
@@ -457,11 +457,11 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changeset with 2 changes to 2 files
-getting src/pkg/flag/flag.go
+getting src/flag/flag.go
 couldn't find merge tool hgmerge
-merging src/pkg/flag/flag_test.go
+merging src/flag/flag_test.go
 warning: conflicts during merge.
-<i>merging src/pkg/flag/flag_test.go failed!</i>
+<i>merging src/flag/flag_test.go failed!</i>
 1 file updated, 0 files merged, 0 files removed, 1 file unresolved
 use 'hg resolve' to retry unresolved file merges
 $
diff --git a/doc/debugging_with_gdb.html b/doc/debugging_with_gdb.html
index afaedf74c..836816419 100644
--- a/doc/debugging_with_gdb.html
+++ b/doc/debugging_with_gdb.html
@@ -120,7 +120,7 @@ For example:
 
 <p>
 If you'd like to see how this works, or want to extend it, take a look at <a
-href="/src/pkg/runtime/runtime-gdb.py">src/pkg/runtime/runtime-gdb.py</a> in
+href="/src/runtime/runtime-gdb.py">src/runtime/runtime-gdb.py</a> in
 the Go source distribution. It depends on some special magic types
 (<code>hash&lt;T,U&gt;</code>) and variables (<code>runtime.m</code> and
 <code>runtime.g</code>) that the linker
@@ -153,7 +153,7 @@ the form <code>pkg.(*MyType).Meth</code>.
 <p>
 In this tutorial we will inspect the binary of the
 <a href="/pkg/regexp/">regexp</a> package's unit tests. To build the binary,
-change to <code>$GOROOT/src/pkg/regexp</code> and run <code>go test -c</code>.
+change to <code>$GOROOT/src/regexp</code> and run <code>go test -c</code>.
 This should produce an executable file named <code>regexp.test</code>.
 </p>
 
@@ -172,7 +172,7 @@ License GPLv  3+: GNU GPL version 3 or later &lt;http://gnu.org/licenses/gpl.htm
 Type "show copying" and "show warranty" for licensing/warranty details.
 This GDB was configured as "x86_64-linux".
 
-Reading symbols from  /home/user/go/src/pkg/regexp/regexp.test...
+Reading symbols from  /home/user/go/src/regexp/regexp.test...
 done.
 Loading Go Runtime support.
 (gdb) 
@@ -180,7 +180,7 @@ Loading Go Runtime support.
 
 <p>
 The message <code>"Loading Go Runtime support"</code> means that GDB loaded the
-extension from <code>$GOROOT/src/pkg/runtime/runtime-gdb.py</code>.
+extension from <code>$GOROOT/src/runtime/runtime-gdb.py</code>.
 </p>
 
 <p>
@@ -199,7 +199,7 @@ it by hand by telling gdb (assuming you have the go sources in
 </p>
 
 <pre>
-(gdb) <b>source ~/go/src/pkg/runtime/runtime-gdb.py</b>
+(gdb) <b>source ~/go/src/runtime/runtime-gdb.py</b>
 Loading Go Runtime support.
 </pre>
 
@@ -259,7 +259,7 @@ Set a breakpoint at the <code>TestFind</code> function:
 
 <pre>
 (gdb) <b>b 'regexp.TestFind'</b>
-Breakpoint 1 at 0x424908: file /home/user/go/src/pkg/regexp/find_test.go, line 148.
+Breakpoint 1 at 0x424908: file /home/user/go/src/regexp/find_test.go, line 148.
 </pre>
 
 <p>
@@ -268,9 +268,9 @@ Run the program:
 
 <pre>
 (gdb) <b>run</b>
-Starting program: /home/user/go/src/pkg/regexp/regexp.test
+Starting program: /home/user/go/src/regexp/regexp.test
 
-Breakpoint 1, regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/pkg/regexp/find_test.go:148
+Breakpoint 1, regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/regexp/find_test.go:148
 148	func TestFind(t *testing.T) {
 </pre>
 
@@ -297,9 +297,9 @@ Look at the stack trace for where we’ve paused the program:
 
 <pre>
 (gdb) <b>bt</b>  <i># backtrace</i>
-#0  regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/pkg/regexp/find_test.go:148
-#1  0x000000000042f60b in testing.tRunner (t=0xf8404a89c0, test=0x573720) at /home/user/go/src/pkg/testing/testing.go:156
-#2  0x000000000040df64 in runtime.initdone () at /home/user/go/src/pkg/runtime/proc.c:242
+#0  regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/regexp/find_test.go:148
+#1  0x000000000042f60b in testing.tRunner (t=0xf8404a89c0, test=0x573720) at /home/user/go/src/testing/testing.go:156
+#2  0x000000000040df64 in runtime.initdone () at /home/user/go/src/runtime/proc.c:242
 #3  0x000000f8404a89c0 in ?? ()
 #4  0x0000000000573720 in ?? ()
 #5  0x0000000000000000 in ?? ()
@@ -311,18 +311,18 @@ The other goroutine, number 1, is stuck in <code>runtime.gosched</code>, blocked
 
 <pre>
 (gdb) <b>goroutine 1 bt</b>
-#0  0x000000000040facb in runtime.gosched () at /home/user/go/src/pkg/runtime/proc.c:873
+#0  0x000000000040facb in runtime.gosched () at /home/user/go/src/runtime/proc.c:873
 #1  0x00000000004031c9 in runtime.chanrecv (c=void, ep=void, selected=void, received=void)
- at  /home/user/go/src/pkg/runtime/chan.c:342
-#2  0x0000000000403299 in runtime.chanrecv1 (t=void, c=void) at/home/user/go/src/pkg/runtime/chan.c:423
+ at  /home/user/go/src/runtime/chan.c:342
+#2  0x0000000000403299 in runtime.chanrecv1 (t=void, c=void) at/home/user/go/src/runtime/chan.c:423
 #3  0x000000000043075b in testing.RunTests (matchString={void (struct string, struct string, bool *, error *)}
- 0x7ffff7f9ef60, tests=  []testing.InternalTest = {...}) at /home/user/go/src/pkg/testing/testing.go:201
+ 0x7ffff7f9ef60, tests=  []testing.InternalTest = {...}) at /home/user/go/src/testing/testing.go:201
 #4  0x00000000004302b1 in testing.Main (matchString={void (struct string, struct string, bool *, error *)} 
  0x7ffff7f9ef80, tests= []testing.InternalTest = {...}, benchmarks= []testing.InternalBenchmark = {...})
-at /home/user/go/src/pkg/testing/testing.go:168
-#5  0x0000000000400dc1 in main.main () at /home/user/go/src/pkg/regexp/_testmain.go:98
-#6  0x00000000004022e7 in runtime.mainstart () at /home/user/go/src/pkg/runtime/amd64/asm.s:78
-#7  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/pkg/runtime/proc.c:243
+at /home/user/go/src/testing/testing.go:168
+#5  0x0000000000400dc1 in main.main () at /home/user/go/src/regexp/_testmain.go:98
+#6  0x00000000004022e7 in runtime.mainstart () at /home/user/go/src/runtime/amd64/asm.s:78
+#7  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/runtime/proc.c:243
 #8  0x0000000000000000 in ?? ()
 </pre>
 
@@ -333,7 +333,7 @@ The stack frame shows we’re currently executing the <code>regexp.TestFind</cod
 <pre>
 (gdb) <b>info frame</b>
 Stack level 0, frame at 0x7ffff7f9ff88:
- rip = 0x425530 in regexp.TestFind (/home/user/go/src/pkg/regexp/find_test.go:148); 
+ rip = 0x425530 in regexp.TestFind (/home/user/go/src/regexp/find_test.go:148); 
     saved rip 0x430233
  called by frame at 0x7ffff7f9ffa8
  source language minimal.
@@ -410,7 +410,7 @@ We can step into the <code>String</code>function call with <code>"s"</code>:
 
 <pre>
 (gdb) <b>s</b>
-regexp.(*Regexp).String (re=0xf84068d070, noname=void) at /home/user/go/src/pkg/regexp/regexp.go:97
+regexp.(*Regexp).String (re=0xf84068d070, noname=void) at /home/user/go/src/regexp/regexp.go:97
 97      func (re *Regexp) String() string {
 </pre>
 
@@ -421,12 +421,12 @@ Get a stack trace to see where we are:
 <pre>
 (gdb) <b>bt</b>
 #0  regexp.(*Regexp).String (re=0xf84068d070, noname=void)
-    at /home/user/go/src/pkg/regexp/regexp.go:97
+    at /home/user/go/src/regexp/regexp.go:97
 #1  0x0000000000425615 in regexp.TestFind (t=0xf840688b60)
-    at /home/user/go/src/pkg/regexp/find_test.go:151
+    at /home/user/go/src/regexp/find_test.go:151
 #2  0x0000000000430233 in testing.tRunner (t=0xf840688b60, test=0x5747b8)
-    at /home/user/go/src/pkg/testing/testing.go:156
-#3  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/pkg/runtime/proc.c:243
+    at /home/user/go/src/testing/testing.go:156
+#3  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/runtime/proc.c:243
 ....
 </pre>
 
diff --git a/doc/effective_go.html b/doc/effective_go.html
index c1e310796..4dd1a3e01 100644
--- a/doc/effective_go.html
+++ b/doc/effective_go.html
@@ -37,7 +37,7 @@ should read first.
 <h3 id="examples">Examples</h3>
 
 <p>
-The <a href="/src/pkg/">Go package sources</a>
+The <a href="/src/">Go package sources</a>
 are intended to serve not
 only as the core library but also as examples of how to
 use the language.
@@ -344,7 +344,7 @@ determines just which package is being used.
 <p>
 Another convention is that the package name is the base name of
 its source directory;
-the package in <code>src/pkg/encoding/base64</code>
+the package in <code>src/encoding/base64</code>
 is imported as <code>"encoding/base64"</code> but has name <code>base64</code>,
 not <code>encoding_base64</code> and not <code>encodingBase64</code>.
 </p>
diff --git a/doc/gccgo_contribute.html b/doc/gccgo_contribute.html
index 9dd6ecb85..db7d1ab0e 100644
--- a/doc/gccgo_contribute.html
+++ b/doc/gccgo_contribute.html
@@ -73,7 +73,7 @@ script <code>libgo/merge.sh</code>.  Accordingly, most library changes
 should be made in the main Go repository.  The files outside
 of <code>libgo/go</code> are gccgo-specific; that said, some of the
 files in <code>libgo/runtime</code> are based on files
-in <code>src/pkg/runtime</code> in the main Go repository.
+in <code>src/runtime</code> in the main Go repository.
 </p>
 
 <h2>Testing</h2>
diff --git a/doc/go1.4.txt b/doc/go1.4.txt
index c5da7b72b..4fe71b4b9 100644
--- a/doc/go1.4.txt
+++ b/doc/go1.4.txt
@@ -7,6 +7,8 @@ Please keep the list sorted (as in sort.Strings of the lines).
 
 spec: permit for range x (CL 104680043)
 
+the directory src/pkg has been deleted, for instance src/pkg/fmt is now just src/fmt (CL 134570043)
+
 cmd/6l, liblink: use pc-relative addressing for all memory references, so that linking Go binaries at high addresses works (CL 125140043). This cuts the maximum size of a Go binary's text+data+bss from 4GB to 2GB.
 cmd/go: import comments (CL 124940043)
 cmd/go: implement "internal" (CL 120600043)
diff --git a/doc/go_faq.html b/doc/go_faq.html
index f2082ef5b..4e90d3907 100644
--- a/doc/go_faq.html
+++ b/doc/go_faq.html
@@ -971,7 +971,7 @@ It is a handy reference for people doing code reviews for Go projects.
 How do I submit patches to the Go libraries?</h3>
 
 <p>
-The library sources are in <code>go/src/pkg</code>.
+The library sources are in <code>go/src</code>.
 If you want to make a significant change, please discuss on the mailing list before embarking.
 </p>
 
@@ -1571,7 +1571,7 @@ table-driven, iterating over a list of inputs and outputs defined
 in a data structure (Go has excellent support for data structure literals).
 The work to write a good test and good error messages will then be amortized over many
 test cases. The standard Go library is full of illustrative examples, such as in
-<a href="/src/pkg/fmt/fmt_test.go">the formatting tests for the <code>fmt</code> package</a>.
+<a href="/src/fmt/fmt_test.go">the formatting tests for the <code>fmt</code> package</a>.
 </p>
 
 
diff --git a/misc/android/go_android_exec.go b/misc/android/go_android_exec.go
index 065b62437..e32a805a8 100644
--- a/misc/android/go_android_exec.go
+++ b/misc/android/go_android_exec.go
@@ -38,7 +38,7 @@ func main() {
 
 	// Determine thepackage by examining the current working
 	// directory, which will look something like
-	// "$GOROOT/src/pkg/mime/multipart". We extract everything
+	// "$GOROOT/src/mime/multipart". We extract everything
 	// after the $GOROOT to run on the same relative directory
 	// on the target device.
 	//
diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go
index 369ab5cb0..3094856dd 100644
--- a/misc/makerelease/makerelease.go
+++ b/misc/makerelease/makerelease.go
@@ -74,8 +74,8 @@ var preBuildCleanFiles = []string{
 	"misc/dashboard/godashboard",
 	"src/cmd/cov",
 	"src/cmd/prof",
-	"src/pkg/exp",
-	"src/pkg/old",
+	"src/exp",
+	"src/old",
 }
 
 var cleanFiles = []string{
diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto
index 89e1e1193..fd0c6a035 100644
--- a/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@ -21,98 +21,97 @@ go	src=..
 			link
 				testdata
 					+
-		pkg
-			archive
-				tar
-					testdata
-						+
-				zip
-					testdata
-						+
-			compress
-				bzip2
-					testdata
-						+
-				flate
-				gzip
-					testdata
-						+
-				lzw
-				testdata
-					+
-				zlib
-			crypto
-				rsa
-					testdata
-						+
-				tls
-					testdata
-						+
-			debug
-				dwarf
-					testdata
-						+
-				elf
-					testdata
-						+
-				macho
-					testdata
-						+
-				pe
-					testdata
-						+
-				plan9obj
-					testdata
-						+
-			go
-				build
-					+
-				doc
-					testdata
-						+
-				format
-					+
-				parser
-					+
-				printer
-					+
-			image
-				testdata
-					+
-				draw
-				gif
-				jpeg
-				png
-					testdata
-						+
-			io
+		archive
+			tar
+				testdata
+					+
+			zip
+				testdata
+					+
+		compress
+			bzip2
+				testdata
+					+
+			flate
+			gzip
+				testdata
+					+
+			lzw
+			testdata
 				+
-			mime
+			zlib
+		crypto
+			rsa
+				testdata
+					+
+			tls
+				testdata
+					+
+		debug
+			dwarf
+				testdata
+					+
+			elf
+				testdata
+					+
+			macho
 				testdata
 					+
-				multipart
-					testdata
-						+
-			net
-				http
+			pe
+				testdata
 					+
+			plan9obj
 				testdata
 					+
-			os
+		go
+			build
 				+
-			path
-				filepath
+			doc
+				testdata
 					+
-			regexp
+			format
+				+
+			parser
+				+
+			printer
+				+
+		image
+			testdata
+				+
+			draw
+			gif
+			jpeg
+			png
 				testdata
 					+
-			strconv
+		io
+			+
+		mime
+			testdata
+				+
+			multipart
+				testdata
+					+
+		net
+			http
+				+
+			testdata
+				+
+		os
+			+
+		path
+			filepath
+				+
+		regexp
+			testdata
+				+
+		strconv
+			testdata
+				+
+		text
+			template
 				testdata
 					+
-			text
-				template
-					testdata
-						+
 	lib
 		time
 			zoneinfo.zip
diff --git a/src/androidtest.bash b/src/androidtest.bash
index 43a93a141..2acfbd815 100755
--- a/src/androidtest.bash
+++ b/src/androidtest.bash
@@ -43,8 +43,7 @@ GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH go build \
 export ANDROID_PRODUCT_OUT=/tmp/androidtest-$$
 FAKE_GOROOT=$ANDROID_PRODUCT_OUT/data/local/tmp/goroot
 mkdir -p $FAKE_GOROOT/src
-ln -s $GOROOT/src/cmd $FAKE_GOROOT/src/cmd
-ln -s $GOROOT/src/pkg $FAKE_GOROOT/src/pkg
+ln -s $GOROOT/src $FAKE_GOROOT/src
 ln -s $GOROOT/test $FAKE_GOROOT/test
 ln -s $GOROOT/lib $FAKE_GOROOT/lib
 echo '# Syncing test files to android device'
diff --git a/src/pkg/archive/tar/common.go b/src/archive/tar/common.go
index e363aa793..e363aa793 100644
--- a/src/pkg/archive/tar/common.go
+++ b/src/archive/tar/common.go
diff --git a/src/pkg/archive/tar/example_test.go b/src/archive/tar/example_test.go
index 351eaa0e6..351eaa0e6 100644
--- a/src/pkg/archive/tar/example_test.go
+++ b/src/archive/tar/example_test.go
diff --git a/src/pkg/archive/tar/reader.go b/src/archive/tar/reader.go
index a27559d0f..a27559d0f 100644
--- a/src/pkg/archive/tar/reader.go
+++ b/src/archive/tar/reader.go
diff --git a/src/pkg/archive/tar/reader_test.go b/src/archive/tar/reader_test.go
index 9601ffe45..9601ffe45 100644
--- a/src/pkg/archive/tar/reader_test.go
+++ b/src/archive/tar/reader_test.go
diff --git a/src/pkg/archive/tar/stat_atim.go b/src/archive/tar/stat_atim.go
index cf9cc79c5..cf9cc79c5 100644
--- a/src/pkg/archive/tar/stat_atim.go
+++ b/src/archive/tar/stat_atim.go
diff --git a/src/pkg/archive/tar/stat_atimespec.go b/src/archive/tar/stat_atimespec.go
index 6f17dbe30..6f17dbe30 100644
--- a/src/pkg/archive/tar/stat_atimespec.go
+++ b/src/archive/tar/stat_atimespec.go
diff --git a/src/pkg/archive/tar/stat_unix.go b/src/archive/tar/stat_unix.go
index cb843db4c..cb843db4c 100644
--- a/src/pkg/archive/tar/stat_unix.go
+++ b/src/archive/tar/stat_unix.go
diff --git a/src/pkg/archive/tar/tar_test.go b/src/archive/tar/tar_test.go
index ed333f3ea..ed333f3ea 100644
--- a/src/pkg/archive/tar/tar_test.go
+++ b/src/archive/tar/tar_test.go
diff --git a/src/pkg/archive/tar/testdata/gnu.tar b/src/archive/tar/testdata/gnu.tar
index fc899dc8d..fc899dc8d 100644
--- a/src/pkg/archive/tar/testdata/gnu.tar
+++ b/src/archive/tar/testdata/gnu.tar
diff --git a/src/pkg/archive/tar/testdata/nil-uid.tar b/src/archive/tar/testdata/nil-uid.tar
index cc9cfaa33..cc9cfaa33 100644
--- a/src/pkg/archive/tar/testdata/nil-uid.tar
+++ b/src/archive/tar/testdata/nil-uid.tar
diff --git a/src/pkg/archive/tar/testdata/pax.tar b/src/archive/tar/testdata/pax.tar
index 9bc24b658..9bc24b658 100644
--- a/src/pkg/archive/tar/testdata/pax.tar
+++ b/src/archive/tar/testdata/pax.tar
diff --git a/src/pkg/archive/tar/testdata/small.txt b/src/archive/tar/testdata/small.txt
index b249bfc51..b249bfc51 100644
--- a/src/pkg/archive/tar/testdata/small.txt
+++ b/src/archive/tar/testdata/small.txt
diff --git a/src/pkg/archive/tar/testdata/small2.txt b/src/archive/tar/testdata/small2.txt
index 394ee3ecd..394ee3ecd 100644
--- a/src/pkg/archive/tar/testdata/small2.txt
+++ b/src/archive/tar/testdata/small2.txt
diff --git a/src/pkg/archive/tar/testdata/sparse-formats.tar b/src/archive/tar/testdata/sparse-formats.tar
index 8bd4e74d5..8bd4e74d5 100644
--- a/src/pkg/archive/tar/testdata/sparse-formats.tar
+++ b/src/archive/tar/testdata/sparse-formats.tar
diff --git a/src/pkg/archive/tar/testdata/star.tar b/src/archive/tar/testdata/star.tar
index 59e2d4e60..59e2d4e60 100644
--- a/src/pkg/archive/tar/testdata/star.tar
+++ b/src/archive/tar/testdata/star.tar
diff --git a/src/pkg/archive/tar/testdata/ustar.tar b/src/archive/tar/testdata/ustar.tar
index 29679d9a3..29679d9a3 100644
--- a/src/pkg/archive/tar/testdata/ustar.tar
+++ b/src/archive/tar/testdata/ustar.tar
diff --git a/src/pkg/archive/tar/testdata/v7.tar b/src/archive/tar/testdata/v7.tar
index eb65fc941..eb65fc941 100644
--- a/src/pkg/archive/tar/testdata/v7.tar
+++ b/src/archive/tar/testdata/v7.tar
diff --git a/src/pkg/archive/tar/testdata/writer-big-long.tar b/src/archive/tar/testdata/writer-big-long.tar
index 5960ee824..5960ee824 100644
--- a/src/pkg/archive/tar/testdata/writer-big-long.tar
+++ b/src/archive/tar/testdata/writer-big-long.tar
diff --git a/src/pkg/archive/tar/testdata/writer-big.tar b/src/archive/tar/testdata/writer-big.tar
index 753e883ce..753e883ce 100644
--- a/src/pkg/archive/tar/testdata/writer-big.tar
+++ b/src/archive/tar/testdata/writer-big.tar
diff --git a/src/pkg/archive/tar/testdata/writer.tar b/src/archive/tar/testdata/writer.tar
index e6d816ad0..e6d816ad0 100644
--- a/src/pkg/archive/tar/testdata/writer.tar
+++ b/src/archive/tar/testdata/writer.tar
diff --git a/src/pkg/archive/tar/testdata/xattrs.tar b/src/archive/tar/testdata/xattrs.tar
index 9701950ed..9701950ed 100644
--- a/src/pkg/archive/tar/testdata/xattrs.tar
+++ b/src/archive/tar/testdata/xattrs.tar
diff --git a/src/pkg/archive/tar/writer.go b/src/archive/tar/writer.go
index dafb2cabf..dafb2cabf 100644
--- a/src/pkg/archive/tar/writer.go
+++ b/src/archive/tar/writer.go
diff --git a/src/pkg/archive/tar/writer_test.go b/src/archive/tar/writer_test.go
index 5e42e322f..5e42e322f 100644
--- a/src/pkg/archive/tar/writer_test.go
+++ b/src/archive/tar/writer_test.go
diff --git a/src/pkg/archive/zip/example_test.go b/src/archive/zip/example_test.go
index c2ed9e79c..c2ed9e79c 100644
--- a/src/pkg/archive/zip/example_test.go
+++ b/src/archive/zip/example_test.go
diff --git a/src/pkg/archive/zip/reader.go b/src/archive/zip/reader.go
index 8136b840d..8136b840d 100644
--- a/src/pkg/archive/zip/reader.go
+++ b/src/archive/zip/reader.go
diff --git a/src/pkg/archive/zip/reader_test.go b/src/archive/zip/reader_test.go
index 29d0652dc..29d0652dc 100644
--- a/src/pkg/archive/zip/reader_test.go
+++ b/src/archive/zip/reader_test.go
diff --git a/src/pkg/archive/zip/register.go b/src/archive/zip/register.go
index 4211ec7af..4211ec7af 100644
--- a/src/pkg/archive/zip/register.go
+++ b/src/archive/zip/register.go
diff --git a/src/pkg/archive/zip/struct.go b/src/archive/zip/struct.go
index cb28e8324..cb28e8324 100644
--- a/src/pkg/archive/zip/struct.go
+++ b/src/archive/zip/struct.go
diff --git a/src/pkg/archive/zip/testdata/crc32-not-streamed.zip b/src/archive/zip/testdata/crc32-not-streamed.zip
index f268d8873..f268d8873 100644
--- a/src/pkg/archive/zip/testdata/crc32-not-streamed.zip
+++ b/src/archive/zip/testdata/crc32-not-streamed.zip
diff --git a/src/pkg/archive/zip/testdata/dd.zip b/src/archive/zip/testdata/dd.zip
index e53378b0b..e53378b0b 100644
--- a/src/pkg/archive/zip/testdata/dd.zip
+++ b/src/archive/zip/testdata/dd.zip
diff --git a/src/pkg/archive/zip/testdata/go-no-datadesc-sig.zip b/src/archive/zip/testdata/go-no-datadesc-sig.zip
index c3d593f44..c3d593f44 100644
--- a/src/pkg/archive/zip/testdata/go-no-datadesc-sig.zip
+++ b/src/archive/zip/testdata/go-no-datadesc-sig.zip
diff --git a/src/pkg/archive/zip/testdata/go-with-datadesc-sig.zip b/src/archive/zip/testdata/go-with-datadesc-sig.zip
index bcfe121bb..bcfe121bb 100644
--- a/src/pkg/archive/zip/testdata/go-with-datadesc-sig.zip
+++ b/src/archive/zip/testdata/go-with-datadesc-sig.zip
diff --git a/src/pkg/archive/zip/testdata/gophercolor16x16.png b/src/archive/zip/testdata/gophercolor16x16.png
index 48854ff3b..48854ff3b 100644
--- a/src/pkg/archive/zip/testdata/gophercolor16x16.png
+++ b/src/archive/zip/testdata/gophercolor16x16.png
diff --git a/src/pkg/archive/zip/testdata/readme.notzip b/src/archive/zip/testdata/readme.notzip
index 06668c4c1..06668c4c1 100644
--- a/src/pkg/archive/zip/testdata/readme.notzip
+++ b/src/archive/zip/testdata/readme.notzip
diff --git a/src/pkg/archive/zip/testdata/readme.zip b/src/archive/zip/testdata/readme.zip
index db3bb900e..db3bb900e 100644
--- a/src/pkg/archive/zip/testdata/readme.zip
+++ b/src/archive/zip/testdata/readme.zip
diff --git a/src/pkg/archive/zip/testdata/symlink.zip b/src/archive/zip/testdata/symlink.zip
index af846938c..af846938c 100644
--- a/src/pkg/archive/zip/testdata/symlink.zip
+++ b/src/archive/zip/testdata/symlink.zip
diff --git a/src/pkg/archive/zip/testdata/test-trailing-junk.zip b/src/archive/zip/testdata/test-trailing-junk.zip
index 42281b4e3..42281b4e3 100644
--- a/src/pkg/archive/zip/testdata/test-trailing-junk.zip
+++ b/src/archive/zip/testdata/test-trailing-junk.zip
diff --git a/src/pkg/archive/zip/testdata/test.zip b/src/archive/zip/testdata/test.zip
index 03890c05d..03890c05d 100644
--- a/src/pkg/archive/zip/testdata/test.zip
+++ b/src/archive/zip/testdata/test.zip
diff --git a/src/pkg/archive/zip/testdata/unix.zip b/src/archive/zip/testdata/unix.zip
index ce1a981b2..ce1a981b2 100644
--- a/src/pkg/archive/zip/testdata/unix.zip
+++ b/src/archive/zip/testdata/unix.zip
diff --git a/src/pkg/archive/zip/testdata/winxp.zip b/src/archive/zip/testdata/winxp.zip
index 3919322f0..3919322f0 100644
--- a/src/pkg/archive/zip/testdata/winxp.zip
+++ b/src/archive/zip/testdata/winxp.zip
diff --git a/src/pkg/archive/zip/testdata/zip64-2.zip b/src/archive/zip/testdata/zip64-2.zip
index f844e3537..f844e3537 100644
--- a/src/pkg/archive/zip/testdata/zip64-2.zip
+++ b/src/archive/zip/testdata/zip64-2.zip
diff --git a/src/pkg/archive/zip/testdata/zip64.zip b/src/archive/zip/testdata/zip64.zip
index a2ee1fa33..a2ee1fa33 100644
--- a/src/pkg/archive/zip/testdata/zip64.zip
+++ b/src/archive/zip/testdata/zip64.zip
diff --git a/src/pkg/archive/zip/writer.go b/src/archive/zip/writer.go
index 170beec0e..170beec0e 100644
--- a/src/pkg/archive/zip/writer.go
+++ b/src/archive/zip/writer.go
diff --git a/src/pkg/archive/zip/writer_test.go b/src/archive/zip/writer_test.go
index 184a7d96a..184a7d96a 100644
--- a/src/pkg/archive/zip/writer_test.go
+++ b/src/archive/zip/writer_test.go
diff --git a/src/pkg/archive/zip/zip_test.go b/src/archive/zip/zip_test.go
index 32a16a79e..32a16a79e 100644
--- a/src/pkg/archive/zip/zip_test.go
+++ b/src/archive/zip/zip_test.go
diff --git a/src/pkg/bufio/bufio.go b/src/bufio/bufio.go
index d3c68fe6f..d3c68fe6f 100644
--- a/src/pkg/bufio/bufio.go
+++ b/src/bufio/bufio.go
diff --git a/src/pkg/bufio/bufio_test.go b/src/bufio/bufio_test.go
index 550dac917..550dac917 100644
--- a/src/pkg/bufio/bufio_test.go
+++ b/src/bufio/bufio_test.go
diff --git a/src/pkg/bufio/example_test.go b/src/bufio/example_test.go
index 3da914142..3da914142 100644
--- a/src/pkg/bufio/example_test.go
+++ b/src/bufio/example_test.go
diff --git a/src/pkg/bufio/export_test.go b/src/bufio/export_test.go
index 3d3bb27d8..3d3bb27d8 100644
--- a/src/pkg/bufio/export_test.go
+++ b/src/bufio/export_test.go
diff --git a/src/pkg/bufio/scan.go b/src/bufio/scan.go
index c5714f331..c5714f331 100644
--- a/src/pkg/bufio/scan.go
+++ b/src/bufio/scan.go
diff --git a/src/pkg/bufio/scan_test.go b/src/bufio/scan_test.go
index 3ddb25acf..3ddb25acf 100644
--- a/src/pkg/bufio/scan_test.go
+++ b/src/bufio/scan_test.go
diff --git a/src/pkg/builtin/builtin.go b/src/builtin/builtin.go
index 51550a459..51550a459 100644
--- a/src/pkg/builtin/builtin.go
+++ b/src/builtin/builtin.go
diff --git a/src/pkg/bytes/buffer.go b/src/bytes/buffer.go
index 46ca1d5ad..46ca1d5ad 100644
--- a/src/pkg/bytes/buffer.go
+++ b/src/bytes/buffer.go
diff --git a/src/pkg/bytes/buffer_test.go b/src/bytes/buffer_test.go
index 75145b05e..75145b05e 100644
--- a/src/pkg/bytes/buffer_test.go
+++ b/src/bytes/buffer_test.go
diff --git a/src/pkg/bytes/bytes.go b/src/bytes/bytes.go
index 34c22bbfb..34c22bbfb 100644
--- a/src/pkg/bytes/bytes.go
+++ b/src/bytes/bytes.go
diff --git a/src/pkg/bytes/bytes.s b/src/bytes/bytes.s
index 55103bae0..55103bae0 100644
--- a/src/pkg/bytes/bytes.s
+++ b/src/bytes/bytes.s
diff --git a/src/pkg/bytes/bytes_decl.go b/src/bytes/bytes_decl.go
index 617d7489a..617d7489a 100644
--- a/src/pkg/bytes/bytes_decl.go
+++ b/src/bytes/bytes_decl.go
diff --git a/src/pkg/bytes/bytes_test.go b/src/bytes/bytes_test.go
index 980c41d75..980c41d75 100644
--- a/src/pkg/bytes/bytes_test.go
+++ b/src/bytes/bytes_test.go
diff --git a/src/pkg/bytes/compare_test.go b/src/bytes/compare_test.go
index 63522374e..63522374e 100644
--- a/src/pkg/bytes/compare_test.go
+++ b/src/bytes/compare_test.go
diff --git a/src/pkg/bytes/equal_test.go b/src/bytes/equal_test.go
index 1bf19a74b..1bf19a74b 100644
--- a/src/pkg/bytes/equal_test.go
+++ b/src/bytes/equal_test.go
diff --git a/src/pkg/bytes/example_test.go b/src/bytes/example_test.go
index ad2dbc69b..ad2dbc69b 100644
--- a/src/pkg/bytes/example_test.go
+++ b/src/bytes/example_test.go
diff --git a/src/pkg/bytes/export_test.go b/src/bytes/export_test.go
index 3b915d5ea..3b915d5ea 100644
--- a/src/pkg/bytes/export_test.go
+++ b/src/bytes/export_test.go
diff --git a/src/pkg/bytes/reader.go b/src/bytes/reader.go
index d2d40fa7c..d2d40fa7c 100644
--- a/src/pkg/bytes/reader.go
+++ b/src/bytes/reader.go
diff --git a/src/pkg/bytes/reader_test.go b/src/bytes/reader_test.go
index d3dce5349..d3dce5349 100644
--- a/src/pkg/bytes/reader_test.go
+++ b/src/bytes/reader_test.go
diff --git a/src/cmd/5a/a.y b/src/cmd/5a/a.y
index 56d0c563d..ad647606e 100644
--- a/src/cmd/5a/a.y
+++ b/src/cmd/5a/a.y
@@ -33,7 +33,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 %}
 %union
 {
diff --git a/src/cmd/5a/y.tab.c b/src/cmd/5a/y.tab.c
index 0bc8c34e1..a6251b835 100644
--- a/src/cmd/5a/y.tab.c
+++ b/src/cmd/5a/y.tab.c
@@ -69,7 +69,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 /* Line 371 of yacc.c  */
 #line 76 "y.tab.c"
diff --git a/src/cmd/5c/cgen.c b/src/cmd/5c/cgen.c
index 5ea8eea07..9be10bf45 100644
--- a/src/cmd/5c/cgen.c
+++ b/src/cmd/5c/cgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 void
 _cgen(Node *n, Node *nn, int inrel)
diff --git a/src/cmd/5g/cgen.c b/src/cmd/5g/cgen.c
index 5fae7a564..c535cfbef 100644
--- a/src/cmd/5g/cgen.c
+++ b/src/cmd/5g/cgen.c
@@ -1522,7 +1522,7 @@ sgen(Node *n, Node *res, int64 w)
 		f = sysfunc("duffcopy");
 		p = gins(ADUFFCOPY, N, f);
 		afunclit(&p->to, f);
-		// 8 and 128 = magic constants: see ../../pkg/runtime/asm_arm.s
+		// 8 and 128 = magic constants: see ../../runtime/asm_arm.s
 		p->to.offset = 8*(128-c);
 
 		regfree(&tmp);
diff --git a/src/cmd/5g/ggen.c b/src/cmd/5g/ggen.c
index cc951df5d..6174e760c 100644
--- a/src/cmd/5g/ggen.c
+++ b/src/cmd/5g/ggen.c
@@ -910,7 +910,7 @@ clearfat(Node *nl)
 		f = sysfunc("duffzero");
 		p = gins(ADUFFZERO, N, f);
 		afunclit(&p->to, f);
-		// 4 and 128 = magic constants: see ../../pkg/runtime/asm_arm.s
+		// 4 and 128 = magic constants: see ../../runtime/asm_arm.s
 		p->to.offset = 4*(128-q);
 	} else
 	while(q > 0) {
diff --git a/src/cmd/5g/gsubr.c b/src/cmd/5g/gsubr.c
index 5a70fcdda..ebd2c70a0 100644
--- a/src/cmd/5g/gsubr.c
+++ b/src/cmd/5g/gsubr.c
@@ -31,11 +31,11 @@
 #include <u.h>
 #include <libc.h>
 #include "gg.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 5l for all GOOS.
-// At the same time, can raise StackBig in ../../pkg/runtime/stack.h.
+// At the same time, can raise StackBig in ../../runtime/stack.h.
 long unmappedzero = 4096;
 
 void
diff --git a/src/cmd/6a/a.y b/src/cmd/6a/a.y
index 6fd491067..1089d4061 100644
--- a/src/cmd/6a/a.y
+++ b/src/cmd/6a/a.y
@@ -33,7 +33,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 %}
 %union	{
 	Sym	*sym;
diff --git a/src/cmd/6a/y.tab.c b/src/cmd/6a/y.tab.c
index a4f0f74cc..b69fd95b5 100644
--- a/src/cmd/6a/y.tab.c
+++ b/src/cmd/6a/y.tab.c
@@ -150,7 +150,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 
 /* Enabling traces.  */
diff --git a/src/cmd/6c/cgen.c b/src/cmd/6c/cgen.c
index b66c6add3..bb09ec05d 100644
--- a/src/cmd/6c/cgen.c
+++ b/src/cmd/6c/cgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 /* ,x/^(print|prtree)\(/i/\/\/ */
 int castup(Type*, Type*);
diff --git a/src/cmd/6c/sgen.c b/src/cmd/6c/sgen.c
index d99510185..fceb332b2 100644
--- a/src/cmd/6c/sgen.c
+++ b/src/cmd/6c/sgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 Prog*
 gtext(Sym *s, int32 stkoff)
diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c
index 592e81542..d13c98dad 100644
--- a/src/cmd/6g/cgen.c
+++ b/src/cmd/6g/cgen.c
@@ -1451,7 +1451,7 @@ sgen(Node *n, Node *ns, int64 w)
 			p = gins(ADUFFCOPY, N, N);
 			p->to.type = D_ADDR;
 			p->to.sym = linksym(pkglookup("duffcopy", runtimepkg));
-			// 14 and 128 = magic constants: see ../../pkg/runtime/asm_amd64.s
+			// 14 and 128 = magic constants: see ../../runtime/asm_amd64.s
 			p->to.offset = 14*(128-q);
 		} else
 		while(q > 0) {
diff --git a/src/cmd/6g/ggen.c b/src/cmd/6g/ggen.c
index 9665d831b..5a9b8418c 100644
--- a/src/cmd/6g/ggen.c
+++ b/src/cmd/6g/ggen.c
@@ -1135,7 +1135,7 @@ clearfat(Node *nl)
 		p = gins(ADUFFZERO, N, N);
 		p->to.type = D_ADDR;
 		p->to.sym = linksym(pkglookup("duffzero", runtimepkg));
-		// 2 and 128 = magic constants: see ../../pkg/runtime/asm_amd64.s
+		// 2 and 128 = magic constants: see ../../runtime/asm_amd64.s
 		p->to.offset = 2*(128-q);
 	} else
 	while(q > 0) {
diff --git a/src/cmd/6g/gsubr.c b/src/cmd/6g/gsubr.c
index a451d7d62..e1ed3b3b8 100644
--- a/src/cmd/6g/gsubr.c
+++ b/src/cmd/6g/gsubr.c
@@ -31,11 +31,11 @@
 #include <u.h>
 #include <libc.h>
 #include "gg.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 6l for all GOOS.
-// At the same time, can raise StackBig in ../../pkg/runtime/stack.h.
+// At the same time, can raise StackBig in ../../runtime/stack.h.
 vlong unmappedzero = 4096;
 
 void
diff --git a/src/cmd/8a/a.y b/src/cmd/8a/a.y
index d7ff623da..6bcf1313b 100644
--- a/src/cmd/8a/a.y
+++ b/src/cmd/8a/a.y
@@ -33,7 +33,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 %}
 %union	{
 	Sym	*sym;
diff --git a/src/cmd/8a/y.tab.c b/src/cmd/8a/y.tab.c
index f48c9fe1f..85279c21f 100644
--- a/src/cmd/8a/y.tab.c
+++ b/src/cmd/8a/y.tab.c
@@ -146,7 +146,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 
 /* Enabling traces.  */
diff --git a/src/cmd/8c/cgen.c b/src/cmd/8c/cgen.c
index 8ac8e3600..6f0f7c97f 100644
--- a/src/cmd/8c/cgen.c
+++ b/src/cmd/8c/cgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 /* ,x/^(print|prtree)\(/i/\/\/ */
 
diff --git a/src/cmd/8g/cgen.c b/src/cmd/8g/cgen.c
index f3093bc26..2735fb6a5 100644
--- a/src/cmd/8g/cgen.c
+++ b/src/cmd/8g/cgen.c
@@ -1326,7 +1326,7 @@ sgen(Node *n, Node *res, int64 w)
 			p = gins(ADUFFCOPY, N, N);
 			p->to.type = D_ADDR;
 			p->to.sym = linksym(pkglookup("duffcopy", runtimepkg));
-			// 10 and 128 = magic constants: see ../../pkg/runtime/asm_386.s
+			// 10 and 128 = magic constants: see ../../runtime/asm_386.s
 			p->to.offset = 10*(128-q);
 		} else
 		while(q > 0) {
diff --git a/src/cmd/8g/ggen.c b/src/cmd/8g/ggen.c
index 5e3140480..6038731f7 100644
--- a/src/cmd/8g/ggen.c
+++ b/src/cmd/8g/ggen.c
@@ -184,7 +184,7 @@ clearfat(Node *nl)
 		p = gins(ADUFFZERO, N, N);
 		p->to.type = D_ADDR;
 		p->to.sym = linksym(pkglookup("duffzero", runtimepkg));
-		// 1 and 128 = magic constants: see ../../pkg/runtime/asm_386.s
+		// 1 and 128 = magic constants: see ../../runtime/asm_386.s
 		p->to.offset = 1*(128-q);
 	} else
 	while(q > 0) {
diff --git a/src/cmd/8g/gsubr.c b/src/cmd/8g/gsubr.c
index 9ee418cb7..9f923cc9a 100644
--- a/src/cmd/8g/gsubr.c
+++ b/src/cmd/8g/gsubr.c
@@ -31,11 +31,11 @@
 #include <u.h>
 #include <libc.h>
 #include "gg.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 8l for all GOOS.
-// At the same time, can raise StackBig in ../../pkg/runtime/stack.h.
+// At the same time, can raise StackBig in ../../runtime/stack.h.
 uint32 unmappedzero = 4096;
 
 #define	CASE(a,b)	(((a)<<16)|((b)<<0))
diff --git a/src/cmd/9a/a.y b/src/cmd/9a/a.y
index 2e0317e06..41776fd3c 100644
--- a/src/cmd/9a/a.y
+++ b/src/cmd/9a/a.y
@@ -32,7 +32,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 %}
 %union
 {
diff --git a/src/cmd/9a/y.tab.c b/src/cmd/9a/y.tab.c
index 9a09cf932..e81db9924 100644
--- a/src/cmd/9a/y.tab.c
+++ b/src/cmd/9a/y.tab.c
@@ -72,7 +72,7 @@
 #include <stdio.h>	/* if we don't, bison will, and a.h re-#defines getc */
 #include <libc.h>
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 
 /* Line 268 of yacc.c  */
diff --git a/src/cmd/9c/cgen.c b/src/cmd/9c/cgen.c
index aeedc60c0..d756af93b 100644
--- a/src/cmd/9c/cgen.c
+++ b/src/cmd/9c/cgen.c
@@ -28,7 +28,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 void
 cgen(Node *n, Node *nn)
diff --git a/src/cmd/9g/ggen.c b/src/cmd/9g/ggen.c
index 09f51536a..708a9392c 100644
--- a/src/cmd/9g/ggen.c
+++ b/src/cmd/9g/ggen.c
@@ -970,7 +970,7 @@ clearfat(Node *nl)
 		f = sysfunc("duffzero");
 		p = gins(ADUFFZERO, N, f);
 		afunclit(&p->to, f);
-		// 4 and 128 = magic constants: see ../../pkg/runtime/asm_power64x.s
+		// 4 and 128 = magic constants: see ../../runtime/asm_power64x.s
 		p->to.offset = 4*(128-q);
 	} else
 	for(t = 0; t < q; t++) {
diff --git a/src/cmd/9g/gsubr.c b/src/cmd/9g/gsubr.c
index b194cfd9e..a84056bbe 100644
--- a/src/cmd/9g/gsubr.c
+++ b/src/cmd/9g/gsubr.c
@@ -31,11 +31,11 @@
 #include <u.h>
 #include <libc.h>
 #include "gg.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 6l for all GOOS.
-// At the same time, can raise StackBig in ../../pkg/runtime/stack.h.
+// At the same time, can raise StackBig in ../../runtime/stack.h.
 vlong unmappedzero = 4096;
 
 void
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index 7e8f85848..fb0e984f7 100644
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -143,7 +143,7 @@ func main() {
 
 	var featureCtx = make(map[string]map[string]bool) // feature -> context name -> true
 	for _, context := range contexts {
-		w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src/pkg"))
+		w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src"))
 
 		for _, name := range pkgNames {
 			// - Package "unsafe" contains special signatures requiring
diff --git a/src/cmd/api/goapi_test.go b/src/cmd/api/goapi_test.go
index cb68769c8..f4fb7d319 100644
--- a/src/cmd/api/goapi_test.go
+++ b/src/cmd/api/goapi_test.go
@@ -38,7 +38,7 @@ func TestGolden(t *testing.T) {
 			continue
 		}
 
-		goldenFile := filepath.Join("testdata", "src", "pkg", fi.Name(), "golden.txt")
+		goldenFile := filepath.Join("testdata", "src", fi.Name(), "golden.txt")
 		w := NewWalker(nil, "testdata/src/pkg")
 		w.export(w.Import(fi.Name()))
 
@@ -176,7 +176,7 @@ func BenchmarkAll(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		for _, context := range contexts {
-			w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src/pkg"))
+			w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src"))
 			for _, name := range pkgNames {
 				if name != "unsafe" && !strings.HasPrefix(name, "cmd/") {
 					w.export(w.Import(name))
diff --git a/src/cmd/cc/pgen.c b/src/cmd/cc/pgen.c
index 4b4684a52..869e377df 100644
--- a/src/cmd/cc/pgen.c
+++ b/src/cmd/cc/pgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 enum { BitsPerPointer = 2 };
 
diff --git a/src/cmd/cgo/ast.go b/src/cmd/cgo/ast.go
index 7757efa1b..6c5a16086 100644
--- a/src/cmd/cgo/ast.go
+++ b/src/cmd/cgo/ast.go
@@ -272,7 +272,7 @@ func (f *File) walk(x interface{}, context string, visit func(*File, interface{}
 
 	case nil:
 
-	// These are ordered and grouped to match ../../pkg/go/ast/ast.go
+	// These are ordered and grouped to match ../../go/ast/ast.go
 	case *ast.Field:
 		if len(n.Names) == 0 && context == "field" {
 			f.walk(&n.Type, "embed-type", visit)
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 6fab14a11..5e8dfee78 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -369,8 +369,8 @@ static char *oldtool[] = {
 // not be in release branches.
 static char *unreleased[] = {
 	"src/cmd/link",
-	"src/pkg/debug/goobj",
-	"src/pkg/old",
+	"src/debug/goobj",
+	"src/old",
 };
 
 // setup sets up the tree for the initial build.
@@ -610,7 +610,7 @@ static struct {
 		"$GOROOT/pkg/obj/$GOHOSTOS_$GOHOSTARCH/libbio.a",
 		"$GOROOT/pkg/obj/$GOHOSTOS_$GOHOSTARCH/lib9.a",
 	}},
-	{"pkg/runtime", {
+	{"runtime", {
 		"zaexperiment.h", // must sort above zasm
 		"zasm_$GOOS_$GOARCH.h",
 		"zsys_$GOOS_$GOARCH.s",
@@ -727,7 +727,7 @@ install(char *dir)
 	}
 
 	islib = hasprefix(dir, "lib") || streq(dir, "cmd/cc") || streq(dir, "cmd/gc");
-	ispkg = hasprefix(dir, "pkg");
+	ispkg = !islib && !hasprefix(dir, "cmd/");
 	isgo = ispkg || streq(dir, "cmd/go") || streq(dir, "cmd/cgo");
 
 	exe = "";
@@ -753,11 +753,11 @@ install(char *dir)
 		// Go library (package).
 		ispackcmd = 1;
 		vadd(&link, "pack"); // program name - unused here, but all the other cases record one
-		p = bprintf(&b, "%s/pkg/%s_%s/%s", goroot, goos, goarch, dir+4);
+		p = bprintf(&b, "%s/pkg/%s_%s/%s", goroot, goos, goarch, dir);
 		*xstrrchr(p, '/') = '\0';
 		xmkdirall(p);
 		targ = link.len;
-		vadd(&link, bpathf(&b, "%s/pkg/%s_%s/%s.a", goroot, goos, goarch, dir+4));
+		vadd(&link, bpathf(&b, "%s/pkg/%s_%s/%s.a", goroot, goos, goarch, dir));
 	} else if(streq(dir, "cmd/go") || streq(dir, "cmd/cgo")) {
 		// Go command.
 		vadd(&link, bpathf(&b, "%s/%sl", tooldir, gochar));
@@ -904,7 +904,7 @@ install(char *dir)
 		goto out;
 
 	// For package runtime, copy some files into the work space.
-	if(streq(dir, "pkg/runtime")) {
+	if(streq(dir, "runtime")) {
 		copyfile(bpathf(&b, "%s/arch_GOARCH.h", workdir),
 			bpathf(&b1, "%s/arch_%s.h", bstr(&path), goarch), 0);
 		copyfile(bpathf(&b, "%s/defs_GOOS_GOARCH.h", workdir),
@@ -932,7 +932,7 @@ install(char *dir)
 					errprintf("generate %s\n", p);
 				gentab[j].gen(bstr(&path), p);
 				// Do not add generated file to clean list.
-				// In pkg/runtime, we want to be able to
+				// In runtime, we want to be able to
 				// build the package with the go tool,
 				// and it assumes these generated files already
 				// exist (it does not know how to build them).
@@ -950,7 +950,7 @@ install(char *dir)
 	// One more copy for package runtime.
 	// The last batch was required for the generators.
 	// This one is generated.
-	if(streq(dir, "pkg/runtime")) {
+	if(streq(dir, "runtime")) {
 		copyfile(bpathf(&b, "%s/zasm_GOOS_GOARCH.h", workdir),
 			bpathf(&b1, "%s/zasm_%s_%s.h", bstr(&path), goos, goarch), 0);
 	}
@@ -1095,7 +1095,7 @@ install(char *dir)
 		else
 			vadd(&compile, "main");
 
-		if(streq(dir, "pkg/runtime"))
+		if(streq(dir, "runtime"))
 			vadd(&compile, "-+");
 
 		vcopy(&compile, go.p, go.len);
@@ -1124,11 +1124,11 @@ install(char *dir)
 nobuild:
 	// In package runtime, we install runtime.h and cgocall.h too,
 	// for use by cgo compilation.
-	if(streq(dir, "pkg/runtime")) {
+	if(streq(dir, "runtime")) {
 		copyfile(bpathf(&b, "%s/pkg/%s_%s/cgocall.h", goroot, goos, goarch),
-			bpathf(&b1, "%s/src/pkg/runtime/cgocall.h", goroot), 0);
+			bpathf(&b1, "%s/src/runtime/cgocall.h", goroot), 0);
 		copyfile(bpathf(&b, "%s/pkg/%s_%s/runtime.h", goroot, goos, goarch),
-			bpathf(&b1, "%s/src/pkg/runtime/runtime.h", goroot), 0);
+			bpathf(&b1, "%s/src/runtime/runtime.h", goroot), 0);
 	}
 
 
@@ -1339,47 +1339,47 @@ static char *buildorder[] = {
 	// back when there were build scripts.  Will have to
 	// be maintained by hand, but shouldn't change very
 	// often.
-	"pkg/runtime",
-	"pkg/errors",
-	"pkg/sync/atomic",
-	"pkg/sync",
-	"pkg/io",
-	"pkg/unicode",
-	"pkg/unicode/utf8",
-	"pkg/unicode/utf16",
-	"pkg/bytes",
-	"pkg/math",
-	"pkg/strings",
-	"pkg/strconv",
-	"pkg/bufio",
-	"pkg/sort",
-	"pkg/container/heap",
-	"pkg/encoding/base64",
-	"pkg/syscall",
-	"pkg/time",
-	"pkg/os",
-	"pkg/reflect",
-	"pkg/fmt",
-	"pkg/encoding",
-	"pkg/encoding/json",
-	"pkg/flag",
-	"pkg/path/filepath",
-	"pkg/path",
-	"pkg/io/ioutil",
-	"pkg/log",
-	"pkg/regexp/syntax",
-	"pkg/regexp",
-	"pkg/go/token",
-	"pkg/go/scanner",
-	"pkg/go/ast",
-	"pkg/go/parser",
-	"pkg/os/exec",
-	"pkg/os/signal",
-	"pkg/net/url",
-	"pkg/text/template/parse",
-	"pkg/text/template",
-	"pkg/go/doc",
-	"pkg/go/build",
+	"runtime",
+	"errors",
+	"sync/atomic",
+	"sync",
+	"io",
+	"unicode",
+	"unicode/utf8",
+	"unicode/utf16",
+	"bytes",
+	"math",
+	"strings",
+	"strconv",
+	"bufio",
+	"sort",
+	"container/heap",
+	"encoding/base64",
+	"syscall",
+	"time",
+	"os",
+	"reflect",
+	"fmt",
+	"encoding",
+	"encoding/json",
+	"flag",
+	"path/filepath",
+	"path",
+	"io/ioutil",
+	"log",
+	"regexp/syntax",
+	"regexp",
+	"go/token",
+	"go/scanner",
+	"go/ast",
+	"go/parser",
+	"os/exec",
+	"os/signal",
+	"net/url",
+	"text/template/parse",
+	"text/template",
+	"go/doc",
+	"go/build",
 	"cmd/go",
 };
 
@@ -1387,6 +1387,7 @@ static char *buildorder[] = {
 // It is bigger than the buildorder because we clean all the
 // compilers but build only the $GOARCH ones.
 static char *cleantab[] = {
+	// Commands and C libraries.
 	"cmd/5a",
 	"cmd/5c",
 	"cmd/5g",
@@ -1409,46 +1410,48 @@ static char *cleantab[] = {
 	"lib9",
 	"libbio",
 	"liblink",
-	"pkg/bufio",
-	"pkg/bytes",
-	"pkg/container/heap",
-	"pkg/encoding",
-	"pkg/encoding/base64",
-	"pkg/encoding/json",
-	"pkg/errors",
-	"pkg/flag",
-	"pkg/fmt",
-	"pkg/go/ast",
-	"pkg/go/build",
-	"pkg/go/doc",
-	"pkg/go/parser",
-	"pkg/go/scanner",
-	"pkg/go/token",
-	"pkg/io",
-	"pkg/io/ioutil",
-	"pkg/log",
-	"pkg/math",
-	"pkg/net/url",
-	"pkg/os",
-	"pkg/os/exec",
-	"pkg/path",
-	"pkg/path/filepath",
-	"pkg/reflect",
-	"pkg/regexp",
-	"pkg/regexp/syntax",
-	"pkg/runtime",
-	"pkg/sort",
-	"pkg/strconv",
-	"pkg/strings",
-	"pkg/sync",
-	"pkg/sync/atomic",
-	"pkg/syscall",
-	"pkg/text/template",
-	"pkg/text/template/parse",
-	"pkg/time",
-	"pkg/unicode",
-	"pkg/unicode/utf16",
-	"pkg/unicode/utf8",
+
+	// Go packages.
+	"bufio",
+	"bytes",
+	"container/heap",
+	"encoding",
+	"encoding/base64",
+	"encoding/json",
+	"errors",
+	"flag",
+	"fmt",
+	"go/ast",
+	"go/build",
+	"go/doc",
+	"go/parser",
+	"go/scanner",
+	"go/token",
+	"io",
+	"io/ioutil",
+	"log",
+	"math",
+	"net/url",
+	"os",
+	"os/exec",
+	"path",
+	"path/filepath",
+	"reflect",
+	"regexp",
+	"regexp/syntax",
+	"runtime",
+	"sort",
+	"strconv",
+	"strings",
+	"sync",
+	"sync/atomic",
+	"syscall",
+	"text/template",
+	"text/template/parse",
+	"time",
+	"unicode",
+	"unicode/utf16",
+	"unicode/utf8",
 };
 
 static void
@@ -1477,9 +1480,9 @@ clean(void)
 			xremove(bpathf(&b, "%s/%s", bstr(&path), cleantab[i]+4));
 	}
 
-	// remove src/pkg/runtime/z* unconditionally
+	// remove src/runtime/z* unconditionally
 	vreset(&dir);
-	bpathf(&path, "%s/src/pkg/runtime", goroot);
+	bpathf(&path, "%s/src/runtime", goroot);
 	xreaddir(&dir, bstr(&path));
 	for(j=0; j<dir.len; j++) {
 		if(hasprefix(dir.p[j], "z"))
@@ -1616,6 +1619,15 @@ cmdbootstrap(int argc, char **argv)
 	if(argc > 0)
 		usage();
 
+	if(isdir(bpathf(&b, "%s/src/pkg", goroot))) {
+		fatal("\n\n"
+			"The Go package sources have moved to $GOROOT/src.\n"
+			"*** %s still exists. ***\n"
+			"It probably contains stale files that may confuse the build.\n"
+			"Please (check what's there and) remove it and try again.\n"
+			"See http://golang.org/s/go14nopkg\n", bpathf(&b, "%s/src/pkg", goroot));
+	}
+	
 	if(rebuildall)
 		clean();
 	goversion = findgoversion();
@@ -1646,9 +1658,9 @@ cmdbootstrap(int argc, char **argv)
 	xsetenv("GOARCH", goarch);
 	xsetenv("GOOS", goos);
 
-	// Build pkg/runtime for actual goos/goarch too.
+	// Build runtime for actual goos/goarch too.
 	if(!streq(goos, gohostos) || !streq(goarch, gohostarch))
-		install("pkg/runtime");
+		install("runtime");
 
 	bfree(&b);
 }
diff --git a/src/cmd/dist/buildruntime.c b/src/cmd/dist/buildruntime.c
index 7af38456d..c21a31639 100644
--- a/src/cmd/dist/buildruntime.c
+++ b/src/cmd/dist/buildruntime.c
@@ -5,7 +5,7 @@
 #include "a.h"
 
 /*
- * Helpers for building pkg/runtime.
+ * Helpers for building runtime.
  */
 
 // mkzversion writes zversion.go:
diff --git a/src/cmd/dist/windows.c b/src/cmd/dist/windows.c
index 1102adff5..ff1a27351 100644
--- a/src/cmd/dist/windows.c
+++ b/src/cmd/dist/windows.c
@@ -929,7 +929,7 @@ xsamefile(char *f1, char *f2)
 		return 1;
 	
 	torune(&ru, f1);
-	// refer to ../../pkg/os/stat_windows.go:/sameFile
+	// refer to ../../os/stat_windows.go:/sameFile
 	fd1 = CreateFileW(ru, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
 	xfree(ru);
 	if(fd1 == INVALID_HANDLE_VALUE)
diff --git a/src/cmd/fix/fix.go b/src/cmd/fix/fix.go
index a100be794..a07bbac79 100644
--- a/src/cmd/fix/fix.go
+++ b/src/cmd/fix/fix.go
@@ -101,7 +101,7 @@ func walkBeforeAfter(x interface{}, before, after func(interface{})) {
 	case *[]ast.Stmt:
 		walkBeforeAfter(*n, before, after)
 
-	// These are ordered and grouped to match ../../pkg/go/ast/ast.go
+	// These are ordered and grouped to match ../../go/ast/ast.go
 	case *ast.Field:
 		walkBeforeAfter(&n.Names, before, after)
 		walkBeforeAfter(&n.Type, before, after)
diff --git a/src/cmd/gc/md5.c b/src/cmd/gc/md5.c
index fa6606719..46cb6b712 100644
--- a/src/cmd/gc/md5.c
+++ b/src/cmd/gc/md5.c
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // 64-bit MD5 (does full MD5 but returns 64 bits only).
-// Translation of ../../pkg/crypto/md5/md5*.go.
+// Translation of ../../crypto/md5/md5*.go.
 
 #include <u.h>
 #include <libc.h>
diff --git a/src/cmd/gc/pgen.c b/src/cmd/gc/pgen.c
index 5ac46e774..2d4795ac1 100644
--- a/src/cmd/gc/pgen.c
+++ b/src/cmd/gc/pgen.c
@@ -11,7 +11,7 @@
 #include	"md5.h"
 #include	"gg.h"
 #include	"opt.h"
-#include	"../../pkg/runtime/funcdata.h"
+#include	"../../runtime/funcdata.h"
 
 static void allocauto(Prog* p);
 
@@ -233,7 +233,7 @@ compile(Node *fn)
 		ptxt->TEXTFLAG |= NOSPLIT;
 
 	// Clumsy but important.
-	// See test/recover.go for test cases and src/pkg/reflect/value.go
+	// See test/recover.go for test cases and src/reflect/value.go
 	// for the actual functions being considered.
 	if(myimportpath != nil && strcmp(myimportpath, "reflect") == 0) {
 		if(strcmp(curfn->nname->sym->name, "callReflect") == 0 || strcmp(curfn->nname->sym->name, "callMethod") == 0)
diff --git a/src/cmd/gc/plive.c b/src/cmd/gc/plive.c
index dc4edad63..0feb2c710 100644
--- a/src/cmd/gc/plive.c
+++ b/src/cmd/gc/plive.c
@@ -18,8 +18,8 @@
 #include "gg.h"
 #include "opt.h"
 #include "../ld/textflag.h"
-#include "../../pkg/runtime/funcdata.h"
-#include "../../pkg/runtime/mgc0.h"
+#include "../../runtime/funcdata.h"
+#include "../../runtime/mgc0.h"
 
 enum {
 	UNVISITED = 0,
diff --git a/src/cmd/gc/reflect.c b/src/cmd/gc/reflect.c
index f227054ca..31e449e76 100644
--- a/src/cmd/gc/reflect.c
+++ b/src/cmd/gc/reflect.c
@@ -6,8 +6,8 @@
 #include <libc.h>
 #include "go.h"
 #include "../ld/textflag.h"
-#include "../../pkg/runtime/mgc0.h"
-#include "../../pkg/runtime/typekind.h"
+#include "../../runtime/mgc0.h"
+#include "../../runtime/typekind.h"
 
 /*
  * runtime interface and reflection data structures
@@ -109,7 +109,7 @@ lsort(Sig *l, int(*f)(Sig*, Sig*))
 // the given map type.  This type is not visible to users -
 // we include only enough information to generate a correct GC
 // program for it.
-// Make sure this stays in sync with ../../pkg/runtime/hashmap.c!
+// Make sure this stays in sync with ../../runtime/hashmap.c!
 enum {
 	BUCKETSIZE = 8,
 	MAXKEYSIZE = 128,
@@ -192,7 +192,7 @@ mapbucket(Type *t)
 // the given map type.  This type is not visible to users -
 // we include only enough information to generate a correct GC
 // program for it.
-// Make sure this stays in sync with ../../pkg/runtime/hashmap.go!
+// Make sure this stays in sync with ../../runtime/hashmap.go!
 static Type*
 hmap(Type *t)
 {
@@ -261,7 +261,7 @@ hiter(Type *t)
 	//    bptr *Bucket
 	//    other [4]uintptr
 	// }
-	// must match ../../pkg/runtime/hashmap.c:hash_iter.
+	// must match ../../runtime/hashmap.c:hash_iter.
 	field[0] = typ(TFIELD);
 	field[0]->type = ptrto(t->down);
 	field[0]->sym = mal(sizeof(Sym));
@@ -550,7 +550,7 @@ dgopkgpath(Sym *s, int ot, Pkg *pkg)
 
 /*
  * uncommonType
- * ../../pkg/runtime/type.go:/uncommonType
+ * ../../runtime/type.go:/uncommonType
  */
 static int
 dextratype(Sym *sym, int off, Type *t, int ptroff)
@@ -594,7 +594,7 @@ dextratype(Sym *sym, int off, Type *t, int ptroff)
 	// methods
 	for(a=m; a; a=a->link) {
 		// method
-		// ../../pkg/runtime/type.go:/method
+		// ../../runtime/type.go:/method
 		ot = dgostringptr(s, ot, a->name);
 		ot = dgopkgpath(s, ot, a->pkg);
 		ot = dsymptr(s, ot, dtypesym(a->mtype), 0);
@@ -710,7 +710,7 @@ haspointers(Type *t)
 
 /*
  * commonType
- * ../../pkg/runtime/type.go:/commonType
+ * ../../runtime/type.go:/commonType
  */
 static int
 dcommontype(Sym *s, int ot, Type *t)
@@ -992,7 +992,7 @@ ok:
 
 	case TARRAY:
 		if(t->bound >= 0) {
-			// ../../pkg/runtime/type.go:/ArrayType
+			// ../../runtime/type.go:/ArrayType
 			s1 = dtypesym(t->type);
 			t2 = typ(TARRAY);
 			t2->type = t->type;
@@ -1004,7 +1004,7 @@ ok:
 			ot = dsymptr(s, ot, s2, 0);
 			ot = duintptr(s, ot, t->bound);
 		} else {
-			// ../../pkg/runtime/type.go:/SliceType
+			// ../../runtime/type.go:/SliceType
 			s1 = dtypesym(t->type);
 			ot = dcommontype(s, ot, t);
 			xt = ot - 3*widthptr;
@@ -1013,7 +1013,7 @@ ok:
 		break;
 
 	case TCHAN:
-		// ../../pkg/runtime/type.go:/ChanType
+		// ../../runtime/type.go:/ChanType
 		s1 = dtypesym(t->type);
 		ot = dcommontype(s, ot, t);
 		xt = ot - 3*widthptr;
@@ -1063,14 +1063,14 @@ ok:
 			n++;
 		}
 
-		// ../../pkg/runtime/type.go:/InterfaceType
+		// ../../runtime/type.go:/InterfaceType
 		ot = dcommontype(s, ot, t);
 		xt = ot - 3*widthptr;
 		ot = dsymptr(s, ot, s, ot+widthptr+2*widthint);
 		ot = duintxx(s, ot, n, widthint);
 		ot = duintxx(s, ot, n, widthint);
 		for(a=m; a; a=a->link) {
-			// ../../pkg/runtime/type.go:/imethod
+			// ../../runtime/type.go:/imethod
 			ot = dgostringptr(s, ot, a->name);
 			ot = dgopkgpath(s, ot, a->pkg);
 			ot = dsymptr(s, ot, dtypesym(a->type), 0);
@@ -1078,7 +1078,7 @@ ok:
 		break;
 
 	case TMAP:
-		// ../../pkg/runtime/type.go:/MapType
+		// ../../runtime/type.go:/MapType
 		s1 = dtypesym(t->down);
 		s2 = dtypesym(t->type);
 		s3 = dtypesym(mapbucket(t));
@@ -1109,11 +1109,11 @@ ok:
 	case TPTR32:
 	case TPTR64:
 		if(t->type->etype == TANY) {
-			// ../../pkg/runtime/type.go:/UnsafePointerType
+			// ../../runtime/type.go:/UnsafePointerType
 			ot = dcommontype(s, ot, t);
 			break;
 		}
-		// ../../pkg/runtime/type.go:/PtrType
+		// ../../runtime/type.go:/PtrType
 		s1 = dtypesym(t->type);
 		ot = dcommontype(s, ot, t);
 		xt = ot - 3*widthptr;
@@ -1121,7 +1121,7 @@ ok:
 		break;
 
 	case TSTRUCT:
-		// ../../pkg/runtime/type.go:/StructType
+		// ../../runtime/type.go:/StructType
 		// for security, only the exported fields.
 		n = 0;
 		for(t1=t->type; t1!=T; t1=t1->down) {
@@ -1134,7 +1134,7 @@ ok:
 		ot = duintxx(s, ot, n, widthint);
 		ot = duintxx(s, ot, n, widthint);
 		for(t1=t->type; t1!=T; t1=t1->down) {
-			// ../../pkg/runtime/type.go:/structField
+			// ../../runtime/type.go:/structField
 			if(t1->sym && !t1->embedded) {
 				ot = dgostringptr(s, ot, t1->sym->name);
 				if(exportname(t1->sym->name))
@@ -1260,7 +1260,7 @@ dalgsym(Type *t)
 	dsymptr(eqfunc, 0, eq, 0);
 	ggloblsym(eqfunc, widthptr, DUPOK|RODATA);
 
-	// ../../pkg/runtime/alg.go:/typeAlg
+	// ../../runtime/alg.go:/typeAlg
 	ot = 0;
 	ot = dsymptr(s, ot, hashfunc, 0);
 	ot = dsymptr(s, ot, eqfunc, 0);
diff --git a/src/cmd/gc/select.c b/src/cmd/gc/select.c
index ed23e4318..965ad277f 100644
--- a/src/cmd/gc/select.c
+++ b/src/cmd/gc/select.c
@@ -325,7 +325,7 @@ out:
 	lineno = lno;
 }
 
-// Keep in sync with src/pkg/runtime/chan.h.
+// Keep in sync with src/runtime/chan.h.
 static Type*
 selecttype(int32 size)
 {
diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index d62d55e77..93600c688 100644
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -3641,7 +3641,7 @@ ngotype(Node *n)
  * users if we escape that as little as possible.
  *
  * If you edit this, edit ../ld/lib.c:/^pathtoprefix too.
- * If you edit this, edit ../../pkg/debug/goobj/read.go:/importPathToPrefix too.
+ * If you edit this, edit ../../debug/goobj/read.go:/importPathToPrefix too.
  */
 static char*
 pathtoprefix(char *s)
diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index 365ece267..d1d4c7246 100644
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -688,7 +688,7 @@ walkexpr(Node **np, NodeList **init)
 		walkexpr(&r->right, init);
 		t = r->left->type;
 		p = nil;
-		if(t->type->width <= 128) { // Check ../../pkg/runtime/hashmap.c:MAXVALUESIZE before changing.
+		if(t->type->width <= 128) { // Check ../../runtime/hashmap.c:MAXVALUESIZE before changing.
 			switch(simsimtype(t->down)) {
 			case TINT32:
 			case TUINT32:
@@ -1083,7 +1083,7 @@ walkexpr(Node **np, NodeList **init)
 
 		t = n->left->type;
 		p = nil;
-		if(t->type->width <= 128) {  // Check ../../pkg/runtime/hashmap.c:MAXVALUESIZE before changing.
+		if(t->type->width <= 128) {  // Check ../../runtime/hashmap.c:MAXVALUESIZE before changing.
 			switch(simsimtype(t->down)) {
 			case TINT32:
 			case TUINT32:
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index fd92ca278..45b5bc323 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -433,12 +433,11 @@ const (
 )
 
 var (
-	goroot       = filepath.Clean(runtime.GOROOT())
-	gobin        = os.Getenv("GOBIN")
-	gorootBin    = filepath.Join(goroot, "bin")
-	gorootSrcPkg = filepath.Join(goroot, "src/pkg")
-	gorootPkg    = filepath.Join(goroot, "pkg")
-	gorootSrc    = filepath.Join(goroot, "src")
+	goroot    = filepath.Clean(runtime.GOROOT())
+	gobin     = os.Getenv("GOBIN")
+	gorootBin = filepath.Join(goroot, "bin")
+	gorootPkg = filepath.Join(goroot, "pkg")
+	gorootSrc = filepath.Join(goroot, "src")
 )
 
 func (b *builder) init() {
@@ -1255,7 +1254,7 @@ func (b *builder) showcmd(dir string, format string, args ...interface{}) {
 // the source directory for the package that has failed to build.
 // showOutput rewrites mentions of dir with a relative path to dir
 // when the relative path is shorter.  This is usually more pleasant.
-// For example, if fmt doesn't compile and we are in src/pkg/html,
+// For example, if fmt doesn't compile and we are in src/html,
 // the output is
 //
 //	$ go build
@@ -1267,7 +1266,7 @@ func (b *builder) showcmd(dir string, format string, args ...interface{}) {
 //
 //	$ go build
 //	# fmt
-//	/usr/gopher/go/src/pkg/fmt/print.go:1090: undefined: asdf
+//	/usr/gopher/go/src/fmt/print.go:1090: undefined: asdf
 //	$
 //
 // showOutput also replaces references to the work directory with $WORK.
diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index eb69606de..9691f39c7 100644
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -537,7 +537,7 @@ func matchPackages(pattern string) []string {
 	})
 
 	for _, src := range buildContext.SrcDirs() {
-		if pattern == "std" && src != gorootSrcPkg {
+		if pattern == "std" && src != gorootSrc {
 			continue
 		}
 		src = filepath.Clean(src) + string(filepath.Separator)
@@ -619,7 +619,7 @@ func matchPackagesInFS(pattern string) []string {
 			// The initial case is not Cleaned, though, so we do this explicitly.
 			//
 			// This converts a path like "./io/" to "io". Without this step, running
-			// "cd $GOROOT/src/pkg; go list ./io/..." would incorrectly skip the io
+			// "cd $GOROOT/src; go list ./io/..." would incorrectly skip the io
 			// package, because prepending the prefix "./" to the unclean path would
 			// result in "././io", and match("././io") returns false.
 			path = filepath.Clean(path)
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index 1af33f037..63875aed5 100644
--- a/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go
@@ -218,7 +218,7 @@ func dirToImportPath(dir string) string {
 }
 
 func makeImportValid(r rune) rune {
-	// Should match Go spec, compilers, and ../../pkg/go/parser/parser.go:/isValidImport.
+	// Should match Go spec, compilers, and ../../go/parser/parser.go:/isValidImport.
 	const illegalChars = `!"#$%&'()*,:;<=>?[\]^{|}` + "`\uFFFD"
 	if !unicode.IsGraphic(r) || unicode.IsSpace(r) || strings.ContainsRune(illegalChars, r) {
 		return '_'
@@ -783,24 +783,13 @@ func loadPackage(arg string, stk *importStack) *Package {
 			arg = sub
 		}
 	}
-	if strings.HasPrefix(arg, "cmd/") {
+	if strings.HasPrefix(arg, "cmd/") && !strings.Contains(arg[4:], "/") {
 		if p := cmdCache[arg]; p != nil {
 			return p
 		}
 		stk.push(arg)
 		defer stk.pop()
 
-		if strings.Contains(arg[4:], "/") {
-			p := &Package{
-				Error: &PackageError{
-					ImportStack: stk.copy(),
-					Err:         fmt.Sprintf("invalid import path: cmd/... is reserved for Go commands"),
-					hard:        true,
-				},
-			}
-			return p
-		}
-
 		bp, err := buildContext.ImportDir(filepath.Join(gorootSrc, arg), 0)
 		bp.ImportPath = arg
 		bp.Goroot = true
diff --git a/src/cmd/go/test.bash b/src/cmd/go/test.bash
index 24640e272..13886e158 100755
--- a/src/cmd/go/test.bash
+++ b/src/cmd/go/test.bash
@@ -430,7 +430,7 @@ fi
 # Test that without GOPATH set, go get should fail
 TEST without GOPATH, go get fails
 d=$(mktemp -d -t testgoXXX)
-mkdir -p $d/src/pkg
+mkdir -p $d/src
 if GOPATH= GOROOT=$d ./testgo get -d code.google.com/p/go.codereview/cmd/hgpatch ; then 
 	echo 'go get code.google.com/p/go.codereview/cmd/hgpatch should not succeed with $GOPATH unset'
 	ok=false
@@ -440,7 +440,7 @@ rm -rf $d
 # Test that with GOPATH=$GOROOT, go get should fail
 TEST with GOPATH=GOROOT, go get fails
 d=$(mktemp -d -t testgoXXX)
-mkdir -p $d/src/pkg
+mkdir -p $d/src
 if GOPATH=$d GOROOT=$d ./testgo get -d code.google.com/p/go.codereview/cmd/hgpatch ; then
         echo 'go get code.google.com/p/go.codereview/cmd/hgpatch should not succeed with GOPATH=$GOROOT'
         ok=false
@@ -595,7 +595,7 @@ export GOPATH=$(pwd)/testdata/shadow/root1:$(pwd)/testdata/shadow/root2
 
 # The math in root1 is not "math" because the standard math is.
 cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root1/src/math)
-if [ "$cdir" != "(_$(pwd)/testdata/shadow/root1/src/math) ($GOROOT/src/pkg/math)" ]; then
+if [ "$cdir" != "(_$(pwd)/testdata/shadow/root1/src/math) ($GOROOT/src/math)" ]; then
 	echo shadowed math is not shadowed: "$cdir"
 	ok=false
 fi
diff --git a/src/cmd/gofmt/doc.go b/src/cmd/gofmt/doc.go
index 8f73ef5b9..3fc043954 100644
--- a/src/cmd/gofmt/doc.go
+++ b/src/cmd/gofmt/doc.go
@@ -67,7 +67,7 @@ To remove the parentheses:
 
 To convert the package tree from explicit slice upper bounds to implicit ones:
 
-	gofmt -r 'α[β:len(α)] -> α[β:]' -w $GOROOT/src/pkg
+	gofmt -r 'α[β:len(α)] -> α[β:]' -w $GOROOT/src
 
 The simplify command
 
diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c
index 7bf18f081..be8c7ef25 100644
--- a/src/cmd/ld/data.c
+++ b/src/cmd/ld/data.c
@@ -35,7 +35,7 @@
 #include	"../ld/elf.h"
 #include	"../ld/macho.h"
 #include	"../ld/pe.h"
-#include	"../../pkg/runtime/mgc0.h"
+#include	"../../runtime/mgc0.h"
 
 void	dynreloc(void);
 
diff --git a/src/cmd/ld/decodesym.c b/src/cmd/ld/decodesym.c
index b5fe47ce9..c53066942 100644
--- a/src/cmd/ld/decodesym.c
+++ b/src/cmd/ld/decodesym.c
@@ -4,10 +4,10 @@
 
 #include	"l.h"
 #include	"lib.h"
-#include	"../../pkg/runtime/typekind.h"
+#include	"../../runtime/typekind.h"
 
 // Decoding the type.* symbols.	 This has to be in sync with
-// ../../pkg/runtime/type.go, or more specificaly, with what
+// ../../runtime/type.go, or more specificaly, with what
 // ../gc/reflect.c stuffs in these.
 
 static Reloc*
diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c
index 702d4dfcb..13c47aa21 100644
--- a/src/cmd/ld/dwarf.c
+++ b/src/cmd/ld/dwarf.c
@@ -19,7 +19,7 @@
 #include	"../ld/elf.h"
 #include	"../ld/macho.h"
 #include	"../ld/pe.h"
-#include	"../../pkg/runtime/typekind.h"
+#include	"../../runtime/typekind.h"
 
 /*
  * Offsets and sizes of the debug_* sections in the cout file.
diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c
index 7b997464d..0e2107fd5 100644
--- a/src/cmd/ld/lib.c
+++ b/src/cmd/ld/lib.c
@@ -33,8 +33,8 @@
 #include	"lib.h"
 #include	"../ld/elf.h"
 #include	"../ld/dwarf.h"
-#include	"../../pkg/runtime/stack.h"
-#include	"../../pkg/runtime/funcdata.h"
+#include	"../../runtime/stack.h"
+#include	"../../runtime/funcdata.h"
 
 #include	<ar.h>
 #if !(defined(_WIN32) || defined(PLAN9))
@@ -900,7 +900,7 @@ unmal(void *v, uint32 n)
  * escaping are %, ., and ", but we escape all control characters too.
  *
  * If you edit this, edit ../gc/subr.c:/^pathtoprefix too.
- * If you edit this, edit ../../pkg/debug/goobj/read.go:/importPathToPrefix too.
+ * If you edit this, edit ../../debug/goobj/read.go:/importPathToPrefix too.
  */
 static char*
 pathtoprefix(char *s)
diff --git a/src/cmd/ld/pcln.c b/src/cmd/ld/pcln.c
index 3cd9e65da..69671c0fc 100644
--- a/src/cmd/ld/pcln.c
+++ b/src/cmd/ld/pcln.c
@@ -4,7 +4,7 @@
 
 #include	"l.h"
 #include	"lib.h"
-#include	"../../pkg/runtime/funcdata.h"
+#include	"../../runtime/funcdata.h"
 
 static void
 addvarint(Pcdata *d, uint32 val)
diff --git a/src/cmd/nm/nm_test.go b/src/cmd/nm/nm_test.go
index f447e8e49..cb555d827 100644
--- a/src/cmd/nm/nm_test.go
+++ b/src/cmd/nm/nm_test.go
@@ -83,7 +83,7 @@ func TestNM(t *testing.T) {
 		"plan9obj/testdata/386-plan9-exec",
 	}
 	for _, f := range testfiles {
-		exepath := filepath.Join(runtime.GOROOT(), "src", "pkg", "debug", f)
+		exepath := filepath.Join(runtime.GOROOT(), "src", "debug", f)
 		cmd := exec.Command(testnmpath, exepath)
 		out, err := cmd.CombinedOutput()
 		if err != nil {
diff --git a/src/pkg/compress/bzip2/bit_reader.go b/src/compress/bzip2/bit_reader.go
index 32d1036ae..32d1036ae 100644
--- a/src/pkg/compress/bzip2/bit_reader.go
+++ b/src/compress/bzip2/bit_reader.go
diff --git a/src/pkg/compress/bzip2/bzip2.go b/src/compress/bzip2/bzip2.go
index d318116a1..d318116a1 100644
--- a/src/pkg/compress/bzip2/bzip2.go
+++ b/src/compress/bzip2/bzip2.go
diff --git a/src/pkg/compress/bzip2/bzip2_test.go b/src/compress/bzip2/bzip2_test.go
index fb79d089e..fb79d089e 100644
--- a/src/pkg/compress/bzip2/bzip2_test.go
+++ b/src/compress/bzip2/bzip2_test.go
diff --git a/src/pkg/compress/bzip2/huffman.go b/src/compress/bzip2/huffman.go
index 75a6223d8..75a6223d8 100644
--- a/src/pkg/compress/bzip2/huffman.go
+++ b/src/compress/bzip2/huffman.go
diff --git a/src/pkg/compress/bzip2/move_to_front.go b/src/compress/bzip2/move_to_front.go
index 526dfb34c..526dfb34c 100644
--- a/src/pkg/compress/bzip2/move_to_front.go
+++ b/src/compress/bzip2/move_to_front.go
diff --git a/src/pkg/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2 b/src/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
index 0bd61a6d4..0bd61a6d4 100644
--- a/src/pkg/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
+++ b/src/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
diff --git a/src/pkg/compress/bzip2/testdata/e.txt.bz2 b/src/compress/bzip2/testdata/e.txt.bz2
index 65bf3b4c3..65bf3b4c3 100644
--- a/src/pkg/compress/bzip2/testdata/e.txt.bz2
+++ b/src/compress/bzip2/testdata/e.txt.bz2
diff --git a/src/pkg/compress/flate/copy.go b/src/compress/flate/copy.go
index a3200a8f4..a3200a8f4 100644
--- a/src/pkg/compress/flate/copy.go
+++ b/src/compress/flate/copy.go
diff --git a/src/pkg/compress/flate/copy_test.go b/src/compress/flate/copy_test.go
index 2011b1547..2011b1547 100644
--- a/src/pkg/compress/flate/copy_test.go
+++ b/src/compress/flate/copy_test.go
diff --git a/src/pkg/compress/flate/deflate.go b/src/compress/flate/deflate.go
index 8c79df0c6..8c79df0c6 100644
--- a/src/pkg/compress/flate/deflate.go
+++ b/src/compress/flate/deflate.go
diff --git a/src/pkg/compress/flate/deflate_test.go b/src/compress/flate/deflate_test.go
index 730234c38..730234c38 100644
--- a/src/pkg/compress/flate/deflate_test.go
+++ b/src/compress/flate/deflate_test.go
diff --git a/src/pkg/compress/flate/fixedhuff.go b/src/compress/flate/fixedhuff.go
index 7df8b9a29..7df8b9a29 100644
--- a/src/pkg/compress/flate/fixedhuff.go
+++ b/src/compress/flate/fixedhuff.go
diff --git a/src/pkg/compress/flate/flate_test.go b/src/compress/flate/flate_test.go
index 068766323..068766323 100644
--- a/src/pkg/compress/flate/flate_test.go
+++ b/src/compress/flate/flate_test.go
diff --git a/src/pkg/compress/flate/gen.go b/src/compress/flate/gen.go
index 6288ecddd..6288ecddd 100644
--- a/src/pkg/compress/flate/gen.go
+++ b/src/compress/flate/gen.go
diff --git a/src/pkg/compress/flate/huffman_bit_writer.go b/src/compress/flate/huffman_bit_writer.go
index b182a710b..b182a710b 100644
--- a/src/pkg/compress/flate/huffman_bit_writer.go
+++ b/src/compress/flate/huffman_bit_writer.go
diff --git a/src/pkg/compress/flate/huffman_code.go b/src/compress/flate/huffman_code.go
index 3b9fce466..3b9fce466 100644
--- a/src/pkg/compress/flate/huffman_code.go
+++ b/src/compress/flate/huffman_code.go
diff --git a/src/pkg/compress/flate/inflate.go b/src/compress/flate/inflate.go
index 769ef4299..769ef4299 100644
--- a/src/pkg/compress/flate/inflate.go
+++ b/src/compress/flate/inflate.go
diff --git a/src/pkg/compress/flate/reader_test.go b/src/compress/flate/reader_test.go
index a62ef741d..a62ef741d 100644
--- a/src/pkg/compress/flate/reader_test.go
+++ b/src/compress/flate/reader_test.go
diff --git a/src/pkg/compress/flate/reverse_bits.go b/src/compress/flate/reverse_bits.go
index c1a02720d..c1a02720d 100644
--- a/src/pkg/compress/flate/reverse_bits.go
+++ b/src/compress/flate/reverse_bits.go
diff --git a/src/pkg/compress/flate/token.go b/src/compress/flate/token.go
index 4d4917687..4d4917687 100644
--- a/src/pkg/compress/flate/token.go
+++ b/src/compress/flate/token.go
diff --git a/src/pkg/compress/flate/writer_test.go b/src/compress/flate/writer_test.go
index 58431774e..58431774e 100644
--- a/src/pkg/compress/flate/writer_test.go
+++ b/src/compress/flate/writer_test.go
diff --git a/src/pkg/compress/gzip/gunzip.go b/src/compress/gzip/gunzip.go
index 4f398b194..4f398b194 100644
--- a/src/pkg/compress/gzip/gunzip.go
+++ b/src/compress/gzip/gunzip.go
diff --git a/src/pkg/compress/gzip/gunzip_test.go b/src/compress/gzip/gunzip_test.go
index 2471038f5..2471038f5 100644
--- a/src/pkg/compress/gzip/gunzip_test.go
+++ b/src/compress/gzip/gunzip_test.go
diff --git a/src/pkg/compress/gzip/gzip.go b/src/compress/gzip/gzip.go
index 5131d128e..5131d128e 100644
--- a/src/pkg/compress/gzip/gzip.go
+++ b/src/compress/gzip/gzip.go
diff --git a/src/pkg/compress/gzip/gzip_test.go b/src/compress/gzip/gzip_test.go
index 09271b24e..09271b24e 100644
--- a/src/pkg/compress/gzip/gzip_test.go
+++ b/src/compress/gzip/gzip_test.go
diff --git a/src/pkg/compress/gzip/testdata/issue6550.gz b/src/compress/gzip/testdata/issue6550.gz
index 57972b636..57972b636 100644
--- a/src/pkg/compress/gzip/testdata/issue6550.gz
+++ b/src/compress/gzip/testdata/issue6550.gz
diff --git a/src/pkg/compress/lzw/reader.go b/src/compress/lzw/reader.go
index cd90c9c63..cd90c9c63 100644
--- a/src/pkg/compress/lzw/reader.go
+++ b/src/compress/lzw/reader.go
diff --git a/src/pkg/compress/lzw/reader_test.go b/src/compress/lzw/reader_test.go
index 9006c91c2..9006c91c2 100644
--- a/src/pkg/compress/lzw/reader_test.go
+++ b/src/compress/lzw/reader_test.go
diff --git a/src/pkg/compress/lzw/writer.go b/src/compress/lzw/writer.go
index 961b25f94..961b25f94 100644
--- a/src/pkg/compress/lzw/writer.go
+++ b/src/compress/lzw/writer.go
diff --git a/src/pkg/compress/lzw/writer_test.go b/src/compress/lzw/writer_test.go
index 3e4e6de21..3e4e6de21 100644
--- a/src/pkg/compress/lzw/writer_test.go
+++ b/src/compress/lzw/writer_test.go
diff --git a/src/pkg/compress/testdata/Mark.Twain-Tom.Sawyer.txt b/src/compress/testdata/Mark.Twain-Tom.Sawyer.txt
index c97da7ecc..c97da7ecc 100644
--- a/src/pkg/compress/testdata/Mark.Twain-Tom.Sawyer.txt
+++ b/src/compress/testdata/Mark.Twain-Tom.Sawyer.txt
diff --git a/src/pkg/compress/testdata/e.txt b/src/compress/testdata/e.txt
index 5ca186f14..5ca186f14 100644
--- a/src/pkg/compress/testdata/e.txt
+++ b/src/compress/testdata/e.txt
diff --git a/src/pkg/compress/testdata/pi.txt b/src/compress/testdata/pi.txt
index ca99bbc2a..ca99bbc2a 100644
--- a/src/pkg/compress/testdata/pi.txt
+++ b/src/compress/testdata/pi.txt
diff --git a/src/pkg/compress/zlib/example_test.go b/src/compress/zlib/example_test.go
index 70408895f..70408895f 100644
--- a/src/pkg/compress/zlib/example_test.go
+++ b/src/compress/zlib/example_test.go
diff --git a/src/pkg/compress/zlib/reader.go b/src/compress/zlib/reader.go
index 9e1aafda9..9e1aafda9 100644
--- a/src/pkg/compress/zlib/reader.go
+++ b/src/compress/zlib/reader.go
diff --git a/src/pkg/compress/zlib/reader_test.go b/src/compress/zlib/reader_test.go
index 218ccba14..218ccba14 100644
--- a/src/pkg/compress/zlib/reader_test.go
+++ b/src/compress/zlib/reader_test.go
diff --git a/src/pkg/compress/zlib/writer.go b/src/compress/zlib/writer.go
index 3b4313a8b..3b4313a8b 100644
--- a/src/pkg/compress/zlib/writer.go
+++ b/src/compress/zlib/writer.go
diff --git a/src/pkg/compress/zlib/writer_test.go b/src/compress/zlib/writer_test.go
index 71ba81aaa..71ba81aaa 100644
--- a/src/pkg/compress/zlib/writer_test.go
+++ b/src/compress/zlib/writer_test.go
diff --git a/src/pkg/container/heap/example_intheap_test.go b/src/container/heap/example_intheap_test.go
index 02d3d8668..02d3d8668 100644
--- a/src/pkg/container/heap/example_intheap_test.go
+++ b/src/container/heap/example_intheap_test.go
diff --git a/src/pkg/container/heap/example_pq_test.go b/src/container/heap/example_pq_test.go
index 7017095cb..7017095cb 100644
--- a/src/pkg/container/heap/example_pq_test.go
+++ b/src/container/heap/example_pq_test.go
diff --git a/src/pkg/container/heap/heap.go b/src/container/heap/heap.go
index c467a1191..c467a1191 100644
--- a/src/pkg/container/heap/heap.go
+++ b/src/container/heap/heap.go
diff --git a/src/pkg/container/heap/heap_test.go b/src/container/heap/heap_test.go
index b3d054c5f..b3d054c5f 100644
--- a/src/pkg/container/heap/heap_test.go
+++ b/src/container/heap/heap_test.go
diff --git a/src/pkg/container/list/example_test.go b/src/container/list/example_test.go
index 362178401..362178401 100644
--- a/src/pkg/container/list/example_test.go
+++ b/src/container/list/example_test.go
diff --git a/src/pkg/container/list/list.go b/src/container/list/list.go
index 0256768ef..0256768ef 100644
--- a/src/pkg/container/list/list.go
+++ b/src/container/list/list.go
diff --git a/src/pkg/container/list/list_test.go b/src/container/list/list_test.go
index 4d8bfc2bf..4d8bfc2bf 100644
--- a/src/pkg/container/list/list_test.go
+++ b/src/container/list/list_test.go
diff --git a/src/pkg/container/ring/ring.go b/src/container/ring/ring.go
index 6d3b3e5b3..6d3b3e5b3 100644
--- a/src/pkg/container/ring/ring.go
+++ b/src/container/ring/ring.go
diff --git a/src/pkg/container/ring/ring_test.go b/src/container/ring/ring_test.go
index 552f0e24b..552f0e24b 100644
--- a/src/pkg/container/ring/ring_test.go
+++ b/src/container/ring/ring_test.go
diff --git a/src/pkg/crypto/aes/aes_test.go b/src/crypto/aes/aes_test.go
index 363180931..363180931 100644
--- a/src/pkg/crypto/aes/aes_test.go
+++ b/src/crypto/aes/aes_test.go
diff --git a/src/pkg/crypto/aes/asm_amd64.s b/src/crypto/aes/asm_amd64.s
index 6a6e6ac4b..6a6e6ac4b 100644
--- a/src/pkg/crypto/aes/asm_amd64.s
+++ b/src/crypto/aes/asm_amd64.s
diff --git a/src/pkg/crypto/aes/block.go b/src/crypto/aes/block.go
index 57a7e9e25..57a7e9e25 100644
--- a/src/pkg/crypto/aes/block.go
+++ b/src/crypto/aes/block.go
diff --git a/src/pkg/crypto/aes/cipher.go b/src/crypto/aes/cipher.go
index 2c6bb0a89..2c6bb0a89 100644
--- a/src/pkg/crypto/aes/cipher.go
+++ b/src/crypto/aes/cipher.go
diff --git a/src/pkg/crypto/aes/cipher_asm.go b/src/crypto/aes/cipher_asm.go
index 964eaaa6f..964eaaa6f 100644
--- a/src/pkg/crypto/aes/cipher_asm.go
+++ b/src/crypto/aes/cipher_asm.go
diff --git a/src/pkg/crypto/aes/cipher_generic.go b/src/crypto/aes/cipher_generic.go
index 1714e0f1e..1714e0f1e 100644
--- a/src/pkg/crypto/aes/cipher_generic.go
+++ b/src/crypto/aes/cipher_generic.go
diff --git a/src/pkg/crypto/aes/const.go b/src/crypto/aes/const.go
index aee73a7c5..aee73a7c5 100644
--- a/src/pkg/crypto/aes/const.go
+++ b/src/crypto/aes/const.go
diff --git a/src/pkg/crypto/cipher/benchmark_test.go b/src/crypto/cipher/benchmark_test.go
index 027b24851..027b24851 100644
--- a/src/pkg/crypto/cipher/benchmark_test.go
+++ b/src/crypto/cipher/benchmark_test.go
diff --git a/src/pkg/crypto/cipher/cbc.go b/src/crypto/cipher/cbc.go
index 241e122ee..241e122ee 100644
--- a/src/pkg/crypto/cipher/cbc.go
+++ b/src/crypto/cipher/cbc.go
diff --git a/src/pkg/crypto/cipher/cbc_aes_test.go b/src/crypto/cipher/cbc_aes_test.go
index bf9e7ad70..bf9e7ad70 100644
--- a/src/pkg/crypto/cipher/cbc_aes_test.go
+++ b/src/crypto/cipher/cbc_aes_test.go
diff --git a/src/pkg/crypto/cipher/cfb.go b/src/crypto/cipher/cfb.go
index 9b4eebf5b..9b4eebf5b 100644
--- a/src/pkg/crypto/cipher/cfb.go
+++ b/src/crypto/cipher/cfb.go
diff --git a/src/pkg/crypto/cipher/cfb_test.go b/src/crypto/cipher/cfb_test.go
index 9b544bb21..9b544bb21 100644
--- a/src/pkg/crypto/cipher/cfb_test.go
+++ b/src/crypto/cipher/cfb_test.go
diff --git a/src/pkg/crypto/cipher/cipher.go b/src/crypto/cipher/cipher.go
index 67afdb1e0..67afdb1e0 100644
--- a/src/pkg/crypto/cipher/cipher.go
+++ b/src/crypto/cipher/cipher.go
diff --git a/src/pkg/crypto/cipher/cipher_test.go b/src/crypto/cipher/cipher_test.go
index 8da5bce93..8da5bce93 100644
--- a/src/pkg/crypto/cipher/cipher_test.go
+++ b/src/crypto/cipher/cipher_test.go
diff --git a/src/pkg/crypto/cipher/common_test.go b/src/crypto/cipher/common_test.go
index c75c919d1..c75c919d1 100644
--- a/src/pkg/crypto/cipher/common_test.go
+++ b/src/crypto/cipher/common_test.go
diff --git a/src/pkg/crypto/cipher/ctr.go b/src/crypto/cipher/ctr.go
index 70ac40f6a..70ac40f6a 100644
--- a/src/pkg/crypto/cipher/ctr.go
+++ b/src/crypto/cipher/ctr.go
diff --git a/src/pkg/crypto/cipher/ctr_aes_test.go b/src/crypto/cipher/ctr_aes_test.go
index d019ae0d0..d019ae0d0 100644
--- a/src/pkg/crypto/cipher/ctr_aes_test.go
+++ b/src/crypto/cipher/ctr_aes_test.go
diff --git a/src/pkg/crypto/cipher/example_test.go b/src/crypto/cipher/example_test.go
index 1cfa982df..1cfa982df 100644
--- a/src/pkg/crypto/cipher/example_test.go
+++ b/src/crypto/cipher/example_test.go
diff --git a/src/pkg/crypto/cipher/gcm.go b/src/crypto/cipher/gcm.go
index bdafd85fc..bdafd85fc 100644
--- a/src/pkg/crypto/cipher/gcm.go
+++ b/src/crypto/cipher/gcm.go
diff --git a/src/pkg/crypto/cipher/gcm_test.go b/src/crypto/cipher/gcm_test.go
index 0c502ce40..0c502ce40 100644
--- a/src/pkg/crypto/cipher/gcm_test.go
+++ b/src/crypto/cipher/gcm_test.go
diff --git a/src/pkg/crypto/cipher/io.go b/src/crypto/cipher/io.go
index 3938c0a4c..3938c0a4c 100644
--- a/src/pkg/crypto/cipher/io.go
+++ b/src/crypto/cipher/io.go
diff --git a/src/pkg/crypto/cipher/ofb.go b/src/crypto/cipher/ofb.go
index e86ebcb23..e86ebcb23 100644
--- a/src/pkg/crypto/cipher/ofb.go
+++ b/src/crypto/cipher/ofb.go
diff --git a/src/pkg/crypto/cipher/ofb_test.go b/src/crypto/cipher/ofb_test.go
index 8d3c5d3a3..8d3c5d3a3 100644
--- a/src/pkg/crypto/cipher/ofb_test.go
+++ b/src/crypto/cipher/ofb_test.go
diff --git a/src/pkg/crypto/cipher/xor.go b/src/crypto/cipher/xor.go
index f88dc8914..f88dc8914 100644
--- a/src/pkg/crypto/cipher/xor.go
+++ b/src/crypto/cipher/xor.go
diff --git a/src/pkg/crypto/cipher/xor_test.go b/src/crypto/cipher/xor_test.go
index cc1c9d72d..cc1c9d72d 100644
--- a/src/pkg/crypto/cipher/xor_test.go
+++ b/src/crypto/cipher/xor_test.go
diff --git a/src/pkg/crypto/crypto.go b/src/crypto/crypto.go
index 5a91baca0..5a91baca0 100644
--- a/src/pkg/crypto/crypto.go
+++ b/src/crypto/crypto.go
diff --git a/src/pkg/crypto/des/block.go b/src/crypto/des/block.go
index 26355a22e..26355a22e 100644
--- a/src/pkg/crypto/des/block.go
+++ b/src/crypto/des/block.go
diff --git a/src/pkg/crypto/des/cipher.go b/src/crypto/des/cipher.go
index 2f929ca7b..2f929ca7b 100644
--- a/src/pkg/crypto/des/cipher.go
+++ b/src/crypto/des/cipher.go
diff --git a/src/pkg/crypto/des/const.go b/src/crypto/des/const.go
index 2bd485ee8..2bd485ee8 100644
--- a/src/pkg/crypto/des/const.go
+++ b/src/crypto/des/const.go
diff --git a/src/pkg/crypto/des/des_test.go b/src/crypto/des/des_test.go
index 2bd525afe..2bd525afe 100644
--- a/src/pkg/crypto/des/des_test.go
+++ b/src/crypto/des/des_test.go
diff --git a/src/pkg/crypto/des/example_test.go b/src/crypto/des/example_test.go
index 336b59375..336b59375 100644
--- a/src/pkg/crypto/des/example_test.go
+++ b/src/crypto/des/example_test.go
diff --git a/src/pkg/crypto/dsa/dsa.go b/src/crypto/dsa/dsa.go
index b7565a61b..b7565a61b 100644
--- a/src/pkg/crypto/dsa/dsa.go
+++ b/src/crypto/dsa/dsa.go
diff --git a/src/pkg/crypto/dsa/dsa_test.go b/src/crypto/dsa/dsa_test.go
index 568416d0d..568416d0d 100644
--- a/src/pkg/crypto/dsa/dsa_test.go
+++ b/src/crypto/dsa/dsa_test.go
diff --git a/src/pkg/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go
index d6135531b..d6135531b 100644
--- a/src/pkg/crypto/ecdsa/ecdsa.go
+++ b/src/crypto/ecdsa/ecdsa.go
diff --git a/src/pkg/crypto/ecdsa/ecdsa_test.go b/src/crypto/ecdsa/ecdsa_test.go
index 0c0643193..0c0643193 100644
--- a/src/pkg/crypto/ecdsa/ecdsa_test.go
+++ b/src/crypto/ecdsa/ecdsa_test.go
diff --git a/src/pkg/crypto/ecdsa/testdata/SigVer.rsp.bz2 b/src/crypto/ecdsa/testdata/SigVer.rsp.bz2
index 09fe2b427..09fe2b427 100644
--- a/src/pkg/crypto/ecdsa/testdata/SigVer.rsp.bz2
+++ b/src/crypto/ecdsa/testdata/SigVer.rsp.bz2
diff --git a/src/pkg/crypto/elliptic/elliptic.go b/src/crypto/elliptic/elliptic.go
index ba673f80c..ba673f80c 100644
--- a/src/pkg/crypto/elliptic/elliptic.go
+++ b/src/crypto/elliptic/elliptic.go
diff --git a/src/pkg/crypto/elliptic/elliptic_test.go b/src/crypto/elliptic/elliptic_test.go
index 4dc27c92b..4dc27c92b 100644
--- a/src/pkg/crypto/elliptic/elliptic_test.go
+++ b/src/crypto/elliptic/elliptic_test.go
diff --git a/src/pkg/crypto/elliptic/p224.go b/src/crypto/elliptic/p224.go
index 1f7ff3f9d..1f7ff3f9d 100644
--- a/src/pkg/crypto/elliptic/p224.go
+++ b/src/crypto/elliptic/p224.go
diff --git a/src/pkg/crypto/elliptic/p224_test.go b/src/crypto/elliptic/p224_test.go
index 4b26d1610..4b26d1610 100644
--- a/src/pkg/crypto/elliptic/p224_test.go
+++ b/src/crypto/elliptic/p224_test.go
diff --git a/src/pkg/crypto/elliptic/p256.go b/src/crypto/elliptic/p256.go
index 82be51e62..82be51e62 100644
--- a/src/pkg/crypto/elliptic/p256.go
+++ b/src/crypto/elliptic/p256.go
diff --git a/src/pkg/crypto/hmac/hmac.go b/src/crypto/hmac/hmac.go
index b6f4919a7..b6f4919a7 100644
--- a/src/pkg/crypto/hmac/hmac.go
+++ b/src/crypto/hmac/hmac.go
diff --git a/src/pkg/crypto/hmac/hmac_test.go b/src/crypto/hmac/hmac_test.go
index e80b7e0ba..e80b7e0ba 100644
--- a/src/pkg/crypto/hmac/hmac_test.go
+++ b/src/crypto/hmac/hmac_test.go
diff --git a/src/pkg/crypto/md5/example_test.go b/src/crypto/md5/example_test.go
index d47bb4570..d47bb4570 100644
--- a/src/pkg/crypto/md5/example_test.go
+++ b/src/crypto/md5/example_test.go
diff --git a/src/pkg/crypto/md5/gen.go b/src/crypto/md5/gen.go
index 8cd0a6358..8cd0a6358 100644
--- a/src/pkg/crypto/md5/gen.go
+++ b/src/crypto/md5/gen.go
diff --git a/src/pkg/crypto/md5/md5.go b/src/crypto/md5/md5.go
index 8c50c6d0b..8c50c6d0b 100644
--- a/src/pkg/crypto/md5/md5.go
+++ b/src/crypto/md5/md5.go
diff --git a/src/pkg/crypto/md5/md5_test.go b/src/crypto/md5/md5_test.go
index e7faf4961..e7faf4961 100644
--- a/src/pkg/crypto/md5/md5_test.go
+++ b/src/crypto/md5/md5_test.go
diff --git a/src/pkg/crypto/md5/md5block.go b/src/crypto/md5/md5block.go
index 64e1e7c1e..64e1e7c1e 100644
--- a/src/pkg/crypto/md5/md5block.go
+++ b/src/crypto/md5/md5block.go
diff --git a/src/pkg/crypto/md5/md5block_386.s b/src/crypto/md5/md5block_386.s
index 8e426d148..8e426d148 100644
--- a/src/pkg/crypto/md5/md5block_386.s
+++ b/src/crypto/md5/md5block_386.s
diff --git a/src/pkg/crypto/md5/md5block_amd64.s b/src/crypto/md5/md5block_amd64.s
index a3ae7d97b..a3ae7d97b 100644
--- a/src/pkg/crypto/md5/md5block_amd64.s
+++ b/src/crypto/md5/md5block_amd64.s
diff --git a/src/pkg/crypto/md5/md5block_amd64p32.s b/src/crypto/md5/md5block_amd64p32.s
index d918a67c5..d918a67c5 100644
--- a/src/pkg/crypto/md5/md5block_amd64p32.s
+++ b/src/crypto/md5/md5block_amd64p32.s
diff --git a/src/pkg/crypto/md5/md5block_arm.s b/src/crypto/md5/md5block_arm.s
index 3b26e549b..3b26e549b 100644
--- a/src/pkg/crypto/md5/md5block_arm.s
+++ b/src/crypto/md5/md5block_arm.s
diff --git a/src/pkg/crypto/md5/md5block_decl.go b/src/crypto/md5/md5block_decl.go
index d7956a6d2..d7956a6d2 100644
--- a/src/pkg/crypto/md5/md5block_decl.go
+++ b/src/crypto/md5/md5block_decl.go
diff --git a/src/pkg/crypto/md5/md5block_generic.go b/src/crypto/md5/md5block_generic.go
index 263463e51..263463e51 100644
--- a/src/pkg/crypto/md5/md5block_generic.go
+++ b/src/crypto/md5/md5block_generic.go
diff --git a/src/pkg/crypto/rand/example_test.go b/src/crypto/rand/example_test.go
index 8a2717300..8a2717300 100644
--- a/src/pkg/crypto/rand/example_test.go
+++ b/src/crypto/rand/example_test.go
diff --git a/src/pkg/crypto/rand/rand.go b/src/crypto/rand/rand.go
index 4da3adb70..4da3adb70 100644
--- a/src/pkg/crypto/rand/rand.go
+++ b/src/crypto/rand/rand.go
diff --git a/src/pkg/crypto/rand/rand_linux.go b/src/crypto/rand/rand_linux.go
index 8cb59c75d..8cb59c75d 100644
--- a/src/pkg/crypto/rand/rand_linux.go
+++ b/src/crypto/rand/rand_linux.go
diff --git a/src/pkg/crypto/rand/rand_test.go b/src/crypto/rand/rand_test.go
index e46e61d37..e46e61d37 100644
--- a/src/pkg/crypto/rand/rand_test.go
+++ b/src/crypto/rand/rand_test.go
diff --git a/src/pkg/crypto/rand/rand_unix.go b/src/crypto/rand/rand_unix.go
index 62d0fbdb3..62d0fbdb3 100644
--- a/src/pkg/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
diff --git a/src/pkg/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
index 82b39b64a..82b39b64a 100644
--- a/src/pkg/crypto/rand/rand_windows.go
+++ b/src/crypto/rand/rand_windows.go
diff --git a/src/pkg/crypto/rand/util.go b/src/crypto/rand/util.go
index 5f7440785..5f7440785 100644
--- a/src/pkg/crypto/rand/util.go
+++ b/src/crypto/rand/util.go
diff --git a/src/pkg/crypto/rand/util_test.go b/src/crypto/rand/util_test.go
index 1e2a4dd84..1e2a4dd84 100644
--- a/src/pkg/crypto/rand/util_test.go
+++ b/src/crypto/rand/util_test.go
diff --git a/src/pkg/crypto/rc4/rc4.go b/src/crypto/rc4/rc4.go
index 9acb681bf..9acb681bf 100644
--- a/src/pkg/crypto/rc4/rc4.go
+++ b/src/crypto/rc4/rc4.go
diff --git a/src/pkg/crypto/rc4/rc4_386.s b/src/crypto/rc4/rc4_386.s
index 54221036b..54221036b 100644
--- a/src/pkg/crypto/rc4/rc4_386.s
+++ b/src/crypto/rc4/rc4_386.s
diff --git a/src/pkg/crypto/rc4/rc4_amd64.s b/src/crypto/rc4/rc4_amd64.s
index 57d941c8f..57d941c8f 100644
--- a/src/pkg/crypto/rc4/rc4_amd64.s
+++ b/src/crypto/rc4/rc4_amd64.s
diff --git a/src/pkg/crypto/rc4/rc4_amd64p32.s b/src/crypto/rc4/rc4_amd64p32.s
index 970b34e08..970b34e08 100644
--- a/src/pkg/crypto/rc4/rc4_amd64p32.s
+++ b/src/crypto/rc4/rc4_amd64p32.s
diff --git a/src/pkg/crypto/rc4/rc4_arm.s b/src/crypto/rc4/rc4_arm.s
index 51be3bf95..51be3bf95 100644
--- a/src/pkg/crypto/rc4/rc4_arm.s
+++ b/src/crypto/rc4/rc4_arm.s
diff --git a/src/pkg/crypto/rc4/rc4_asm.go b/src/crypto/rc4/rc4_asm.go
index 02e5b67d5..02e5b67d5 100644
--- a/src/pkg/crypto/rc4/rc4_asm.go
+++ b/src/crypto/rc4/rc4_asm.go
diff --git a/src/pkg/crypto/rc4/rc4_ref.go b/src/crypto/rc4/rc4_ref.go
index e34bd34cf..e34bd34cf 100644
--- a/src/pkg/crypto/rc4/rc4_ref.go
+++ b/src/crypto/rc4/rc4_ref.go
diff --git a/src/pkg/crypto/rc4/rc4_test.go b/src/crypto/rc4/rc4_test.go
index af7988246..af7988246 100644
--- a/src/pkg/crypto/rc4/rc4_test.go
+++ b/src/crypto/rc4/rc4_test.go
diff --git a/src/pkg/crypto/rsa/pkcs1v15.go b/src/crypto/rsa/pkcs1v15.go
index 59e8bb5b7..59e8bb5b7 100644
--- a/src/pkg/crypto/rsa/pkcs1v15.go
+++ b/src/crypto/rsa/pkcs1v15.go
diff --git a/src/pkg/crypto/rsa/pkcs1v15_test.go b/src/crypto/rsa/pkcs1v15_test.go
index 2dc5dbc2c..2dc5dbc2c 100644
--- a/src/pkg/crypto/rsa/pkcs1v15_test.go
+++ b/src/crypto/rsa/pkcs1v15_test.go
diff --git a/src/pkg/crypto/rsa/pss.go b/src/crypto/rsa/pss.go
index e9f290825..e9f290825 100644
--- a/src/pkg/crypto/rsa/pss.go
+++ b/src/crypto/rsa/pss.go
diff --git a/src/pkg/crypto/rsa/pss_test.go b/src/crypto/rsa/pss_test.go
index 32e6fc39d..32e6fc39d 100644
--- a/src/pkg/crypto/rsa/pss_test.go
+++ b/src/crypto/rsa/pss_test.go
diff --git a/src/pkg/crypto/rsa/rsa.go b/src/crypto/rsa/rsa.go
index 270231128..270231128 100644
--- a/src/pkg/crypto/rsa/rsa.go
+++ b/src/crypto/rsa/rsa.go
diff --git a/src/pkg/crypto/rsa/rsa_test.go b/src/crypto/rsa/rsa_test.go
index 4ee1c3a8b..4ee1c3a8b 100644
--- a/src/pkg/crypto/rsa/rsa_test.go
+++ b/src/crypto/rsa/rsa_test.go
diff --git a/src/pkg/crypto/rsa/testdata/pss-vect.txt.bz2 b/src/crypto/rsa/testdata/pss-vect.txt.bz2
index ad3da1ac4..ad3da1ac4 100644
--- a/src/pkg/crypto/rsa/testdata/pss-vect.txt.bz2
+++ b/src/crypto/rsa/testdata/pss-vect.txt.bz2
diff --git a/src/pkg/crypto/sha1/example_test.go b/src/crypto/sha1/example_test.go
index 42aec8afa..42aec8afa 100644
--- a/src/pkg/crypto/sha1/example_test.go
+++ b/src/crypto/sha1/example_test.go
diff --git a/src/pkg/crypto/sha1/sha1.go b/src/crypto/sha1/sha1.go
index 9f1a96e36..9f1a96e36 100644
--- a/src/pkg/crypto/sha1/sha1.go
+++ b/src/crypto/sha1/sha1.go
diff --git a/src/pkg/crypto/sha1/sha1_test.go b/src/crypto/sha1/sha1_test.go
index 4a629518b..4a629518b 100644
--- a/src/pkg/crypto/sha1/sha1_test.go
+++ b/src/crypto/sha1/sha1_test.go
diff --git a/src/pkg/crypto/sha1/sha1block.go b/src/crypto/sha1/sha1block.go
index fde3c981c..fde3c981c 100644
--- a/src/pkg/crypto/sha1/sha1block.go
+++ b/src/crypto/sha1/sha1block.go
diff --git a/src/pkg/crypto/sha1/sha1block_386.s b/src/crypto/sha1/sha1block_386.s
index a0adabc3c..a0adabc3c 100644
--- a/src/pkg/crypto/sha1/sha1block_386.s
+++ b/src/crypto/sha1/sha1block_386.s
diff --git a/src/pkg/crypto/sha1/sha1block_amd64.s b/src/crypto/sha1/sha1block_amd64.s
index 4319df63e..4319df63e 100644
--- a/src/pkg/crypto/sha1/sha1block_amd64.s
+++ b/src/crypto/sha1/sha1block_amd64.s
diff --git a/src/pkg/crypto/sha1/sha1block_amd64p32.s b/src/crypto/sha1/sha1block_amd64p32.s
index d93fbf1ed..d93fbf1ed 100644
--- a/src/pkg/crypto/sha1/sha1block_amd64p32.s
+++ b/src/crypto/sha1/sha1block_amd64p32.s
diff --git a/src/pkg/crypto/sha1/sha1block_arm.s b/src/crypto/sha1/sha1block_arm.s
index f11f33dc3..f11f33dc3 100644
--- a/src/pkg/crypto/sha1/sha1block_arm.s
+++ b/src/crypto/sha1/sha1block_arm.s
diff --git a/src/pkg/crypto/sha1/sha1block_decl.go b/src/crypto/sha1/sha1block_decl.go
index 24e521af1..24e521af1 100644
--- a/src/pkg/crypto/sha1/sha1block_decl.go
+++ b/src/crypto/sha1/sha1block_decl.go
diff --git a/src/pkg/crypto/sha1/sha1block_generic.go b/src/crypto/sha1/sha1block_generic.go
index 696e26b62..696e26b62 100644
--- a/src/pkg/crypto/sha1/sha1block_generic.go
+++ b/src/crypto/sha1/sha1block_generic.go
diff --git a/src/pkg/crypto/sha256/sha256.go b/src/crypto/sha256/sha256.go
index d84cebf2f..d84cebf2f 100644
--- a/src/pkg/crypto/sha256/sha256.go
+++ b/src/crypto/sha256/sha256.go
diff --git a/src/pkg/crypto/sha256/sha256_test.go b/src/crypto/sha256/sha256_test.go
index 1d883d390..1d883d390 100644
--- a/src/pkg/crypto/sha256/sha256_test.go
+++ b/src/crypto/sha256/sha256_test.go
diff --git a/src/pkg/crypto/sha256/sha256block.go b/src/crypto/sha256/sha256block.go
index ca5efd156..ca5efd156 100644
--- a/src/pkg/crypto/sha256/sha256block.go
+++ b/src/crypto/sha256/sha256block.go
diff --git a/src/pkg/crypto/sha256/sha256block_386.s b/src/crypto/sha256/sha256block_386.s
index 73ae2bf30..73ae2bf30 100644
--- a/src/pkg/crypto/sha256/sha256block_386.s
+++ b/src/crypto/sha256/sha256block_386.s
diff --git a/src/pkg/crypto/sha256/sha256block_amd64.s b/src/crypto/sha256/sha256block_amd64.s
index 868eaed48..868eaed48 100644
--- a/src/pkg/crypto/sha256/sha256block_amd64.s
+++ b/src/crypto/sha256/sha256block_amd64.s
diff --git a/src/pkg/crypto/sha256/sha256block_decl.go b/src/crypto/sha256/sha256block_decl.go
index a50c97871..a50c97871 100644
--- a/src/pkg/crypto/sha256/sha256block_decl.go
+++ b/src/crypto/sha256/sha256block_decl.go
diff --git a/src/pkg/crypto/sha512/sha512.go b/src/crypto/sha512/sha512.go
index bca7a91e2..bca7a91e2 100644
--- a/src/pkg/crypto/sha512/sha512.go
+++ b/src/crypto/sha512/sha512.go
diff --git a/src/pkg/crypto/sha512/sha512_test.go b/src/crypto/sha512/sha512_test.go
index 541860f70..541860f70 100644
--- a/src/pkg/crypto/sha512/sha512_test.go
+++ b/src/crypto/sha512/sha512_test.go
diff --git a/src/pkg/crypto/sha512/sha512block.go b/src/crypto/sha512/sha512block.go
index 648ae8f7e..648ae8f7e 100644
--- a/src/pkg/crypto/sha512/sha512block.go
+++ b/src/crypto/sha512/sha512block.go
diff --git a/src/pkg/crypto/sha512/sha512block_amd64.s b/src/crypto/sha512/sha512block_amd64.s
index 2e10233de..2e10233de 100644
--- a/src/pkg/crypto/sha512/sha512block_amd64.s
+++ b/src/crypto/sha512/sha512block_amd64.s
diff --git a/src/pkg/crypto/sha512/sha512block_decl.go b/src/crypto/sha512/sha512block_decl.go
index bef99de2e..bef99de2e 100644
--- a/src/pkg/crypto/sha512/sha512block_decl.go
+++ b/src/crypto/sha512/sha512block_decl.go
diff --git a/src/pkg/crypto/subtle/constant_time.go b/src/crypto/subtle/constant_time.go
index 6f80e7c58..6f80e7c58 100644
--- a/src/pkg/crypto/subtle/constant_time.go
+++ b/src/crypto/subtle/constant_time.go
diff --git a/src/pkg/crypto/subtle/constant_time_test.go b/src/crypto/subtle/constant_time_test.go
index 619a45444..619a45444 100644
--- a/src/pkg/crypto/subtle/constant_time_test.go
+++ b/src/crypto/subtle/constant_time_test.go
diff --git a/src/pkg/crypto/tls/alert.go b/src/crypto/tls/alert.go
index 0856311e4..0856311e4 100644
--- a/src/pkg/crypto/tls/alert.go
+++ b/src/crypto/tls/alert.go
diff --git a/src/pkg/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go
index 39a51459d..39a51459d 100644
--- a/src/pkg/crypto/tls/cipher_suites.go
+++ b/src/crypto/tls/cipher_suites.go
diff --git a/src/pkg/crypto/tls/common.go b/src/crypto/tls/common.go
index 776b70c93..776b70c93 100644
--- a/src/pkg/crypto/tls/common.go
+++ b/src/crypto/tls/common.go
diff --git a/src/pkg/crypto/tls/conn.go b/src/crypto/tls/conn.go
index ba8e4c22b..ba8e4c22b 100644
--- a/src/pkg/crypto/tls/conn.go
+++ b/src/crypto/tls/conn.go
diff --git a/src/pkg/crypto/tls/conn_test.go b/src/crypto/tls/conn_test.go
index ec802cad7..ec802cad7 100644
--- a/src/pkg/crypto/tls/conn_test.go
+++ b/src/crypto/tls/conn_test.go
diff --git a/src/pkg/crypto/tls/example_test.go b/src/crypto/tls/example_test.go
index 7628e431b..7628e431b 100644
--- a/src/pkg/crypto/tls/example_test.go
+++ b/src/crypto/tls/example_test.go
diff --git a/src/pkg/crypto/tls/generate_cert.go b/src/crypto/tls/generate_cert.go
index 83f9916ff..83f9916ff 100644
--- a/src/pkg/crypto/tls/generate_cert.go
+++ b/src/crypto/tls/generate_cert.go
diff --git a/src/pkg/crypto/tls/handshake_client.go b/src/crypto/tls/handshake_client.go
index 7f662e9c9..7f662e9c9 100644
--- a/src/pkg/crypto/tls/handshake_client.go
+++ b/src/crypto/tls/handshake_client.go
diff --git a/src/pkg/crypto/tls/handshake_client_test.go b/src/crypto/tls/handshake_client_test.go
index e5eaa7de2..e5eaa7de2 100644
--- a/src/pkg/crypto/tls/handshake_client_test.go
+++ b/src/crypto/tls/handshake_client_test.go
diff --git a/src/pkg/crypto/tls/handshake_messages.go b/src/crypto/tls/handshake_messages.go
index 5d14871a3..5d14871a3 100644
--- a/src/pkg/crypto/tls/handshake_messages.go
+++ b/src/crypto/tls/handshake_messages.go
diff --git a/src/pkg/crypto/tls/handshake_messages_test.go b/src/crypto/tls/handshake_messages_test.go
index a96e95c3f..a96e95c3f 100644
--- a/src/pkg/crypto/tls/handshake_messages_test.go
+++ b/src/crypto/tls/handshake_messages_test.go
diff --git a/src/pkg/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go
index 684ab288f..684ab288f 100644
--- a/src/pkg/crypto/tls/handshake_server.go
+++ b/src/crypto/tls/handshake_server.go
diff --git a/src/pkg/crypto/tls/handshake_server_test.go b/src/crypto/tls/handshake_server_test.go
index 36c79a9b0..36c79a9b0 100644
--- a/src/pkg/crypto/tls/handshake_server_test.go
+++ b/src/crypto/tls/handshake_server_test.go
diff --git a/src/pkg/crypto/tls/handshake_test.go b/src/crypto/tls/handshake_test.go
index f95f274ab..f95f274ab 100644
--- a/src/pkg/crypto/tls/handshake_test.go
+++ b/src/crypto/tls/handshake_test.go
diff --git a/src/pkg/crypto/tls/key_agreement.go b/src/crypto/tls/key_agreement.go
index 0974fc6e0..0974fc6e0 100644
--- a/src/pkg/crypto/tls/key_agreement.go
+++ b/src/crypto/tls/key_agreement.go
diff --git a/src/pkg/crypto/tls/prf.go b/src/crypto/tls/prf.go
index fb8b3ab4d..fb8b3ab4d 100644
--- a/src/pkg/crypto/tls/prf.go
+++ b/src/crypto/tls/prf.go
diff --git a/src/pkg/crypto/tls/prf_test.go b/src/crypto/tls/prf_test.go
index a9b6c9e4c..a9b6c9e4c 100644
--- a/src/pkg/crypto/tls/prf_test.go
+++ b/src/crypto/tls/prf_test.go
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
index 00722cba9..00722cba9 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
+++ b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
index c0be82491..c0be82491 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
index 3e6dbc271..3e6dbc271 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
+++ b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
index 94e686004..94e686004 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
index 30c4c6b83..30c4c6b83 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
+++ b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
index 868f0ceb0..868f0ceb0 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
+++ b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv10-RSA-RC4
index 395d53bba..395d53bba 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv10-RSA-RC4
+++ b/src/crypto/tls/testdata/Client-TLSv10-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
index 9f941f8ef..9f941f8ef 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
+++ b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
index fc723396a..fc723396a 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
+++ b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
index f7be3f7e9..f7be3f7e9 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv11-RSA-RC4
+++ b/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN b/src/crypto/tls/testdata/Client-TLSv12-ALPN
index f09a4f106..f09a4f106 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN
+++ b/src/crypto/tls/testdata/Client-TLSv12-ALPN
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch b/src/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
index f24a70cc8..f24a70cc8 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
+++ b/src/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
index 207327036..207327036 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
index c3b753a7b..c3b753a7b 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
index 0037af61a..0037af61a 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
index df3eaa440..df3eaa440 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
+++ b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
index 76445903b..76445903b 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
+++ b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
index fb5af17f0..fb5af17f0 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
+++ b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
index 5336bbbad..5336bbbad 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
+++ b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv12-RSA-RC4
index 0377f052a..0377f052a 100644
--- a/src/pkg/crypto/tls/testdata/Client-TLSv12-RSA-RC4
+++ b/src/crypto/tls/testdata/Client-TLSv12-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-3DES b/src/crypto/tls/testdata/Server-SSLv3-RSA-3DES
index a6c7a4196..a6c7a4196 100644
--- a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-3DES
+++ b/src/crypto/tls/testdata/Server-SSLv3-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-AES b/src/crypto/tls/testdata/Server-SSLv3-RSA-AES
index 4885b267d..4885b267d 100644
--- a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-AES
+++ b/src/crypto/tls/testdata/Server-SSLv3-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-RC4 b/src/crypto/tls/testdata/Server-SSLv3-RSA-RC4
index 1314b659b..1314b659b 100644
--- a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-RC4
+++ b/src/crypto/tls/testdata/Server-SSLv3-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
index 9b8cb4d9b..9b8cb4d9b 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
+++ b/src/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-3DES b/src/crypto/tls/testdata/Server-TLSv10-RSA-3DES
index c0e6241c0..c0e6241c0 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-3DES
+++ b/src/crypto/tls/testdata/Server-TLSv10-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-AES b/src/crypto/tls/testdata/Server-TLSv10-RSA-AES
index 1670997b0..1670997b0 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-AES
+++ b/src/crypto/tls/testdata/Server-TLSv10-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv10-RSA-RC4
index d653561f9..d653561f9 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-RC4
+++ b/src/crypto/tls/testdata/Server-TLSv10-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv11-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv11-RSA-RC4
index 9237db078..9237db078 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv11-RSA-RC4
+++ b/src/crypto/tls/testdata/Server-TLSv11-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN b/src/crypto/tls/testdata/Server-TLSv12-ALPN
index 106244d5a..106244d5a 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN
+++ b/src/crypto/tls/testdata/Server-TLSv12-ALPN
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch b/src/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
index db5881b76..db5881b76 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
+++ b/src/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
index 0ab8b8d74..0ab8b8d74 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
+++ b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
index 88abb15a7..88abb15a7 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
+++ b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
index 547f79834..547f79834 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
+++ b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
index 04a5b117c..04a5b117c 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
+++ b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
index 562fe1aaa..562fe1aaa 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
+++ b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
index aacbb8670..aacbb8670 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
+++ b/src/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-IssueTicket b/src/crypto/tls/testdata/Server-TLSv12-IssueTicket
index e3e62f224..e3e62f224 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-IssueTicket
+++ b/src/crypto/tls/testdata/Server-TLSv12-IssueTicket
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-3DES b/src/crypto/tls/testdata/Server-TLSv12-RSA-3DES
index 5995b3314..5995b3314 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-3DES
+++ b/src/crypto/tls/testdata/Server-TLSv12-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES
index a152a96a8..a152a96a8 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES
+++ b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
index 0ddfe022f..0ddfe022f 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
+++ b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv12-RSA-RC4
index b703a8f76..b703a8f76 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-RC4
+++ b/src/crypto/tls/testdata/Server-TLSv12-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-Resume b/src/crypto/tls/testdata/Server-TLSv12-Resume
index c495d4adc..c495d4adc 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-Resume
+++ b/src/crypto/tls/testdata/Server-TLSv12-Resume
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-SNI b/src/crypto/tls/testdata/Server-TLSv12-SNI
index 61b17a11d..61b17a11d 100644
--- a/src/pkg/crypto/tls/testdata/Server-TLSv12-SNI
+++ b/src/crypto/tls/testdata/Server-TLSv12-SNI
diff --git a/src/pkg/crypto/tls/ticket.go b/src/crypto/tls/ticket.go
index 4cfc5a53f..4cfc5a53f 100644
--- a/src/pkg/crypto/tls/ticket.go
+++ b/src/crypto/tls/ticket.go
diff --git a/src/pkg/crypto/tls/tls.go b/src/crypto/tls/tls.go
index d50e12029..d50e12029 100644
--- a/src/pkg/crypto/tls/tls.go
+++ b/src/crypto/tls/tls.go
diff --git a/src/pkg/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go
index e82579eee..e82579eee 100644
--- a/src/pkg/crypto/tls/tls_test.go
+++ b/src/crypto/tls/tls_test.go
diff --git a/src/pkg/crypto/x509/cert_pool.go b/src/crypto/x509/cert_pool.go
index babe94d41..babe94d41 100644
--- a/src/pkg/crypto/x509/cert_pool.go
+++ b/src/crypto/x509/cert_pool.go
diff --git a/src/pkg/crypto/x509/example_test.go b/src/crypto/x509/example_test.go
index 29e7c2139..29e7c2139 100644
--- a/src/pkg/crypto/x509/example_test.go
+++ b/src/crypto/x509/example_test.go
diff --git a/src/pkg/crypto/x509/pem_decrypt.go b/src/crypto/x509/pem_decrypt.go
index 194c81bf6..194c81bf6 100644
--- a/src/pkg/crypto/x509/pem_decrypt.go
+++ b/src/crypto/x509/pem_decrypt.go
diff --git a/src/pkg/crypto/x509/pem_decrypt_test.go b/src/crypto/x509/pem_decrypt_test.go
index 13e4700bd..13e4700bd 100644
--- a/src/pkg/crypto/x509/pem_decrypt_test.go
+++ b/src/crypto/x509/pem_decrypt_test.go
diff --git a/src/pkg/crypto/x509/pkcs1.go b/src/crypto/x509/pkcs1.go
index acebe3513..acebe3513 100644
--- a/src/pkg/crypto/x509/pkcs1.go
+++ b/src/crypto/x509/pkcs1.go
diff --git a/src/pkg/crypto/x509/pkcs8.go b/src/crypto/x509/pkcs8.go
index ba19989cb..ba19989cb 100644
--- a/src/pkg/crypto/x509/pkcs8.go
+++ b/src/crypto/x509/pkcs8.go
diff --git a/src/pkg/crypto/x509/pkcs8_test.go b/src/crypto/x509/pkcs8_test.go
index 4114efd0e..4114efd0e 100644
--- a/src/pkg/crypto/x509/pkcs8_test.go
+++ b/src/crypto/x509/pkcs8_test.go
diff --git a/src/pkg/crypto/x509/pkix/pkix.go b/src/crypto/x509/pkix/pkix.go
index 58c1e54d1..58c1e54d1 100644
--- a/src/pkg/crypto/x509/pkix/pkix.go
+++ b/src/crypto/x509/pkix/pkix.go
diff --git a/src/pkg/crypto/x509/root.go b/src/crypto/x509/root.go
index 8aae14e09..8aae14e09 100644
--- a/src/pkg/crypto/x509/root.go
+++ b/src/crypto/x509/root.go
diff --git a/src/pkg/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
index bdcc2c170..bdcc2c170 100644
--- a/src/pkg/crypto/x509/root_cgo_darwin.go
+++ b/src/crypto/x509/root_cgo_darwin.go
diff --git a/src/pkg/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
index 2a61d36ea..2a61d36ea 100644
--- a/src/pkg/crypto/x509/root_darwin.go
+++ b/src/crypto/x509/root_darwin.go
diff --git a/src/pkg/crypto/x509/root_darwin_test.go b/src/crypto/x509/root_darwin_test.go
index 87ea4e344..87ea4e344 100644
--- a/src/pkg/crypto/x509/root_darwin_test.go
+++ b/src/crypto/x509/root_darwin_test.go
diff --git a/src/pkg/crypto/x509/root_nocgo_darwin.go b/src/crypto/x509/root_nocgo_darwin.go
index d00e25766..d00e25766 100644
--- a/src/pkg/crypto/x509/root_nocgo_darwin.go
+++ b/src/crypto/x509/root_nocgo_darwin.go
diff --git a/src/pkg/crypto/x509/root_plan9.go b/src/crypto/x509/root_plan9.go
index 9965caade..9965caade 100644
--- a/src/pkg/crypto/x509/root_plan9.go
+++ b/src/crypto/x509/root_plan9.go
diff --git a/src/pkg/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index 11ad3c440..11ad3c440 100644
--- a/src/pkg/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
diff --git a/src/pkg/crypto/x509/root_windows.go b/src/crypto/x509/root_windows.go
index 81018b78f..81018b78f 100644
--- a/src/pkg/crypto/x509/root_windows.go
+++ b/src/crypto/x509/root_windows.go
diff --git a/src/pkg/crypto/x509/sec1.go b/src/crypto/x509/sec1.go
index 7de66754e..7de66754e 100644
--- a/src/pkg/crypto/x509/sec1.go
+++ b/src/crypto/x509/sec1.go
diff --git a/src/pkg/crypto/x509/sec1_test.go b/src/crypto/x509/sec1_test.go
index 95f18e77d..95f18e77d 100644
--- a/src/pkg/crypto/x509/sec1_test.go
+++ b/src/crypto/x509/sec1_test.go
diff --git a/src/pkg/crypto/x509/verify.go b/src/crypto/x509/verify.go
index ec1981423..ec1981423 100644
--- a/src/pkg/crypto/x509/verify.go
+++ b/src/crypto/x509/verify.go
diff --git a/src/pkg/crypto/x509/verify_test.go b/src/crypto/x509/verify_test.go
index 96b9d9b42..96b9d9b42 100644
--- a/src/pkg/crypto/x509/verify_test.go
+++ b/src/crypto/x509/verify_test.go
diff --git a/src/pkg/crypto/x509/x509.go b/src/crypto/x509/x509.go
index c347fb384..c347fb384 100644
--- a/src/pkg/crypto/x509/x509.go
+++ b/src/crypto/x509/x509.go
diff --git a/src/pkg/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go
index 56f7a9832..56f7a9832 100644
--- a/src/pkg/crypto/x509/x509_test.go
+++ b/src/crypto/x509/x509_test.go
diff --git a/src/pkg/crypto/x509/x509_test_import.go b/src/crypto/x509/x509_test_import.go
index 3fda7da18..3fda7da18 100644
--- a/src/pkg/crypto/x509/x509_test_import.go
+++ b/src/crypto/x509/x509_test_import.go
diff --git a/src/pkg/database/sql/convert.go b/src/database/sql/convert.go
index c0b38a249..c0b38a249 100644
--- a/src/pkg/database/sql/convert.go
+++ b/src/database/sql/convert.go
diff --git a/src/pkg/database/sql/convert_test.go b/src/database/sql/convert_test.go
index 98af9fb64..98af9fb64 100644
--- a/src/pkg/database/sql/convert_test.go
+++ b/src/database/sql/convert_test.go
diff --git a/src/pkg/database/sql/doc.txt b/src/database/sql/doc.txt
index 405c5ed2a..405c5ed2a 100644
--- a/src/pkg/database/sql/doc.txt
+++ b/src/database/sql/doc.txt
diff --git a/src/pkg/database/sql/driver/driver.go b/src/database/sql/driver/driver.go
index eca25f29a..eca25f29a 100644
--- a/src/pkg/database/sql/driver/driver.go
+++ b/src/database/sql/driver/driver.go
diff --git a/src/pkg/database/sql/driver/types.go b/src/database/sql/driver/types.go
index 3305354df..3305354df 100644
--- a/src/pkg/database/sql/driver/types.go
+++ b/src/database/sql/driver/types.go
diff --git a/src/pkg/database/sql/driver/types_test.go b/src/database/sql/driver/types_test.go
index 1ce0ff065..1ce0ff065 100644
--- a/src/pkg/database/sql/driver/types_test.go
+++ b/src/database/sql/driver/types_test.go
diff --git a/src/pkg/database/sql/example_test.go b/src/database/sql/example_test.go
index dcb74e069..dcb74e069 100644
--- a/src/pkg/database/sql/example_test.go
+++ b/src/database/sql/example_test.go
diff --git a/src/pkg/database/sql/fakedb_test.go b/src/database/sql/fakedb_test.go
index c7db0dd77..c7db0dd77 100644
--- a/src/pkg/database/sql/fakedb_test.go
+++ b/src/database/sql/fakedb_test.go
diff --git a/src/pkg/database/sql/sql.go b/src/database/sql/sql.go
index 90f813d82..90f813d82 100644
--- a/src/pkg/database/sql/sql.go
+++ b/src/database/sql/sql.go
diff --git a/src/pkg/database/sql/sql_test.go b/src/database/sql/sql_test.go
index 12e5a6fd6..12e5a6fd6 100644
--- a/src/pkg/database/sql/sql_test.go
+++ b/src/database/sql/sql_test.go
diff --git a/src/pkg/debug/dwarf/buf.go b/src/debug/dwarf/buf.go
index 53c46eb4b..53c46eb4b 100644
--- a/src/pkg/debug/dwarf/buf.go
+++ b/src/debug/dwarf/buf.go
diff --git a/src/pkg/debug/dwarf/const.go b/src/debug/dwarf/const.go
index 93c68881a..93c68881a 100644
--- a/src/pkg/debug/dwarf/const.go
+++ b/src/debug/dwarf/const.go
diff --git a/src/pkg/debug/dwarf/entry.go b/src/debug/dwarf/entry.go
index 665c6840d..665c6840d 100644
--- a/src/pkg/debug/dwarf/entry.go
+++ b/src/debug/dwarf/entry.go
diff --git a/src/pkg/debug/dwarf/open.go b/src/debug/dwarf/open.go
index c1b3f37ac..c1b3f37ac 100644
--- a/src/pkg/debug/dwarf/open.go
+++ b/src/debug/dwarf/open.go
diff --git a/src/pkg/debug/dwarf/testdata/typedef.c b/src/debug/dwarf/testdata/typedef.c
index f05f01564..f05f01564 100644
--- a/src/pkg/debug/dwarf/testdata/typedef.c
+++ b/src/debug/dwarf/testdata/typedef.c
diff --git a/src/pkg/debug/dwarf/testdata/typedef.elf b/src/debug/dwarf/testdata/typedef.elf
index b2062d2c4..b2062d2c4 100755
--- a/src/pkg/debug/dwarf/testdata/typedef.elf
+++ b/src/debug/dwarf/testdata/typedef.elf
diff --git a/src/pkg/debug/dwarf/testdata/typedef.elf4 b/src/debug/dwarf/testdata/typedef.elf4
index 3d5a5a1b1..3d5a5a1b1 100644
--- a/src/pkg/debug/dwarf/testdata/typedef.elf4
+++ b/src/debug/dwarf/testdata/typedef.elf4
diff --git a/src/pkg/debug/dwarf/testdata/typedef.macho b/src/debug/dwarf/testdata/typedef.macho
index f75afcccb..f75afcccb 100644
--- a/src/pkg/debug/dwarf/testdata/typedef.macho
+++ b/src/debug/dwarf/testdata/typedef.macho
diff --git a/src/pkg/debug/dwarf/type.go b/src/debug/dwarf/type.go
index fa40b2bef..fa40b2bef 100644
--- a/src/pkg/debug/dwarf/type.go
+++ b/src/debug/dwarf/type.go
diff --git a/src/pkg/debug/dwarf/type_test.go b/src/debug/dwarf/type_test.go
index 2cb85e74b..2cb85e74b 100644
--- a/src/pkg/debug/dwarf/type_test.go
+++ b/src/debug/dwarf/type_test.go
diff --git a/src/pkg/debug/dwarf/typeunit.go b/src/debug/dwarf/typeunit.go
index 3fd1c9973..3fd1c9973 100644
--- a/src/pkg/debug/dwarf/typeunit.go
+++ b/src/debug/dwarf/typeunit.go
diff --git a/src/pkg/debug/dwarf/unit.go b/src/debug/dwarf/unit.go
index 0fbc8e082..0fbc8e082 100644
--- a/src/pkg/debug/dwarf/unit.go
+++ b/src/debug/dwarf/unit.go
diff --git a/src/pkg/debug/elf/elf.go b/src/debug/elf/elf.go
index 46e9d5735..46e9d5735 100644
--- a/src/pkg/debug/elf/elf.go
+++ b/src/debug/elf/elf.go
diff --git a/src/pkg/debug/elf/elf_test.go b/src/debug/elf/elf_test.go
index e3c51bb71..e3c51bb71 100644
--- a/src/pkg/debug/elf/elf_test.go
+++ b/src/debug/elf/elf_test.go
diff --git a/src/pkg/debug/elf/file.go b/src/debug/elf/file.go
index 49060b735..49060b735 100644
--- a/src/pkg/debug/elf/file.go
+++ b/src/debug/elf/file.go
diff --git a/src/pkg/debug/elf/file_test.go b/src/debug/elf/file_test.go
index d57aaab0e..d57aaab0e 100644
--- a/src/pkg/debug/elf/file_test.go
+++ b/src/debug/elf/file_test.go
diff --git a/src/pkg/debug/elf/symbols_test.go b/src/debug/elf/symbols_test.go
index 1b79520e3..1b79520e3 100644
--- a/src/pkg/debug/elf/symbols_test.go
+++ b/src/debug/elf/symbols_test.go
diff --git a/src/pkg/debug/elf/testdata/gcc-386-freebsd-exec b/src/debug/elf/testdata/gcc-386-freebsd-exec
index 7af9c58ca..7af9c58ca 100755
--- a/src/pkg/debug/elf/testdata/gcc-386-freebsd-exec
+++ b/src/debug/elf/testdata/gcc-386-freebsd-exec
diff --git a/src/pkg/debug/elf/testdata/gcc-amd64-linux-exec b/src/debug/elf/testdata/gcc-amd64-linux-exec
index c6cb1de28..c6cb1de28 100755
--- a/src/pkg/debug/elf/testdata/gcc-amd64-linux-exec
+++ b/src/debug/elf/testdata/gcc-amd64-linux-exec
diff --git a/src/pkg/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj b/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
index f62b1ea1c..f62b1ea1c 100644
--- a/src/pkg/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
+++ b/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-clang-x86.obj b/src/debug/elf/testdata/go-relocation-test-clang-x86.obj
index e909cf4e6..e909cf4e6 100644
--- a/src/pkg/debug/elf/testdata/go-relocation-test-clang-x86.obj
+++ b/src/debug/elf/testdata/go-relocation-test-clang-x86.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj b/src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
index a7c6d6e56..a7c6d6e56 100644
--- a/src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
+++ b/src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj b/src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
index 2d37ab6e6..2d37ab6e6 100644
--- a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
+++ b/src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.obj b/src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
index 0d59fe303..0d59fe303 100644
--- a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
+++ b/src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj b/src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
index 849e2644e..849e2644e 100644
--- a/src/pkg/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
+++ b/src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc482-ppc64le.obj b/src/debug/elf/testdata/go-relocation-test-gcc482-ppc64le.obj
index dad744548..dad744548 100644
--- a/src/pkg/debug/elf/testdata/go-relocation-test-gcc482-ppc64le.obj
+++ b/src/debug/elf/testdata/go-relocation-test-gcc482-ppc64le.obj
diff --git a/src/pkg/debug/elf/testdata/hello-world-core.gz b/src/debug/elf/testdata/hello-world-core.gz
index 806af6edb..806af6edb 100644
--- a/src/pkg/debug/elf/testdata/hello-world-core.gz
+++ b/src/debug/elf/testdata/hello-world-core.gz
diff --git a/src/pkg/debug/elf/testdata/hello.c b/src/debug/elf/testdata/hello.c
index 34d9ee792..34d9ee792 100644
--- a/src/pkg/debug/elf/testdata/hello.c
+++ b/src/debug/elf/testdata/hello.c
diff --git a/src/pkg/debug/goobj/read.go b/src/debug/goobj/read.go
index 79a83e59a..79a83e59a 100644
--- a/src/pkg/debug/goobj/read.go
+++ b/src/debug/goobj/read.go
diff --git a/src/pkg/debug/goobj/read_test.go b/src/debug/goobj/read_test.go
index dee140533..dee140533 100644
--- a/src/pkg/debug/goobj/read_test.go
+++ b/src/debug/goobj/read_test.go
diff --git a/src/pkg/debug/gosym/pclinetest.asm b/src/debug/gosym/pclinetest.asm
index b9ee9c0a5..b9ee9c0a5 100644
--- a/src/pkg/debug/gosym/pclinetest.asm
+++ b/src/debug/gosym/pclinetest.asm
diff --git a/src/pkg/debug/gosym/pclinetest.h b/src/debug/gosym/pclinetest.h
index 156c0b87b..156c0b87b 100644
--- a/src/pkg/debug/gosym/pclinetest.h
+++ b/src/debug/gosym/pclinetest.h
diff --git a/src/pkg/debug/gosym/pclntab.go b/src/debug/gosym/pclntab.go
index 6620aefb0..6620aefb0 100644
--- a/src/pkg/debug/gosym/pclntab.go
+++ b/src/debug/gosym/pclntab.go
diff --git a/src/pkg/debug/gosym/pclntab_test.go b/src/debug/gosym/pclntab_test.go
index 35502e8c3..35502e8c3 100644
--- a/src/pkg/debug/gosym/pclntab_test.go
+++ b/src/debug/gosym/pclntab_test.go
diff --git a/src/pkg/debug/gosym/symtab.go b/src/debug/gosym/symtab.go
index ee18499d1..ee18499d1 100644
--- a/src/pkg/debug/gosym/symtab.go
+++ b/src/debug/gosym/symtab.go
diff --git a/src/pkg/debug/macho/fat.go b/src/debug/macho/fat.go
index 93b831526..93b831526 100644
--- a/src/pkg/debug/macho/fat.go
+++ b/src/debug/macho/fat.go
diff --git a/src/pkg/debug/macho/file.go b/src/debug/macho/file.go
index eefb74444..eefb74444 100644
--- a/src/pkg/debug/macho/file.go
+++ b/src/debug/macho/file.go
diff --git a/src/pkg/debug/macho/file_test.go b/src/debug/macho/file_test.go
index 4797780ce..4797780ce 100644
--- a/src/pkg/debug/macho/file_test.go
+++ b/src/debug/macho/file_test.go
diff --git a/src/pkg/debug/macho/macho.go b/src/debug/macho/macho.go
index d9678c8ed..d9678c8ed 100644
--- a/src/pkg/debug/macho/macho.go
+++ b/src/debug/macho/macho.go
diff --git a/src/pkg/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec b/src/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
index 7efd19300..7efd19300 100644
--- a/src/pkg/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
+++ b/src/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-386-darwin-exec b/src/debug/macho/testdata/gcc-386-darwin-exec
index 03ba1bafa..03ba1bafa 100755
--- a/src/pkg/debug/macho/testdata/gcc-386-darwin-exec
+++ b/src/debug/macho/testdata/gcc-386-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec b/src/debug/macho/testdata/gcc-amd64-darwin-exec
index 5155a5a26..5155a5a26 100755
--- a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec
+++ b/src/debug/macho/testdata/gcc-amd64-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec-debug b/src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
index a47d3aef7..a47d3aef7 100644
--- a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec-debug
+++ b/src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
diff --git a/src/pkg/debug/macho/testdata/hello.c b/src/debug/macho/testdata/hello.c
index a689d3644..a689d3644 100644
--- a/src/pkg/debug/macho/testdata/hello.c
+++ b/src/debug/macho/testdata/hello.c
diff --git a/src/pkg/debug/pe/file.go b/src/debug/pe/file.go
index ce6f1408f..ce6f1408f 100644
--- a/src/pkg/debug/pe/file.go
+++ b/src/debug/pe/file.go
diff --git a/src/pkg/debug/pe/file_test.go b/src/debug/pe/file_test.go
index 0d73969bc..0d73969bc 100644
--- a/src/pkg/debug/pe/file_test.go
+++ b/src/debug/pe/file_test.go
diff --git a/src/pkg/debug/pe/pe.go b/src/debug/pe/pe.go
index 8e90b1b51..8e90b1b51 100644
--- a/src/pkg/debug/pe/pe.go
+++ b/src/debug/pe/pe.go
diff --git a/src/pkg/debug/pe/testdata/gcc-386-mingw-exec b/src/debug/pe/testdata/gcc-386-mingw-exec
index 4b808d043..4b808d043 100644
--- a/src/pkg/debug/pe/testdata/gcc-386-mingw-exec
+++ b/src/debug/pe/testdata/gcc-386-mingw-exec
diff --git a/src/pkg/debug/pe/testdata/gcc-386-mingw-obj b/src/debug/pe/testdata/gcc-386-mingw-obj
index 0c84d898d..0c84d898d 100644
--- a/src/pkg/debug/pe/testdata/gcc-386-mingw-obj
+++ b/src/debug/pe/testdata/gcc-386-mingw-obj
diff --git a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-exec b/src/debug/pe/testdata/gcc-amd64-mingw-exec
index ce6feb6b7..ce6feb6b7 100644
--- a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-exec
+++ b/src/debug/pe/testdata/gcc-amd64-mingw-exec
diff --git a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-obj b/src/debug/pe/testdata/gcc-amd64-mingw-obj
index 48ae7921f..48ae7921f 100644
--- a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-obj
+++ b/src/debug/pe/testdata/gcc-amd64-mingw-obj
diff --git a/src/pkg/debug/pe/testdata/hello.c b/src/debug/pe/testdata/hello.c
index a689d3644..a689d3644 100644
--- a/src/pkg/debug/pe/testdata/hello.c
+++ b/src/debug/pe/testdata/hello.c
diff --git a/src/pkg/debug/plan9obj/file.go b/src/debug/plan9obj/file.go
index b11ed86f1..b11ed86f1 100644
--- a/src/pkg/debug/plan9obj/file.go
+++ b/src/debug/plan9obj/file.go
diff --git a/src/pkg/debug/plan9obj/file_test.go b/src/debug/plan9obj/file_test.go
index cfd7a61d1..cfd7a61d1 100644
--- a/src/pkg/debug/plan9obj/file_test.go
+++ b/src/debug/plan9obj/file_test.go
diff --git a/src/pkg/debug/plan9obj/plan9obj.go b/src/debug/plan9obj/plan9obj.go
index af9858562..af9858562 100644
--- a/src/pkg/debug/plan9obj/plan9obj.go
+++ b/src/debug/plan9obj/plan9obj.go
diff --git a/src/pkg/debug/plan9obj/testdata/386-plan9-exec b/src/debug/plan9obj/testdata/386-plan9-exec
index 748e83f8e..748e83f8e 100755
--- a/src/pkg/debug/plan9obj/testdata/386-plan9-exec
+++ b/src/debug/plan9obj/testdata/386-plan9-exec
diff --git a/src/pkg/debug/plan9obj/testdata/amd64-plan9-exec b/src/debug/plan9obj/testdata/amd64-plan9-exec
index 3e257dd8f..3e257dd8f 100755
--- a/src/pkg/debug/plan9obj/testdata/amd64-plan9-exec
+++ b/src/debug/plan9obj/testdata/amd64-plan9-exec
diff --git a/src/pkg/debug/plan9obj/testdata/hello.c b/src/debug/plan9obj/testdata/hello.c
index c0d633e29..c0d633e29 100644
--- a/src/pkg/debug/plan9obj/testdata/hello.c
+++ b/src/debug/plan9obj/testdata/hello.c
diff --git a/src/pkg/encoding/ascii85/ascii85.go b/src/encoding/ascii85/ascii85.go
index 4d7193873..4d7193873 100644
--- a/src/pkg/encoding/ascii85/ascii85.go
+++ b/src/encoding/ascii85/ascii85.go
diff --git a/src/pkg/encoding/ascii85/ascii85_test.go b/src/encoding/ascii85/ascii85_test.go
index aad199b4f..aad199b4f 100644
--- a/src/pkg/encoding/ascii85/ascii85_test.go
+++ b/src/encoding/ascii85/ascii85_test.go
diff --git a/src/pkg/encoding/asn1/asn1.go b/src/encoding/asn1/asn1.go
index b06aec3e4..b06aec3e4 100644
--- a/src/pkg/encoding/asn1/asn1.go
+++ b/src/encoding/asn1/asn1.go
diff --git a/src/pkg/encoding/asn1/asn1_test.go b/src/encoding/asn1/asn1_test.go
index b553f78e0..b553f78e0 100644
--- a/src/pkg/encoding/asn1/asn1_test.go
+++ b/src/encoding/asn1/asn1_test.go
diff --git a/src/pkg/encoding/asn1/common.go b/src/encoding/asn1/common.go
index 33a117ece..33a117ece 100644
--- a/src/pkg/encoding/asn1/common.go
+++ b/src/encoding/asn1/common.go
diff --git a/src/pkg/encoding/asn1/marshal.go b/src/encoding/asn1/marshal.go
index b2f104b4c..b2f104b4c 100644
--- a/src/pkg/encoding/asn1/marshal.go
+++ b/src/encoding/asn1/marshal.go
diff --git a/src/pkg/encoding/asn1/marshal_test.go b/src/encoding/asn1/marshal_test.go
index 5b0115f28..5b0115f28 100644
--- a/src/pkg/encoding/asn1/marshal_test.go
+++ b/src/encoding/asn1/marshal_test.go
diff --git a/src/pkg/encoding/base32/base32.go b/src/encoding/base32/base32.go
index 5a9e86919..5a9e86919 100644
--- a/src/pkg/encoding/base32/base32.go
+++ b/src/encoding/base32/base32.go
diff --git a/src/pkg/encoding/base32/base32_test.go b/src/encoding/base32/base32_test.go
index 5a68f06e1..5a68f06e1 100644
--- a/src/pkg/encoding/base32/base32_test.go
+++ b/src/encoding/base32/base32_test.go
diff --git a/src/pkg/encoding/base32/example_test.go b/src/encoding/base32/example_test.go
index f6128d900..f6128d900 100644
--- a/src/pkg/encoding/base32/example_test.go
+++ b/src/encoding/base32/example_test.go
diff --git a/src/pkg/encoding/base64/base64.go b/src/encoding/base64/base64.go
index ad3abe662..ad3abe662 100644
--- a/src/pkg/encoding/base64/base64.go
+++ b/src/encoding/base64/base64.go
diff --git a/src/pkg/encoding/base64/base64_test.go b/src/encoding/base64/base64_test.go
index 7d199bfa0..7d199bfa0 100644
--- a/src/pkg/encoding/base64/base64_test.go
+++ b/src/encoding/base64/base64_test.go
diff --git a/src/pkg/encoding/base64/example_test.go b/src/encoding/base64/example_test.go
index d18b856a0..d18b856a0 100644
--- a/src/pkg/encoding/base64/example_test.go
+++ b/src/encoding/base64/example_test.go
diff --git a/src/pkg/encoding/binary/binary.go b/src/encoding/binary/binary.go
index a5694876a..a5694876a 100644
--- a/src/pkg/encoding/binary/binary.go
+++ b/src/encoding/binary/binary.go
diff --git a/src/pkg/encoding/binary/binary_test.go b/src/encoding/binary/binary_test.go
index c80c90383..c80c90383 100644
--- a/src/pkg/encoding/binary/binary_test.go
+++ b/src/encoding/binary/binary_test.go
diff --git a/src/pkg/encoding/binary/example_test.go b/src/encoding/binary/example_test.go
index 067cf553b..067cf553b 100644
--- a/src/pkg/encoding/binary/example_test.go
+++ b/src/encoding/binary/example_test.go
diff --git a/src/pkg/encoding/binary/varint.go b/src/encoding/binary/varint.go
index 3a2dfa3c7..3a2dfa3c7 100644
--- a/src/pkg/encoding/binary/varint.go
+++ b/src/encoding/binary/varint.go
diff --git a/src/pkg/encoding/binary/varint_test.go b/src/encoding/binary/varint_test.go
index ca411ecbd..ca411ecbd 100644
--- a/src/pkg/encoding/binary/varint_test.go
+++ b/src/encoding/binary/varint_test.go
diff --git a/src/pkg/encoding/csv/reader.go b/src/encoding/csv/reader.go
index d9432954a..d9432954a 100644
--- a/src/pkg/encoding/csv/reader.go
+++ b/src/encoding/csv/reader.go
diff --git a/src/pkg/encoding/csv/reader_test.go b/src/encoding/csv/reader_test.go
index 123df06bc..123df06bc 100644
--- a/src/pkg/encoding/csv/reader_test.go
+++ b/src/encoding/csv/reader_test.go
diff --git a/src/pkg/encoding/csv/writer.go b/src/encoding/csv/writer.go
index 1faecb664..1faecb664 100644
--- a/src/pkg/encoding/csv/writer.go
+++ b/src/encoding/csv/writer.go
diff --git a/src/pkg/encoding/csv/writer_test.go b/src/encoding/csv/writer_test.go
index 22b740c07..22b740c07 100644
--- a/src/pkg/encoding/csv/writer_test.go
+++ b/src/encoding/csv/writer_test.go
diff --git a/src/pkg/encoding/encoding.go b/src/encoding/encoding.go
index 6d218071b..6d218071b 100644
--- a/src/pkg/encoding/encoding.go
+++ b/src/encoding/encoding.go
diff --git a/src/pkg/encoding/gob/codec_test.go b/src/encoding/gob/codec_test.go
index 4f17a2893..4f17a2893 100644
--- a/src/pkg/encoding/gob/codec_test.go
+++ b/src/encoding/gob/codec_test.go
diff --git a/src/pkg/encoding/gob/debug.go b/src/encoding/gob/debug.go
index 536bbdb5a..536bbdb5a 100644
--- a/src/pkg/encoding/gob/debug.go
+++ b/src/encoding/gob/debug.go
diff --git a/src/pkg/encoding/gob/decode.go b/src/encoding/gob/decode.go
index 2367650c8..2367650c8 100644
--- a/src/pkg/encoding/gob/decode.go
+++ b/src/encoding/gob/decode.go
diff --git a/src/pkg/encoding/gob/decoder.go b/src/encoding/gob/decoder.go
index 3a769ec12..3a769ec12 100644
--- a/src/pkg/encoding/gob/decoder.go
+++ b/src/encoding/gob/decoder.go
diff --git a/src/pkg/encoding/gob/doc.go b/src/encoding/gob/doc.go
index d0acaba1a..d0acaba1a 100644
--- a/src/pkg/encoding/gob/doc.go
+++ b/src/encoding/gob/doc.go
diff --git a/src/pkg/encoding/gob/dump.go b/src/encoding/gob/dump.go
index 17238c98d..17238c98d 100644
--- a/src/pkg/encoding/gob/dump.go
+++ b/src/encoding/gob/dump.go
diff --git a/src/pkg/encoding/gob/encode.go b/src/encoding/gob/encode.go
index 5d35db20e..5d35db20e 100644
--- a/src/pkg/encoding/gob/encode.go
+++ b/src/encoding/gob/encode.go
diff --git a/src/pkg/encoding/gob/encoder.go b/src/encoding/gob/encoder.go
index a3301c3bd..a3301c3bd 100644
--- a/src/pkg/encoding/gob/encoder.go
+++ b/src/encoding/gob/encoder.go
diff --git a/src/pkg/encoding/gob/encoder_test.go b/src/encoding/gob/encoder_test.go
index 376df82f1..376df82f1 100644
--- a/src/pkg/encoding/gob/encoder_test.go
+++ b/src/encoding/gob/encoder_test.go
diff --git a/src/pkg/encoding/gob/error.go b/src/encoding/gob/error.go
index 92cc0c615..92cc0c615 100644
--- a/src/pkg/encoding/gob/error.go
+++ b/src/encoding/gob/error.go
diff --git a/src/pkg/encoding/gob/example_encdec_test.go b/src/encoding/gob/example_encdec_test.go
index e45ad4ccf..e45ad4ccf 100644
--- a/src/pkg/encoding/gob/example_encdec_test.go
+++ b/src/encoding/gob/example_encdec_test.go
diff --git a/src/pkg/encoding/gob/example_interface_test.go b/src/encoding/gob/example_interface_test.go
index 4681e6307..4681e6307 100644
--- a/src/pkg/encoding/gob/example_interface_test.go
+++ b/src/encoding/gob/example_interface_test.go
diff --git a/src/pkg/encoding/gob/example_test.go b/src/encoding/gob/example_test.go
index 020352cee..020352cee 100644
--- a/src/pkg/encoding/gob/example_test.go
+++ b/src/encoding/gob/example_test.go
diff --git a/src/pkg/encoding/gob/gobencdec_test.go b/src/encoding/gob/gobencdec_test.go
index eb76b481d..eb76b481d 100644
--- a/src/pkg/encoding/gob/gobencdec_test.go
+++ b/src/encoding/gob/gobencdec_test.go
diff --git a/src/pkg/encoding/gob/timing_test.go b/src/encoding/gob/timing_test.go
index ec55c4d63..ec55c4d63 100644
--- a/src/pkg/encoding/gob/timing_test.go
+++ b/src/encoding/gob/timing_test.go
diff --git a/src/pkg/encoding/gob/type.go b/src/encoding/gob/type.go
index cad145279..cad145279 100644
--- a/src/pkg/encoding/gob/type.go
+++ b/src/encoding/gob/type.go
diff --git a/src/pkg/encoding/gob/type_test.go b/src/encoding/gob/type_test.go
index e230d22d4..e230d22d4 100644
--- a/src/pkg/encoding/gob/type_test.go
+++ b/src/encoding/gob/type_test.go
diff --git a/src/pkg/encoding/hex/hex.go b/src/encoding/hex/hex.go
index d1fc7024a..d1fc7024a 100644
--- a/src/pkg/encoding/hex/hex.go
+++ b/src/encoding/hex/hex.go
diff --git a/src/pkg/encoding/hex/hex_test.go b/src/encoding/hex/hex_test.go
index b969636cd..b969636cd 100644
--- a/src/pkg/encoding/hex/hex_test.go
+++ b/src/encoding/hex/hex_test.go
diff --git a/src/pkg/encoding/json/bench_test.go b/src/encoding/json/bench_test.go
index 29dbc26d4..29dbc26d4 100644
--- a/src/pkg/encoding/json/bench_test.go
+++ b/src/encoding/json/bench_test.go
diff --git a/src/pkg/encoding/json/decode.go b/src/encoding/json/decode.go
index af1c908ad..af1c908ad 100644
--- a/src/pkg/encoding/json/decode.go
+++ b/src/encoding/json/decode.go
diff --git a/src/pkg/encoding/json/decode_test.go b/src/encoding/json/decode_test.go
index 238a87fd6..238a87fd6 100644
--- a/src/pkg/encoding/json/decode_test.go
+++ b/src/encoding/json/decode_test.go
diff --git a/src/pkg/encoding/json/encode.go b/src/encoding/json/encode.go
index b63538c92..b63538c92 100644
--- a/src/pkg/encoding/json/encode.go
+++ b/src/encoding/json/encode.go
diff --git a/src/pkg/encoding/json/encode_test.go b/src/encoding/json/encode_test.go
index eb84cbae1..eb84cbae1 100644
--- a/src/pkg/encoding/json/encode_test.go
+++ b/src/encoding/json/encode_test.go
diff --git a/src/pkg/encoding/json/example_test.go b/src/encoding/json/example_test.go
index ca4e5ae68..ca4e5ae68 100644
--- a/src/pkg/encoding/json/example_test.go
+++ b/src/encoding/json/example_test.go
diff --git a/src/pkg/encoding/json/fold.go b/src/encoding/json/fold.go
index d6f77c93e..d6f77c93e 100644
--- a/src/pkg/encoding/json/fold.go
+++ b/src/encoding/json/fold.go
diff --git a/src/pkg/encoding/json/fold_test.go b/src/encoding/json/fold_test.go
index 9fb94646a..9fb94646a 100644
--- a/src/pkg/encoding/json/fold_test.go
+++ b/src/encoding/json/fold_test.go
diff --git a/src/pkg/encoding/json/indent.go b/src/encoding/json/indent.go
index e1bacafd6..e1bacafd6 100644
--- a/src/pkg/encoding/json/indent.go
+++ b/src/encoding/json/indent.go
diff --git a/src/pkg/encoding/json/scanner.go b/src/encoding/json/scanner.go
index a4609c895..a4609c895 100644
--- a/src/pkg/encoding/json/scanner.go
+++ b/src/encoding/json/scanner.go
diff --git a/src/pkg/encoding/json/scanner_test.go b/src/encoding/json/scanner_test.go
index 788034290..788034290 100644
--- a/src/pkg/encoding/json/scanner_test.go
+++ b/src/encoding/json/scanner_test.go
diff --git a/src/pkg/encoding/json/stream.go b/src/encoding/json/stream.go
index 9566ecadc..9566ecadc 100644
--- a/src/pkg/encoding/json/stream.go
+++ b/src/encoding/json/stream.go
diff --git a/src/pkg/encoding/json/stream_test.go b/src/encoding/json/stream_test.go
index b562e8769..b562e8769 100644
--- a/src/pkg/encoding/json/stream_test.go
+++ b/src/encoding/json/stream_test.go
diff --git a/src/pkg/encoding/json/tagkey_test.go b/src/encoding/json/tagkey_test.go
index 23e71c752..23e71c752 100644
--- a/src/pkg/encoding/json/tagkey_test.go
+++ b/src/encoding/json/tagkey_test.go
diff --git a/src/pkg/encoding/json/tags.go b/src/encoding/json/tags.go
index c38fd5102..c38fd5102 100644
--- a/src/pkg/encoding/json/tags.go
+++ b/src/encoding/json/tags.go
diff --git a/src/pkg/encoding/json/tags_test.go b/src/encoding/json/tags_test.go
index 91fb18831..91fb18831 100644
--- a/src/pkg/encoding/json/tags_test.go
+++ b/src/encoding/json/tags_test.go
diff --git a/src/pkg/encoding/json/testdata/code.json.gz b/src/encoding/json/testdata/code.json.gz
index 0e2895b53..0e2895b53 100644
--- a/src/pkg/encoding/json/testdata/code.json.gz
+++ b/src/encoding/json/testdata/code.json.gz
diff --git a/src/pkg/encoding/pem/pem.go b/src/encoding/pem/pem.go
index 8ff7ee8c3..8ff7ee8c3 100644
--- a/src/pkg/encoding/pem/pem.go
+++ b/src/encoding/pem/pem.go
diff --git a/src/pkg/encoding/pem/pem_test.go b/src/encoding/pem/pem_test.go
index ccce42cf1..ccce42cf1 100644
--- a/src/pkg/encoding/pem/pem_test.go
+++ b/src/encoding/pem/pem_test.go
diff --git a/src/pkg/encoding/xml/atom_test.go b/src/encoding/xml/atom_test.go
index a71284312..a71284312 100644
--- a/src/pkg/encoding/xml/atom_test.go
+++ b/src/encoding/xml/atom_test.go
diff --git a/src/pkg/encoding/xml/example_test.go b/src/encoding/xml/example_test.go
index becedd583..becedd583 100644
--- a/src/pkg/encoding/xml/example_test.go
+++ b/src/encoding/xml/example_test.go
diff --git a/src/pkg/encoding/xml/marshal.go b/src/encoding/xml/marshal.go
index 8c6342013..8c6342013 100644
--- a/src/pkg/encoding/xml/marshal.go
+++ b/src/encoding/xml/marshal.go
diff --git a/src/pkg/encoding/xml/marshal_test.go b/src/encoding/xml/marshal_test.go
index 14f73a75d..14f73a75d 100644
--- a/src/pkg/encoding/xml/marshal_test.go
+++ b/src/encoding/xml/marshal_test.go
diff --git a/src/pkg/encoding/xml/read.go b/src/encoding/xml/read.go
index 75b9f2ba1..75b9f2ba1 100644
--- a/src/pkg/encoding/xml/read.go
+++ b/src/encoding/xml/read.go
diff --git a/src/pkg/encoding/xml/read_test.go b/src/encoding/xml/read_test.go
index 01f55d0dd..01f55d0dd 100644
--- a/src/pkg/encoding/xml/read_test.go
+++ b/src/encoding/xml/read_test.go
diff --git a/src/pkg/encoding/xml/typeinfo.go b/src/encoding/xml/typeinfo.go
index 22248d20a..22248d20a 100644
--- a/src/pkg/encoding/xml/typeinfo.go
+++ b/src/encoding/xml/typeinfo.go
diff --git a/src/pkg/encoding/xml/xml.go b/src/encoding/xml/xml.go
index a4cd4e29e..a4cd4e29e 100644
--- a/src/pkg/encoding/xml/xml.go
+++ b/src/encoding/xml/xml.go
diff --git a/src/pkg/encoding/xml/xml_test.go b/src/encoding/xml/xml_test.go
index be995c0d5..be995c0d5 100644
--- a/src/pkg/encoding/xml/xml_test.go
+++ b/src/encoding/xml/xml_test.go
diff --git a/src/pkg/errors/errors.go b/src/errors/errors.go
index 3085a7962..3085a7962 100644
--- a/src/pkg/errors/errors.go
+++ b/src/errors/errors.go
diff --git a/src/pkg/errors/errors_test.go b/src/errors/errors_test.go
index 63c05d718..63c05d718 100644
--- a/src/pkg/errors/errors_test.go
+++ b/src/errors/errors_test.go
diff --git a/src/pkg/errors/example_test.go b/src/errors/example_test.go
index 0e86828f4..0e86828f4 100644
--- a/src/pkg/errors/example_test.go
+++ b/src/errors/example_test.go
diff --git a/src/pkg/expvar/expvar.go b/src/expvar/expvar.go
index 9b6dab487..9b6dab487 100644
--- a/src/pkg/expvar/expvar.go
+++ b/src/expvar/expvar.go
diff --git a/src/pkg/expvar/expvar_test.go b/src/expvar/expvar_test.go
index 765e3b757..765e3b757 100644
--- a/src/pkg/expvar/expvar_test.go
+++ b/src/expvar/expvar_test.go
diff --git a/src/pkg/flag/example_test.go b/src/flag/example_test.go
index 04a0d20ee..04a0d20ee 100644
--- a/src/pkg/flag/example_test.go
+++ b/src/flag/example_test.go
diff --git a/src/pkg/flag/export_test.go b/src/flag/export_test.go
index 56cda58b3..56cda58b3 100644
--- a/src/pkg/flag/export_test.go
+++ b/src/flag/export_test.go
diff --git a/src/pkg/flag/flag.go b/src/flag/flag.go
index de2d91f8b..de2d91f8b 100644
--- a/src/pkg/flag/flag.go
+++ b/src/flag/flag.go
diff --git a/src/pkg/flag/flag_test.go b/src/flag/flag_test.go
index 2c0387269..2c0387269 100644
--- a/src/pkg/flag/flag_test.go
+++ b/src/flag/flag_test.go
diff --git a/src/pkg/fmt/doc.go b/src/fmt/doc.go
index 5af8d3e71..5af8d3e71 100644
--- a/src/pkg/fmt/doc.go
+++ b/src/fmt/doc.go
diff --git a/src/pkg/fmt/export_test.go b/src/fmt/export_test.go
index 89d57ee6c..89d57ee6c 100644
--- a/src/pkg/fmt/export_test.go
+++ b/src/fmt/export_test.go
diff --git a/src/pkg/fmt/fmt_test.go b/src/fmt/fmt_test.go
index 8c577949a..8c577949a 100644
--- a/src/pkg/fmt/fmt_test.go
+++ b/src/fmt/fmt_test.go
diff --git a/src/pkg/fmt/format.go b/src/fmt/format.go
index 8aeffd7b2..8aeffd7b2 100644
--- a/src/pkg/fmt/format.go
+++ b/src/fmt/format.go
diff --git a/src/pkg/fmt/print.go b/src/fmt/print.go
index 679c577db..679c577db 100644
--- a/src/pkg/fmt/print.go
+++ b/src/fmt/print.go
diff --git a/src/pkg/fmt/scan.go b/src/fmt/scan.go
index d7befeae4..d7befeae4 100644
--- a/src/pkg/fmt/scan.go
+++ b/src/fmt/scan.go
diff --git a/src/pkg/fmt/scan_test.go b/src/fmt/scan_test.go
index 541e12df2..541e12df2 100644
--- a/src/pkg/fmt/scan_test.go
+++ b/src/fmt/scan_test.go
diff --git a/src/pkg/fmt/stringer_test.go b/src/fmt/stringer_test.go
index 0ca3f522d..0ca3f522d 100644
--- a/src/pkg/fmt/stringer_test.go
+++ b/src/fmt/stringer_test.go
diff --git a/src/pkg/go/ast/ast.go b/src/go/ast/ast.go
index 312e3d1b9..312e3d1b9 100644
--- a/src/pkg/go/ast/ast.go
+++ b/src/go/ast/ast.go
diff --git a/src/pkg/go/ast/ast_test.go b/src/go/ast/ast_test.go
index 1a6a283f2..1a6a283f2 100644
--- a/src/pkg/go/ast/ast_test.go
+++ b/src/go/ast/ast_test.go
diff --git a/src/pkg/go/ast/commentmap.go b/src/go/ast/commentmap.go
index ac999d627..ac999d627 100644
--- a/src/pkg/go/ast/commentmap.go
+++ b/src/go/ast/commentmap.go
diff --git a/src/pkg/go/ast/commentmap_test.go b/src/go/ast/commentmap_test.go
index e372eab74..e372eab74 100644
--- a/src/pkg/go/ast/commentmap_test.go
+++ b/src/go/ast/commentmap_test.go
diff --git a/src/pkg/go/ast/example_test.go b/src/go/ast/example_test.go
index d2e734f2c..d2e734f2c 100644
--- a/src/pkg/go/ast/example_test.go
+++ b/src/go/ast/example_test.go
diff --git a/src/pkg/go/ast/filter.go b/src/go/ast/filter.go
index fc3eeb4a1..fc3eeb4a1 100644
--- a/src/pkg/go/ast/filter.go
+++ b/src/go/ast/filter.go
diff --git a/src/pkg/go/ast/filter_test.go b/src/go/ast/filter_test.go
index 9fd86cb46..9fd86cb46 100644
--- a/src/pkg/go/ast/filter_test.go
+++ b/src/go/ast/filter_test.go
diff --git a/src/pkg/go/ast/import.go b/src/go/ast/import.go
index d2770d16c..d2770d16c 100644
--- a/src/pkg/go/ast/import.go
+++ b/src/go/ast/import.go
diff --git a/src/pkg/go/ast/print.go b/src/go/ast/print.go
index f15dc11dc..f15dc11dc 100644
--- a/src/pkg/go/ast/print.go
+++ b/src/go/ast/print.go
diff --git a/src/pkg/go/ast/print_test.go b/src/go/ast/print_test.go
index 210f16430..210f16430 100644
--- a/src/pkg/go/ast/print_test.go
+++ b/src/go/ast/print_test.go
diff --git a/src/pkg/go/ast/resolve.go b/src/go/ast/resolve.go
index 0406bfc58..0406bfc58 100644
--- a/src/pkg/go/ast/resolve.go
+++ b/src/go/ast/resolve.go
diff --git a/src/pkg/go/ast/scope.go b/src/go/ast/scope.go
index df1529d18..df1529d18 100644
--- a/src/pkg/go/ast/scope.go
+++ b/src/go/ast/scope.go
diff --git a/src/pkg/go/ast/walk.go b/src/go/ast/walk.go
index 73ac38647..73ac38647 100644
--- a/src/pkg/go/ast/walk.go
+++ b/src/go/ast/walk.go
diff --git a/src/pkg/go/build/build.go b/src/go/build/build.go
index 1002851e8..d6c04b785 100644
--- a/src/pkg/go/build/build.go
+++ b/src/go/build/build.go
@@ -207,9 +207,7 @@ func (ctxt *Context) gopath() []string {
 		if p == "" || p == ctxt.GOROOT {
 			// Empty paths are uninteresting.
 			// If the path is the GOROOT, ignore it.
-			// People sometimes set GOPATH=$GOROOT, which is useless
-			// but would cause us to find packages with import paths
-			// like "pkg/math".
+			// People sometimes set GOPATH=$GOROOT.
 			// Do not get confused by this common mistake.
 			continue
 		}
@@ -239,7 +237,7 @@ func (ctxt *Context) gopath() []string {
 func (ctxt *Context) SrcDirs() []string {
 	var all []string
 	if ctxt.GOROOT != "" {
-		dir := ctxt.joinPath(ctxt.GOROOT, "src", "pkg")
+		dir := ctxt.joinPath(ctxt.GOROOT, "src")
 		if ctxt.isDir(dir) {
 			all = append(all, dir)
 		}
@@ -479,7 +477,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 		}
 		// Determine canonical import path, if any.
 		if ctxt.GOROOT != "" {
-			root := ctxt.joinPath(ctxt.GOROOT, "src", "pkg")
+			root := ctxt.joinPath(ctxt.GOROOT, "src")
 			if sub, ok := ctxt.hasSubdir(root, p.Dir); ok {
 				p.Goroot = true
 				p.ImportPath = sub
@@ -495,7 +493,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 				// but check that using it wouldn't find something
 				// else first.
 				if ctxt.GOROOT != "" {
-					if dir := ctxt.joinPath(ctxt.GOROOT, "src", "pkg", sub); ctxt.isDir(dir) {
+					if dir := ctxt.joinPath(ctxt.GOROOT, "src", sub); ctxt.isDir(dir) {
 						p.ConflictDir = dir
 						goto Found
 					}
@@ -529,12 +527,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 
 		// Determine directory from import path.
 		if ctxt.GOROOT != "" {
-			var dir string
-			if strings.HasPrefix(path, "cmd/") {
-				dir = ctxt.joinPath(ctxt.GOROOT, "src", path)
-			} else {
-				dir = ctxt.joinPath(ctxt.GOROOT, "src", "pkg", path)
-			}
+			dir := ctxt.joinPath(ctxt.GOROOT, "src", path)
 			isDir := ctxt.isDir(dir)
 			binaryOnly = !isDir && mode&AllowBinary != 0 && pkga != "" && ctxt.isFile(ctxt.joinPath(ctxt.GOROOT, pkga))
 			if isDir || binaryOnly {
@@ -580,11 +573,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 
 Found:
 	if p.Root != "" {
-		if p.Goroot {
-			p.SrcRoot = ctxt.joinPath(p.Root, "src", "pkg")
-		} else {
-			p.SrcRoot = ctxt.joinPath(p.Root, "src")
-		}
+		p.SrcRoot = ctxt.joinPath(p.Root, "src")
 		p.PkgRoot = ctxt.joinPath(p.Root, "pkg")
 		p.BinDir = ctxt.joinPath(p.Root, "bin")
 		if pkga != "" {
diff --git a/src/pkg/go/build/build_test.go b/src/go/build/build_test.go
index 004010113..004010113 100644
--- a/src/pkg/go/build/build_test.go
+++ b/src/go/build/build_test.go
diff --git a/src/pkg/go/build/deps_test.go b/src/go/build/deps_test.go
index b74595ea8..b74595ea8 100644
--- a/src/pkg/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
diff --git a/src/pkg/go/build/doc.go b/src/go/build/doc.go
index d78ef3f1c..d78ef3f1c 100644
--- a/src/pkg/go/build/doc.go
+++ b/src/go/build/doc.go
diff --git a/src/pkg/go/build/read.go b/src/go/build/read.go
index c8079dfd1..c8079dfd1 100644
--- a/src/pkg/go/build/read.go
+++ b/src/go/build/read.go
diff --git a/src/pkg/go/build/read_test.go b/src/go/build/read_test.go
index 2dcc1208f..2dcc1208f 100644
--- a/src/pkg/go/build/read_test.go
+++ b/src/go/build/read_test.go
diff --git a/src/pkg/go/build/syslist.go b/src/go/build/syslist.go
index 2ab53bb9c..2ab53bb9c 100644
--- a/src/pkg/go/build/syslist.go
+++ b/src/go/build/syslist.go
diff --git a/src/pkg/go/build/syslist_test.go b/src/go/build/syslist_test.go
index 3be2928f5..3be2928f5 100644
--- a/src/pkg/go/build/syslist_test.go
+++ b/src/go/build/syslist_test.go
diff --git a/src/pkg/go/build/testdata/other/file/file.go b/src/go/build/testdata/other/file/file.go
index bbfd3e9e5..bbfd3e9e5 100644
--- a/src/pkg/go/build/testdata/other/file/file.go
+++ b/src/go/build/testdata/other/file/file.go
diff --git a/src/pkg/go/build/testdata/other/main.go b/src/go/build/testdata/other/main.go
index e0904357c..e0904357c 100644
--- a/src/pkg/go/build/testdata/other/main.go
+++ b/src/go/build/testdata/other/main.go
diff --git a/src/pkg/go/doc/Makefile b/src/go/doc/Makefile
index ca4948f91..ca4948f91 100644
--- a/src/pkg/go/doc/Makefile
+++ b/src/go/doc/Makefile
diff --git a/src/pkg/go/doc/comment.go b/src/go/doc/comment.go
index f414ca409..f414ca409 100644
--- a/src/pkg/go/doc/comment.go
+++ b/src/go/doc/comment.go
diff --git a/src/pkg/go/doc/comment_test.go b/src/go/doc/comment_test.go
index ad65c2a27..ad65c2a27 100644
--- a/src/pkg/go/doc/comment_test.go
+++ b/src/go/doc/comment_test.go
diff --git a/src/pkg/go/doc/doc.go b/src/go/doc/doc.go
index 4264940a0..4264940a0 100644
--- a/src/pkg/go/doc/doc.go
+++ b/src/go/doc/doc.go
diff --git a/src/pkg/go/doc/doc_test.go b/src/go/doc/doc_test.go
index ad8ba5378..ad8ba5378 100644
--- a/src/pkg/go/doc/doc_test.go
+++ b/src/go/doc/doc_test.go
diff --git a/src/pkg/go/doc/example.go b/src/go/doc/example.go
index c414e548c..c414e548c 100644
--- a/src/pkg/go/doc/example.go
+++ b/src/go/doc/example.go
diff --git a/src/pkg/go/doc/example_test.go b/src/go/doc/example_test.go
index e154ea8bf..e154ea8bf 100644
--- a/src/pkg/go/doc/example_test.go
+++ b/src/go/doc/example_test.go
diff --git a/src/pkg/go/doc/exports.go b/src/go/doc/exports.go
index ff01285d4..ff01285d4 100644
--- a/src/pkg/go/doc/exports.go
+++ b/src/go/doc/exports.go
diff --git a/src/pkg/go/doc/filter.go b/src/go/doc/filter.go
index a6f243f33..a6f243f33 100644
--- a/src/pkg/go/doc/filter.go
+++ b/src/go/doc/filter.go
diff --git a/src/pkg/go/doc/headscan.go b/src/go/doc/headscan.go
index 1ccaa1581..1ccaa1581 100644
--- a/src/pkg/go/doc/headscan.go
+++ b/src/go/doc/headscan.go
diff --git a/src/pkg/go/doc/reader.go b/src/go/doc/reader.go
index ed82c47cd..ed82c47cd 100644
--- a/src/pkg/go/doc/reader.go
+++ b/src/go/doc/reader.go
diff --git a/src/pkg/go/doc/synopsis.go b/src/go/doc/synopsis.go
index c90080b7c..c90080b7c 100644
--- a/src/pkg/go/doc/synopsis.go
+++ b/src/go/doc/synopsis.go
diff --git a/src/pkg/go/doc/synopsis_test.go b/src/go/doc/synopsis_test.go
index 59b253cb8..59b253cb8 100644
--- a/src/pkg/go/doc/synopsis_test.go
+++ b/src/go/doc/synopsis_test.go
diff --git a/src/pkg/go/doc/testdata/a.0.golden b/src/go/doc/testdata/a.0.golden
index 7e680b80b..7e680b80b 100644
--- a/src/pkg/go/doc/testdata/a.0.golden
+++ b/src/go/doc/testdata/a.0.golden
diff --git a/src/pkg/go/doc/testdata/a.1.golden b/src/go/doc/testdata/a.1.golden
index 7e680b80b..7e680b80b 100644
--- a/src/pkg/go/doc/testdata/a.1.golden
+++ b/src/go/doc/testdata/a.1.golden
diff --git a/src/pkg/go/doc/testdata/a.2.golden b/src/go/doc/testdata/a.2.golden
index 7e680b80b..7e680b80b 100644
--- a/src/pkg/go/doc/testdata/a.2.golden
+++ b/src/go/doc/testdata/a.2.golden
diff --git a/src/pkg/go/doc/testdata/a0.go b/src/go/doc/testdata/a0.go
index 2420c8a48..2420c8a48 100644
--- a/src/pkg/go/doc/testdata/a0.go
+++ b/src/go/doc/testdata/a0.go
diff --git a/src/pkg/go/doc/testdata/a1.go b/src/go/doc/testdata/a1.go
index 9fad1e09b..9fad1e09b 100644
--- a/src/pkg/go/doc/testdata/a1.go
+++ b/src/go/doc/testdata/a1.go
diff --git a/src/pkg/go/doc/testdata/b.0.golden b/src/go/doc/testdata/b.0.golden
index 9d93392ea..9d93392ea 100644
--- a/src/pkg/go/doc/testdata/b.0.golden
+++ b/src/go/doc/testdata/b.0.golden
diff --git a/src/pkg/go/doc/testdata/b.1.golden b/src/go/doc/testdata/b.1.golden
index 66c47b5c2..66c47b5c2 100644
--- a/src/pkg/go/doc/testdata/b.1.golden
+++ b/src/go/doc/testdata/b.1.golden
diff --git a/src/pkg/go/doc/testdata/b.2.golden b/src/go/doc/testdata/b.2.golden
index 9d93392ea..9d93392ea 100644
--- a/src/pkg/go/doc/testdata/b.2.golden
+++ b/src/go/doc/testdata/b.2.golden
diff --git a/src/pkg/go/doc/testdata/b.go b/src/go/doc/testdata/b.go
index e50663b3d..e50663b3d 100644
--- a/src/pkg/go/doc/testdata/b.go
+++ b/src/go/doc/testdata/b.go
diff --git a/src/pkg/go/doc/testdata/benchmark.go b/src/go/doc/testdata/benchmark.go
index 905e49644..905e49644 100644
--- a/src/pkg/go/doc/testdata/benchmark.go
+++ b/src/go/doc/testdata/benchmark.go
diff --git a/src/pkg/go/doc/testdata/bugpara.0.golden b/src/go/doc/testdata/bugpara.0.golden
index 580485950..580485950 100644
--- a/src/pkg/go/doc/testdata/bugpara.0.golden
+++ b/src/go/doc/testdata/bugpara.0.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.1.golden b/src/go/doc/testdata/bugpara.1.golden
index 580485950..580485950 100644
--- a/src/pkg/go/doc/testdata/bugpara.1.golden
+++ b/src/go/doc/testdata/bugpara.1.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.2.golden b/src/go/doc/testdata/bugpara.2.golden
index 580485950..580485950 100644
--- a/src/pkg/go/doc/testdata/bugpara.2.golden
+++ b/src/go/doc/testdata/bugpara.2.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.go b/src/go/doc/testdata/bugpara.go
index f5345a797..f5345a797 100644
--- a/src/pkg/go/doc/testdata/bugpara.go
+++ b/src/go/doc/testdata/bugpara.go
diff --git a/src/pkg/go/doc/testdata/c.0.golden b/src/go/doc/testdata/c.0.golden
index e21959b19..e21959b19 100644
--- a/src/pkg/go/doc/testdata/c.0.golden
+++ b/src/go/doc/testdata/c.0.golden
diff --git a/src/pkg/go/doc/testdata/c.1.golden b/src/go/doc/testdata/c.1.golden
index e21959b19..e21959b19 100644
--- a/src/pkg/go/doc/testdata/c.1.golden
+++ b/src/go/doc/testdata/c.1.golden
diff --git a/src/pkg/go/doc/testdata/c.2.golden b/src/go/doc/testdata/c.2.golden
index e21959b19..e21959b19 100644
--- a/src/pkg/go/doc/testdata/c.2.golden
+++ b/src/go/doc/testdata/c.2.golden
diff --git a/src/pkg/go/doc/testdata/c.go b/src/go/doc/testdata/c.go
index e0f39196d..e0f39196d 100644
--- a/src/pkg/go/doc/testdata/c.go
+++ b/src/go/doc/testdata/c.go
diff --git a/src/pkg/go/doc/testdata/d.0.golden b/src/go/doc/testdata/d.0.golden
index c00519953..c00519953 100644
--- a/src/pkg/go/doc/testdata/d.0.golden
+++ b/src/go/doc/testdata/d.0.golden
diff --git a/src/pkg/go/doc/testdata/d.1.golden b/src/go/doc/testdata/d.1.golden
index c00519953..c00519953 100644
--- a/src/pkg/go/doc/testdata/d.1.golden
+++ b/src/go/doc/testdata/d.1.golden
diff --git a/src/pkg/go/doc/testdata/d.2.golden b/src/go/doc/testdata/d.2.golden
index c00519953..c00519953 100644
--- a/src/pkg/go/doc/testdata/d.2.golden
+++ b/src/go/doc/testdata/d.2.golden
diff --git a/src/pkg/go/doc/testdata/d1.go b/src/go/doc/testdata/d1.go
index ebd694195..ebd694195 100644
--- a/src/pkg/go/doc/testdata/d1.go
+++ b/src/go/doc/testdata/d1.go
diff --git a/src/pkg/go/doc/testdata/d2.go b/src/go/doc/testdata/d2.go
index 2f56f4fa4..2f56f4fa4 100644
--- a/src/pkg/go/doc/testdata/d2.go
+++ b/src/go/doc/testdata/d2.go
diff --git a/src/pkg/go/doc/testdata/e.0.golden b/src/go/doc/testdata/e.0.golden
index 6987e5867..6987e5867 100644
--- a/src/pkg/go/doc/testdata/e.0.golden
+++ b/src/go/doc/testdata/e.0.golden
diff --git a/src/pkg/go/doc/testdata/e.1.golden b/src/go/doc/testdata/e.1.golden
index cbe22e0bf..cbe22e0bf 100644
--- a/src/pkg/go/doc/testdata/e.1.golden
+++ b/src/go/doc/testdata/e.1.golden
diff --git a/src/pkg/go/doc/testdata/e.2.golden b/src/go/doc/testdata/e.2.golden
index e7b05e80f..e7b05e80f 100644
--- a/src/pkg/go/doc/testdata/e.2.golden
+++ b/src/go/doc/testdata/e.2.golden
diff --git a/src/pkg/go/doc/testdata/e.go b/src/go/doc/testdata/e.go
index ec432e3e5..ec432e3e5 100644
--- a/src/pkg/go/doc/testdata/e.go
+++ b/src/go/doc/testdata/e.go
diff --git a/src/pkg/go/doc/testdata/error1.0.golden b/src/go/doc/testdata/error1.0.golden
index 6c6fe5d49..6c6fe5d49 100644
--- a/src/pkg/go/doc/testdata/error1.0.golden
+++ b/src/go/doc/testdata/error1.0.golden
diff --git a/src/pkg/go/doc/testdata/error1.1.golden b/src/go/doc/testdata/error1.1.golden
index a8dc2e71d..a8dc2e71d 100644
--- a/src/pkg/go/doc/testdata/error1.1.golden
+++ b/src/go/doc/testdata/error1.1.golden
diff --git a/src/pkg/go/doc/testdata/error1.2.golden b/src/go/doc/testdata/error1.2.golden
index 6c6fe5d49..6c6fe5d49 100644
--- a/src/pkg/go/doc/testdata/error1.2.golden
+++ b/src/go/doc/testdata/error1.2.golden
diff --git a/src/pkg/go/doc/testdata/error1.go b/src/go/doc/testdata/error1.go
index 3c777a780..3c777a780 100644
--- a/src/pkg/go/doc/testdata/error1.go
+++ b/src/go/doc/testdata/error1.go
diff --git a/src/pkg/go/doc/testdata/error2.0.golden b/src/go/doc/testdata/error2.0.golden
index dedfe412a..dedfe412a 100644
--- a/src/pkg/go/doc/testdata/error2.0.golden
+++ b/src/go/doc/testdata/error2.0.golden
diff --git a/src/pkg/go/doc/testdata/error2.1.golden b/src/go/doc/testdata/error2.1.golden
index dbcc1b03e..dbcc1b03e 100644
--- a/src/pkg/go/doc/testdata/error2.1.golden
+++ b/src/go/doc/testdata/error2.1.golden
diff --git a/src/pkg/go/doc/testdata/error2.2.golden b/src/go/doc/testdata/error2.2.golden
index dedfe412a..dedfe412a 100644
--- a/src/pkg/go/doc/testdata/error2.2.golden
+++ b/src/go/doc/testdata/error2.2.golden
diff --git a/src/pkg/go/doc/testdata/error2.go b/src/go/doc/testdata/error2.go
index 6ee96c245..6ee96c245 100644
--- a/src/pkg/go/doc/testdata/error2.go
+++ b/src/go/doc/testdata/error2.go
diff --git a/src/pkg/go/doc/testdata/example.go b/src/go/doc/testdata/example.go
index fdeda137e..fdeda137e 100644
--- a/src/pkg/go/doc/testdata/example.go
+++ b/src/go/doc/testdata/example.go
diff --git a/src/pkg/go/doc/testdata/f.0.golden b/src/go/doc/testdata/f.0.golden
index 817590186..817590186 100644
--- a/src/pkg/go/doc/testdata/f.0.golden
+++ b/src/go/doc/testdata/f.0.golden
diff --git a/src/pkg/go/doc/testdata/f.1.golden b/src/go/doc/testdata/f.1.golden
index ba68e884c..ba68e884c 100644
--- a/src/pkg/go/doc/testdata/f.1.golden
+++ b/src/go/doc/testdata/f.1.golden
diff --git a/src/pkg/go/doc/testdata/f.2.golden b/src/go/doc/testdata/f.2.golden
index 817590186..817590186 100644
--- a/src/pkg/go/doc/testdata/f.2.golden
+++ b/src/go/doc/testdata/f.2.golden
diff --git a/src/pkg/go/doc/testdata/f.go b/src/go/doc/testdata/f.go
index 7e9add907..7e9add907 100644
--- a/src/pkg/go/doc/testdata/f.go
+++ b/src/go/doc/testdata/f.go
diff --git a/src/pkg/go/doc/testdata/template.txt b/src/go/doc/testdata/template.txt
index 1b0738261..1b0738261 100644
--- a/src/pkg/go/doc/testdata/template.txt
+++ b/src/go/doc/testdata/template.txt
diff --git a/src/pkg/go/doc/testdata/testing.0.golden b/src/go/doc/testdata/testing.0.golden
index f8348f1ac..f8348f1ac 100644
--- a/src/pkg/go/doc/testdata/testing.0.golden
+++ b/src/go/doc/testdata/testing.0.golden
diff --git a/src/pkg/go/doc/testdata/testing.1.golden b/src/go/doc/testdata/testing.1.golden
index 282bb1015..282bb1015 100644
--- a/src/pkg/go/doc/testdata/testing.1.golden
+++ b/src/go/doc/testdata/testing.1.golden
diff --git a/src/pkg/go/doc/testdata/testing.2.golden b/src/go/doc/testdata/testing.2.golden
index f8348f1ac..f8348f1ac 100644
--- a/src/pkg/go/doc/testdata/testing.2.golden
+++ b/src/go/doc/testdata/testing.2.golden
diff --git a/src/pkg/go/doc/testdata/testing.go b/src/go/doc/testdata/testing.go
index 93ed494c3..93ed494c3 100644
--- a/src/pkg/go/doc/testdata/testing.go
+++ b/src/go/doc/testdata/testing.go
diff --git a/src/pkg/go/format/format.go b/src/go/format/format.go
index 3d00a645d..3d00a645d 100644
--- a/src/pkg/go/format/format.go
+++ b/src/go/format/format.go
diff --git a/src/pkg/go/format/format_test.go b/src/go/format/format_test.go
index 93f099247..93f099247 100644
--- a/src/pkg/go/format/format_test.go
+++ b/src/go/format/format_test.go
diff --git a/src/pkg/go/parser/error_test.go b/src/go/parser/error_test.go
index 48fb53e5b..48fb53e5b 100644
--- a/src/pkg/go/parser/error_test.go
+++ b/src/go/parser/error_test.go
diff --git a/src/pkg/go/parser/example_test.go b/src/go/parser/example_test.go
index 3c58e63a9..3c58e63a9 100644
--- a/src/pkg/go/parser/example_test.go
+++ b/src/go/parser/example_test.go
diff --git a/src/pkg/go/parser/interface.go b/src/go/parser/interface.go
index 49103058b..49103058b 100644
--- a/src/pkg/go/parser/interface.go
+++ b/src/go/parser/interface.go
diff --git a/src/pkg/go/parser/parser.go b/src/go/parser/parser.go
index 9c62076f2..9c62076f2 100644
--- a/src/pkg/go/parser/parser.go
+++ b/src/go/parser/parser.go
diff --git a/src/pkg/go/parser/parser_test.go b/src/go/parser/parser_test.go
index 85065fd18..85065fd18 100644
--- a/src/pkg/go/parser/parser_test.go
+++ b/src/go/parser/parser_test.go
diff --git a/src/pkg/go/parser/performance_test.go b/src/go/parser/performance_test.go
index f2732c0e2..f2732c0e2 100644
--- a/src/pkg/go/parser/performance_test.go
+++ b/src/go/parser/performance_test.go
diff --git a/src/pkg/go/parser/short_test.go b/src/go/parser/short_test.go
index f861086dd..f861086dd 100644
--- a/src/pkg/go/parser/short_test.go
+++ b/src/go/parser/short_test.go
diff --git a/src/pkg/go/parser/testdata/commas.src b/src/go/parser/testdata/commas.src
index af6e70645..af6e70645 100644
--- a/src/pkg/go/parser/testdata/commas.src
+++ b/src/go/parser/testdata/commas.src
diff --git a/src/pkg/go/parser/testdata/issue3106.src b/src/go/parser/testdata/issue3106.src
index 82796c8ce..82796c8ce 100644
--- a/src/pkg/go/parser/testdata/issue3106.src
+++ b/src/go/parser/testdata/issue3106.src
diff --git a/src/pkg/go/printer/example_test.go b/src/go/printer/example_test.go
index e570040ba..e570040ba 100644
--- a/src/pkg/go/printer/example_test.go
+++ b/src/go/printer/example_test.go
diff --git a/src/pkg/go/printer/nodes.go b/src/go/printer/nodes.go
index 6e26f9a63..6e26f9a63 100644
--- a/src/pkg/go/printer/nodes.go
+++ b/src/go/printer/nodes.go
diff --git a/src/pkg/go/printer/performance_test.go b/src/go/printer/performance_test.go
index 5b29affcb..5b29affcb 100644
--- a/src/pkg/go/printer/performance_test.go
+++ b/src/go/printer/performance_test.go
diff --git a/src/pkg/go/printer/printer.go b/src/go/printer/printer.go
index 280c697a0..280c697a0 100644
--- a/src/pkg/go/printer/printer.go
+++ b/src/go/printer/printer.go
diff --git a/src/pkg/go/printer/printer_test.go b/src/go/printer/printer_test.go
index 3b0570e5b..3b0570e5b 100644
--- a/src/pkg/go/printer/printer_test.go
+++ b/src/go/printer/printer_test.go
diff --git a/src/pkg/go/printer/testdata/comments.golden b/src/go/printer/testdata/comments.golden
index b1af7958a..b1af7958a 100644
--- a/src/pkg/go/printer/testdata/comments.golden
+++ b/src/go/printer/testdata/comments.golden
diff --git a/src/pkg/go/printer/testdata/comments.input b/src/go/printer/testdata/comments.input
index 983e2b2c9..983e2b2c9 100644
--- a/src/pkg/go/printer/testdata/comments.input
+++ b/src/go/printer/testdata/comments.input
diff --git a/src/pkg/go/printer/testdata/comments.x b/src/go/printer/testdata/comments.x
index ae7729286..ae7729286 100644
--- a/src/pkg/go/printer/testdata/comments.x
+++ b/src/go/printer/testdata/comments.x
diff --git a/src/pkg/go/printer/testdata/comments2.golden b/src/go/printer/testdata/comments2.golden
index 7676a26c1..7676a26c1 100644
--- a/src/pkg/go/printer/testdata/comments2.golden
+++ b/src/go/printer/testdata/comments2.golden
diff --git a/src/pkg/go/printer/testdata/comments2.input b/src/go/printer/testdata/comments2.input
index 4a055c827..4a055c827 100644
--- a/src/pkg/go/printer/testdata/comments2.input
+++ b/src/go/printer/testdata/comments2.input
diff --git a/src/pkg/go/printer/testdata/declarations.golden b/src/go/printer/testdata/declarations.golden
index a27f21fc8..a27f21fc8 100644
--- a/src/pkg/go/printer/testdata/declarations.golden
+++ b/src/go/printer/testdata/declarations.golden
diff --git a/src/pkg/go/printer/testdata/declarations.input b/src/go/printer/testdata/declarations.input
index d9951d386..d9951d386 100644
--- a/src/pkg/go/printer/testdata/declarations.input
+++ b/src/go/printer/testdata/declarations.input
diff --git a/src/pkg/go/printer/testdata/empty.golden b/src/go/printer/testdata/empty.golden
index a055f4758..a055f4758 100644
--- a/src/pkg/go/printer/testdata/empty.golden
+++ b/src/go/printer/testdata/empty.golden
diff --git a/src/pkg/go/printer/testdata/empty.input b/src/go/printer/testdata/empty.input
index a055f4758..a055f4758 100644
--- a/src/pkg/go/printer/testdata/empty.input
+++ b/src/go/printer/testdata/empty.input
diff --git a/src/pkg/go/printer/testdata/expressions.golden b/src/go/printer/testdata/expressions.golden
index fbe8275b3..fbe8275b3 100644
--- a/src/pkg/go/printer/testdata/expressions.golden
+++ b/src/go/printer/testdata/expressions.golden
diff --git a/src/pkg/go/printer/testdata/expressions.input b/src/go/printer/testdata/expressions.input
index f4d20fa0f..f4d20fa0f 100644
--- a/src/pkg/go/printer/testdata/expressions.input
+++ b/src/go/printer/testdata/expressions.input
diff --git a/src/pkg/go/printer/testdata/expressions.raw b/src/go/printer/testdata/expressions.raw
index 97bc81dad..97bc81dad 100644
--- a/src/pkg/go/printer/testdata/expressions.raw
+++ b/src/go/printer/testdata/expressions.raw
diff --git a/src/pkg/go/printer/testdata/linebreaks.golden b/src/go/printer/testdata/linebreaks.golden
index 006cf1718..006cf1718 100644
--- a/src/pkg/go/printer/testdata/linebreaks.golden
+++ b/src/go/printer/testdata/linebreaks.golden
diff --git a/src/pkg/go/printer/testdata/linebreaks.input b/src/go/printer/testdata/linebreaks.input
index e782bb044..e782bb044 100644
--- a/src/pkg/go/printer/testdata/linebreaks.input
+++ b/src/go/printer/testdata/linebreaks.input
diff --git a/src/pkg/go/printer/testdata/parser.go b/src/go/printer/testdata/parser.go
index dba8bbd43..dba8bbd43 100644
--- a/src/pkg/go/printer/testdata/parser.go
+++ b/src/go/printer/testdata/parser.go
diff --git a/src/pkg/go/printer/testdata/slow.golden b/src/go/printer/testdata/slow.golden
index 43a15cb1d..43a15cb1d 100644
--- a/src/pkg/go/printer/testdata/slow.golden
+++ b/src/go/printer/testdata/slow.golden
diff --git a/src/pkg/go/printer/testdata/slow.input b/src/go/printer/testdata/slow.input
index 0e5a23d88..0e5a23d88 100644
--- a/src/pkg/go/printer/testdata/slow.input
+++ b/src/go/printer/testdata/slow.input
diff --git a/src/pkg/go/printer/testdata/statements.golden b/src/go/printer/testdata/statements.golden
index 324b6cdd0..324b6cdd0 100644
--- a/src/pkg/go/printer/testdata/statements.golden
+++ b/src/go/printer/testdata/statements.golden
diff --git a/src/pkg/go/printer/testdata/statements.input b/src/go/printer/testdata/statements.input
index cade1576b..cade1576b 100644
--- a/src/pkg/go/printer/testdata/statements.input
+++ b/src/go/printer/testdata/statements.input
diff --git a/src/pkg/go/scanner/errors.go b/src/go/scanner/errors.go
index 22de69c3c..22de69c3c 100644
--- a/src/pkg/go/scanner/errors.go
+++ b/src/go/scanner/errors.go
diff --git a/src/pkg/go/scanner/example_test.go b/src/go/scanner/example_test.go
index 9004a4ad3..9004a4ad3 100644
--- a/src/pkg/go/scanner/example_test.go
+++ b/src/go/scanner/example_test.go
diff --git a/src/pkg/go/scanner/scanner.go b/src/go/scanner/scanner.go
index cec82ea10..cec82ea10 100644
--- a/src/pkg/go/scanner/scanner.go
+++ b/src/go/scanner/scanner.go
diff --git a/src/pkg/go/scanner/scanner_test.go b/src/go/scanner/scanner_test.go
index fc450d8a6..fc450d8a6 100644
--- a/src/pkg/go/scanner/scanner_test.go
+++ b/src/go/scanner/scanner_test.go
diff --git a/src/pkg/go/token/position.go b/src/go/token/position.go
index 82d90eeb7..82d90eeb7 100644
--- a/src/pkg/go/token/position.go
+++ b/src/go/token/position.go
diff --git a/src/pkg/go/token/position_test.go b/src/go/token/position_test.go
index d26939ce2..d26939ce2 100644
--- a/src/pkg/go/token/position_test.go
+++ b/src/go/token/position_test.go
diff --git a/src/pkg/go/token/serialize.go b/src/go/token/serialize.go
index 4adc8f9e3..4adc8f9e3 100644
--- a/src/pkg/go/token/serialize.go
+++ b/src/go/token/serialize.go
diff --git a/src/pkg/go/token/serialize_test.go b/src/go/token/serialize_test.go
index 4e925adb6..4e925adb6 100644
--- a/src/pkg/go/token/serialize_test.go
+++ b/src/go/token/serialize_test.go
diff --git a/src/pkg/go/token/token.go b/src/go/token/token.go
index 865f63f4a..865f63f4a 100644
--- a/src/pkg/go/token/token.go
+++ b/src/go/token/token.go
diff --git a/src/pkg/hash/adler32/adler32.go b/src/hash/adler32/adler32.go
index 7c80796bf..7c80796bf 100644
--- a/src/pkg/hash/adler32/adler32.go
+++ b/src/hash/adler32/adler32.go
diff --git a/src/pkg/hash/adler32/adler32_test.go b/src/hash/adler32/adler32_test.go
index 0e9c938d8..0e9c938d8 100644
--- a/src/pkg/hash/adler32/adler32_test.go
+++ b/src/hash/adler32/adler32_test.go
diff --git a/src/pkg/hash/crc32/crc32.go b/src/hash/crc32/crc32.go
index a2a21a06f..a2a21a06f 100644
--- a/src/pkg/hash/crc32/crc32.go
+++ b/src/hash/crc32/crc32.go
diff --git a/src/pkg/hash/crc32/crc32_amd64.s b/src/hash/crc32/crc32_amd64.s
index 30b0d0691..30b0d0691 100644
--- a/src/pkg/hash/crc32/crc32_amd64.s
+++ b/src/hash/crc32/crc32_amd64.s
diff --git a/src/pkg/hash/crc32/crc32_amd64p32.s b/src/hash/crc32/crc32_amd64p32.s
index b6770eba3..b6770eba3 100644
--- a/src/pkg/hash/crc32/crc32_amd64p32.s
+++ b/src/hash/crc32/crc32_amd64p32.s
diff --git a/src/pkg/hash/crc32/crc32_amd64x.go b/src/hash/crc32/crc32_amd64x.go
index b7e359930..b7e359930 100644
--- a/src/pkg/hash/crc32/crc32_amd64x.go
+++ b/src/hash/crc32/crc32_amd64x.go
diff --git a/src/pkg/hash/crc32/crc32_generic.go b/src/hash/crc32/crc32_generic.go
index 1c7f806c6..1c7f806c6 100644
--- a/src/pkg/hash/crc32/crc32_generic.go
+++ b/src/hash/crc32/crc32_generic.go
diff --git a/src/pkg/hash/crc32/crc32_test.go b/src/hash/crc32/crc32_test.go
index 75dc26e7c..75dc26e7c 100644
--- a/src/pkg/hash/crc32/crc32_test.go
+++ b/src/hash/crc32/crc32_test.go
diff --git a/src/pkg/hash/crc64/crc64.go b/src/hash/crc64/crc64.go
index 692586798..692586798 100644
--- a/src/pkg/hash/crc64/crc64.go
+++ b/src/hash/crc64/crc64.go
diff --git a/src/pkg/hash/crc64/crc64_test.go b/src/hash/crc64/crc64_test.go
index 81a87b56e..81a87b56e 100644
--- a/src/pkg/hash/crc64/crc64_test.go
+++ b/src/hash/crc64/crc64_test.go
diff --git a/src/pkg/hash/fnv/fnv.go b/src/hash/fnv/fnv.go
index c0206613a..c0206613a 100644
--- a/src/pkg/hash/fnv/fnv.go
+++ b/src/hash/fnv/fnv.go
diff --git a/src/pkg/hash/fnv/fnv_test.go b/src/hash/fnv/fnv_test.go
index 89d39b38a..89d39b38a 100644
--- a/src/pkg/hash/fnv/fnv_test.go
+++ b/src/hash/fnv/fnv_test.go
diff --git a/src/pkg/hash/hash.go b/src/hash/hash.go
index 8d138d07f..8d138d07f 100644
--- a/src/pkg/hash/hash.go
+++ b/src/hash/hash.go
diff --git a/src/pkg/hash/test_cases.txt b/src/hash/test_cases.txt
index 26d3ccc05..26d3ccc05 100644
--- a/src/pkg/hash/test_cases.txt
+++ b/src/hash/test_cases.txt
diff --git a/src/pkg/hash/test_gen.awk b/src/hash/test_gen.awk
index 804f78679..804f78679 100644
--- a/src/pkg/hash/test_gen.awk
+++ b/src/hash/test_gen.awk
diff --git a/src/pkg/html/entity.go b/src/html/entity.go
index af8a007ed..af8a007ed 100644
--- a/src/pkg/html/entity.go
+++ b/src/html/entity.go
diff --git a/src/pkg/html/entity_test.go b/src/html/entity_test.go
index b53f866fa..b53f866fa 100644
--- a/src/pkg/html/entity_test.go
+++ b/src/html/entity_test.go
diff --git a/src/pkg/html/escape.go b/src/html/escape.go
index dd5dfa7cd..dd5dfa7cd 100644
--- a/src/pkg/html/escape.go
+++ b/src/html/escape.go
diff --git a/src/pkg/html/escape_test.go b/src/html/escape_test.go
index 2d7ad8ac2..2d7ad8ac2 100644
--- a/src/pkg/html/escape_test.go
+++ b/src/html/escape_test.go
diff --git a/src/pkg/html/template/attr.go b/src/html/template/attr.go
index d65d34007..d65d34007 100644
--- a/src/pkg/html/template/attr.go
+++ b/src/html/template/attr.go
diff --git a/src/pkg/html/template/clone_test.go b/src/html/template/clone_test.go
index e11bff2c5..e11bff2c5 100644
--- a/src/pkg/html/template/clone_test.go
+++ b/src/html/template/clone_test.go
diff --git a/src/pkg/html/template/content.go b/src/html/template/content.go
index 3715ed5c9..3715ed5c9 100644
--- a/src/pkg/html/template/content.go
+++ b/src/html/template/content.go
diff --git a/src/pkg/html/template/content_test.go b/src/html/template/content_test.go
index 5f3ffe2d3..5f3ffe2d3 100644
--- a/src/pkg/html/template/content_test.go
+++ b/src/html/template/content_test.go
diff --git a/src/pkg/html/template/context.go b/src/html/template/context.go
index 59e794d68..59e794d68 100644
--- a/src/pkg/html/template/context.go
+++ b/src/html/template/context.go
diff --git a/src/pkg/html/template/css.go b/src/html/template/css.go
index 634f183f7..634f183f7 100644
--- a/src/pkg/html/template/css.go
+++ b/src/html/template/css.go
diff --git a/src/pkg/html/template/css_test.go b/src/html/template/css_test.go
index a735638b0..a735638b0 100644
--- a/src/pkg/html/template/css_test.go
+++ b/src/html/template/css_test.go
diff --git a/src/pkg/html/template/doc.go b/src/html/template/doc.go
index d422ada37..d422ada37 100644
--- a/src/pkg/html/template/doc.go
+++ b/src/html/template/doc.go
diff --git a/src/pkg/html/template/error.go b/src/html/template/error.go
index 8f99e1b96..8f99e1b96 100644
--- a/src/pkg/html/template/error.go
+++ b/src/html/template/error.go
diff --git a/src/pkg/html/template/escape.go b/src/html/template/escape.go
index ee01fb12a..ee01fb12a 100644
--- a/src/pkg/html/template/escape.go
+++ b/src/html/template/escape.go
diff --git a/src/pkg/html/template/escape_test.go b/src/html/template/escape_test.go
index ef7b87748..ef7b87748 100644
--- a/src/pkg/html/template/escape_test.go
+++ b/src/html/template/escape_test.go
diff --git a/src/pkg/html/template/html.go b/src/html/template/html.go
index 9c069efd1..9c069efd1 100644
--- a/src/pkg/html/template/html.go
+++ b/src/html/template/html.go
diff --git a/src/pkg/html/template/html_test.go b/src/html/template/html_test.go
index b9b970387..b9b970387 100644
--- a/src/pkg/html/template/html_test.go
+++ b/src/html/template/html_test.go
diff --git a/src/pkg/html/template/js.go b/src/html/template/js.go
index 999a61ed0..999a61ed0 100644
--- a/src/pkg/html/template/js.go
+++ b/src/html/template/js.go
diff --git a/src/pkg/html/template/js_test.go b/src/html/template/js_test.go
index 311e1d2c4..311e1d2c4 100644
--- a/src/pkg/html/template/js_test.go
+++ b/src/html/template/js_test.go
diff --git a/src/pkg/html/template/template.go b/src/html/template/template.go
index ce6170105..ce6170105 100644
--- a/src/pkg/html/template/template.go
+++ b/src/html/template/template.go
diff --git a/src/pkg/html/template/transition.go b/src/html/template/transition.go
index b486fcd28..b486fcd28 100644
--- a/src/pkg/html/template/transition.go
+++ b/src/html/template/transition.go
diff --git a/src/pkg/html/template/url.go b/src/html/template/url.go
index 2ca76bf38..2ca76bf38 100644
--- a/src/pkg/html/template/url.go
+++ b/src/html/template/url.go
diff --git a/src/pkg/html/template/url_test.go b/src/html/template/url_test.go
index 5182e9d79..5182e9d79 100644
--- a/src/pkg/html/template/url_test.go
+++ b/src/html/template/url_test.go
diff --git a/src/pkg/image/color/color.go b/src/image/color/color.go
index ff596a76a..ff596a76a 100644
--- a/src/pkg/image/color/color.go
+++ b/src/image/color/color.go
diff --git a/src/pkg/image/color/palette/gen.go b/src/image/color/palette/gen.go
index 2b5fdaaf2..2b5fdaaf2 100644
--- a/src/pkg/image/color/palette/gen.go
+++ b/src/image/color/palette/gen.go
diff --git a/src/pkg/image/color/palette/generate.go b/src/image/color/palette/generate.go
index 64c2ec0d9..64c2ec0d9 100644
--- a/src/pkg/image/color/palette/generate.go
+++ b/src/image/color/palette/generate.go
diff --git a/src/pkg/image/color/palette/palette.go b/src/image/color/palette/palette.go
index 0bf2c8e1a..0bf2c8e1a 100644
--- a/src/pkg/image/color/palette/palette.go
+++ b/src/image/color/palette/palette.go
diff --git a/src/pkg/image/color/ycbcr.go b/src/image/color/ycbcr.go
index 4c2f29ea0..4c2f29ea0 100644
--- a/src/pkg/image/color/ycbcr.go
+++ b/src/image/color/ycbcr.go
diff --git a/src/pkg/image/color/ycbcr_test.go b/src/image/color/ycbcr_test.go
index 92a0e6ff1..92a0e6ff1 100644
--- a/src/pkg/image/color/ycbcr_test.go
+++ b/src/image/color/ycbcr_test.go
diff --git a/src/pkg/image/decode_example_test.go b/src/image/decode_example_test.go
index 21e90fea4..21e90fea4 100644
--- a/src/pkg/image/decode_example_test.go
+++ b/src/image/decode_example_test.go
diff --git a/src/pkg/image/decode_test.go b/src/image/decode_test.go
index 8dee57ee4..8dee57ee4 100644
--- a/src/pkg/image/decode_test.go
+++ b/src/image/decode_test.go
diff --git a/src/pkg/image/draw/bench_test.go b/src/image/draw/bench_test.go
index cc62e25f1..cc62e25f1 100644
--- a/src/pkg/image/draw/bench_test.go
+++ b/src/image/draw/bench_test.go
diff --git a/src/pkg/image/draw/clip_test.go b/src/image/draw/clip_test.go
index 65381f72f..65381f72f 100644
--- a/src/pkg/image/draw/clip_test.go
+++ b/src/image/draw/clip_test.go
diff --git a/src/pkg/image/draw/draw.go b/src/image/draw/draw.go
index 661230e7c..661230e7c 100644
--- a/src/pkg/image/draw/draw.go
+++ b/src/image/draw/draw.go
diff --git a/src/pkg/image/draw/draw_test.go b/src/image/draw/draw_test.go
index 0dd7fbd47..0dd7fbd47 100644
--- a/src/pkg/image/draw/draw_test.go
+++ b/src/image/draw/draw_test.go
diff --git a/src/pkg/image/format.go b/src/image/format.go
index 3668de4e6..3668de4e6 100644
--- a/src/pkg/image/format.go
+++ b/src/image/format.go
diff --git a/src/pkg/image/geom.go b/src/image/geom.go
index 6ebaf67da..6ebaf67da 100644
--- a/src/pkg/image/geom.go
+++ b/src/image/geom.go
diff --git a/src/pkg/image/gif/reader.go b/src/image/gif/reader.go
index 926710a45..926710a45 100644
--- a/src/pkg/image/gif/reader.go
+++ b/src/image/gif/reader.go
diff --git a/src/pkg/image/gif/reader_test.go b/src/image/gif/reader_test.go
index fc2041e99..fc2041e99 100644
--- a/src/pkg/image/gif/reader_test.go
+++ b/src/image/gif/reader_test.go
diff --git a/src/pkg/image/gif/writer.go b/src/image/gif/writer.go
index 15cd40fad..15cd40fad 100644
--- a/src/pkg/image/gif/writer.go
+++ b/src/image/gif/writer.go
diff --git a/src/pkg/image/gif/writer_test.go b/src/image/gif/writer_test.go
index bc5d37845..bc5d37845 100644
--- a/src/pkg/image/gif/writer_test.go
+++ b/src/image/gif/writer_test.go
diff --git a/src/pkg/image/image.go b/src/image/image.go
index 6b8e5c487..6b8e5c487 100644
--- a/src/pkg/image/image.go
+++ b/src/image/image.go
diff --git a/src/pkg/image/image_test.go b/src/image/image_test.go
index 799c1a7a1..799c1a7a1 100644
--- a/src/pkg/image/image_test.go
+++ b/src/image/image_test.go
diff --git a/src/pkg/image/jpeg/dct_test.go b/src/image/jpeg/dct_test.go
index 845e75887..845e75887 100644
--- a/src/pkg/image/jpeg/dct_test.go
+++ b/src/image/jpeg/dct_test.go
diff --git a/src/pkg/image/jpeg/fdct.go b/src/image/jpeg/fdct.go
index 3f8be4e32..3f8be4e32 100644
--- a/src/pkg/image/jpeg/fdct.go
+++ b/src/image/jpeg/fdct.go
diff --git a/src/pkg/image/jpeg/huffman.go b/src/image/jpeg/huffman.go
index d4ff4cfa0..d4ff4cfa0 100644
--- a/src/pkg/image/jpeg/huffman.go
+++ b/src/image/jpeg/huffman.go
diff --git a/src/pkg/image/jpeg/idct.go b/src/image/jpeg/idct.go
index 46fcaecb7..46fcaecb7 100644
--- a/src/pkg/image/jpeg/idct.go
+++ b/src/image/jpeg/idct.go
diff --git a/src/pkg/image/jpeg/reader.go b/src/image/jpeg/reader.go
index c8fae3cea..c8fae3cea 100644
--- a/src/pkg/image/jpeg/reader.go
+++ b/src/image/jpeg/reader.go
diff --git a/src/pkg/image/jpeg/reader_test.go b/src/image/jpeg/reader_test.go
index 93f4adab9..93f4adab9 100644
--- a/src/pkg/image/jpeg/reader_test.go
+++ b/src/image/jpeg/reader_test.go
diff --git a/src/pkg/image/jpeg/scan.go b/src/image/jpeg/scan.go
index 8d81b0808..8d81b0808 100644
--- a/src/pkg/image/jpeg/scan.go
+++ b/src/image/jpeg/scan.go
diff --git a/src/pkg/image/jpeg/writer.go b/src/image/jpeg/writer.go
index 91bbde3bf..91bbde3bf 100644
--- a/src/pkg/image/jpeg/writer.go
+++ b/src/image/jpeg/writer.go
diff --git a/src/pkg/image/jpeg/writer_test.go b/src/image/jpeg/writer_test.go
index 3df3cfcc5..3df3cfcc5 100644
--- a/src/pkg/image/jpeg/writer_test.go
+++ b/src/image/jpeg/writer_test.go
diff --git a/src/pkg/image/names.go b/src/image/names.go
index 8985f4921..8985f4921 100644
--- a/src/pkg/image/names.go
+++ b/src/image/names.go
diff --git a/src/pkg/image/png/paeth.go b/src/image/png/paeth.go
index 9ed6300c8..9ed6300c8 100644
--- a/src/pkg/image/png/paeth.go
+++ b/src/image/png/paeth.go
diff --git a/src/pkg/image/png/paeth_test.go b/src/image/png/paeth_test.go
index cfc1896cd..cfc1896cd 100644
--- a/src/pkg/image/png/paeth_test.go
+++ b/src/image/png/paeth_test.go
diff --git a/src/pkg/image/png/reader.go b/src/image/png/reader.go
index 0a40ca161..0a40ca161 100644
--- a/src/pkg/image/png/reader.go
+++ b/src/image/png/reader.go
diff --git a/src/pkg/image/png/reader_test.go b/src/image/png/reader_test.go
index ce772eb6f..ce772eb6f 100644
--- a/src/pkg/image/png/reader_test.go
+++ b/src/image/png/reader_test.go
diff --git a/src/pkg/image/png/testdata/benchGray.png b/src/image/png/testdata/benchGray.png
index 42bc6c3a0..42bc6c3a0 100644
--- a/src/pkg/image/png/testdata/benchGray.png
+++ b/src/image/png/testdata/benchGray.png
diff --git a/src/pkg/image/png/testdata/benchNRGBA-gradient.png b/src/image/png/testdata/benchNRGBA-gradient.png
index 961934cca..961934cca 100644
--- a/src/pkg/image/png/testdata/benchNRGBA-gradient.png
+++ b/src/image/png/testdata/benchNRGBA-gradient.png
diff --git a/src/pkg/image/png/testdata/benchNRGBA-opaque.png b/src/image/png/testdata/benchNRGBA-opaque.png
index ca4f4a037..ca4f4a037 100644
--- a/src/pkg/image/png/testdata/benchNRGBA-opaque.png
+++ b/src/image/png/testdata/benchNRGBA-opaque.png
diff --git a/src/pkg/image/png/testdata/benchPaletted.png b/src/image/png/testdata/benchPaletted.png
index 4b4d5b992..4b4d5b992 100644
--- a/src/pkg/image/png/testdata/benchPaletted.png
+++ b/src/image/png/testdata/benchPaletted.png
diff --git a/src/pkg/image/png/testdata/benchRGB-interlace.png b/src/image/png/testdata/benchRGB-interlace.png
index b4b5daba3..b4b5daba3 100644
--- a/src/pkg/image/png/testdata/benchRGB-interlace.png
+++ b/src/image/png/testdata/benchRGB-interlace.png
diff --git a/src/pkg/image/png/testdata/benchRGB.png b/src/image/png/testdata/benchRGB.png
index 31ac65a3f..31ac65a3f 100644
--- a/src/pkg/image/png/testdata/benchRGB.png
+++ b/src/image/png/testdata/benchRGB.png
diff --git a/src/pkg/image/png/testdata/invalid-crc32.png b/src/image/png/testdata/invalid-crc32.png
index e5be4086c..e5be4086c 100644
--- a/src/pkg/image/png/testdata/invalid-crc32.png
+++ b/src/image/png/testdata/invalid-crc32.png
diff --git a/src/pkg/image/png/testdata/invalid-noend.png b/src/image/png/testdata/invalid-noend.png
index 9137270d9..9137270d9 100644
--- a/src/pkg/image/png/testdata/invalid-noend.png
+++ b/src/image/png/testdata/invalid-noend.png
diff --git a/src/pkg/image/png/testdata/invalid-trunc.png b/src/image/png/testdata/invalid-trunc.png
index d0748cf65..d0748cf65 100644
--- a/src/pkg/image/png/testdata/invalid-trunc.png
+++ b/src/image/png/testdata/invalid-trunc.png
diff --git a/src/pkg/image/png/testdata/invalid-zlib.png b/src/image/png/testdata/invalid-zlib.png
index c6d051cae..c6d051cae 100644
--- a/src/pkg/image/png/testdata/invalid-zlib.png
+++ b/src/image/png/testdata/invalid-zlib.png
diff --git a/src/pkg/image/png/testdata/pngsuite/README b/src/image/png/testdata/pngsuite/README
index c0f78bde8..c0f78bde8 100644
--- a/src/pkg/image/png/testdata/pngsuite/README
+++ b/src/image/png/testdata/pngsuite/README
diff --git a/src/pkg/image/png/testdata/pngsuite/README.original b/src/image/png/testdata/pngsuite/README.original
index 714d12c64..714d12c64 100644
--- a/src/pkg/image/png/testdata/pngsuite/README.original
+++ b/src/image/png/testdata/pngsuite/README.original
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.png b/src/image/png/testdata/pngsuite/basn0g01-30.png
index 007750c8c..007750c8c 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.png
+++ b/src/image/png/testdata/pngsuite/basn0g01-30.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.sng b/src/image/png/testdata/pngsuite/basn0g01-30.sng
index 7fa35710c..7fa35710c 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.sng
+++ b/src/image/png/testdata/pngsuite/basn0g01-30.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01.png b/src/image/png/testdata/pngsuite/basn0g01.png
index e31e1c7a6..e31e1c7a6 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g01.png
+++ b/src/image/png/testdata/pngsuite/basn0g01.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01.sng b/src/image/png/testdata/pngsuite/basn0g01.sng
index 2ce069de2..2ce069de2 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g01.sng
+++ b/src/image/png/testdata/pngsuite/basn0g01.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.png b/src/image/png/testdata/pngsuite/basn0g02-29.png
index d17d8f83c..d17d8f83c 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.png
+++ b/src/image/png/testdata/pngsuite/basn0g02-29.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.sng b/src/image/png/testdata/pngsuite/basn0g02-29.sng
index afb5dba48..afb5dba48 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.sng
+++ b/src/image/png/testdata/pngsuite/basn0g02-29.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02.png b/src/image/png/testdata/pngsuite/basn0g02.png
index 68809dd8f..68809dd8f 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g02.png
+++ b/src/image/png/testdata/pngsuite/basn0g02.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02.sng b/src/image/png/testdata/pngsuite/basn0g02.sng
index bb53d750d..bb53d750d 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g02.sng
+++ b/src/image/png/testdata/pngsuite/basn0g02.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.png b/src/image/png/testdata/pngsuite/basn0g04-31.png
index e30644d34..e30644d34 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.png
+++ b/src/image/png/testdata/pngsuite/basn0g04-31.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.sng b/src/image/png/testdata/pngsuite/basn0g04-31.sng
index 7f7948e1f..7f7948e1f 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.sng
+++ b/src/image/png/testdata/pngsuite/basn0g04-31.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04.png b/src/image/png/testdata/pngsuite/basn0g04.png
index 6fa089cb8..6fa089cb8 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g04.png
+++ b/src/image/png/testdata/pngsuite/basn0g04.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04.sng b/src/image/png/testdata/pngsuite/basn0g04.sng
index a95ad01a3..a95ad01a3 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g04.sng
+++ b/src/image/png/testdata/pngsuite/basn0g04.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g08.png b/src/image/png/testdata/pngsuite/basn0g08.png
index bf522eef0..bf522eef0 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g08.png
+++ b/src/image/png/testdata/pngsuite/basn0g08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g08.sng b/src/image/png/testdata/pngsuite/basn0g08.sng
index 7389eb774..7389eb774 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g08.sng
+++ b/src/image/png/testdata/pngsuite/basn0g08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g16.png b/src/image/png/testdata/pngsuite/basn0g16.png
index 318ebcadf..318ebcadf 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g16.png
+++ b/src/image/png/testdata/pngsuite/basn0g16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g16.sng b/src/image/png/testdata/pngsuite/basn0g16.sng
index 922391a9e..922391a9e 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn0g16.sng
+++ b/src/image/png/testdata/pngsuite/basn0g16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c08.png b/src/image/png/testdata/pngsuite/basn2c08.png
index 21d2f91a8..21d2f91a8 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn2c08.png
+++ b/src/image/png/testdata/pngsuite/basn2c08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c08.sng b/src/image/png/testdata/pngsuite/basn2c08.sng
index 09a61317b..09a61317b 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn2c08.sng
+++ b/src/image/png/testdata/pngsuite/basn2c08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c16.png b/src/image/png/testdata/pngsuite/basn2c16.png
index 1bd4a4d0e..1bd4a4d0e 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn2c16.png
+++ b/src/image/png/testdata/pngsuite/basn2c16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c16.sng b/src/image/png/testdata/pngsuite/basn2c16.sng
index bac7c9d91..bac7c9d91 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn2c16.sng
+++ b/src/image/png/testdata/pngsuite/basn2c16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p01.png b/src/image/png/testdata/pngsuite/basn3p01.png
index a21db5977..a21db5977 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p01.png
+++ b/src/image/png/testdata/pngsuite/basn3p01.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p01.sng b/src/image/png/testdata/pngsuite/basn3p01.sng
index a8b3ce878..a8b3ce878 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p01.sng
+++ b/src/image/png/testdata/pngsuite/basn3p01.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p02.png b/src/image/png/testdata/pngsuite/basn3p02.png
index 1d0ab6197..1d0ab6197 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p02.png
+++ b/src/image/png/testdata/pngsuite/basn3p02.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p02.sng b/src/image/png/testdata/pngsuite/basn3p02.sng
index ab3fb375f..ab3fb375f 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p02.sng
+++ b/src/image/png/testdata/pngsuite/basn3p02.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.png b/src/image/png/testdata/pngsuite/basn3p04-31i.png
index 540137cb5..540137cb5 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.png
+++ b/src/image/png/testdata/pngsuite/basn3p04-31i.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.sng b/src/image/png/testdata/pngsuite/basn3p04-31i.sng
index 31b87c72d..31b87c72d 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.sng
+++ b/src/image/png/testdata/pngsuite/basn3p04-31i.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04.png b/src/image/png/testdata/pngsuite/basn3p04.png
index 6dc6eac83..6dc6eac83 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p04.png
+++ b/src/image/png/testdata/pngsuite/basn3p04.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04.sng b/src/image/png/testdata/pngsuite/basn3p04.sng
index a2b2fb53c..a2b2fb53c 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p04.sng
+++ b/src/image/png/testdata/pngsuite/basn3p04.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.png b/src/image/png/testdata/pngsuite/basn3p08-trns.png
index b0fc0c1be..b0fc0c1be 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.png
+++ b/src/image/png/testdata/pngsuite/basn3p08-trns.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.sng b/src/image/png/testdata/pngsuite/basn3p08-trns.sng
index 78dc367bb..78dc367bb 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.sng
+++ b/src/image/png/testdata/pngsuite/basn3p08-trns.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08.png b/src/image/png/testdata/pngsuite/basn3p08.png
index 0e07f483c..0e07f483c 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p08.png
+++ b/src/image/png/testdata/pngsuite/basn3p08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08.sng b/src/image/png/testdata/pngsuite/basn3p08.sng
index 0423bb21e..0423bb21e 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn3p08.sng
+++ b/src/image/png/testdata/pngsuite/basn3p08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a08.png b/src/image/png/testdata/pngsuite/basn4a08.png
index 3bb0dd06b..3bb0dd06b 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn4a08.png
+++ b/src/image/png/testdata/pngsuite/basn4a08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a08.sng b/src/image/png/testdata/pngsuite/basn4a08.sng
index cc4096fac..cc4096fac 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn4a08.sng
+++ b/src/image/png/testdata/pngsuite/basn4a08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a16.png b/src/image/png/testdata/pngsuite/basn4a16.png
index 6dbee9fbd..6dbee9fbd 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn4a16.png
+++ b/src/image/png/testdata/pngsuite/basn4a16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a16.sng b/src/image/png/testdata/pngsuite/basn4a16.sng
index d3b9b4722..d3b9b4722 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn4a16.sng
+++ b/src/image/png/testdata/pngsuite/basn4a16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a08.png b/src/image/png/testdata/pngsuite/basn6a08.png
index 610623085..610623085 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn6a08.png
+++ b/src/image/png/testdata/pngsuite/basn6a08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a08.sng b/src/image/png/testdata/pngsuite/basn6a08.sng
index c1e0bf475..c1e0bf475 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn6a08.sng
+++ b/src/image/png/testdata/pngsuite/basn6a08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a16.png b/src/image/png/testdata/pngsuite/basn6a16.png
index a9bf3cb46..a9bf3cb46 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn6a16.png
+++ b/src/image/png/testdata/pngsuite/basn6a16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a16.sng b/src/image/png/testdata/pngsuite/basn6a16.sng
index 13c70a4d5..13c70a4d5 100644
--- a/src/pkg/image/png/testdata/pngsuite/basn6a16.sng
+++ b/src/image/png/testdata/pngsuite/basn6a16.sng
diff --git a/src/pkg/image/png/writer.go b/src/image/png/writer.go
index df23270ee..df23270ee 100644
--- a/src/pkg/image/png/writer.go
+++ b/src/image/png/writer.go
diff --git a/src/pkg/image/png/writer_test.go b/src/image/png/writer_test.go
index d67a81569..d67a81569 100644
--- a/src/pkg/image/png/writer_test.go
+++ b/src/image/png/writer_test.go
diff --git a/src/pkg/image/testdata/video-001.5bpp.gif b/src/image/testdata/video-001.5bpp.gif
index ce53104b2..ce53104b2 100644
--- a/src/pkg/image/testdata/video-001.5bpp.gif
+++ b/src/image/testdata/video-001.5bpp.gif
diff --git a/src/pkg/image/testdata/video-001.gif b/src/image/testdata/video-001.gif
index ca06af61b..ca06af61b 100644
--- a/src/pkg/image/testdata/video-001.gif
+++ b/src/image/testdata/video-001.gif
diff --git a/src/pkg/image/testdata/video-001.interlaced.gif b/src/image/testdata/video-001.interlaced.gif
index 590594ea9..590594ea9 100644
--- a/src/pkg/image/testdata/video-001.interlaced.gif
+++ b/src/image/testdata/video-001.interlaced.gif
diff --git a/src/pkg/image/testdata/video-001.jpeg b/src/image/testdata/video-001.jpeg
index 1b87c933b..1b87c933b 100644
--- a/src/pkg/image/testdata/video-001.jpeg
+++ b/src/image/testdata/video-001.jpeg
diff --git a/src/pkg/image/testdata/video-001.png b/src/image/testdata/video-001.png
index d3468bbe8..d3468bbe8 100644
--- a/src/pkg/image/testdata/video-001.png
+++ b/src/image/testdata/video-001.png
diff --git a/src/pkg/image/testdata/video-001.progressive.jpeg b/src/image/testdata/video-001.progressive.jpeg
index b8cae2359..b8cae2359 100644
--- a/src/pkg/image/testdata/video-001.progressive.jpeg
+++ b/src/image/testdata/video-001.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.420.jpeg b/src/image/testdata/video-001.q50.420.jpeg
index 83fb0f8ab..83fb0f8ab 100644
--- a/src/pkg/image/testdata/video-001.q50.420.jpeg
+++ b/src/image/testdata/video-001.q50.420.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.420.progressive.jpeg b/src/image/testdata/video-001.q50.420.progressive.jpeg
index b048eb205..b048eb205 100644
--- a/src/pkg/image/testdata/video-001.q50.420.progressive.jpeg
+++ b/src/image/testdata/video-001.q50.420.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.422.jpeg b/src/image/testdata/video-001.q50.422.jpeg
index 60fff4ff9..60fff4ff9 100644
--- a/src/pkg/image/testdata/video-001.q50.422.jpeg
+++ b/src/image/testdata/video-001.q50.422.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.422.progressive.jpeg b/src/image/testdata/video-001.q50.422.progressive.jpeg
index 926d005de..926d005de 100644
--- a/src/pkg/image/testdata/video-001.q50.422.progressive.jpeg
+++ b/src/image/testdata/video-001.q50.422.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.440.jpeg b/src/image/testdata/video-001.q50.440.jpeg
index 32eeeaef6..32eeeaef6 100644
--- a/src/pkg/image/testdata/video-001.q50.440.jpeg
+++ b/src/image/testdata/video-001.q50.440.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.440.progressive.jpeg b/src/image/testdata/video-001.q50.440.progressive.jpeg
index e641a3bbb..e641a3bbb 100644
--- a/src/pkg/image/testdata/video-001.q50.440.progressive.jpeg
+++ b/src/image/testdata/video-001.q50.440.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.444.jpeg b/src/image/testdata/video-001.q50.444.jpeg
index 7d5743382..7d5743382 100644
--- a/src/pkg/image/testdata/video-001.q50.444.jpeg
+++ b/src/image/testdata/video-001.q50.444.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.444.progressive.jpeg b/src/image/testdata/video-001.q50.444.progressive.jpeg
index ff7d5f9ff..ff7d5f9ff 100644
--- a/src/pkg/image/testdata/video-001.q50.444.progressive.jpeg
+++ b/src/image/testdata/video-001.q50.444.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.separate.dc.progression.jpeg b/src/image/testdata/video-001.separate.dc.progression.jpeg
index 107f0fa0c..107f0fa0c 100644
--- a/src/pkg/image/testdata/video-001.separate.dc.progression.jpeg
+++ b/src/image/testdata/video-001.separate.dc.progression.jpeg
diff --git a/src/pkg/image/testdata/video-001.separate.dc.progression.progressive.jpeg b/src/image/testdata/video-001.separate.dc.progression.progressive.jpeg
index a1d493ef8..a1d493ef8 100644
--- a/src/pkg/image/testdata/video-001.separate.dc.progression.progressive.jpeg
+++ b/src/image/testdata/video-001.separate.dc.progression.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.gif b/src/image/testdata/video-005.gray.gif
index 23350d6dc..23350d6dc 100644
--- a/src/pkg/image/testdata/video-005.gray.gif
+++ b/src/image/testdata/video-005.gray.gif
diff --git a/src/pkg/image/testdata/video-005.gray.jpeg b/src/image/testdata/video-005.gray.jpeg
index f9d6e5cdb..f9d6e5cdb 100644
--- a/src/pkg/image/testdata/video-005.gray.jpeg
+++ b/src/image/testdata/video-005.gray.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.png b/src/image/testdata/video-005.gray.png
index 0b0ee7538..0b0ee7538 100644
--- a/src/pkg/image/testdata/video-005.gray.png
+++ b/src/image/testdata/video-005.gray.png
diff --git a/src/pkg/image/testdata/video-005.gray.q50.2x2.jpeg b/src/image/testdata/video-005.gray.q50.2x2.jpeg
index 630b615f7..630b615f7 100644
--- a/src/pkg/image/testdata/video-005.gray.q50.2x2.jpeg
+++ b/src/image/testdata/video-005.gray.q50.2x2.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.2x2.progressive.jpeg b/src/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
index c6b93608c..c6b93608c 100644
--- a/src/pkg/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
+++ b/src/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.jpeg b/src/image/testdata/video-005.gray.q50.jpeg
index c65b5a794..c65b5a794 100644
--- a/src/pkg/image/testdata/video-005.gray.q50.jpeg
+++ b/src/image/testdata/video-005.gray.q50.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.progressive.jpeg b/src/image/testdata/video-005.gray.q50.progressive.jpeg
index 24b70e8bf..24b70e8bf 100644
--- a/src/pkg/image/testdata/video-005.gray.q50.progressive.jpeg
+++ b/src/image/testdata/video-005.gray.q50.progressive.jpeg
diff --git a/src/pkg/image/ycbcr.go b/src/image/ycbcr.go
index 7c773f2f0..7c773f2f0 100644
--- a/src/pkg/image/ycbcr.go
+++ b/src/image/ycbcr.go
diff --git a/src/pkg/image/ycbcr_test.go b/src/image/ycbcr_test.go
index a5f448265..a5f448265 100644
--- a/src/pkg/image/ycbcr_test.go
+++ b/src/image/ycbcr_test.go
diff --git a/src/pkg/index/suffixarray/qsufsort.go b/src/index/suffixarray/qsufsort.go
index 9c36a98f8..9c36a98f8 100644
--- a/src/pkg/index/suffixarray/qsufsort.go
+++ b/src/index/suffixarray/qsufsort.go
diff --git a/src/pkg/index/suffixarray/suffixarray.go b/src/index/suffixarray/suffixarray.go
index c59ae6eef..c59ae6eef 100644
--- a/src/pkg/index/suffixarray/suffixarray.go
+++ b/src/index/suffixarray/suffixarray.go
diff --git a/src/pkg/index/suffixarray/suffixarray_test.go b/src/index/suffixarray/suffixarray_test.go
index 644f00c75..644f00c75 100644
--- a/src/pkg/index/suffixarray/suffixarray_test.go
+++ b/src/index/suffixarray/suffixarray_test.go
diff --git a/src/pkg/internal/syscall/getrandom_linux.go b/src/internal/syscall/getrandom_linux.go
index 944bab3f5..944bab3f5 100644
--- a/src/pkg/internal/syscall/getrandom_linux.go
+++ b/src/internal/syscall/getrandom_linux.go
diff --git a/src/pkg/io/io.go b/src/io/io.go
index e8bbad537..e8bbad537 100644
--- a/src/pkg/io/io.go
+++ b/src/io/io.go
diff --git a/src/pkg/io/io_test.go b/src/io/io_test.go
index 57db1fbf0..57db1fbf0 100644
--- a/src/pkg/io/io_test.go
+++ b/src/io/io_test.go
diff --git a/src/pkg/io/ioutil/ioutil.go b/src/io/ioutil/ioutil.go
index 909a81563..909a81563 100644
--- a/src/pkg/io/ioutil/ioutil.go
+++ b/src/io/ioutil/ioutil.go
diff --git a/src/pkg/io/ioutil/ioutil_test.go b/src/io/ioutil/ioutil_test.go
index c297847b4..c297847b4 100644
--- a/src/pkg/io/ioutil/ioutil_test.go
+++ b/src/io/ioutil/ioutil_test.go
diff --git a/src/pkg/io/ioutil/tempfile.go b/src/io/ioutil/tempfile.go
index 4a06e9756..4a06e9756 100644
--- a/src/pkg/io/ioutil/tempfile.go
+++ b/src/io/ioutil/tempfile.go
diff --git a/src/pkg/io/ioutil/tempfile_test.go b/src/io/ioutil/tempfile_test.go
index d2a132a11..d2a132a11 100644
--- a/src/pkg/io/ioutil/tempfile_test.go
+++ b/src/io/ioutil/tempfile_test.go
diff --git a/src/pkg/io/multi.go b/src/io/multi.go
index e26cc53e9..e26cc53e9 100644
--- a/src/pkg/io/multi.go
+++ b/src/io/multi.go
diff --git a/src/pkg/io/multi_test.go b/src/io/multi_test.go
index 56c6769a9..56c6769a9 100644
--- a/src/pkg/io/multi_test.go
+++ b/src/io/multi_test.go
diff --git a/src/pkg/io/pipe.go b/src/io/pipe.go
index f65354a7f..f65354a7f 100644
--- a/src/pkg/io/pipe.go
+++ b/src/io/pipe.go
diff --git a/src/pkg/io/pipe_test.go b/src/io/pipe_test.go
index b16e65306..b16e65306 100644
--- a/src/pkg/io/pipe_test.go
+++ b/src/io/pipe_test.go
diff --git a/src/liblink/asm5.c b/src/liblink/asm5.c
index 65c4ca199..96df9f791 100644
--- a/src/liblink/asm5.c
+++ b/src/liblink/asm5.c
@@ -35,7 +35,7 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/5l/5.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 typedef	struct	Optab	Optab;
 typedef	struct	Oprang	Oprang;
diff --git a/src/liblink/asm6.c b/src/liblink/asm6.c
index 999507650..428eb9442 100644
--- a/src/liblink/asm6.c
+++ b/src/liblink/asm6.c
@@ -35,7 +35,7 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/6l/6.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 enum
 {
diff --git a/src/liblink/asm8.c b/src/liblink/asm8.c
index 6035017b2..b6627d5fd 100644
--- a/src/liblink/asm8.c
+++ b/src/liblink/asm8.c
@@ -35,7 +35,7 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/8l/8.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 enum
 {
diff --git a/src/liblink/asm9.c b/src/liblink/asm9.c
index 56582fe27..47d515e05 100644
--- a/src/liblink/asm9.c
+++ b/src/liblink/asm9.c
@@ -34,7 +34,7 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/9l/9.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 enum {
 	FuncAlign = 8,
diff --git a/src/liblink/obj5.c b/src/liblink/obj5.c
index 0b6b8deb5..6630a5923 100644
--- a/src/liblink/obj5.c
+++ b/src/liblink/obj5.c
@@ -33,7 +33,7 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/5l/5.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 static Prog zprg = {
 	.as = AGOK,
diff --git a/src/liblink/obj6.c b/src/liblink/obj6.c
index 3c62470be..6a7ff48b0 100644
--- a/src/liblink/obj6.c
+++ b/src/liblink/obj6.c
@@ -33,7 +33,7 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/6l/6.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 static Prog zprg = {
 	.back = 2,
diff --git a/src/liblink/obj8.c b/src/liblink/obj8.c
index fa1e1ca24..03f12462e 100644
--- a/src/liblink/obj8.c
+++ b/src/liblink/obj8.c
@@ -33,7 +33,7 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/8l/8.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 static Prog zprg = {
 	.back = 2,
diff --git a/src/liblink/obj9.c b/src/liblink/obj9.c
index d0c14dfb5..3906181a3 100644
--- a/src/liblink/obj9.c
+++ b/src/liblink/obj9.c
@@ -32,8 +32,8 @@
 #include <bio.h>
 #include <link.h>
 #include "../cmd/9l/9.out.h"
-#include "../pkg/runtime/stack.h"
-#include "../pkg/runtime/funcdata.h"
+#include "../runtime/stack.h"
+#include "../runtime/funcdata.h"
 
 static Prog zprg = {
 	.as = AGOK,
diff --git a/src/liblink/sym.c b/src/liblink/sym.c
index ec07957f4..bd8551846 100644
--- a/src/liblink/sym.c
+++ b/src/liblink/sym.c
@@ -163,7 +163,7 @@ linknew(LinkArch *arch)
 	case Hdarwin:
 		/*
 		 * OS X system constants - offset from 0(GS) to our TLS.
-		 * Explained in ../../pkg/runtime/cgo/gcc_darwin_*.c.
+		 * Explained in ../../runtime/cgo/gcc_darwin_*.c.
 		 */
 		switch(ctxt->arch->thechar) {
 		default:
diff --git a/src/pkg/log/example_test.go b/src/log/example_test.go
index 74385a3a0..74385a3a0 100644
--- a/src/pkg/log/example_test.go
+++ b/src/log/example_test.go
diff --git a/src/pkg/log/log.go b/src/log/log.go
index d37e4375e..d37e4375e 100644
--- a/src/pkg/log/log.go
+++ b/src/log/log.go
diff --git a/src/pkg/log/log_test.go b/src/log/log_test.go
index 158c3d93c..158c3d93c 100644
--- a/src/pkg/log/log_test.go
+++ b/src/log/log_test.go
diff --git a/src/pkg/log/syslog/syslog.go b/src/log/syslog/syslog.go
index 5e0959916..5e0959916 100644
--- a/src/pkg/log/syslog/syslog.go
+++ b/src/log/syslog/syslog.go
diff --git a/src/pkg/log/syslog/syslog_plan9.go b/src/log/syslog/syslog_plan9.go
index 0c05f6f83..0c05f6f83 100644
--- a/src/pkg/log/syslog/syslog_plan9.go
+++ b/src/log/syslog/syslog_plan9.go
diff --git a/src/pkg/log/syslog/syslog_test.go b/src/log/syslog/syslog_test.go
index 6a863fed3..6a863fed3 100644
--- a/src/pkg/log/syslog/syslog_test.go
+++ b/src/log/syslog/syslog_test.go
diff --git a/src/pkg/log/syslog/syslog_unix.go b/src/log/syslog/syslog_unix.go
index f6d2f1b7a..f6d2f1b7a 100644
--- a/src/pkg/log/syslog/syslog_unix.go
+++ b/src/log/syslog/syslog_unix.go
diff --git a/src/pkg/log/syslog/syslog_windows.go b/src/log/syslog/syslog_windows.go
index 8d99e2e59..8d99e2e59 100644
--- a/src/pkg/log/syslog/syslog_windows.go
+++ b/src/log/syslog/syslog_windows.go
diff --git a/src/make.bash b/src/make.bash
index d7b63ff09..fbc6f5d89 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -106,7 +106,7 @@ if [ "$(uname -s)" == "GNU/kFreeBSD" ]; then
 fi
 
 # Clean old generated file that will cause problems in the build.
-rm -f ./pkg/runtime/runtime_defs.go
+rm -f ./runtime/runtime_defs.go
 
 # Finally!  Run the build.
 
diff --git a/src/make.rc b/src/make.rc
index ab152c0db..7a62d6af0 100755
--- a/src/make.rc
+++ b/src/make.rc
@@ -40,7 +40,7 @@ if(! test -f run.rc){
 ../include/plan9/mklibc.rc > ../include/plan9/libc_plan9.h
 
 # Clean old generated file that will cause problems in the build.
-rm -f ./pkg/runtime/runtime_defs.go
+rm -f ./runtime/runtime_defs.go
 
 # Determine the host compiler toolchain.
 eval `{grep '^(CC|LD|O)=' /$objtype/mkfile}
diff --git a/src/pkg/math/abs.go b/src/math/abs.go
index bc41a6d6b..bc41a6d6b 100644
--- a/src/pkg/math/abs.go
+++ b/src/math/abs.go
diff --git a/src/pkg/math/abs_386.s b/src/math/abs_386.s
index f30a439c2..f30a439c2 100644
--- a/src/pkg/math/abs_386.s
+++ b/src/math/abs_386.s
diff --git a/src/pkg/math/abs_amd64.s b/src/math/abs_amd64.s
index 0424eb5fa..0424eb5fa 100644
--- a/src/pkg/math/abs_amd64.s
+++ b/src/math/abs_amd64.s
diff --git a/src/pkg/math/abs_amd64p32.s b/src/math/abs_amd64p32.s
index 08c8c6b33..08c8c6b33 100644
--- a/src/pkg/math/abs_amd64p32.s
+++ b/src/math/abs_amd64p32.s
diff --git a/src/pkg/math/abs_arm.s b/src/math/abs_arm.s
index bfa77eb49..bfa77eb49 100644
--- a/src/pkg/math/abs_arm.s
+++ b/src/math/abs_arm.s
diff --git a/src/pkg/math/abs_power64x.s b/src/math/abs_power64x.s
index 3ba8201b3..3ba8201b3 100644
--- a/src/pkg/math/abs_power64x.s
+++ b/src/math/abs_power64x.s
diff --git a/src/pkg/math/acosh.go b/src/math/acosh.go
index e394008b0..e394008b0 100644
--- a/src/pkg/math/acosh.go
+++ b/src/math/acosh.go
diff --git a/src/pkg/math/all_test.go b/src/math/all_test.go
index 763efb2e6..763efb2e6 100644
--- a/src/pkg/math/all_test.go
+++ b/src/math/all_test.go
diff --git a/src/pkg/math/asin.go b/src/math/asin.go
index 88b851e55..88b851e55 100644
--- a/src/pkg/math/asin.go
+++ b/src/math/asin.go
diff --git a/src/pkg/math/asin_386.s b/src/math/asin_386.s
index 4f34e123e..4f34e123e 100644
--- a/src/pkg/math/asin_386.s
+++ b/src/math/asin_386.s
diff --git a/src/pkg/math/asin_amd64.s b/src/math/asin_amd64.s
index 1a43d489b..1a43d489b 100644
--- a/src/pkg/math/asin_amd64.s
+++ b/src/math/asin_amd64.s
diff --git a/src/pkg/math/asin_amd64p32.s b/src/math/asin_amd64p32.s
index 2751c475f..2751c475f 100644
--- a/src/pkg/math/asin_amd64p32.s
+++ b/src/math/asin_amd64p32.s
diff --git a/src/pkg/math/asin_arm.s b/src/math/asin_arm.s
index 8fe03b61d..8fe03b61d 100644
--- a/src/pkg/math/asin_arm.s
+++ b/src/math/asin_arm.s
diff --git a/src/pkg/math/asinh.go b/src/math/asinh.go
index ff2de0215..ff2de0215 100644
--- a/src/pkg/math/asinh.go
+++ b/src/math/asinh.go
diff --git a/src/pkg/math/atan.go b/src/math/atan.go
index 7fcc90b8b..7fcc90b8b 100644
--- a/src/pkg/math/atan.go
+++ b/src/math/atan.go
diff --git a/src/pkg/math/atan2.go b/src/math/atan2.go
index d84b332c9..d84b332c9 100644
--- a/src/pkg/math/atan2.go
+++ b/src/math/atan2.go
diff --git a/src/pkg/math/atan2_386.s b/src/math/atan2_386.s
index 31a74e726..31a74e726 100644
--- a/src/pkg/math/atan2_386.s
+++ b/src/math/atan2_386.s
diff --git a/src/pkg/math/atan2_amd64.s b/src/math/atan2_amd64.s
index fc471f76c..fc471f76c 100644
--- a/src/pkg/math/atan2_amd64.s
+++ b/src/math/atan2_amd64.s
diff --git a/src/pkg/math/atan2_amd64p32.s b/src/math/atan2_amd64p32.s
index 3fdc03ca8..3fdc03ca8 100644
--- a/src/pkg/math/atan2_amd64p32.s
+++ b/src/math/atan2_amd64p32.s
diff --git a/src/pkg/math/atan2_arm.s b/src/math/atan2_arm.s
index 06c12ecbc..06c12ecbc 100644
--- a/src/pkg/math/atan2_arm.s
+++ b/src/math/atan2_arm.s
diff --git a/src/pkg/math/atan_386.s b/src/math/atan_386.s
index f3976b1d3..f3976b1d3 100644
--- a/src/pkg/math/atan_386.s
+++ b/src/math/atan_386.s
diff --git a/src/pkg/math/atan_amd64.s b/src/math/atan_amd64.s
index b801ae99d..b801ae99d 100644
--- a/src/pkg/math/atan_amd64.s
+++ b/src/math/atan_amd64.s
diff --git a/src/pkg/math/atan_amd64p32.s b/src/math/atan_amd64p32.s
index 1c1f6ceda..1c1f6ceda 100644
--- a/src/pkg/math/atan_amd64p32.s
+++ b/src/math/atan_amd64p32.s
diff --git a/src/pkg/math/atan_arm.s b/src/math/atan_arm.s
index d190a8bb0..d190a8bb0 100644
--- a/src/pkg/math/atan_arm.s
+++ b/src/math/atan_arm.s
diff --git a/src/pkg/math/atanh.go b/src/math/atanh.go
index 113d5c103..113d5c103 100644
--- a/src/pkg/math/atanh.go
+++ b/src/math/atanh.go
diff --git a/src/pkg/math/big/arith.go b/src/math/big/arith.go
index 3d5a8682d..3d5a8682d 100644
--- a/src/pkg/math/big/arith.go
+++ b/src/math/big/arith.go
diff --git a/src/pkg/math/big/arith_386.s b/src/math/big/arith_386.s
index 1b47c898f..1b47c898f 100644
--- a/src/pkg/math/big/arith_386.s
+++ b/src/math/big/arith_386.s
diff --git a/src/pkg/math/big/arith_amd64.s b/src/math/big/arith_amd64.s
index 56c4cb050..56c4cb050 100644
--- a/src/pkg/math/big/arith_amd64.s
+++ b/src/math/big/arith_amd64.s
diff --git a/src/pkg/math/big/arith_amd64p32.s b/src/math/big/arith_amd64p32.s
index 908dbbdc5..908dbbdc5 100644
--- a/src/pkg/math/big/arith_amd64p32.s
+++ b/src/math/big/arith_amd64p32.s
diff --git a/src/pkg/math/big/arith_arm.s b/src/math/big/arith_arm.s
index a4c51c212..a4c51c212 100644
--- a/src/pkg/math/big/arith_arm.s
+++ b/src/math/big/arith_arm.s
diff --git a/src/pkg/math/big/arith_decl.go b/src/math/big/arith_decl.go
index 068cc8d93..068cc8d93 100644
--- a/src/pkg/math/big/arith_decl.go
+++ b/src/math/big/arith_decl.go
diff --git a/src/pkg/math/big/arith_power64x.s b/src/math/big/arith_power64x.s
index c33a9209f..c33a9209f 100644
--- a/src/pkg/math/big/arith_power64x.s
+++ b/src/math/big/arith_power64x.s
diff --git a/src/pkg/math/big/arith_test.go b/src/math/big/arith_test.go
index 3615a659c..3615a659c 100644
--- a/src/pkg/math/big/arith_test.go
+++ b/src/math/big/arith_test.go
diff --git a/src/pkg/math/big/calibrate_test.go b/src/math/big/calibrate_test.go
index f69ffbf5c..f69ffbf5c 100644
--- a/src/pkg/math/big/calibrate_test.go
+++ b/src/math/big/calibrate_test.go
diff --git a/src/pkg/math/big/example_test.go b/src/math/big/example_test.go
index 078be47f9..078be47f9 100644
--- a/src/pkg/math/big/example_test.go
+++ b/src/math/big/example_test.go
diff --git a/src/pkg/math/big/gcd_test.go b/src/math/big/gcd_test.go
index c0b9f5830..c0b9f5830 100644
--- a/src/pkg/math/big/gcd_test.go
+++ b/src/math/big/gcd_test.go
diff --git a/src/pkg/math/big/hilbert_test.go b/src/math/big/hilbert_test.go
index 1a84341b3..1a84341b3 100644
--- a/src/pkg/math/big/hilbert_test.go
+++ b/src/math/big/hilbert_test.go
diff --git a/src/pkg/math/big/int.go b/src/math/big/int.go
index e70d0489b..e70d0489b 100644
--- a/src/pkg/math/big/int.go
+++ b/src/math/big/int.go
diff --git a/src/pkg/math/big/int_test.go b/src/math/big/int_test.go
index 299dc72fb..299dc72fb 100644
--- a/src/pkg/math/big/int_test.go
+++ b/src/math/big/int_test.go
diff --git a/src/pkg/math/big/nat.go b/src/math/big/nat.go
index 16a87f5c5..16a87f5c5 100644
--- a/src/pkg/math/big/nat.go
+++ b/src/math/big/nat.go
diff --git a/src/pkg/math/big/nat_test.go b/src/math/big/nat_test.go
index a2ae53385..a2ae53385 100644
--- a/src/pkg/math/big/nat_test.go
+++ b/src/math/big/nat_test.go
diff --git a/src/pkg/math/big/rat.go b/src/math/big/rat.go
index e6ab0bb48..e6ab0bb48 100644
--- a/src/pkg/math/big/rat.go
+++ b/src/math/big/rat.go
diff --git a/src/pkg/math/big/rat_test.go b/src/math/big/rat_test.go
index 598eac8cc..598eac8cc 100644
--- a/src/pkg/math/big/rat_test.go
+++ b/src/math/big/rat_test.go
diff --git a/src/pkg/math/bits.go b/src/math/bits.go
index d85ee9cb1..d85ee9cb1 100644
--- a/src/pkg/math/bits.go
+++ b/src/math/bits.go
diff --git a/src/pkg/math/cbrt.go b/src/math/cbrt.go
index 272e30923..272e30923 100644
--- a/src/pkg/math/cbrt.go
+++ b/src/math/cbrt.go
diff --git a/src/pkg/math/cmplx/abs.go b/src/math/cmplx/abs.go
index f3cd1073e..f3cd1073e 100644
--- a/src/pkg/math/cmplx/abs.go
+++ b/src/math/cmplx/abs.go
diff --git a/src/pkg/math/cmplx/asin.go b/src/math/cmplx/asin.go
index 61880a257..61880a257 100644
--- a/src/pkg/math/cmplx/asin.go
+++ b/src/math/cmplx/asin.go
diff --git a/src/pkg/math/cmplx/cmath_test.go b/src/math/cmplx/cmath_test.go
index f285646af..f285646af 100644
--- a/src/pkg/math/cmplx/cmath_test.go
+++ b/src/math/cmplx/cmath_test.go
diff --git a/src/pkg/math/cmplx/conj.go b/src/math/cmplx/conj.go
index 34a4277c1..34a4277c1 100644
--- a/src/pkg/math/cmplx/conj.go
+++ b/src/math/cmplx/conj.go
diff --git a/src/pkg/math/cmplx/exp.go b/src/math/cmplx/exp.go
index 485ed2c78..485ed2c78 100644
--- a/src/pkg/math/cmplx/exp.go
+++ b/src/math/cmplx/exp.go
diff --git a/src/pkg/math/cmplx/isinf.go b/src/math/cmplx/isinf.go
index d5a65b44b..d5a65b44b 100644
--- a/src/pkg/math/cmplx/isinf.go
+++ b/src/math/cmplx/isinf.go
diff --git a/src/pkg/math/cmplx/isnan.go b/src/math/cmplx/isnan.go
index 05d0cce63..05d0cce63 100644
--- a/src/pkg/math/cmplx/isnan.go
+++ b/src/math/cmplx/isnan.go
diff --git a/src/pkg/math/cmplx/log.go b/src/math/cmplx/log.go
index 881a064d8..881a064d8 100644
--- a/src/pkg/math/cmplx/log.go
+++ b/src/math/cmplx/log.go
diff --git a/src/pkg/math/cmplx/phase.go b/src/math/cmplx/phase.go
index 03cece8a5..03cece8a5 100644
--- a/src/pkg/math/cmplx/phase.go
+++ b/src/math/cmplx/phase.go
diff --git a/src/pkg/math/cmplx/polar.go b/src/math/cmplx/polar.go
index 9b192bc62..9b192bc62 100644
--- a/src/pkg/math/cmplx/polar.go
+++ b/src/math/cmplx/polar.go
diff --git a/src/pkg/math/cmplx/pow.go b/src/math/cmplx/pow.go
index 1630b879b..1630b879b 100644
--- a/src/pkg/math/cmplx/pow.go
+++ b/src/math/cmplx/pow.go
diff --git a/src/pkg/math/cmplx/rect.go b/src/math/cmplx/rect.go
index bf94d787e..bf94d787e 100644
--- a/src/pkg/math/cmplx/rect.go
+++ b/src/math/cmplx/rect.go
diff --git a/src/pkg/math/cmplx/sin.go b/src/math/cmplx/sin.go
index 2c57536ed..2c57536ed 100644
--- a/src/pkg/math/cmplx/sin.go
+++ b/src/math/cmplx/sin.go
diff --git a/src/pkg/math/cmplx/sqrt.go b/src/math/cmplx/sqrt.go
index 4ef6807ad..4ef6807ad 100644
--- a/src/pkg/math/cmplx/sqrt.go
+++ b/src/math/cmplx/sqrt.go
diff --git a/src/pkg/math/cmplx/tan.go b/src/math/cmplx/tan.go
index 9485315d8..9485315d8 100644
--- a/src/pkg/math/cmplx/tan.go
+++ b/src/math/cmplx/tan.go
diff --git a/src/pkg/math/const.go b/src/math/const.go
index f1247c383..f1247c383 100644
--- a/src/pkg/math/const.go
+++ b/src/math/const.go
diff --git a/src/pkg/math/copysign.go b/src/math/copysign.go
index 719c64b9e..719c64b9e 100644
--- a/src/pkg/math/copysign.go
+++ b/src/math/copysign.go
diff --git a/src/pkg/math/dim.go b/src/math/dim.go
index 1c634d415..1c634d415 100644
--- a/src/pkg/math/dim.go
+++ b/src/math/dim.go
diff --git a/src/pkg/math/dim_386.s b/src/math/dim_386.s
index c8194fed8..c8194fed8 100644
--- a/src/pkg/math/dim_386.s
+++ b/src/math/dim_386.s
diff --git a/src/pkg/math/dim_amd64.s b/src/math/dim_amd64.s
index 622cc3fba..622cc3fba 100644
--- a/src/pkg/math/dim_amd64.s
+++ b/src/math/dim_amd64.s
diff --git a/src/pkg/math/dim_amd64p32.s b/src/math/dim_amd64p32.s
index e5e34479d..e5e34479d 100644
--- a/src/pkg/math/dim_amd64p32.s
+++ b/src/math/dim_amd64p32.s
diff --git a/src/pkg/math/dim_arm.s b/src/math/dim_arm.s
index be6695068..be6695068 100644
--- a/src/pkg/math/dim_arm.s
+++ b/src/math/dim_arm.s
diff --git a/src/pkg/math/erf.go b/src/math/erf.go
index 4cd80f80c..4cd80f80c 100644
--- a/src/pkg/math/erf.go
+++ b/src/math/erf.go
diff --git a/src/pkg/math/exp.go b/src/math/exp.go
index f31585fa7..f31585fa7 100644
--- a/src/pkg/math/exp.go
+++ b/src/math/exp.go
diff --git a/src/pkg/math/exp2_386.s b/src/math/exp2_386.s
index 7d11920c2..7d11920c2 100644
--- a/src/pkg/math/exp2_386.s
+++ b/src/math/exp2_386.s
diff --git a/src/pkg/math/exp2_amd64.s b/src/math/exp2_amd64.s
index 903c83589..903c83589 100644
--- a/src/pkg/math/exp2_amd64.s
+++ b/src/math/exp2_amd64.s
diff --git a/src/pkg/math/exp2_amd64p32.s b/src/math/exp2_amd64p32.s
index 4d3830914..4d3830914 100644
--- a/src/pkg/math/exp2_amd64p32.s
+++ b/src/math/exp2_amd64p32.s
diff --git a/src/pkg/math/exp2_arm.s b/src/math/exp2_arm.s
index 58283cd08..58283cd08 100644
--- a/src/pkg/math/exp2_arm.s
+++ b/src/math/exp2_arm.s
diff --git a/src/pkg/math/exp_386.s b/src/math/exp_386.s
index 6a478a5e6..6a478a5e6 100644
--- a/src/pkg/math/exp_386.s
+++ b/src/math/exp_386.s
diff --git a/src/pkg/math/exp_amd64.s b/src/math/exp_amd64.s
index d9cf8fd86..d9cf8fd86 100644
--- a/src/pkg/math/exp_amd64.s
+++ b/src/math/exp_amd64.s
diff --git a/src/pkg/math/exp_amd64p32.s b/src/math/exp_amd64p32.s
index 98ac2e91e..98ac2e91e 100644
--- a/src/pkg/math/exp_amd64p32.s
+++ b/src/math/exp_amd64p32.s
diff --git a/src/pkg/math/exp_arm.s b/src/math/exp_arm.s
index ce36d03ca..ce36d03ca 100644
--- a/src/pkg/math/exp_arm.s
+++ b/src/math/exp_arm.s
diff --git a/src/pkg/math/expm1.go b/src/math/expm1.go
index 8f56e15cc..8f56e15cc 100644
--- a/src/pkg/math/expm1.go
+++ b/src/math/expm1.go
diff --git a/src/pkg/math/expm1_386.s b/src/math/expm1_386.s
index a48ca8a58..a48ca8a58 100644
--- a/src/pkg/math/expm1_386.s
+++ b/src/math/expm1_386.s
diff --git a/src/pkg/math/expm1_amd64.s b/src/math/expm1_amd64.s
index b7d5a3be0..b7d5a3be0 100644
--- a/src/pkg/math/expm1_amd64.s
+++ b/src/math/expm1_amd64.s
diff --git a/src/pkg/math/expm1_amd64p32.s b/src/math/expm1_amd64p32.s
index 709ebefcb..709ebefcb 100644
--- a/src/pkg/math/expm1_amd64p32.s
+++ b/src/math/expm1_amd64p32.s
diff --git a/src/pkg/math/expm1_arm.s b/src/math/expm1_arm.s
index 5f80d872f..5f80d872f 100644
--- a/src/pkg/math/expm1_arm.s
+++ b/src/math/expm1_arm.s
diff --git a/src/pkg/math/export_test.go b/src/math/export_test.go
index 02992d70e..02992d70e 100644
--- a/src/pkg/math/export_test.go
+++ b/src/math/export_test.go
diff --git a/src/pkg/math/floor.go b/src/math/floor.go
index 9d30629c5..9d30629c5 100644
--- a/src/pkg/math/floor.go
+++ b/src/math/floor.go
diff --git a/src/pkg/math/floor_386.s b/src/math/floor_386.s
index 31c9b174d..31c9b174d 100644
--- a/src/pkg/math/floor_386.s
+++ b/src/math/floor_386.s
diff --git a/src/pkg/math/floor_amd64.s b/src/math/floor_amd64.s
index 67b7cdec0..67b7cdec0 100644
--- a/src/pkg/math/floor_amd64.s
+++ b/src/math/floor_amd64.s
diff --git a/src/pkg/math/floor_amd64p32.s b/src/math/floor_amd64p32.s
index 5b87d7a40..5b87d7a40 100644
--- a/src/pkg/math/floor_amd64p32.s
+++ b/src/math/floor_amd64p32.s
diff --git a/src/pkg/math/floor_arm.s b/src/math/floor_arm.s
index 59091765b..59091765b 100644
--- a/src/pkg/math/floor_arm.s
+++ b/src/math/floor_arm.s
diff --git a/src/pkg/math/frexp.go b/src/math/frexp.go
index 0e26feb66..0e26feb66 100644
--- a/src/pkg/math/frexp.go
+++ b/src/math/frexp.go
diff --git a/src/pkg/math/frexp_386.s b/src/math/frexp_386.s
index 5bff7e215..5bff7e215 100644
--- a/src/pkg/math/frexp_386.s
+++ b/src/math/frexp_386.s
diff --git a/src/pkg/math/frexp_amd64.s b/src/math/frexp_amd64.s
index 93a321039..93a321039 100644
--- a/src/pkg/math/frexp_amd64.s
+++ b/src/math/frexp_amd64.s
diff --git a/src/pkg/math/frexp_amd64p32.s b/src/math/frexp_amd64p32.s
index fbb564539..fbb564539 100644
--- a/src/pkg/math/frexp_amd64p32.s
+++ b/src/math/frexp_amd64p32.s
diff --git a/src/pkg/math/frexp_arm.s b/src/math/frexp_arm.s
index 7842eca59..7842eca59 100644
--- a/src/pkg/math/frexp_arm.s
+++ b/src/math/frexp_arm.s
diff --git a/src/pkg/math/gamma.go b/src/math/gamma.go
index 164f54f33..164f54f33 100644
--- a/src/pkg/math/gamma.go
+++ b/src/math/gamma.go
diff --git a/src/pkg/math/hypot.go b/src/math/hypot.go
index 2087cb05b..2087cb05b 100644
--- a/src/pkg/math/hypot.go
+++ b/src/math/hypot.go
diff --git a/src/pkg/math/hypot_386.s b/src/math/hypot_386.s
index d321f465b..d321f465b 100644
--- a/src/pkg/math/hypot_386.s
+++ b/src/math/hypot_386.s
diff --git a/src/pkg/math/hypot_amd64.s b/src/math/hypot_amd64.s
index a68eebc8c..a68eebc8c 100644
--- a/src/pkg/math/hypot_amd64.s
+++ b/src/math/hypot_amd64.s
diff --git a/src/pkg/math/hypot_amd64p32.s b/src/math/hypot_amd64p32.s
index b84542ae3..b84542ae3 100644
--- a/src/pkg/math/hypot_amd64p32.s
+++ b/src/math/hypot_amd64p32.s
diff --git a/src/pkg/math/hypot_arm.s b/src/math/hypot_arm.s
index 9c8abca13..9c8abca13 100644
--- a/src/pkg/math/hypot_arm.s
+++ b/src/math/hypot_arm.s
diff --git a/src/pkg/math/j0.go b/src/math/j0.go
index c20a9b22a..c20a9b22a 100644
--- a/src/pkg/math/j0.go
+++ b/src/math/j0.go
diff --git a/src/pkg/math/j1.go b/src/math/j1.go
index 7ac186b72..7ac186b72 100644
--- a/src/pkg/math/j1.go
+++ b/src/math/j1.go
diff --git a/src/pkg/math/jn.go b/src/math/jn.go
index a7909eb24..a7909eb24 100644
--- a/src/pkg/math/jn.go
+++ b/src/math/jn.go
diff --git a/src/pkg/math/ldexp.go b/src/math/ldexp.go
index b5d2a5e7e..b5d2a5e7e 100644
--- a/src/pkg/math/ldexp.go
+++ b/src/math/ldexp.go
diff --git a/src/pkg/math/ldexp_386.s b/src/math/ldexp_386.s
index ac8e8ba54..ac8e8ba54 100644
--- a/src/pkg/math/ldexp_386.s
+++ b/src/math/ldexp_386.s
diff --git a/src/pkg/math/ldexp_amd64.s b/src/math/ldexp_amd64.s
index 6063a6480..6063a6480 100644
--- a/src/pkg/math/ldexp_amd64.s
+++ b/src/math/ldexp_amd64.s
diff --git a/src/pkg/math/ldexp_amd64p32.s b/src/math/ldexp_amd64p32.s
index 9aa9d9da3..9aa9d9da3 100644
--- a/src/pkg/math/ldexp_amd64p32.s
+++ b/src/math/ldexp_amd64p32.s
diff --git a/src/pkg/math/ldexp_arm.s b/src/math/ldexp_arm.s
index fcffa2e0f..fcffa2e0f 100644
--- a/src/pkg/math/ldexp_arm.s
+++ b/src/math/ldexp_arm.s
diff --git a/src/pkg/math/lgamma.go b/src/math/lgamma.go
index 6a02c412d..6a02c412d 100644
--- a/src/pkg/math/lgamma.go
+++ b/src/math/lgamma.go
diff --git a/src/pkg/math/log.go b/src/math/log.go
index 818f00a73..818f00a73 100644
--- a/src/pkg/math/log.go
+++ b/src/math/log.go
diff --git a/src/pkg/math/log10.go b/src/math/log10.go
index 95cfbf47c..95cfbf47c 100644
--- a/src/pkg/math/log10.go
+++ b/src/math/log10.go
diff --git a/src/pkg/math/log10_386.s b/src/math/log10_386.s
index 2897f3c15..2897f3c15 100644
--- a/src/pkg/math/log10_386.s
+++ b/src/math/log10_386.s
diff --git a/src/pkg/math/log10_amd64.s b/src/math/log10_amd64.s
index 8382ba7ae..8382ba7ae 100644
--- a/src/pkg/math/log10_amd64.s
+++ b/src/math/log10_amd64.s
diff --git a/src/pkg/math/log10_amd64p32.s b/src/math/log10_amd64p32.s
index bf43841e2..bf43841e2 100644
--- a/src/pkg/math/log10_amd64p32.s
+++ b/src/math/log10_amd64p32.s
diff --git a/src/pkg/math/log10_arm.s b/src/math/log10_arm.s
index dbcb8351c..dbcb8351c 100644
--- a/src/pkg/math/log10_arm.s
+++ b/src/math/log10_arm.s
diff --git a/src/pkg/math/log1p.go b/src/math/log1p.go
index 12b98684c..12b98684c 100644
--- a/src/pkg/math/log1p.go
+++ b/src/math/log1p.go
diff --git a/src/pkg/math/log1p_386.s b/src/math/log1p_386.s
index 1c2d683a8..1c2d683a8 100644
--- a/src/pkg/math/log1p_386.s
+++ b/src/math/log1p_386.s
diff --git a/src/pkg/math/log1p_amd64.s b/src/math/log1p_amd64.s
index 1e58fb110..1e58fb110 100644
--- a/src/pkg/math/log1p_amd64.s
+++ b/src/math/log1p_amd64.s
diff --git a/src/pkg/math/log1p_amd64p32.s b/src/math/log1p_amd64p32.s
index a14b5e38a..a14b5e38a 100644
--- a/src/pkg/math/log1p_amd64p32.s
+++ b/src/math/log1p_amd64p32.s
diff --git a/src/pkg/math/log1p_arm.s b/src/math/log1p_arm.s
index 95d549678..95d549678 100644
--- a/src/pkg/math/log1p_arm.s
+++ b/src/math/log1p_arm.s
diff --git a/src/pkg/math/log_386.s b/src/math/log_386.s
index ff998afb4..ff998afb4 100644
--- a/src/pkg/math/log_386.s
+++ b/src/math/log_386.s
diff --git a/src/pkg/math/log_amd64.s b/src/math/log_amd64.s
index 84c60ab4d..84c60ab4d 100644
--- a/src/pkg/math/log_amd64.s
+++ b/src/math/log_amd64.s
diff --git a/src/pkg/math/log_amd64p32.s b/src/math/log_amd64p32.s
index 5058d607e..5058d607e 100644
--- a/src/pkg/math/log_amd64p32.s
+++ b/src/math/log_amd64p32.s
diff --git a/src/pkg/math/log_arm.s b/src/math/log_arm.s
index e21d0366e..e21d0366e 100644
--- a/src/pkg/math/log_arm.s
+++ b/src/math/log_arm.s
diff --git a/src/pkg/math/logb.go b/src/math/logb.go
index f2769d4fd..f2769d4fd 100644
--- a/src/pkg/math/logb.go
+++ b/src/math/logb.go
diff --git a/src/pkg/math/mod.go b/src/math/mod.go
index e1a414e5f..e1a414e5f 100644
--- a/src/pkg/math/mod.go
+++ b/src/math/mod.go
diff --git a/src/pkg/math/mod_386.s b/src/math/mod_386.s
index 10ad98be3..10ad98be3 100644
--- a/src/pkg/math/mod_386.s
+++ b/src/math/mod_386.s
diff --git a/src/pkg/math/mod_amd64.s b/src/math/mod_amd64.s
index f99dbe293..f99dbe293 100644
--- a/src/pkg/math/mod_amd64.s
+++ b/src/math/mod_amd64.s
diff --git a/src/pkg/math/mod_amd64p32.s b/src/math/mod_amd64p32.s
index c1b231124..c1b231124 100644
--- a/src/pkg/math/mod_amd64p32.s
+++ b/src/math/mod_amd64p32.s
diff --git a/src/pkg/math/mod_arm.s b/src/math/mod_arm.s
index 5afb3594d..5afb3594d 100644
--- a/src/pkg/math/mod_arm.s
+++ b/src/math/mod_arm.s
diff --git a/src/pkg/math/modf.go b/src/math/modf.go
index 1e8376a93..1e8376a93 100644
--- a/src/pkg/math/modf.go
+++ b/src/math/modf.go
diff --git a/src/pkg/math/modf_386.s b/src/math/modf_386.s
index 3debd3b95..3debd3b95 100644
--- a/src/pkg/math/modf_386.s
+++ b/src/math/modf_386.s
diff --git a/src/pkg/math/modf_amd64.s b/src/math/modf_amd64.s
index 701cf72a3..701cf72a3 100644
--- a/src/pkg/math/modf_amd64.s
+++ b/src/math/modf_amd64.s
diff --git a/src/pkg/math/modf_amd64p32.s b/src/math/modf_amd64p32.s
index 5508c2547..5508c2547 100644
--- a/src/pkg/math/modf_amd64p32.s
+++ b/src/math/modf_amd64p32.s
diff --git a/src/pkg/math/modf_arm.s b/src/math/modf_arm.s
index ea3c8dc74..ea3c8dc74 100644
--- a/src/pkg/math/modf_arm.s
+++ b/src/math/modf_arm.s
diff --git a/src/pkg/math/nextafter.go b/src/math/nextafter.go
index bbb139986..bbb139986 100644
--- a/src/pkg/math/nextafter.go
+++ b/src/math/nextafter.go
diff --git a/src/pkg/math/pow.go b/src/math/pow.go
index 77af25648..77af25648 100644
--- a/src/pkg/math/pow.go
+++ b/src/math/pow.go
diff --git a/src/pkg/math/pow10.go b/src/math/pow10.go
index f5ad28bb4..f5ad28bb4 100644
--- a/src/pkg/math/pow10.go
+++ b/src/math/pow10.go
diff --git a/src/pkg/math/rand/example_test.go b/src/math/rand/example_test.go
index f42991453..f42991453 100644
--- a/src/pkg/math/rand/example_test.go
+++ b/src/math/rand/example_test.go
diff --git a/src/pkg/math/rand/exp.go b/src/math/rand/exp.go
index 4bc110f91..4bc110f91 100644
--- a/src/pkg/math/rand/exp.go
+++ b/src/math/rand/exp.go
diff --git a/src/pkg/math/rand/normal.go b/src/math/rand/normal.go
index ba4ea54ca..ba4ea54ca 100644
--- a/src/pkg/math/rand/normal.go
+++ b/src/math/rand/normal.go
diff --git a/src/pkg/math/rand/rand.go b/src/math/rand/rand.go
index 3ffb5c4e5..3ffb5c4e5 100644
--- a/src/pkg/math/rand/rand.go
+++ b/src/math/rand/rand.go
diff --git a/src/pkg/math/rand/rand_test.go b/src/math/rand/rand_test.go
index ab0dc49b4..ab0dc49b4 100644
--- a/src/pkg/math/rand/rand_test.go
+++ b/src/math/rand/rand_test.go
diff --git a/src/pkg/math/rand/regress_test.go b/src/math/rand/regress_test.go
index 2b012af89..2b012af89 100644
--- a/src/pkg/math/rand/regress_test.go
+++ b/src/math/rand/regress_test.go
diff --git a/src/pkg/math/rand/rng.go b/src/math/rand/rng.go
index 947c49f0f..947c49f0f 100644
--- a/src/pkg/math/rand/rng.go
+++ b/src/math/rand/rng.go
diff --git a/src/pkg/math/rand/zipf.go b/src/math/rand/zipf.go
index 8db2c6f5b..8db2c6f5b 100644
--- a/src/pkg/math/rand/zipf.go
+++ b/src/math/rand/zipf.go
diff --git a/src/pkg/math/remainder.go b/src/math/remainder.go
index 9a4e4154c..9a4e4154c 100644
--- a/src/pkg/math/remainder.go
+++ b/src/math/remainder.go
diff --git a/src/pkg/math/remainder_386.s b/src/math/remainder_386.s
index 318fa2c46..318fa2c46 100644
--- a/src/pkg/math/remainder_386.s
+++ b/src/math/remainder_386.s
diff --git a/src/pkg/math/remainder_amd64.s b/src/math/remainder_amd64.s
index f7fda99d8..f7fda99d8 100644
--- a/src/pkg/math/remainder_amd64.s
+++ b/src/math/remainder_amd64.s
diff --git a/src/pkg/math/remainder_amd64p32.s b/src/math/remainder_amd64p32.s
index cd5cf55ff..cd5cf55ff 100644
--- a/src/pkg/math/remainder_amd64p32.s
+++ b/src/math/remainder_amd64p32.s
diff --git a/src/pkg/math/remainder_arm.s b/src/math/remainder_arm.s
index 1ae597a60..1ae597a60 100644
--- a/src/pkg/math/remainder_arm.s
+++ b/src/math/remainder_arm.s
diff --git a/src/pkg/math/signbit.go b/src/math/signbit.go
index 670cc1a66..670cc1a66 100644
--- a/src/pkg/math/signbit.go
+++ b/src/math/signbit.go
diff --git a/src/pkg/math/sin.go b/src/math/sin.go
index ed85f21be..ed85f21be 100644
--- a/src/pkg/math/sin.go
+++ b/src/math/sin.go
diff --git a/src/pkg/math/sin_386.s b/src/math/sin_386.s
index ccc8e64be..ccc8e64be 100644
--- a/src/pkg/math/sin_386.s
+++ b/src/math/sin_386.s
diff --git a/src/pkg/math/sin_amd64.s b/src/math/sin_amd64.s
index 0c33cecef..0c33cecef 100644
--- a/src/pkg/math/sin_amd64.s
+++ b/src/math/sin_amd64.s
diff --git a/src/pkg/math/sin_amd64p32.s b/src/math/sin_amd64p32.s
index 9f93eba20..9f93eba20 100644
--- a/src/pkg/math/sin_amd64p32.s
+++ b/src/math/sin_amd64p32.s
diff --git a/src/pkg/math/sin_arm.s b/src/math/sin_arm.s
index 467af3dea..467af3dea 100644
--- a/src/pkg/math/sin_arm.s
+++ b/src/math/sin_arm.s
diff --git a/src/pkg/math/sincos.go b/src/math/sincos.go
index 718030319..718030319 100644
--- a/src/pkg/math/sincos.go
+++ b/src/math/sincos.go
diff --git a/src/pkg/math/sincos_386.s b/src/math/sincos_386.s
index 83af5016e..83af5016e 100644
--- a/src/pkg/math/sincos_386.s
+++ b/src/math/sincos_386.s
diff --git a/src/pkg/math/sincos_amd64.s b/src/math/sincos_amd64.s
index dae636b24..dae636b24 100644
--- a/src/pkg/math/sincos_amd64.s
+++ b/src/math/sincos_amd64.s
diff --git a/src/pkg/math/sincos_amd64p32.s b/src/math/sincos_amd64p32.s
index 360e94d09..360e94d09 100644
--- a/src/pkg/math/sincos_amd64p32.s
+++ b/src/math/sincos_amd64p32.s
diff --git a/src/pkg/math/sincos_arm.s b/src/math/sincos_arm.s
index 9fe048248..9fe048248 100644
--- a/src/pkg/math/sincos_arm.s
+++ b/src/math/sincos_arm.s
diff --git a/src/pkg/math/sinh.go b/src/math/sinh.go
index 139b911fe..139b911fe 100644
--- a/src/pkg/math/sinh.go
+++ b/src/math/sinh.go
diff --git a/src/pkg/math/sqrt.go b/src/math/sqrt.go
index 1bd4437f1..fdc869992 100644
--- a/src/pkg/math/sqrt.go
+++ b/src/math/sqrt.go
@@ -80,7 +80,7 @@ package math
 //
 //
 // Notes:  Rounding mode detection omitted.  The constants "mask", "shift",
-// and "bias" are found in src/pkg/math/bits.go
+// and "bias" are found in src/math/bits.go
 
 // Sqrt returns the square root of x.
 //
diff --git a/src/pkg/math/sqrt_386.s b/src/math/sqrt_386.s
index 5234a1e88..5234a1e88 100644
--- a/src/pkg/math/sqrt_386.s
+++ b/src/math/sqrt_386.s
diff --git a/src/pkg/math/sqrt_amd64.s b/src/math/sqrt_amd64.s
index 443d83fe3..443d83fe3 100644
--- a/src/pkg/math/sqrt_amd64.s
+++ b/src/math/sqrt_amd64.s
diff --git a/src/pkg/math/sqrt_amd64p32.s b/src/math/sqrt_amd64p32.s
index d83a286c2..d83a286c2 100644
--- a/src/pkg/math/sqrt_amd64p32.s
+++ b/src/math/sqrt_amd64p32.s
diff --git a/src/pkg/math/sqrt_arm.s b/src/math/sqrt_arm.s
index 4f9dc2e03..4f9dc2e03 100644
--- a/src/pkg/math/sqrt_arm.s
+++ b/src/math/sqrt_arm.s
diff --git a/src/pkg/math/stubs_power64x.s b/src/math/stubs_power64x.s
index 0cb86144a..0cb86144a 100644
--- a/src/pkg/math/stubs_power64x.s
+++ b/src/math/stubs_power64x.s
diff --git a/src/pkg/math/tan.go b/src/math/tan.go
index 285eff1ab..285eff1ab 100644
--- a/src/pkg/math/tan.go
+++ b/src/math/tan.go
diff --git a/src/pkg/math/tan_386.s b/src/math/tan_386.s
index f1bdae153..f1bdae153 100644
--- a/src/pkg/math/tan_386.s
+++ b/src/math/tan_386.s
diff --git a/src/pkg/math/tan_amd64.s b/src/math/tan_amd64.s
index 39aa08061..39aa08061 100644
--- a/src/pkg/math/tan_amd64.s
+++ b/src/math/tan_amd64.s
diff --git a/src/pkg/math/tan_amd64p32.s b/src/math/tan_amd64p32.s
index 9b3f70de7..9b3f70de7 100644
--- a/src/pkg/math/tan_amd64p32.s
+++ b/src/math/tan_amd64p32.s
diff --git a/src/pkg/math/tan_arm.s b/src/math/tan_arm.s
index 36c7c128f..36c7c128f 100644
--- a/src/pkg/math/tan_arm.s
+++ b/src/math/tan_arm.s
diff --git a/src/pkg/math/tanh.go b/src/math/tanh.go
index cf0ffa192..cf0ffa192 100644
--- a/src/pkg/math/tanh.go
+++ b/src/math/tanh.go
diff --git a/src/pkg/math/unsafe.go b/src/math/unsafe.go
index 5ae67420f..5ae67420f 100644
--- a/src/pkg/math/unsafe.go
+++ b/src/math/unsafe.go
diff --git a/src/pkg/mime/grammar.go b/src/mime/grammar.go
index 2347324aa..2347324aa 100644
--- a/src/pkg/mime/grammar.go
+++ b/src/mime/grammar.go
diff --git a/src/pkg/mime/mediatype.go b/src/mime/mediatype.go
index ad63f9bb9..ad63f9bb9 100644
--- a/src/pkg/mime/mediatype.go
+++ b/src/mime/mediatype.go
diff --git a/src/pkg/mime/mediatype_test.go b/src/mime/mediatype_test.go
index 026bfa4d7..026bfa4d7 100644
--- a/src/pkg/mime/mediatype_test.go
+++ b/src/mime/mediatype_test.go
diff --git a/src/pkg/mime/multipart/example_test.go b/src/mime/multipart/example_test.go
index 6d6ba81d5..6d6ba81d5 100644
--- a/src/pkg/mime/multipart/example_test.go
+++ b/src/mime/multipart/example_test.go
diff --git a/src/pkg/mime/multipart/formdata.go b/src/mime/multipart/formdata.go
index eee53fc8d..eee53fc8d 100644
--- a/src/pkg/mime/multipart/formdata.go
+++ b/src/mime/multipart/formdata.go
diff --git a/src/pkg/mime/multipart/formdata_test.go b/src/mime/multipart/formdata_test.go
index 6e2388baf..6e2388baf 100644
--- a/src/pkg/mime/multipart/formdata_test.go
+++ b/src/mime/multipart/formdata_test.go
diff --git a/src/pkg/mime/multipart/multipart.go b/src/mime/multipart/multipart.go
index 01a667d93..01a667d93 100644
--- a/src/pkg/mime/multipart/multipart.go
+++ b/src/mime/multipart/multipart.go
diff --git a/src/pkg/mime/multipart/multipart_test.go b/src/mime/multipart/multipart_test.go
index d662e8340..d662e8340 100644
--- a/src/pkg/mime/multipart/multipart_test.go
+++ b/src/mime/multipart/multipart_test.go
diff --git a/src/pkg/mime/multipart/quotedprintable.go b/src/mime/multipart/quotedprintable.go
index 9ff4ee703..9ff4ee703 100644
--- a/src/pkg/mime/multipart/quotedprintable.go
+++ b/src/mime/multipart/quotedprintable.go
diff --git a/src/pkg/mime/multipart/quotedprintable_test.go b/src/mime/multipart/quotedprintable_test.go
index c4de3eb75..c4de3eb75 100644
--- a/src/pkg/mime/multipart/quotedprintable_test.go
+++ b/src/mime/multipart/quotedprintable_test.go
diff --git a/src/pkg/mime/multipart/testdata/nested-mime b/src/mime/multipart/testdata/nested-mime
index 71c238e38..71c238e38 100644
--- a/src/pkg/mime/multipart/testdata/nested-mime
+++ b/src/mime/multipart/testdata/nested-mime
diff --git a/src/pkg/mime/multipart/writer.go b/src/mime/multipart/writer.go
index e13a956af..e13a956af 100644
--- a/src/pkg/mime/multipart/writer.go
+++ b/src/mime/multipart/writer.go
diff --git a/src/pkg/mime/multipart/writer_test.go b/src/mime/multipart/writer_test.go
index ba00c97ec..ba00c97ec 100644
--- a/src/pkg/mime/multipart/writer_test.go
+++ b/src/mime/multipart/writer_test.go
diff --git a/src/pkg/mime/testdata/test.types b/src/mime/testdata/test.types
index 9b040edd7..9b040edd7 100644
--- a/src/pkg/mime/testdata/test.types
+++ b/src/mime/testdata/test.types
diff --git a/src/pkg/mime/testdata/test.types.plan9 b/src/mime/testdata/test.types.plan9
index 19dbf41cc..19dbf41cc 100644
--- a/src/pkg/mime/testdata/test.types.plan9
+++ b/src/mime/testdata/test.types.plan9
diff --git a/src/pkg/mime/type.go b/src/mime/type.go
index ffda1f0ce..ffda1f0ce 100644
--- a/src/pkg/mime/type.go
+++ b/src/mime/type.go
diff --git a/src/pkg/mime/type_plan9.go b/src/mime/type_plan9.go
index 8cbf6777f..8cbf6777f 100644
--- a/src/pkg/mime/type_plan9.go
+++ b/src/mime/type_plan9.go
diff --git a/src/pkg/mime/type_test.go b/src/mime/type_test.go
index d2d254ae9..d2d254ae9 100644
--- a/src/pkg/mime/type_test.go
+++ b/src/mime/type_test.go
diff --git a/src/pkg/mime/type_unix.go b/src/mime/type_unix.go
index 3e404cf74..3e404cf74 100644
--- a/src/pkg/mime/type_unix.go
+++ b/src/mime/type_unix.go
diff --git a/src/pkg/mime/type_windows.go b/src/mime/type_windows.go
index ae758d78b..ae758d78b 100644
--- a/src/pkg/mime/type_windows.go
+++ b/src/mime/type_windows.go
diff --git a/src/nacltest.bash b/src/nacltest.bash
index 154d99ae9..6220d39f1 100755
--- a/src/nacltest.bash
+++ b/src/nacltest.bash
@@ -72,8 +72,8 @@ export GOROOT=$(pwd)/..
 
 # Build zip file embedded in package syscall.
 gobin=${GOBIN:-$(pwd)/../bin}
-rm -f pkg/syscall/fstest_nacl.go
-GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto pkg/syscall/fstest_nacl.go
+rm -f syscall/fstest_nacl.go
+GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto syscall/fstest_nacl.go
 
 # Run standard build and tests.
 export PATH=$(pwd)/../misc/nacl:$PATH
diff --git a/src/pkg/net/cgo_android.go b/src/net/cgo_android.go
index 3819ce56a..3819ce56a 100644
--- a/src/pkg/net/cgo_android.go
+++ b/src/net/cgo_android.go
diff --git a/src/pkg/net/cgo_bsd.go b/src/net/cgo_bsd.go
index 3090d3019..3090d3019 100644
--- a/src/pkg/net/cgo_bsd.go
+++ b/src/net/cgo_bsd.go
diff --git a/src/pkg/net/cgo_linux.go b/src/net/cgo_linux.go
index 4ef2d0cd1..4ef2d0cd1 100644
--- a/src/pkg/net/cgo_linux.go
+++ b/src/net/cgo_linux.go
diff --git a/src/pkg/net/cgo_netbsd.go b/src/net/cgo_netbsd.go
index 09c5ad2d9..09c5ad2d9 100644
--- a/src/pkg/net/cgo_netbsd.go
+++ b/src/net/cgo_netbsd.go
diff --git a/src/pkg/net/cgo_openbsd.go b/src/net/cgo_openbsd.go
index 09c5ad2d9..09c5ad2d9 100644
--- a/src/pkg/net/cgo_openbsd.go
+++ b/src/net/cgo_openbsd.go
diff --git a/src/pkg/net/cgo_stub.go b/src/net/cgo_stub.go
index f533c1421..f533c1421 100644
--- a/src/pkg/net/cgo_stub.go
+++ b/src/net/cgo_stub.go
diff --git a/src/pkg/net/cgo_unix.go b/src/net/cgo_unix.go
index 1f366ee5c..1f366ee5c 100644
--- a/src/pkg/net/cgo_unix.go
+++ b/src/net/cgo_unix.go
diff --git a/src/pkg/net/cgo_unix_test.go b/src/net/cgo_unix_test.go
index 33566ce9c..33566ce9c 100644
--- a/src/pkg/net/cgo_unix_test.go
+++ b/src/net/cgo_unix_test.go
diff --git a/src/pkg/net/conn_test.go b/src/net/conn_test.go
index 9c9d1a805..9c9d1a805 100644
--- a/src/pkg/net/conn_test.go
+++ b/src/net/conn_test.go
diff --git a/src/pkg/net/dial.go b/src/net/dial.go
index e6f0436cd..e6f0436cd 100644
--- a/src/pkg/net/dial.go
+++ b/src/net/dial.go
diff --git a/src/pkg/net/dial_gen.go b/src/net/dial_gen.go
index ada623300..ada623300 100644
--- a/src/pkg/net/dial_gen.go
+++ b/src/net/dial_gen.go
diff --git a/src/pkg/net/dial_gen_test.go b/src/net/dial_gen_test.go
index c857acd06..c857acd06 100644
--- a/src/pkg/net/dial_gen_test.go
+++ b/src/net/dial_gen_test.go
diff --git a/src/pkg/net/dial_test.go b/src/net/dial_test.go
index c5c3236cc..c5c3236cc 100644
--- a/src/pkg/net/dial_test.go
+++ b/src/net/dial_test.go
diff --git a/src/pkg/net/dialgoogle_test.go b/src/net/dialgoogle_test.go
index df5895afa..df5895afa 100644
--- a/src/pkg/net/dialgoogle_test.go
+++ b/src/net/dialgoogle_test.go
diff --git a/src/pkg/net/dnsclient.go b/src/net/dnsclient.go
index e8014e4ff..e8014e4ff 100644
--- a/src/pkg/net/dnsclient.go
+++ b/src/net/dnsclient.go
diff --git a/src/pkg/net/dnsclient_test.go b/src/net/dnsclient_test.go
index 435eb3550..435eb3550 100644
--- a/src/pkg/net/dnsclient_test.go
+++ b/src/net/dnsclient_test.go
diff --git a/src/pkg/net/dnsclient_unix.go b/src/net/dnsclient_unix.go
index abe7da05c..abe7da05c 100644
--- a/src/pkg/net/dnsclient_unix.go
+++ b/src/net/dnsclient_unix.go
diff --git a/src/pkg/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
index 1167c26b3..1167c26b3 100644
--- a/src/pkg/net/dnsclient_unix_test.go
+++ b/src/net/dnsclient_unix_test.go
diff --git a/src/pkg/net/dnsconfig_unix.go b/src/net/dnsconfig_unix.go
index ebb6e673f..ebb6e673f 100644
--- a/src/pkg/net/dnsconfig_unix.go
+++ b/src/net/dnsconfig_unix.go
diff --git a/src/pkg/net/dnsconfig_unix_test.go b/src/net/dnsconfig_unix_test.go
index 94fb0c32e..94fb0c32e 100644
--- a/src/pkg/net/dnsconfig_unix_test.go
+++ b/src/net/dnsconfig_unix_test.go
diff --git a/src/pkg/net/dnsmsg.go b/src/net/dnsmsg.go
index 161afb2a5..161afb2a5 100644
--- a/src/pkg/net/dnsmsg.go
+++ b/src/net/dnsmsg.go
diff --git a/src/pkg/net/dnsmsg_test.go b/src/net/dnsmsg_test.go
index c39dbdb04..c39dbdb04 100644
--- a/src/pkg/net/dnsmsg_test.go
+++ b/src/net/dnsmsg_test.go
diff --git a/src/pkg/net/dnsname_test.go b/src/net/dnsname_test.go
index 57dd25fe4..57dd25fe4 100644
--- a/src/pkg/net/dnsname_test.go
+++ b/src/net/dnsname_test.go
diff --git a/src/pkg/net/empty.c b/src/net/empty.c
index a515c2fe2..a515c2fe2 100644
--- a/src/pkg/net/empty.c
+++ b/src/net/empty.c
diff --git a/src/pkg/net/example_test.go b/src/net/example_test.go
index 6f2f9074c..6f2f9074c 100644
--- a/src/pkg/net/example_test.go
+++ b/src/net/example_test.go
diff --git a/src/pkg/net/fd_mutex.go b/src/net/fd_mutex.go
index 6d5509d7f..6d5509d7f 100644
--- a/src/pkg/net/fd_mutex.go
+++ b/src/net/fd_mutex.go
diff --git a/src/pkg/net/fd_mutex_test.go b/src/net/fd_mutex_test.go
index c34ec59b9..c34ec59b9 100644
--- a/src/pkg/net/fd_mutex_test.go
+++ b/src/net/fd_mutex_test.go
diff --git a/src/pkg/net/fd_plan9.go b/src/net/fd_plan9.go
index 5fe8effc2..5fe8effc2 100644
--- a/src/pkg/net/fd_plan9.go
+++ b/src/net/fd_plan9.go
diff --git a/src/pkg/net/fd_poll_nacl.go b/src/net/fd_poll_nacl.go
index a3701f876..a3701f876 100644
--- a/src/pkg/net/fd_poll_nacl.go
+++ b/src/net/fd_poll_nacl.go
diff --git a/src/pkg/net/fd_poll_runtime.go b/src/net/fd_poll_runtime.go
index 2bddc836c..2bddc836c 100644
--- a/src/pkg/net/fd_poll_runtime.go
+++ b/src/net/fd_poll_runtime.go
diff --git a/src/pkg/net/fd_unix.go b/src/net/fd_unix.go
index 7fa43f6ab..7fa43f6ab 100644
--- a/src/pkg/net/fd_unix.go
+++ b/src/net/fd_unix.go
diff --git a/src/pkg/net/fd_unix_test.go b/src/net/fd_unix_test.go
index fe8e8ff6a..fe8e8ff6a 100644
--- a/src/pkg/net/fd_unix_test.go
+++ b/src/net/fd_unix_test.go
diff --git a/src/pkg/net/fd_windows.go b/src/net/fd_windows.go
index 6d69e0624..6d69e0624 100644
--- a/src/pkg/net/fd_windows.go
+++ b/src/net/fd_windows.go
diff --git a/src/pkg/net/file_plan9.go b/src/net/file_plan9.go
index 068f0881d..068f0881d 100644
--- a/src/pkg/net/file_plan9.go
+++ b/src/net/file_plan9.go
diff --git a/src/pkg/net/file_test.go b/src/net/file_test.go
index d81bca782..d81bca782 100644
--- a/src/pkg/net/file_test.go
+++ b/src/net/file_test.go
diff --git a/src/pkg/net/file_unix.go b/src/net/file_unix.go
index 07b3ecf62..07b3ecf62 100644
--- a/src/pkg/net/file_unix.go
+++ b/src/net/file_unix.go
diff --git a/src/pkg/net/file_windows.go b/src/net/file_windows.go
index ca2b9b226..ca2b9b226 100644
--- a/src/pkg/net/file_windows.go
+++ b/src/net/file_windows.go
diff --git a/src/pkg/net/hosts.go b/src/net/hosts.go
index 9400503e4..9400503e4 100644
--- a/src/pkg/net/hosts.go
+++ b/src/net/hosts.go
diff --git a/src/pkg/net/hosts_test.go b/src/net/hosts_test.go
index 2fe358e07..2fe358e07 100644
--- a/src/pkg/net/hosts_test.go
+++ b/src/net/hosts_test.go
diff --git a/src/pkg/net/http/cgi/child.go b/src/net/http/cgi/child.go
index 45fc2e57c..45fc2e57c 100644
--- a/src/pkg/net/http/cgi/child.go
+++ b/src/net/http/cgi/child.go
diff --git a/src/pkg/net/http/cgi/child_test.go b/src/net/http/cgi/child_test.go
index 075d8411b..075d8411b 100644
--- a/src/pkg/net/http/cgi/child_test.go
+++ b/src/net/http/cgi/child_test.go
diff --git a/src/pkg/net/http/cgi/host.go b/src/net/http/cgi/host.go
index ec95a972c..ec95a972c 100644
--- a/src/pkg/net/http/cgi/host.go
+++ b/src/net/http/cgi/host.go
diff --git a/src/pkg/net/http/cgi/host_test.go b/src/net/http/cgi/host_test.go
index 8c16e6897..8c16e6897 100644
--- a/src/pkg/net/http/cgi/host_test.go
+++ b/src/net/http/cgi/host_test.go
diff --git a/src/pkg/net/http/cgi/matryoshka_test.go b/src/net/http/cgi/matryoshka_test.go
index 18c4803e7..18c4803e7 100644
--- a/src/pkg/net/http/cgi/matryoshka_test.go
+++ b/src/net/http/cgi/matryoshka_test.go
diff --git a/src/pkg/net/http/cgi/plan9_test.go b/src/net/http/cgi/plan9_test.go
index c8235831b..c8235831b 100644
--- a/src/pkg/net/http/cgi/plan9_test.go
+++ b/src/net/http/cgi/plan9_test.go
diff --git a/src/pkg/net/http/cgi/posix_test.go b/src/net/http/cgi/posix_test.go
index 5ff9e7d5e..5ff9e7d5e 100644
--- a/src/pkg/net/http/cgi/posix_test.go
+++ b/src/net/http/cgi/posix_test.go
diff --git a/src/pkg/net/http/cgi/testdata/test.cgi b/src/net/http/cgi/testdata/test.cgi
index 3214df6f0..3214df6f0 100755
--- a/src/pkg/net/http/cgi/testdata/test.cgi
+++ b/src/net/http/cgi/testdata/test.cgi
diff --git a/src/pkg/net/http/client.go b/src/net/http/client.go
index a5a3abe61..a5a3abe61 100644
--- a/src/pkg/net/http/client.go
+++ b/src/net/http/client.go
diff --git a/src/pkg/net/http/client_test.go b/src/net/http/client_test.go
index 6392c1baf..6392c1baf 100644
--- a/src/pkg/net/http/client_test.go
+++ b/src/net/http/client_test.go
diff --git a/src/pkg/net/http/cookie.go b/src/net/http/cookie.go
index dc60ba87f..dc60ba87f 100644
--- a/src/pkg/net/http/cookie.go
+++ b/src/net/http/cookie.go
diff --git a/src/pkg/net/http/cookie_test.go b/src/net/http/cookie_test.go
index f78f37299..f78f37299 100644
--- a/src/pkg/net/http/cookie_test.go
+++ b/src/net/http/cookie_test.go
diff --git a/src/pkg/net/http/cookiejar/jar.go b/src/net/http/cookiejar/jar.go
index 389ab58e4..389ab58e4 100644
--- a/src/pkg/net/http/cookiejar/jar.go
+++ b/src/net/http/cookiejar/jar.go
diff --git a/src/pkg/net/http/cookiejar/jar_test.go b/src/net/http/cookiejar/jar_test.go
index 3aa601586..3aa601586 100644
--- a/src/pkg/net/http/cookiejar/jar_test.go
+++ b/src/net/http/cookiejar/jar_test.go
diff --git a/src/pkg/net/http/cookiejar/punycode.go b/src/net/http/cookiejar/punycode.go
index ea7ceb5ef..ea7ceb5ef 100644
--- a/src/pkg/net/http/cookiejar/punycode.go
+++ b/src/net/http/cookiejar/punycode.go
diff --git a/src/pkg/net/http/cookiejar/punycode_test.go b/src/net/http/cookiejar/punycode_test.go
index 0301de14e..0301de14e 100644
--- a/src/pkg/net/http/cookiejar/punycode_test.go
+++ b/src/net/http/cookiejar/punycode_test.go
diff --git a/src/pkg/net/http/doc.go b/src/net/http/doc.go
index b1216e8da..b1216e8da 100644
--- a/src/pkg/net/http/doc.go
+++ b/src/net/http/doc.go
diff --git a/src/pkg/net/http/example_test.go b/src/net/http/example_test.go
index 88b97d9e3..88b97d9e3 100644
--- a/src/pkg/net/http/example_test.go
+++ b/src/net/http/example_test.go
diff --git a/src/pkg/net/http/export_test.go b/src/net/http/export_test.go
index 2c8735355..2c8735355 100644
--- a/src/pkg/net/http/export_test.go
+++ b/src/net/http/export_test.go
diff --git a/src/pkg/net/http/fcgi/child.go b/src/net/http/fcgi/child.go
index a3beaa33a..a3beaa33a 100644
--- a/src/pkg/net/http/fcgi/child.go
+++ b/src/net/http/fcgi/child.go
diff --git a/src/pkg/net/http/fcgi/fcgi.go b/src/net/http/fcgi/fcgi.go
index 06bba0488..06bba0488 100644
--- a/src/pkg/net/http/fcgi/fcgi.go
+++ b/src/net/http/fcgi/fcgi.go
diff --git a/src/pkg/net/http/fcgi/fcgi_test.go b/src/net/http/fcgi/fcgi_test.go
index 6c7e1a9ce..6c7e1a9ce 100644
--- a/src/pkg/net/http/fcgi/fcgi_test.go
+++ b/src/net/http/fcgi/fcgi_test.go
diff --git a/src/pkg/net/http/filetransport.go b/src/net/http/filetransport.go
index 821787e0c..821787e0c 100644
--- a/src/pkg/net/http/filetransport.go
+++ b/src/net/http/filetransport.go
diff --git a/src/pkg/net/http/filetransport_test.go b/src/net/http/filetransport_test.go
index 6f1a537e2..6f1a537e2 100644
--- a/src/pkg/net/http/filetransport_test.go
+++ b/src/net/http/filetransport_test.go
diff --git a/src/pkg/net/http/fs.go b/src/net/http/fs.go
index bae902cd2..bae902cd2 100644
--- a/src/pkg/net/http/fs.go
+++ b/src/net/http/fs.go
diff --git a/src/pkg/net/http/fs_test.go b/src/net/http/fs_test.go
index a6f33cc42..a6f33cc42 100644
--- a/src/pkg/net/http/fs_test.go
+++ b/src/net/http/fs_test.go
diff --git a/src/pkg/net/http/header.go b/src/net/http/header.go
index 153b94370..153b94370 100644
--- a/src/pkg/net/http/header.go
+++ b/src/net/http/header.go
diff --git a/src/pkg/net/http/header_test.go b/src/net/http/header_test.go
index 9dcd591fa..9dcd591fa 100644
--- a/src/pkg/net/http/header_test.go
+++ b/src/net/http/header_test.go
diff --git a/src/pkg/net/http/httptest/example_test.go b/src/net/http/httptest/example_test.go
index 42a0ec953..42a0ec953 100644
--- a/src/pkg/net/http/httptest/example_test.go
+++ b/src/net/http/httptest/example_test.go
diff --git a/src/pkg/net/http/httptest/recorder.go b/src/net/http/httptest/recorder.go
index 5451f5423..5451f5423 100644
--- a/src/pkg/net/http/httptest/recorder.go
+++ b/src/net/http/httptest/recorder.go
diff --git a/src/pkg/net/http/httptest/recorder_test.go b/src/net/http/httptest/recorder_test.go
index 2b563260c..2b563260c 100644
--- a/src/pkg/net/http/httptest/recorder_test.go
+++ b/src/net/http/httptest/recorder_test.go
diff --git a/src/pkg/net/http/httptest/server.go b/src/net/http/httptest/server.go
index 7f265552f..789e7bf41 100644
--- a/src/pkg/net/http/httptest/server.go
+++ b/src/net/http/httptest/server.go
@@ -203,7 +203,7 @@ func (h *waitGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 // localhostCert is a PEM-encoded TLS cert with SAN IPs
 // "127.0.0.1" and "[::1]", expiring at the last second of 2049 (the end
 // of ASN.1 time).
-// generated from src/pkg/crypto/tls:
+// generated from src/crypto/tls:
 // go run generate_cert.go  --rsa-bits 512 --host 127.0.0.1,::1,example.com --ca --start-date "Jan 1 00:00:00 1970" --duration=1000000h
 var localhostCert = []byte(`-----BEGIN CERTIFICATE-----
 MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwEjEQMA4GA1UEChMHQWNtZSBD
diff --git a/src/pkg/net/http/httptest/server_test.go b/src/net/http/httptest/server_test.go
index 500a9f0b8..500a9f0b8 100644
--- a/src/pkg/net/http/httptest/server_test.go
+++ b/src/net/http/httptest/server_test.go
diff --git a/src/pkg/net/http/httputil/dump.go b/src/net/http/httputil/dump.go
index 2a7a413d0..2a7a413d0 100644
--- a/src/pkg/net/http/httputil/dump.go
+++ b/src/net/http/httputil/dump.go
diff --git a/src/pkg/net/http/httputil/dump_test.go b/src/net/http/httputil/dump_test.go
index e1ffb3935..e1ffb3935 100644
--- a/src/pkg/net/http/httputil/dump_test.go
+++ b/src/net/http/httputil/dump_test.go
diff --git a/src/pkg/net/http/httputil/httputil.go b/src/net/http/httputil/httputil.go
index 2e523e9e2..2e523e9e2 100644
--- a/src/pkg/net/http/httputil/httputil.go
+++ b/src/net/http/httputil/httputil.go
diff --git a/src/pkg/net/http/httputil/persist.go b/src/net/http/httputil/persist.go
index 987bcc96b..987bcc96b 100644
--- a/src/pkg/net/http/httputil/persist.go
+++ b/src/net/http/httputil/persist.go
diff --git a/src/pkg/net/http/httputil/reverseproxy.go b/src/net/http/httputil/reverseproxy.go
index ab4637018..ab4637018 100644
--- a/src/pkg/net/http/httputil/reverseproxy.go
+++ b/src/net/http/httputil/reverseproxy.go
diff --git a/src/pkg/net/http/httputil/reverseproxy_test.go b/src/net/http/httputil/reverseproxy_test.go
index e9539b44b..e9539b44b 100644
--- a/src/pkg/net/http/httputil/reverseproxy_test.go
+++ b/src/net/http/httputil/reverseproxy_test.go
diff --git a/src/pkg/net/http/internal/chunked.go b/src/net/http/internal/chunked.go
index 9294deb3e..9294deb3e 100644
--- a/src/pkg/net/http/internal/chunked.go
+++ b/src/net/http/internal/chunked.go
diff --git a/src/pkg/net/http/internal/chunked_test.go b/src/net/http/internal/chunked_test.go
index ebc626ea9..ebc626ea9 100644
--- a/src/pkg/net/http/internal/chunked_test.go
+++ b/src/net/http/internal/chunked_test.go
diff --git a/src/pkg/net/http/jar.go b/src/net/http/jar.go
index 5c3de0dad..5c3de0dad 100644
--- a/src/pkg/net/http/jar.go
+++ b/src/net/http/jar.go
diff --git a/src/pkg/net/http/lex.go b/src/net/http/lex.go
index cb33318f4..cb33318f4 100644
--- a/src/pkg/net/http/lex.go
+++ b/src/net/http/lex.go
diff --git a/src/pkg/net/http/lex_test.go b/src/net/http/lex_test.go
index 6d9d294f7..6d9d294f7 100644
--- a/src/pkg/net/http/lex_test.go
+++ b/src/net/http/lex_test.go
diff --git a/src/pkg/net/http/npn_test.go b/src/net/http/npn_test.go
index 98b8930d0..98b8930d0 100644
--- a/src/pkg/net/http/npn_test.go
+++ b/src/net/http/npn_test.go
diff --git a/src/pkg/net/http/pprof/pprof.go b/src/net/http/pprof/pprof.go
index 0c7548e3e..0c7548e3e 100644
--- a/src/pkg/net/http/pprof/pprof.go
+++ b/src/net/http/pprof/pprof.go
diff --git a/src/pkg/net/http/proxy_test.go b/src/net/http/proxy_test.go
index b6aed3792..b6aed3792 100644
--- a/src/pkg/net/http/proxy_test.go
+++ b/src/net/http/proxy_test.go
diff --git a/src/pkg/net/http/race.go b/src/net/http/race.go
index 766503967..766503967 100644
--- a/src/pkg/net/http/race.go
+++ b/src/net/http/race.go
diff --git a/src/pkg/net/http/range_test.go b/src/net/http/range_test.go
index ef911af7b..ef911af7b 100644
--- a/src/pkg/net/http/range_test.go
+++ b/src/net/http/range_test.go
diff --git a/src/pkg/net/http/readrequest_test.go b/src/net/http/readrequest_test.go
index e930d99af..e930d99af 100644
--- a/src/pkg/net/http/readrequest_test.go
+++ b/src/net/http/readrequest_test.go
diff --git a/src/pkg/net/http/request.go b/src/net/http/request.go
index 263c26c9b..263c26c9b 100644
--- a/src/pkg/net/http/request.go
+++ b/src/net/http/request.go
diff --git a/src/pkg/net/http/request_test.go b/src/net/http/request_test.go
index 759ea4e8b..759ea4e8b 100644
--- a/src/pkg/net/http/request_test.go
+++ b/src/net/http/request_test.go
diff --git a/src/pkg/net/http/requestwrite_test.go b/src/net/http/requestwrite_test.go
index 7a6bd5878..7a6bd5878 100644
--- a/src/pkg/net/http/requestwrite_test.go
+++ b/src/net/http/requestwrite_test.go
diff --git a/src/pkg/net/http/response.go b/src/net/http/response.go
index 5d2c39080..5d2c39080 100644
--- a/src/pkg/net/http/response.go
+++ b/src/net/http/response.go
diff --git a/src/pkg/net/http/response_test.go b/src/net/http/response_test.go
index 2dd0fad11..2dd0fad11 100644
--- a/src/pkg/net/http/response_test.go
+++ b/src/net/http/response_test.go
diff --git a/src/pkg/net/http/responsewrite_test.go b/src/net/http/responsewrite_test.go
index 585b13b85..585b13b85 100644
--- a/src/pkg/net/http/responsewrite_test.go
+++ b/src/net/http/responsewrite_test.go
diff --git a/src/pkg/net/http/serve_test.go b/src/net/http/serve_test.go
index ee4f20499..ee4f20499 100644
--- a/src/pkg/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
diff --git a/src/pkg/net/http/server.go b/src/net/http/server.go
index 203037e9f..203037e9f 100644
--- a/src/pkg/net/http/server.go
+++ b/src/net/http/server.go
diff --git a/src/pkg/net/http/sniff.go b/src/net/http/sniff.go
index 68f519b05..68f519b05 100644
--- a/src/pkg/net/http/sniff.go
+++ b/src/net/http/sniff.go
diff --git a/src/pkg/net/http/sniff_test.go b/src/net/http/sniff_test.go
index 24ca27afc..24ca27afc 100644
--- a/src/pkg/net/http/sniff_test.go
+++ b/src/net/http/sniff_test.go
diff --git a/src/pkg/net/http/status.go b/src/net/http/status.go
index d253bd5cb..d253bd5cb 100644
--- a/src/pkg/net/http/status.go
+++ b/src/net/http/status.go
diff --git a/src/pkg/net/http/testdata/file b/src/net/http/testdata/file
index 11f11f9be..11f11f9be 100644
--- a/src/pkg/net/http/testdata/file
+++ b/src/net/http/testdata/file
diff --git a/src/pkg/net/http/testdata/index.html b/src/net/http/testdata/index.html
index da8e1e93d..da8e1e93d 100644
--- a/src/pkg/net/http/testdata/index.html
+++ b/src/net/http/testdata/index.html
diff --git a/src/pkg/net/http/testdata/style.css b/src/net/http/testdata/style.css
index 208d16d42..208d16d42 100644
--- a/src/pkg/net/http/testdata/style.css
+++ b/src/net/http/testdata/style.css
diff --git a/src/pkg/net/http/transfer.go b/src/net/http/transfer.go
index 520500330..520500330 100644
--- a/src/pkg/net/http/transfer.go
+++ b/src/net/http/transfer.go
diff --git a/src/pkg/net/http/transfer_test.go b/src/net/http/transfer_test.go
index 48cd540b9..48cd540b9 100644
--- a/src/pkg/net/http/transfer_test.go
+++ b/src/net/http/transfer_test.go
diff --git a/src/pkg/net/http/transport.go b/src/net/http/transport.go
index 527ed8bdd..527ed8bdd 100644
--- a/src/pkg/net/http/transport.go
+++ b/src/net/http/transport.go
diff --git a/src/pkg/net/http/transport_test.go b/src/net/http/transport_test.go
index 3460d690e..3460d690e 100644
--- a/src/pkg/net/http/transport_test.go
+++ b/src/net/http/transport_test.go
diff --git a/src/pkg/net/http/triv.go b/src/net/http/triv.go
index 232d65089..232d65089 100644
--- a/src/pkg/net/http/triv.go
+++ b/src/net/http/triv.go
diff --git a/src/pkg/net/http/z_last_test.go b/src/net/http/z_last_test.go
index 5a0cc1198..5a0cc1198 100644
--- a/src/pkg/net/http/z_last_test.go
+++ b/src/net/http/z_last_test.go
diff --git a/src/pkg/net/interface.go b/src/net/interface.go
index 2e9f1ebc6..2e9f1ebc6 100644
--- a/src/pkg/net/interface.go
+++ b/src/net/interface.go
diff --git a/src/pkg/net/interface_bsd.go b/src/net/interface_bsd.go
index 16775579d..16775579d 100644
--- a/src/pkg/net/interface_bsd.go
+++ b/src/net/interface_bsd.go
diff --git a/src/pkg/net/interface_bsd_test.go b/src/net/interface_bsd_test.go
index 88daf7393..88daf7393 100644
--- a/src/pkg/net/interface_bsd_test.go
+++ b/src/net/interface_bsd_test.go
diff --git a/src/pkg/net/interface_darwin.go b/src/net/interface_darwin.go
index ad0937db0..ad0937db0 100644
--- a/src/pkg/net/interface_darwin.go
+++ b/src/net/interface_darwin.go
diff --git a/src/pkg/net/interface_dragonfly.go b/src/net/interface_dragonfly.go
index c9ce5a7ac..c9ce5a7ac 100644
--- a/src/pkg/net/interface_dragonfly.go
+++ b/src/net/interface_dragonfly.go
diff --git a/src/pkg/net/interface_freebsd.go b/src/net/interface_freebsd.go
index 5df767910..5df767910 100644
--- a/src/pkg/net/interface_freebsd.go
+++ b/src/net/interface_freebsd.go
diff --git a/src/pkg/net/interface_linux.go b/src/net/interface_linux.go
index 1115d0fc4..1115d0fc4 100644
--- a/src/pkg/net/interface_linux.go
+++ b/src/net/interface_linux.go
diff --git a/src/pkg/net/interface_linux_test.go b/src/net/interface_linux_test.go
index d8800bd0c..d8800bd0c 100644
--- a/src/pkg/net/interface_linux_test.go
+++ b/src/net/interface_linux_test.go
diff --git a/src/pkg/net/interface_netbsd.go b/src/net/interface_netbsd.go
index c9ce5a7ac..c9ce5a7ac 100644
--- a/src/pkg/net/interface_netbsd.go
+++ b/src/net/interface_netbsd.go
diff --git a/src/pkg/net/interface_openbsd.go b/src/net/interface_openbsd.go
index c9ce5a7ac..c9ce5a7ac 100644
--- a/src/pkg/net/interface_openbsd.go
+++ b/src/net/interface_openbsd.go
diff --git a/src/pkg/net/interface_stub.go b/src/net/interface_stub.go
index c38fb7f76..c38fb7f76 100644
--- a/src/pkg/net/interface_stub.go
+++ b/src/net/interface_stub.go
diff --git a/src/pkg/net/interface_test.go b/src/net/interface_test.go
index efabb5f3c..efabb5f3c 100644
--- a/src/pkg/net/interface_test.go
+++ b/src/net/interface_test.go
diff --git a/src/pkg/net/interface_unix_test.go b/src/net/interface_unix_test.go
index 01f609f15..01f609f15 100644
--- a/src/pkg/net/interface_unix_test.go
+++ b/src/net/interface_unix_test.go
diff --git a/src/pkg/net/interface_windows.go b/src/net/interface_windows.go
index 0759dc255..0759dc255 100644
--- a/src/pkg/net/interface_windows.go
+++ b/src/net/interface_windows.go
diff --git a/src/pkg/net/ip.go b/src/net/ip.go
index 4a93e97b3..4a93e97b3 100644
--- a/src/pkg/net/ip.go
+++ b/src/net/ip.go
diff --git a/src/pkg/net/ip_test.go b/src/net/ip_test.go
index 485ff5115..485ff5115 100644
--- a/src/pkg/net/ip_test.go
+++ b/src/net/ip_test.go
diff --git a/src/pkg/net/ipraw_test.go b/src/net/ipraw_test.go
index 0632dafc6..0632dafc6 100644
--- a/src/pkg/net/ipraw_test.go
+++ b/src/net/ipraw_test.go
diff --git a/src/pkg/net/iprawsock.go b/src/net/iprawsock.go
index 5cc361390..5cc361390 100644
--- a/src/pkg/net/iprawsock.go
+++ b/src/net/iprawsock.go
diff --git a/src/pkg/net/iprawsock_plan9.go b/src/net/iprawsock_plan9.go
index e62d116b8..e62d116b8 100644
--- a/src/pkg/net/iprawsock_plan9.go
+++ b/src/net/iprawsock_plan9.go
diff --git a/src/pkg/net/iprawsock_posix.go b/src/net/iprawsock_posix.go
index 99b081ba8..99b081ba8 100644
--- a/src/pkg/net/iprawsock_posix.go
+++ b/src/net/iprawsock_posix.go
diff --git a/src/pkg/net/ipsock.go b/src/net/ipsock.go
index dda857803..dda857803 100644
--- a/src/pkg/net/ipsock.go
+++ b/src/net/ipsock.go
diff --git a/src/pkg/net/ipsock_plan9.go b/src/net/ipsock_plan9.go
index 94ceea31b..94ceea31b 100644
--- a/src/pkg/net/ipsock_plan9.go
+++ b/src/net/ipsock_plan9.go
diff --git a/src/pkg/net/ipsock_posix.go b/src/net/ipsock_posix.go
index f9ebe40a2..f9ebe40a2 100644
--- a/src/pkg/net/ipsock_posix.go
+++ b/src/net/ipsock_posix.go
diff --git a/src/pkg/net/ipsock_test.go b/src/net/ipsock_test.go
index 9ecaaec69..9ecaaec69 100644
--- a/src/pkg/net/ipsock_test.go
+++ b/src/net/ipsock_test.go
diff --git a/src/pkg/net/lookup.go b/src/net/lookup.go
index 20f20578c..20f20578c 100644
--- a/src/pkg/net/lookup.go
+++ b/src/net/lookup.go
diff --git a/src/pkg/net/lookup_plan9.go b/src/net/lookup_plan9.go
index b80ac10e0..b80ac10e0 100644
--- a/src/pkg/net/lookup_plan9.go
+++ b/src/net/lookup_plan9.go
diff --git a/src/pkg/net/lookup_test.go b/src/net/lookup_test.go
index 057e1322b..057e1322b 100644
--- a/src/pkg/net/lookup_test.go
+++ b/src/net/lookup_test.go
diff --git a/src/pkg/net/lookup_unix.go b/src/net/lookup_unix.go
index b1d2f8f31..b1d2f8f31 100644
--- a/src/pkg/net/lookup_unix.go
+++ b/src/net/lookup_unix.go
diff --git a/src/pkg/net/lookup_windows.go b/src/net/lookup_windows.go
index 6a925b0a7..6a925b0a7 100644
--- a/src/pkg/net/lookup_windows.go
+++ b/src/net/lookup_windows.go
diff --git a/src/pkg/net/lookup_windows_test.go b/src/net/lookup_windows_test.go
index 7495b5b57..7495b5b57 100644
--- a/src/pkg/net/lookup_windows_test.go
+++ b/src/net/lookup_windows_test.go
diff --git a/src/pkg/net/mac.go b/src/net/mac.go
index d616b1f68..d616b1f68 100644
--- a/src/pkg/net/mac.go
+++ b/src/net/mac.go
diff --git a/src/pkg/net/mac_test.go b/src/net/mac_test.go
index 8f9dc6685..8f9dc6685 100644
--- a/src/pkg/net/mac_test.go
+++ b/src/net/mac_test.go
diff --git a/src/pkg/net/mail/message.go b/src/net/mail/message.go
index ba0778caa..ba0778caa 100644
--- a/src/pkg/net/mail/message.go
+++ b/src/net/mail/message.go
diff --git a/src/pkg/net/mail/message_test.go b/src/net/mail/message_test.go
index eb9c8cbdc..eb9c8cbdc 100644
--- a/src/pkg/net/mail/message_test.go
+++ b/src/net/mail/message_test.go
diff --git a/src/pkg/net/mockicmp_test.go b/src/net/mockicmp_test.go
index e742365ea..e742365ea 100644
--- a/src/pkg/net/mockicmp_test.go
+++ b/src/net/mockicmp_test.go
diff --git a/src/pkg/net/mockserver_test.go b/src/net/mockserver_test.go
index 68ded5d75..68ded5d75 100644
--- a/src/pkg/net/mockserver_test.go
+++ b/src/net/mockserver_test.go
diff --git a/src/pkg/net/multicast_test.go b/src/net/multicast_test.go
index 5f253f44a..5f253f44a 100644
--- a/src/pkg/net/multicast_test.go
+++ b/src/net/multicast_test.go
diff --git a/src/pkg/net/net.go b/src/net/net.go
index ca56af54f..ca56af54f 100644
--- a/src/pkg/net/net.go
+++ b/src/net/net.go
diff --git a/src/pkg/net/net_test.go b/src/net/net_test.go
index bfed4d657..bfed4d657 100644
--- a/src/pkg/net/net_test.go
+++ b/src/net/net_test.go
diff --git a/src/pkg/net/net_windows_test.go b/src/net/net_windows_test.go
index 750a4304b..750a4304b 100644
--- a/src/pkg/net/net_windows_test.go
+++ b/src/net/net_windows_test.go
diff --git a/src/pkg/net/netgo_unix_test.go b/src/net/netgo_unix_test.go
index 9fb2a567d..9fb2a567d 100644
--- a/src/pkg/net/netgo_unix_test.go
+++ b/src/net/netgo_unix_test.go
diff --git a/src/pkg/net/packetconn_test.go b/src/net/packetconn_test.go
index b6e4e76f9..b6e4e76f9 100644
--- a/src/pkg/net/packetconn_test.go
+++ b/src/net/packetconn_test.go
diff --git a/src/pkg/net/parse.go b/src/net/parse.go
index e1d0130c9..e1d0130c9 100644
--- a/src/pkg/net/parse.go
+++ b/src/net/parse.go
diff --git a/src/pkg/net/parse_test.go b/src/net/parse_test.go
index 7b213b75b..7b213b75b 100644
--- a/src/pkg/net/parse_test.go
+++ b/src/net/parse_test.go
diff --git a/src/pkg/net/pipe.go b/src/net/pipe.go
index f1a2eca4e..f1a2eca4e 100644
--- a/src/pkg/net/pipe.go
+++ b/src/net/pipe.go
diff --git a/src/pkg/net/pipe_test.go b/src/net/pipe_test.go
index afe4f2408..afe4f2408 100644
--- a/src/pkg/net/pipe_test.go
+++ b/src/net/pipe_test.go
diff --git a/src/pkg/net/port.go b/src/net/port.go
index c24f4ed5b..c24f4ed5b 100644
--- a/src/pkg/net/port.go
+++ b/src/net/port.go
diff --git a/src/pkg/net/port_test.go b/src/net/port_test.go
index 9e8968f35..9e8968f35 100644
--- a/src/pkg/net/port_test.go
+++ b/src/net/port_test.go
diff --git a/src/pkg/net/port_unix.go b/src/net/port_unix.go
index 89558c1f0..89558c1f0 100644
--- a/src/pkg/net/port_unix.go
+++ b/src/net/port_unix.go
diff --git a/src/pkg/net/protoconn_test.go b/src/net/protoconn_test.go
index 12856b6c3..12856b6c3 100644
--- a/src/pkg/net/protoconn_test.go
+++ b/src/net/protoconn_test.go
diff --git a/src/pkg/net/race.go b/src/net/race.go
index 2f02a6c22..2f02a6c22 100644
--- a/src/pkg/net/race.go
+++ b/src/net/race.go
diff --git a/src/pkg/net/race0.go b/src/net/race0.go
index f50429779..f50429779 100644
--- a/src/pkg/net/race0.go
+++ b/src/net/race0.go
diff --git a/src/pkg/net/rpc/client.go b/src/net/rpc/client.go
index 21f79b068..21f79b068 100644
--- a/src/pkg/net/rpc/client.go
+++ b/src/net/rpc/client.go
diff --git a/src/pkg/net/rpc/client_test.go b/src/net/rpc/client_test.go
index bbfc1ec3a..bbfc1ec3a 100644
--- a/src/pkg/net/rpc/client_test.go
+++ b/src/net/rpc/client_test.go
diff --git a/src/pkg/net/rpc/debug.go b/src/net/rpc/debug.go
index 98b2c1c6c..98b2c1c6c 100644
--- a/src/pkg/net/rpc/debug.go
+++ b/src/net/rpc/debug.go
diff --git a/src/pkg/net/rpc/jsonrpc/all_test.go b/src/net/rpc/jsonrpc/all_test.go
index a433a365e..a433a365e 100644
--- a/src/pkg/net/rpc/jsonrpc/all_test.go
+++ b/src/net/rpc/jsonrpc/all_test.go
diff --git a/src/pkg/net/rpc/jsonrpc/client.go b/src/net/rpc/jsonrpc/client.go
index 2194f2125..2194f2125 100644
--- a/src/pkg/net/rpc/jsonrpc/client.go
+++ b/src/net/rpc/jsonrpc/client.go
diff --git a/src/pkg/net/rpc/jsonrpc/server.go b/src/net/rpc/jsonrpc/server.go
index e6d37cfa6..e6d37cfa6 100644
--- a/src/pkg/net/rpc/jsonrpc/server.go
+++ b/src/net/rpc/jsonrpc/server.go
diff --git a/src/pkg/net/rpc/server.go b/src/net/rpc/server.go
index 6b264b46b..6b264b46b 100644
--- a/src/pkg/net/rpc/server.go
+++ b/src/net/rpc/server.go
diff --git a/src/pkg/net/rpc/server_test.go b/src/net/rpc/server_test.go
index 0dc4ddc2d..0dc4ddc2d 100644
--- a/src/pkg/net/rpc/server_test.go
+++ b/src/net/rpc/server_test.go
diff --git a/src/pkg/net/sendfile_dragonfly.go b/src/net/sendfile_dragonfly.go
index bc88fd3b9..bc88fd3b9 100644
--- a/src/pkg/net/sendfile_dragonfly.go
+++ b/src/net/sendfile_dragonfly.go
diff --git a/src/pkg/net/sendfile_freebsd.go b/src/net/sendfile_freebsd.go
index ffc147262..ffc147262 100644
--- a/src/pkg/net/sendfile_freebsd.go
+++ b/src/net/sendfile_freebsd.go
diff --git a/src/pkg/net/sendfile_linux.go b/src/net/sendfile_linux.go
index 5e117636a..5e117636a 100644
--- a/src/pkg/net/sendfile_linux.go
+++ b/src/net/sendfile_linux.go
diff --git a/src/pkg/net/sendfile_stub.go b/src/net/sendfile_stub.go
index 03426ef0d..03426ef0d 100644
--- a/src/pkg/net/sendfile_stub.go
+++ b/src/net/sendfile_stub.go
diff --git a/src/pkg/net/sendfile_windows.go b/src/net/sendfile_windows.go
index b128ba27b..b128ba27b 100644
--- a/src/pkg/net/sendfile_windows.go
+++ b/src/net/sendfile_windows.go
diff --git a/src/pkg/net/server_test.go b/src/net/server_test.go
index 6a2bb9243..6a2bb9243 100644
--- a/src/pkg/net/server_test.go
+++ b/src/net/server_test.go
diff --git a/src/pkg/net/singleflight.go b/src/net/singleflight.go
index dc58affda..dc58affda 100644
--- a/src/pkg/net/singleflight.go
+++ b/src/net/singleflight.go
diff --git a/src/pkg/net/smtp/auth.go b/src/net/smtp/auth.go
index 3f1339ebc..3f1339ebc 100644
--- a/src/pkg/net/smtp/auth.go
+++ b/src/net/smtp/auth.go
diff --git a/src/pkg/net/smtp/example_test.go b/src/net/smtp/example_test.go
index d551e365a..d551e365a 100644
--- a/src/pkg/net/smtp/example_test.go
+++ b/src/net/smtp/example_test.go
diff --git a/src/pkg/net/smtp/smtp.go b/src/net/smtp/smtp.go
index 87dea442c..87dea442c 100644
--- a/src/pkg/net/smtp/smtp.go
+++ b/src/net/smtp/smtp.go
diff --git a/src/pkg/net/smtp/smtp_test.go b/src/net/smtp/smtp_test.go
index 3fba1ea5a..5c659e8a0 100644
--- a/src/pkg/net/smtp/smtp_test.go
+++ b/src/net/smtp/smtp_test.go
@@ -669,7 +669,7 @@ func sendMail(hostPort string) error {
 // localhostCert is a PEM-encoded TLS cert with SAN IPs
 // "127.0.0.1" and "[::1]", expiring at the last second of 2049 (the end
 // of ASN.1 time).
-// generated from src/pkg/crypto/tls:
+// generated from src/crypto/tls:
 // go run generate_cert.go  --rsa-bits 512 --host 127.0.0.1,::1,example.com --ca --start-date "Jan 1 00:00:00 1970" --duration=1000000h
 var localhostCert = []byte(`-----BEGIN CERTIFICATE-----
 MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwEjEQMA4GA1UEChMHQWNtZSBD
diff --git a/src/pkg/net/sock_bsd.go b/src/net/sock_bsd.go
index 48fb78527..48fb78527 100644
--- a/src/pkg/net/sock_bsd.go
+++ b/src/net/sock_bsd.go
diff --git a/src/pkg/net/sock_cloexec.go b/src/net/sock_cloexec.go
index dec81855b..dec81855b 100644
--- a/src/pkg/net/sock_cloexec.go
+++ b/src/net/sock_cloexec.go
diff --git a/src/pkg/net/sock_linux.go b/src/net/sock_linux.go
index cc5ce153b..cc5ce153b 100644
--- a/src/pkg/net/sock_linux.go
+++ b/src/net/sock_linux.go
diff --git a/src/pkg/net/sock_plan9.go b/src/net/sock_plan9.go
index 88d9ed15c..88d9ed15c 100644
--- a/src/pkg/net/sock_plan9.go
+++ b/src/net/sock_plan9.go
diff --git a/src/pkg/net/sock_posix.go b/src/net/sock_posix.go
index 3f956df65..3f956df65 100644
--- a/src/pkg/net/sock_posix.go
+++ b/src/net/sock_posix.go
diff --git a/src/pkg/net/sock_solaris.go b/src/net/sock_solaris.go
index 90fe9de89..90fe9de89 100644
--- a/src/pkg/net/sock_solaris.go
+++ b/src/net/sock_solaris.go
diff --git a/src/pkg/net/sock_windows.go b/src/net/sock_windows.go
index 6ccde3a24..6ccde3a24 100644
--- a/src/pkg/net/sock_windows.go
+++ b/src/net/sock_windows.go
diff --git a/src/pkg/net/sockopt_bsd.go b/src/net/sockopt_bsd.go
index 2d36a5595..2d36a5595 100644
--- a/src/pkg/net/sockopt_bsd.go
+++ b/src/net/sockopt_bsd.go
diff --git a/src/pkg/net/sockopt_linux.go b/src/net/sockopt_linux.go
index 54c20b140..54c20b140 100644
--- a/src/pkg/net/sockopt_linux.go
+++ b/src/net/sockopt_linux.go
diff --git a/src/pkg/net/sockopt_plan9.go b/src/net/sockopt_plan9.go
index 8bc689b6c..8bc689b6c 100644
--- a/src/pkg/net/sockopt_plan9.go
+++ b/src/net/sockopt_plan9.go
diff --git a/src/pkg/net/sockopt_posix.go b/src/net/sockopt_posix.go
index 921918c37..921918c37 100644
--- a/src/pkg/net/sockopt_posix.go
+++ b/src/net/sockopt_posix.go
diff --git a/src/pkg/net/sockopt_solaris.go b/src/net/sockopt_solaris.go
index 54c20b140..54c20b140 100644
--- a/src/pkg/net/sockopt_solaris.go
+++ b/src/net/sockopt_solaris.go
diff --git a/src/pkg/net/sockopt_windows.go b/src/net/sockopt_windows.go
index cb64a40c6..cb64a40c6 100644
--- a/src/pkg/net/sockopt_windows.go
+++ b/src/net/sockopt_windows.go
diff --git a/src/pkg/net/sockoptip_bsd.go b/src/net/sockoptip_bsd.go
index 87132f0f4..87132f0f4 100644
--- a/src/pkg/net/sockoptip_bsd.go
+++ b/src/net/sockoptip_bsd.go
diff --git a/src/pkg/net/sockoptip_linux.go b/src/net/sockoptip_linux.go
index a69b778e4..a69b778e4 100644
--- a/src/pkg/net/sockoptip_linux.go
+++ b/src/net/sockoptip_linux.go
diff --git a/src/pkg/net/sockoptip_posix.go b/src/net/sockoptip_posix.go
index b5c80e449..b5c80e449 100644
--- a/src/pkg/net/sockoptip_posix.go
+++ b/src/net/sockoptip_posix.go
diff --git a/src/pkg/net/sockoptip_stub.go b/src/net/sockoptip_stub.go
index dcd3a22b5..dcd3a22b5 100644
--- a/src/pkg/net/sockoptip_stub.go
+++ b/src/net/sockoptip_stub.go
diff --git a/src/pkg/net/sockoptip_windows.go b/src/net/sockoptip_windows.go
index 7b11f207a..7b11f207a 100644
--- a/src/pkg/net/sockoptip_windows.go
+++ b/src/net/sockoptip_windows.go
diff --git a/src/pkg/net/sys_cloexec.go b/src/net/sys_cloexec.go
index 898fb7c0c..898fb7c0c 100644
--- a/src/pkg/net/sys_cloexec.go
+++ b/src/net/sys_cloexec.go
diff --git a/src/pkg/net/tcp_test.go b/src/net/tcp_test.go
index c04198ea0..c04198ea0 100644
--- a/src/pkg/net/tcp_test.go
+++ b/src/net/tcp_test.go
diff --git a/src/pkg/net/tcpsock.go b/src/net/tcpsock.go
index f3dfbd23d..f3dfbd23d 100644
--- a/src/pkg/net/tcpsock.go
+++ b/src/net/tcpsock.go
diff --git a/src/pkg/net/tcpsock_plan9.go b/src/net/tcpsock_plan9.go
index 52019d7b4..52019d7b4 100644
--- a/src/pkg/net/tcpsock_plan9.go
+++ b/src/net/tcpsock_plan9.go
diff --git a/src/pkg/net/tcpsock_posix.go b/src/net/tcpsock_posix.go
index dd78aefa7..dd78aefa7 100644
--- a/src/pkg/net/tcpsock_posix.go
+++ b/src/net/tcpsock_posix.go
diff --git a/src/pkg/net/tcpsockopt_darwin.go b/src/net/tcpsockopt_darwin.go
index 33140849c..33140849c 100644
--- a/src/pkg/net/tcpsockopt_darwin.go
+++ b/src/net/tcpsockopt_darwin.go
diff --git a/src/pkg/net/tcpsockopt_dragonfly.go b/src/net/tcpsockopt_dragonfly.go
index d10a77773..d10a77773 100644
--- a/src/pkg/net/tcpsockopt_dragonfly.go
+++ b/src/net/tcpsockopt_dragonfly.go
diff --git a/src/pkg/net/tcpsockopt_openbsd.go b/src/net/tcpsockopt_openbsd.go
index 3480f932c..3480f932c 100644
--- a/src/pkg/net/tcpsockopt_openbsd.go
+++ b/src/net/tcpsockopt_openbsd.go
diff --git a/src/pkg/net/tcpsockopt_plan9.go b/src/net/tcpsockopt_plan9.go
index 0e7a6647c..0e7a6647c 100644
--- a/src/pkg/net/tcpsockopt_plan9.go
+++ b/src/net/tcpsockopt_plan9.go
diff --git a/src/pkg/net/tcpsockopt_posix.go b/src/net/tcpsockopt_posix.go
index 6484bad4b..6484bad4b 100644
--- a/src/pkg/net/tcpsockopt_posix.go
+++ b/src/net/tcpsockopt_posix.go
diff --git a/src/pkg/net/tcpsockopt_solaris.go b/src/net/tcpsockopt_solaris.go
index eaab6b678..eaab6b678 100644
--- a/src/pkg/net/tcpsockopt_solaris.go
+++ b/src/net/tcpsockopt_solaris.go
diff --git a/src/pkg/net/tcpsockopt_unix.go b/src/net/tcpsockopt_unix.go
index 2693a541d..2693a541d 100644
--- a/src/pkg/net/tcpsockopt_unix.go
+++ b/src/net/tcpsockopt_unix.go
diff --git a/src/pkg/net/tcpsockopt_windows.go b/src/net/tcpsockopt_windows.go
index 8ef140797..8ef140797 100644
--- a/src/pkg/net/tcpsockopt_windows.go
+++ b/src/net/tcpsockopt_windows.go
diff --git a/src/pkg/net/testdata/domain-resolv.conf b/src/net/testdata/domain-resolv.conf
index ff269180f..ff269180f 100644
--- a/src/pkg/net/testdata/domain-resolv.conf
+++ b/src/net/testdata/domain-resolv.conf
diff --git a/src/pkg/net/testdata/empty-resolv.conf b/src/net/testdata/empty-resolv.conf
index c4b2b5765..c4b2b5765 100644
--- a/src/pkg/net/testdata/empty-resolv.conf
+++ b/src/net/testdata/empty-resolv.conf
diff --git a/src/pkg/net/testdata/hosts b/src/net/testdata/hosts
index b60176389..b60176389 100644
--- a/src/pkg/net/testdata/hosts
+++ b/src/net/testdata/hosts
diff --git a/src/pkg/net/testdata/hosts_singleline b/src/net/testdata/hosts_singleline
index 5f5f74a3f..5f5f74a3f 100644
--- a/src/pkg/net/testdata/hosts_singleline
+++ b/src/net/testdata/hosts_singleline
diff --git a/src/pkg/net/testdata/igmp b/src/net/testdata/igmp
index 5f380a2c7..5f380a2c7 100644
--- a/src/pkg/net/testdata/igmp
+++ b/src/net/testdata/igmp
diff --git a/src/pkg/net/testdata/igmp6 b/src/net/testdata/igmp6
index 6cd5a2d4d..6cd5a2d4d 100644
--- a/src/pkg/net/testdata/igmp6
+++ b/src/net/testdata/igmp6
diff --git a/src/pkg/net/testdata/resolv.conf b/src/net/testdata/resolv.conf
index 04e87eed0..04e87eed0 100644
--- a/src/pkg/net/testdata/resolv.conf
+++ b/src/net/testdata/resolv.conf
diff --git a/src/pkg/net/testdata/search-resolv.conf b/src/net/testdata/search-resolv.conf
index 1c846bfaf..1c846bfaf 100644
--- a/src/pkg/net/testdata/search-resolv.conf
+++ b/src/net/testdata/search-resolv.conf
diff --git a/src/pkg/net/textproto/header.go b/src/net/textproto/header.go
index 7fb32f804..7fb32f804 100644
--- a/src/pkg/net/textproto/header.go
+++ b/src/net/textproto/header.go
diff --git a/src/pkg/net/textproto/pipeline.go b/src/net/textproto/pipeline.go
index ca50eddac..ca50eddac 100644
--- a/src/pkg/net/textproto/pipeline.go
+++ b/src/net/textproto/pipeline.go
diff --git a/src/pkg/net/textproto/reader.go b/src/net/textproto/reader.go
index eea9207f2..eea9207f2 100644
--- a/src/pkg/net/textproto/reader.go
+++ b/src/net/textproto/reader.go
diff --git a/src/pkg/net/textproto/reader_test.go b/src/net/textproto/reader_test.go
index cbc0ed183..cbc0ed183 100644
--- a/src/pkg/net/textproto/reader_test.go
+++ b/src/net/textproto/reader_test.go
diff --git a/src/pkg/net/textproto/textproto.go b/src/net/textproto/textproto.go
index 026eb026b..026eb026b 100644
--- a/src/pkg/net/textproto/textproto.go
+++ b/src/net/textproto/textproto.go
diff --git a/src/pkg/net/textproto/writer.go b/src/net/textproto/writer.go
index 03e2fd658..03e2fd658 100644
--- a/src/pkg/net/textproto/writer.go
+++ b/src/net/textproto/writer.go
diff --git a/src/pkg/net/textproto/writer_test.go b/src/net/textproto/writer_test.go
index e03ab5e15..e03ab5e15 100644
--- a/src/pkg/net/textproto/writer_test.go
+++ b/src/net/textproto/writer_test.go
diff --git a/src/pkg/net/timeout_test.go b/src/net/timeout_test.go
index 9ef0c4d15..9ef0c4d15 100644
--- a/src/pkg/net/timeout_test.go
+++ b/src/net/timeout_test.go
diff --git a/src/pkg/net/udp_test.go b/src/net/udp_test.go
index e1778779c..e1778779c 100644
--- a/src/pkg/net/udp_test.go
+++ b/src/net/udp_test.go
diff --git a/src/pkg/net/udpsock.go b/src/net/udpsock.go
index 4c99ae4af..4c99ae4af 100644
--- a/src/pkg/net/udpsock.go
+++ b/src/net/udpsock.go
diff --git a/src/pkg/net/udpsock_plan9.go b/src/net/udpsock_plan9.go
index 510ac5e4a..510ac5e4a 100644
--- a/src/pkg/net/udpsock_plan9.go
+++ b/src/net/udpsock_plan9.go
diff --git a/src/pkg/net/udpsock_posix.go b/src/net/udpsock_posix.go
index a0533366a..a0533366a 100644
--- a/src/pkg/net/udpsock_posix.go
+++ b/src/net/udpsock_posix.go
diff --git a/src/pkg/net/unicast_posix_test.go b/src/net/unicast_posix_test.go
index 452ac9254..452ac9254 100644
--- a/src/pkg/net/unicast_posix_test.go
+++ b/src/net/unicast_posix_test.go
diff --git a/src/pkg/net/unix_test.go b/src/net/unix_test.go
index 1cdff3908..1cdff3908 100644
--- a/src/pkg/net/unix_test.go
+++ b/src/net/unix_test.go
diff --git a/src/pkg/net/unixsock.go b/src/net/unixsock.go
index 85955845b..85955845b 100644
--- a/src/pkg/net/unixsock.go
+++ b/src/net/unixsock.go
diff --git a/src/pkg/net/unixsock_plan9.go b/src/net/unixsock_plan9.go
index c60c1d83b..c60c1d83b 100644
--- a/src/pkg/net/unixsock_plan9.go
+++ b/src/net/unixsock_plan9.go
diff --git a/src/pkg/net/unixsock_posix.go b/src/net/unixsock_posix.go
index 3c2e78bdc..3c2e78bdc 100644
--- a/src/pkg/net/unixsock_posix.go
+++ b/src/net/unixsock_posix.go
diff --git a/src/pkg/net/url/example_test.go b/src/net/url/example_test.go
index 56c5dc696..56c5dc696 100644
--- a/src/pkg/net/url/example_test.go
+++ b/src/net/url/example_test.go
diff --git a/src/pkg/net/url/url.go b/src/net/url/url.go
index 0b32cd7c8..0b32cd7c8 100644
--- a/src/pkg/net/url/url.go
+++ b/src/net/url/url.go
diff --git a/src/pkg/net/url/url_test.go b/src/net/url/url_test.go
index d8b19d805..d8b19d805 100644
--- a/src/pkg/net/url/url_test.go
+++ b/src/net/url/url_test.go
diff --git a/src/pkg/net/z_last_test.go b/src/net/z_last_test.go
index 4f6a54a56..4f6a54a56 100644
--- a/src/pkg/net/z_last_test.go
+++ b/src/net/z_last_test.go
diff --git a/src/pkg/os/dir_plan9.go b/src/os/dir_plan9.go
index 8195c02a4..8195c02a4 100644
--- a/src/pkg/os/dir_plan9.go
+++ b/src/os/dir_plan9.go
diff --git a/src/pkg/os/dir_unix.go b/src/os/dir_unix.go
index d353e405e..d353e405e 100644
--- a/src/pkg/os/dir_unix.go
+++ b/src/os/dir_unix.go
diff --git a/src/pkg/os/dir_windows.go b/src/os/dir_windows.go
index 931316048..931316048 100644
--- a/src/pkg/os/dir_windows.go
+++ b/src/os/dir_windows.go
diff --git a/src/pkg/os/doc.go b/src/os/doc.go
index 389a8eb14..389a8eb14 100644
--- a/src/pkg/os/doc.go
+++ b/src/os/doc.go
diff --git a/src/pkg/os/env.go b/src/os/env.go
index db7fc72b8..db7fc72b8 100644
--- a/src/pkg/os/env.go
+++ b/src/os/env.go
diff --git a/src/pkg/os/env_test.go b/src/os/env_test.go
index 991fa4d05..991fa4d05 100644
--- a/src/pkg/os/env_test.go
+++ b/src/os/env_test.go
diff --git a/src/pkg/os/env_unix_test.go b/src/os/env_unix_test.go
index 5ec07ee1b..5ec07ee1b 100644
--- a/src/pkg/os/env_unix_test.go
+++ b/src/os/env_unix_test.go
diff --git a/src/pkg/os/error.go b/src/os/error.go
index 8810e6930..8810e6930 100644
--- a/src/pkg/os/error.go
+++ b/src/os/error.go
diff --git a/src/pkg/os/error_plan9.go b/src/os/error_plan9.go
index 62d4e420e..62d4e420e 100644
--- a/src/pkg/os/error_plan9.go
+++ b/src/os/error_plan9.go
diff --git a/src/pkg/os/error_test.go b/src/os/error_test.go
index 02ed2351c..02ed2351c 100644
--- a/src/pkg/os/error_test.go
+++ b/src/os/error_test.go
diff --git a/src/pkg/os/error_unix.go b/src/os/error_unix.go
index f2aabbb45..f2aabbb45 100644
--- a/src/pkg/os/error_unix.go
+++ b/src/os/error_unix.go
diff --git a/src/pkg/os/error_windows.go b/src/os/error_windows.go
index 83db6c078..83db6c078 100644
--- a/src/pkg/os/error_windows.go
+++ b/src/os/error_windows.go
diff --git a/src/pkg/os/error_windows_test.go b/src/os/error_windows_test.go
index 3e6504f8d..3e6504f8d 100644
--- a/src/pkg/os/error_windows_test.go
+++ b/src/os/error_windows_test.go
diff --git a/src/pkg/os/exec.go b/src/os/exec.go
index 5aea3098b..5aea3098b 100644
--- a/src/pkg/os/exec.go
+++ b/src/os/exec.go
diff --git a/src/pkg/os/exec/example_test.go b/src/os/exec/example_test.go
index 55eaac8ab..55eaac8ab 100644
--- a/src/pkg/os/exec/example_test.go
+++ b/src/os/exec/example_test.go
diff --git a/src/pkg/os/exec/exec.go b/src/os/exec/exec.go
index 4aded4171..4aded4171 100644
--- a/src/pkg/os/exec/exec.go
+++ b/src/os/exec/exec.go
diff --git a/src/pkg/os/exec/exec_test.go b/src/os/exec/exec_test.go
index 6f77ac38a..6f77ac38a 100644
--- a/src/pkg/os/exec/exec_test.go
+++ b/src/os/exec/exec_test.go
diff --git a/src/pkg/os/exec/lp_plan9.go b/src/os/exec/lp_plan9.go
index 5aa8a54ed..5aa8a54ed 100644
--- a/src/pkg/os/exec/lp_plan9.go
+++ b/src/os/exec/lp_plan9.go
diff --git a/src/pkg/os/exec/lp_test.go b/src/os/exec/lp_test.go
index 77d8e848c..77d8e848c 100644
--- a/src/pkg/os/exec/lp_test.go
+++ b/src/os/exec/lp_test.go
diff --git a/src/pkg/os/exec/lp_unix.go b/src/os/exec/lp_unix.go
index 3f895d5b3..3f895d5b3 100644
--- a/src/pkg/os/exec/lp_unix.go
+++ b/src/os/exec/lp_unix.go
diff --git a/src/pkg/os/exec/lp_unix_test.go b/src/os/exec/lp_unix_test.go
index 051db664a..051db664a 100644
--- a/src/pkg/os/exec/lp_unix_test.go
+++ b/src/os/exec/lp_unix_test.go
diff --git a/src/pkg/os/exec/lp_windows.go b/src/os/exec/lp_windows.go
index c3efd67e9..c3efd67e9 100644
--- a/src/pkg/os/exec/lp_windows.go
+++ b/src/os/exec/lp_windows.go
diff --git a/src/pkg/os/exec/lp_windows_test.go b/src/os/exec/lp_windows_test.go
index 72df03ed2..72df03ed2 100644
--- a/src/pkg/os/exec/lp_windows_test.go
+++ b/src/os/exec/lp_windows_test.go
diff --git a/src/pkg/os/exec_plan9.go b/src/os/exec_plan9.go
index 676be36ac..676be36ac 100644
--- a/src/pkg/os/exec_plan9.go
+++ b/src/os/exec_plan9.go
diff --git a/src/pkg/os/exec_posix.go b/src/os/exec_posix.go
index fb9d291e6..fb9d291e6 100644
--- a/src/pkg/os/exec_posix.go
+++ b/src/os/exec_posix.go
diff --git a/src/pkg/os/exec_unix.go b/src/os/exec_unix.go
index 1b1e3350b..1b1e3350b 100644
--- a/src/pkg/os/exec_unix.go
+++ b/src/os/exec_unix.go
diff --git a/src/pkg/os/exec_windows.go b/src/os/exec_windows.go
index c4f3d4f85..c4f3d4f85 100644
--- a/src/pkg/os/exec_windows.go
+++ b/src/os/exec_windows.go
diff --git a/src/pkg/os/export_test.go b/src/os/export_test.go
index 9fa7936ae..9fa7936ae 100644
--- a/src/pkg/os/export_test.go
+++ b/src/os/export_test.go
diff --git a/src/pkg/os/file.go b/src/os/file.go
index b4a745801..b4a745801 100644
--- a/src/pkg/os/file.go
+++ b/src/os/file.go
diff --git a/src/pkg/os/file_plan9.go b/src/os/file_plan9.go
index a804b8197..a804b8197 100644
--- a/src/pkg/os/file_plan9.go
+++ b/src/os/file_plan9.go
diff --git a/src/pkg/os/file_posix.go b/src/os/file_posix.go
index 9cff7e5bc..9cff7e5bc 100644
--- a/src/pkg/os/file_posix.go
+++ b/src/os/file_posix.go
diff --git a/src/pkg/os/file_unix.go b/src/os/file_unix.go
index bba0d9c0f..bba0d9c0f 100644
--- a/src/pkg/os/file_unix.go
+++ b/src/os/file_unix.go
diff --git a/src/pkg/os/file_windows.go b/src/os/file_windows.go
index e78d4abf6..e78d4abf6 100644
--- a/src/pkg/os/file_windows.go
+++ b/src/os/file_windows.go
diff --git a/src/pkg/os/getwd.go b/src/os/getwd.go
index d5da53b34..d5da53b34 100644
--- a/src/pkg/os/getwd.go
+++ b/src/os/getwd.go
diff --git a/src/pkg/os/getwd_darwin.go b/src/os/getwd_darwin.go
index e51ffcd5e..e51ffcd5e 100644
--- a/src/pkg/os/getwd_darwin.go
+++ b/src/os/getwd_darwin.go
diff --git a/src/pkg/os/os_test.go b/src/os/os_test.go
index 0224c9b01..0224c9b01 100644
--- a/src/pkg/os/os_test.go
+++ b/src/os/os_test.go
diff --git a/src/pkg/os/os_unix_test.go b/src/os/os_unix_test.go
index 21d40ccaf..21d40ccaf 100644
--- a/src/pkg/os/os_unix_test.go
+++ b/src/os/os_unix_test.go
diff --git a/src/pkg/os/os_windows_test.go b/src/os/os_windows_test.go
index fd96713ea..fd96713ea 100644
--- a/src/pkg/os/os_windows_test.go
+++ b/src/os/os_windows_test.go
diff --git a/src/pkg/os/path.go b/src/os/path.go
index 02a77ec80..02a77ec80 100644
--- a/src/pkg/os/path.go
+++ b/src/os/path.go
diff --git a/src/pkg/os/path_plan9.go b/src/os/path_plan9.go
index 64bad500a..64bad500a 100644
--- a/src/pkg/os/path_plan9.go
+++ b/src/os/path_plan9.go
diff --git a/src/pkg/os/path_test.go b/src/os/path_test.go
index 6f24a4313..6f24a4313 100644
--- a/src/pkg/os/path_test.go
+++ b/src/os/path_test.go
diff --git a/src/pkg/os/path_unix.go b/src/os/path_unix.go
index 0211107dd..0211107dd 100644
--- a/src/pkg/os/path_unix.go
+++ b/src/os/path_unix.go
diff --git a/src/pkg/os/path_windows.go b/src/os/path_windows.go
index 61f2ca59f..61f2ca59f 100644
--- a/src/pkg/os/path_windows.go
+++ b/src/os/path_windows.go
diff --git a/src/pkg/os/pipe_bsd.go b/src/os/pipe_bsd.go
index 3b81ed20f..3b81ed20f 100644
--- a/src/pkg/os/pipe_bsd.go
+++ b/src/os/pipe_bsd.go
diff --git a/src/pkg/os/pipe_linux.go b/src/os/pipe_linux.go
index 9bafad84f..9bafad84f 100644
--- a/src/pkg/os/pipe_linux.go
+++ b/src/os/pipe_linux.go
diff --git a/src/pkg/os/proc.go b/src/os/proc.go
index 38c436ec5..38c436ec5 100644
--- a/src/pkg/os/proc.go
+++ b/src/os/proc.go
diff --git a/src/pkg/os/signal/example_test.go b/src/os/signal/example_test.go
index 079ee5070..079ee5070 100644
--- a/src/pkg/os/signal/example_test.go
+++ b/src/os/signal/example_test.go
diff --git a/src/pkg/os/signal/sig.s b/src/os/signal/sig.s
index 1826c37fb..1826c37fb 100644
--- a/src/pkg/os/signal/sig.s
+++ b/src/os/signal/sig.s
diff --git a/src/pkg/os/signal/signal.go b/src/os/signal/signal.go
index 300427549..300427549 100644
--- a/src/pkg/os/signal/signal.go
+++ b/src/os/signal/signal.go
diff --git a/src/pkg/os/signal/signal_stub.go b/src/os/signal/signal_stub.go
index d0a6935ff..d0a6935ff 100644
--- a/src/pkg/os/signal/signal_stub.go
+++ b/src/os/signal/signal_stub.go
diff --git a/src/pkg/os/signal/signal_test.go b/src/os/signal/signal_test.go
index 076fe3f93..076fe3f93 100644
--- a/src/pkg/os/signal/signal_test.go
+++ b/src/os/signal/signal_test.go
diff --git a/src/pkg/os/signal/signal_unix.go b/src/os/signal/signal_unix.go
index 94b8ab3dd..94b8ab3dd 100644
--- a/src/pkg/os/signal/signal_unix.go
+++ b/src/os/signal/signal_unix.go
diff --git a/src/pkg/os/signal/signal_windows_test.go b/src/os/signal/signal_windows_test.go
index f3e6706b7..f3e6706b7 100644
--- a/src/pkg/os/signal/signal_windows_test.go
+++ b/src/os/signal/signal_windows_test.go
diff --git a/src/pkg/os/stat_darwin.go b/src/os/stat_darwin.go
index 0eea52201..0eea52201 100644
--- a/src/pkg/os/stat_darwin.go
+++ b/src/os/stat_darwin.go
diff --git a/src/pkg/os/stat_dragonfly.go b/src/os/stat_dragonfly.go
index 605c1d9b6..605c1d9b6 100644
--- a/src/pkg/os/stat_dragonfly.go
+++ b/src/os/stat_dragonfly.go
diff --git a/src/pkg/os/stat_freebsd.go b/src/os/stat_freebsd.go
index 2ffb60fe2..2ffb60fe2 100644
--- a/src/pkg/os/stat_freebsd.go
+++ b/src/os/stat_freebsd.go
diff --git a/src/pkg/os/stat_linux.go b/src/os/stat_linux.go
index 605c1d9b6..605c1d9b6 100644
--- a/src/pkg/os/stat_linux.go
+++ b/src/os/stat_linux.go
diff --git a/src/pkg/os/stat_nacl.go b/src/os/stat_nacl.go
index a503b59fa..a503b59fa 100644
--- a/src/pkg/os/stat_nacl.go
+++ b/src/os/stat_nacl.go
diff --git a/src/pkg/os/stat_netbsd.go b/src/os/stat_netbsd.go
index 2ffb60fe2..2ffb60fe2 100644
--- a/src/pkg/os/stat_netbsd.go
+++ b/src/os/stat_netbsd.go
diff --git a/src/pkg/os/stat_openbsd.go b/src/os/stat_openbsd.go
index 605c1d9b6..605c1d9b6 100644
--- a/src/pkg/os/stat_openbsd.go
+++ b/src/os/stat_openbsd.go
diff --git a/src/pkg/os/stat_plan9.go b/src/os/stat_plan9.go
index 25c9a8c14..25c9a8c14 100644
--- a/src/pkg/os/stat_plan9.go
+++ b/src/os/stat_plan9.go
diff --git a/src/pkg/os/stat_solaris.go b/src/os/stat_solaris.go
index 605c1d9b6..605c1d9b6 100644
--- a/src/pkg/os/stat_solaris.go
+++ b/src/os/stat_solaris.go
diff --git a/src/pkg/os/stat_windows.go b/src/os/stat_windows.go
index f396c1db3..f396c1db3 100644
--- a/src/pkg/os/stat_windows.go
+++ b/src/os/stat_windows.go
diff --git a/src/pkg/os/str.go b/src/os/str.go
index e3606b61e..e3606b61e 100644
--- a/src/pkg/os/str.go
+++ b/src/os/str.go
diff --git a/src/pkg/os/sys_bsd.go b/src/os/sys_bsd.go
index 8ad5e2183..8ad5e2183 100644
--- a/src/pkg/os/sys_bsd.go
+++ b/src/os/sys_bsd.go
diff --git a/src/pkg/os/sys_darwin.go b/src/os/sys_darwin.go
index 7a8330abb..7a8330abb 100644
--- a/src/pkg/os/sys_darwin.go
+++ b/src/os/sys_darwin.go
diff --git a/src/pkg/os/sys_freebsd.go b/src/os/sys_freebsd.go
index 273c2df1c..273c2df1c 100644
--- a/src/pkg/os/sys_freebsd.go
+++ b/src/os/sys_freebsd.go
diff --git a/src/pkg/os/sys_linux.go b/src/os/sys_linux.go
index 76cdf5043..76cdf5043 100644
--- a/src/pkg/os/sys_linux.go
+++ b/src/os/sys_linux.go
diff --git a/src/pkg/os/sys_nacl.go b/src/os/sys_nacl.go
index 07907c847..07907c847 100644
--- a/src/pkg/os/sys_nacl.go
+++ b/src/os/sys_nacl.go
diff --git a/src/pkg/os/sys_plan9.go b/src/os/sys_plan9.go
index 07a7905f4..07a7905f4 100644
--- a/src/pkg/os/sys_plan9.go
+++ b/src/os/sys_plan9.go
diff --git a/src/pkg/os/sys_solaris.go b/src/os/sys_solaris.go
index 917e8f2b0..917e8f2b0 100644
--- a/src/pkg/os/sys_solaris.go
+++ b/src/os/sys_solaris.go
diff --git a/src/pkg/os/sys_unix.go b/src/os/sys_unix.go
index 39c20dc73..39c20dc73 100644
--- a/src/pkg/os/sys_unix.go
+++ b/src/os/sys_unix.go
diff --git a/src/pkg/os/sys_windows.go b/src/os/sys_windows.go
index 92617de5e..92617de5e 100644
--- a/src/pkg/os/sys_windows.go
+++ b/src/os/sys_windows.go
diff --git a/src/pkg/os/types.go b/src/os/types.go
index 473d431d4..473d431d4 100644
--- a/src/pkg/os/types.go
+++ b/src/os/types.go
diff --git a/src/pkg/os/types_notwin.go b/src/os/types_notwin.go
index ea1a07393..ea1a07393 100644
--- a/src/pkg/os/types_notwin.go
+++ b/src/os/types_notwin.go
diff --git a/src/pkg/os/types_windows.go b/src/os/types_windows.go
index 7b2e54698..7b2e54698 100644
--- a/src/pkg/os/types_windows.go
+++ b/src/os/types_windows.go
diff --git a/src/pkg/os/user/lookup.go b/src/os/user/lookup.go
index 09f00c7bd..09f00c7bd 100644
--- a/src/pkg/os/user/lookup.go
+++ b/src/os/user/lookup.go
diff --git a/src/pkg/os/user/lookup_plan9.go b/src/os/user/lookup_plan9.go
index f7ef3482b..f7ef3482b 100644
--- a/src/pkg/os/user/lookup_plan9.go
+++ b/src/os/user/lookup_plan9.go
diff --git a/src/pkg/os/user/lookup_stubs.go b/src/os/user/lookup_stubs.go
index 4fb0e3c6e..4fb0e3c6e 100644
--- a/src/pkg/os/user/lookup_stubs.go
+++ b/src/os/user/lookup_stubs.go
diff --git a/src/pkg/os/user/lookup_unix.go b/src/os/user/lookup_unix.go
index 0871473df..0871473df 100644
--- a/src/pkg/os/user/lookup_unix.go
+++ b/src/os/user/lookup_unix.go
diff --git a/src/pkg/os/user/lookup_windows.go b/src/os/user/lookup_windows.go
index 99c325ff0..99c325ff0 100644
--- a/src/pkg/os/user/lookup_windows.go
+++ b/src/os/user/lookup_windows.go
diff --git a/src/pkg/os/user/user.go b/src/os/user/user.go
index e8680fe54..e8680fe54 100644
--- a/src/pkg/os/user/user.go
+++ b/src/os/user/user.go
diff --git a/src/pkg/os/user/user_test.go b/src/os/user/user_test.go
index 9d9420e80..9d9420e80 100644
--- a/src/pkg/os/user/user_test.go
+++ b/src/os/user/user_test.go
diff --git a/src/pkg/path/example_test.go b/src/path/example_test.go
index fa8c28d2e..fa8c28d2e 100644
--- a/src/pkg/path/example_test.go
+++ b/src/path/example_test.go
diff --git a/src/pkg/path/filepath/example_unix_test.go b/src/path/filepath/example_unix_test.go
index f3fe076c3..f3fe076c3 100644
--- a/src/pkg/path/filepath/example_unix_test.go
+++ b/src/path/filepath/example_unix_test.go
diff --git a/src/pkg/path/filepath/export_test.go b/src/path/filepath/export_test.go
index 0cf9e3bca..0cf9e3bca 100644
--- a/src/pkg/path/filepath/export_test.go
+++ b/src/path/filepath/export_test.go
diff --git a/src/pkg/path/filepath/match.go b/src/path/filepath/match.go
index a9bcc103c..a9bcc103c 100644
--- a/src/pkg/path/filepath/match.go
+++ b/src/path/filepath/match.go
diff --git a/src/pkg/path/filepath/match_test.go b/src/path/filepath/match_test.go
index 20ec5aa2a..20ec5aa2a 100644
--- a/src/pkg/path/filepath/match_test.go
+++ b/src/path/filepath/match_test.go
diff --git a/src/pkg/path/filepath/path.go b/src/path/filepath/path.go
index d37fc9dfc..d37fc9dfc 100644
--- a/src/pkg/path/filepath/path.go
+++ b/src/path/filepath/path.go
diff --git a/src/pkg/path/filepath/path_plan9.go b/src/path/filepath/path_plan9.go
index ee8912d58..ee8912d58 100644
--- a/src/pkg/path/filepath/path_plan9.go
+++ b/src/path/filepath/path_plan9.go
diff --git a/src/pkg/path/filepath/path_test.go b/src/path/filepath/path_test.go
index 399284b97..399284b97 100644
--- a/src/pkg/path/filepath/path_test.go
+++ b/src/path/filepath/path_test.go
diff --git a/src/pkg/path/filepath/path_unix.go b/src/path/filepath/path_unix.go
index 4e7d0d1b4..4e7d0d1b4 100644
--- a/src/pkg/path/filepath/path_unix.go
+++ b/src/path/filepath/path_unix.go
diff --git a/src/pkg/path/filepath/path_windows.go b/src/path/filepath/path_windows.go
index ec50f6b26..ec50f6b26 100644
--- a/src/pkg/path/filepath/path_windows.go
+++ b/src/path/filepath/path_windows.go
diff --git a/src/pkg/path/filepath/path_windows_test.go b/src/path/filepath/path_windows_test.go
index 100cf30a4..100cf30a4 100644
--- a/src/pkg/path/filepath/path_windows_test.go
+++ b/src/path/filepath/path_windows_test.go
diff --git a/src/pkg/path/filepath/symlink.go b/src/path/filepath/symlink.go
index df0a9e0c2..df0a9e0c2 100644
--- a/src/pkg/path/filepath/symlink.go
+++ b/src/path/filepath/symlink.go
diff --git a/src/pkg/path/filepath/symlink_unix.go b/src/path/filepath/symlink_unix.go
index d20e63a98..d20e63a98 100644
--- a/src/pkg/path/filepath/symlink_unix.go
+++ b/src/path/filepath/symlink_unix.go
diff --git a/src/pkg/path/filepath/symlink_windows.go b/src/path/filepath/symlink_windows.go
index 327c2c89a..327c2c89a 100644
--- a/src/pkg/path/filepath/symlink_windows.go
+++ b/src/path/filepath/symlink_windows.go
diff --git a/src/pkg/path/match.go b/src/path/match.go
index 8154bf602..8154bf602 100644
--- a/src/pkg/path/match.go
+++ b/src/path/match.go
diff --git a/src/pkg/path/match_test.go b/src/path/match_test.go
index 6b0676f81..6b0676f81 100644
--- a/src/pkg/path/match_test.go
+++ b/src/path/match_test.go
diff --git a/src/pkg/path/path.go b/src/path/path.go
index 98a6d5292..98a6d5292 100644
--- a/src/pkg/path/path.go
+++ b/src/path/path.go
diff --git a/src/pkg/path/path_test.go b/src/path/path_test.go
index 13b585223..13b585223 100644
--- a/src/pkg/path/path_test.go
+++ b/src/path/path_test.go
diff --git a/src/pkg/runtime/noasm.goc b/src/pkg/runtime/noasm.goc
deleted file mode 100644
index 496667729..000000000
--- a/src/pkg/runtime/noasm.goc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2013 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.
-
-// Routines that are implemented in assembly in asm_{amd64,386}.s
-// but are implemented in C for arm.
-
-// +build arm power64 power64le
-
-package runtime
-#include "runtime.h"
-#include "../../cmd/ld/textflag.h"
-
-#pragma textflag NOSPLIT
-func cmpstring(s1 String, s2 String) (v int) {
-	uintgo i, l;
-	byte c1, c2;
-	
-	l = s1.len;
-        if(s2.len < l)
-		l = s2.len;
-        for(i=0; i<l; i++) {
-		c1 = s1.str[i];
-		c2 = s2.str[i];
-		if(c1 < c2) {
-			v = -1;
-			goto done;
-		}
-		if(c1 > c2) {
-			v = +1;
-			goto done;
-		}
-	}
-        if(s1.len < s2.len) {
-		v = -1;
-		goto done;
-	}
-        if(s1.len > s2.len) {
-		v = +1;
-		goto done;
-	}
-        v = 0;
- done:;
-}
-
-#pragma textflag NOSPLIT
-func bytes·Compare(s1 Slice, s2 Slice) (v int) {
-	uintgo i, l;
-	byte c1, c2;
-	
-	l = s1.len;
-        if(s2.len < l)
-		l = s2.len;
-        for(i=0; i<l; i++) {
-		c1 = s1.array[i];
-		c2 = s2.array[i];
-		if(c1 < c2) {
-			v = -1;
-			goto done;
-		}
-		if(c1 > c2) {
-			v = +1;
-			goto done;
-		}
-	}
-        if(s1.len < s2.len) {
-		v = -1;
-		goto done;
-	}
-	if(s1.len > s2.len) {
-		v = +1;
-		goto done;
-	}
-	v = 0;
- done:;
-}
diff --git a/src/pkg/runtime/traceback_lr.c b/src/pkg/runtime/traceback_lr.c
deleted file mode 100644
index d8fcddf68..000000000
--- a/src/pkg/runtime/traceback_lr.c
+++ /dev/null
@@ -1,365 +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.
-
-// +build arm power64 power64le
-
-#include "runtime.h"
-#include "arch_GOARCH.h"
-#include "malloc.h"
-#include "funcdata.h"
-
-void runtime·sigpanic(void);
-void runtime·newproc(void);
-void runtime·deferproc(void);
-
-int32
-runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, uintptr *pcbuf, int32 max, bool (*callback)(Stkframe*, void*), void *v, bool printall)
-{
-	int32 i, n, nprint, line, gotraceback;
-	uintptr x, tracepc, sparg;
-	bool waspanic, wasnewproc, printing;
-	Func *f, *flr;
-	Stkframe frame;
-	Stktop *stk;
-	String file;
-	Panic *panic;
-	Defer *defer;
-
-	gotraceback = runtime·gotraceback(nil);
-
-	if(pc0 == ~(uintptr)0 && sp0 == ~(uintptr)0) { // Signal to fetch saved values from gp.
-		if(gp->syscallstack != (uintptr)nil) {
-			pc0 = gp->syscallpc;
-			sp0 = gp->syscallsp;
-			lr0 = 0;
-		} else {
-			pc0 = gp->sched.pc;
-			sp0 = gp->sched.sp;
-			lr0 = gp->sched.lr;
-		}
-	}
-
-	nprint = 0;
-	runtime·memclr((byte*)&frame, sizeof frame);
-	frame.pc = pc0;
-	frame.lr = lr0;
-	frame.sp = sp0;
-	waspanic = false;
-	wasnewproc = false;
-	printing = pcbuf==nil && callback==nil;
-
-	panic = gp->panic;
-	defer = gp->defer;
-
-	while(defer != nil && defer->argp == NoArgs)
-		defer = defer->link;	
-	while(panic != nil && panic->defer == nil)
-		panic = panic->link;
-
-	// If the PC is zero, it's likely a nil function call.
-	// Start in the caller's frame.
-	if(frame.pc == 0) {
-		frame.pc = frame.lr;
-		frame.lr = 0;
-	}
-	
-	f = runtime·findfunc(frame.pc);
-	if(f == nil) {
-		if(callback != nil) {
-			runtime·printf("runtime: unknown pc %p\n", frame.pc);
-			runtime·throw("unknown pc");
-		}
-		return 0;
-	}
-	frame.fn = f;
-
-	n = 0;
-	stk = (Stktop*)gp->stackbase;
-	while(n < max) {
-		// Typically:
-		//	pc is the PC of the running function.
-		//	sp is the stack pointer at that program counter.
-		//	fp is the frame pointer (caller's stack pointer) at that program counter, or nil if unknown.
-		//	stk is the stack containing sp.
-		//	The caller's program counter is lr, unless lr is zero, in which case it is *(uintptr*)sp.
-		
-		if(frame.pc == (uintptr)runtime·lessstack) {
-			// Hit top of stack segment.  Unwind to next segment.
-			frame.pc = stk->gobuf.pc;
-			frame.sp = stk->gobuf.sp;
-			frame.lr = 0;
-			frame.fp = 0;
-			if(printing && runtime·showframe(nil, gp))
-				runtime·printf("----- stack segment boundary -----\n");
-			stk = (Stktop*)stk->stackbase;
-			
-			f = runtime·findfunc(frame.pc);
-			if(f == nil) {
-				runtime·printf("runtime: unknown pc %p after stack split\n", frame.pc);
-				if(callback != nil)
-					runtime·throw("unknown pc");
-			}
-			frame.fn = f;
-			continue;
-		}
-		f = frame.fn;
-		
-		// Found an actual function.
-		// Derive frame pointer and link register.
-		if(frame.fp == 0)
-			frame.fp = frame.sp + runtime·funcspdelta(f, frame.pc);
-		if(runtime·topofstack(f)) {
-			frame.lr = 0;
-			flr = nil;
-		} else if(f->entry == (uintptr)runtime·jmpdefer) {
-			// jmpdefer modifies SP/LR/PC non-atomically.
-			// If a profiling interrupt arrives during jmpdefer,
-			// the stack unwind may see a mismatched register set
-			// and get confused. Stop if we see PC within jmpdefer
-			// to avoid that confusion.
-			// See golang.org/issue/8153.
-			// This check can be deleted if jmpdefer is changed
-			// to restore all three atomically using pop.
-			if(callback != nil)
-				runtime·throw("traceback_arm: found jmpdefer when tracing with callback");
-			frame.lr = 0;
-			flr = nil;
-		} else {
-			if((n == 0 && frame.sp < frame.fp) || frame.lr == 0)
-				frame.lr = *(uintptr*)frame.sp;
-			flr = runtime·findfunc(frame.lr);
-			if(flr == nil) {
-				// This happens if you get a profiling interrupt at just the wrong time.
-				// In that context it is okay to stop early.
-				// But if callback is set, we're doing a garbage collection and must
-				// get everything, so crash loudly.
-				if(callback != nil) {
-					runtime·printf("runtime: unexpected return pc for %s called from %p\n", runtime·funcname(f), frame.lr);
-					runtime·throw("unknown caller pc");
-				}
-			}
-		}
-
-		frame.varp = (byte*)frame.fp;
-
-		// Derive size of arguments.
-		// Most functions have a fixed-size argument block,
-		// so we can use metadata about the function f.
-		// Not all, though: there are some variadic functions
-		// in package runtime and reflect, and for those we use call-specific
-		// metadata recorded by f's caller.
-		if(callback != nil || printing) {
-			frame.argp = (byte*)frame.fp + sizeof(uintptr);
-			if(f->args != ArgsSizeUnknown)
-				frame.arglen = f->args;
-			else if(flr == nil)
-				frame.arglen = 0;
-			else if(frame.lr == (uintptr)runtime·lessstack)
-				frame.arglen = stk->argsize;
-			else if((i = runtime·funcarglen(flr, frame.lr)) >= 0)
-				frame.arglen = i;
-			else {
-				runtime·printf("runtime: unknown argument frame size for %s called from %p [%s]\n",
-					runtime·funcname(f), frame.lr, flr ? runtime·funcname(flr) : "?");
-				if(callback != nil)
-					runtime·throw("invalid stack");
-				frame.arglen = 0;
-			}
-		}
-
-		// Determine function SP where deferproc would find its arguments.
-		// On ARM that's just the standard bottom-of-stack plus 1 word for
-		// the saved LR. If the previous frame was a direct call to newproc/deferproc,
-		// however, the SP is three words lower than normal.
-		// If the function has no frame at all - perhaps it just started, or perhaps
-		// it is a leaf with no local variables - then we cannot possibly find its
-		// SP in a defer, and we might confuse its SP for its caller's SP, so
-		// set sparg=0 in that case.
-		sparg = 0;
-		if(frame.fp != frame.sp) {
-			sparg = frame.sp + sizeof(uintreg);
-			if(wasnewproc)
-				sparg += 3*sizeof(uintreg);
-		}
-
-		// Determine frame's 'continuation PC', where it can continue.
-		// Normally this is the return address on the stack, but if sigpanic
-		// is immediately below this function on the stack, then the frame
-		// stopped executing due to a trap, and frame.pc is probably not
-		// a safe point for looking up liveness information. In this panicking case,
-		// the function either doesn't return at all (if it has no defers or if the
-		// defers do not recover) or it returns from one of the calls to 
-		// deferproc a second time (if the corresponding deferred func recovers).
-		// It suffices to assume that the most recent deferproc is the one that
-		// returns; everything live at earlier deferprocs is still live at that one.
-		frame.continpc = frame.pc;
-		if(waspanic) {
-			if(panic != nil && panic->defer->argp == (byte*)sparg)
-				frame.continpc = (uintptr)panic->defer->pc;
-			else if(defer != nil && defer->argp == (byte*)sparg)
-				frame.continpc = (uintptr)defer->pc;
-			else
-				frame.continpc = 0;
-		}
-
-		// Unwind our local panic & defer stacks past this frame.
-		while(panic != nil && (panic->defer == nil || panic->defer->argp == (byte*)sparg || panic->defer->argp == NoArgs))
-			panic = panic->link;
-		while(defer != nil && (defer->argp == (byte*)sparg || defer->argp == NoArgs))
-			defer = defer->link;	
-
-		if(skip > 0) {
-			skip--;
-			goto skipped;
-		}
-
-		if(pcbuf != nil)
-			pcbuf[n] = frame.pc;
-		if(callback != nil) {
-			if(!callback(&frame, v))
-				return n;
-		}
-		if(printing) {
-			if(printall || runtime·showframe(f, gp)) {
-				// Print during crash.
-				//	main(0x1, 0x2, 0x3)
-				//		/home/rsc/go/src/runtime/x.go:23 +0xf
-				tracepc = frame.pc;	// back up to CALL instruction for funcline.
-				if(n > 0 && frame.pc > f->entry && !waspanic)
-					tracepc -= sizeof(uintptr);
-				runtime·printf("%s(", runtime·funcname(f));
-				for(i = 0; i < frame.arglen/sizeof(uintptr); i++) {
-					if(i >= 10) {
-						runtime·prints(", ...");
-						break;
-					}
-					if(i != 0)
-						runtime·prints(", ");
-					runtime·printhex_c(((uintptr*)frame.argp)[i]);
-				}
-				runtime·prints(")\n");
-				line = runtime·funcline(f, tracepc, &file);
-				runtime·printf("\t%S:%d", file, line);
-				if(frame.pc > f->entry)
-					runtime·printf(" +%p", (uintptr)(frame.pc - f->entry));
-				if(g->m->throwing > 0 && gp == g->m->curg || gotraceback >= 2)
-					runtime·printf(" fp=%p sp=%p", frame.fp, frame.sp);
-				runtime·printf("\n");
-				nprint++;
-			}
-		}
-		n++;
-		
-	skipped:
-		waspanic = f->entry == (uintptr)runtime·sigpanic;
-		wasnewproc = f->entry == (uintptr)runtime·newproc || f->entry == (uintptr)runtime·deferproc;
-
-		// Do not unwind past the bottom of the stack.
-		if(flr == nil)
-			break;
-
-		// Unwind to next frame.
-		frame.pc = frame.lr;
-		frame.fn = flr;
-		frame.lr = 0;
-		frame.sp = frame.fp;
-		frame.fp = 0;
-	
-		// sighandler saves the lr on stack before faking a call to sigpanic
-		if(waspanic) {
-			x = *(uintptr*)frame.sp;
-			frame.sp += sizeof(uintptr);
-			frame.fn = f = runtime·findfunc(frame.pc);
-			if(f == nil)
-				frame.pc = x;
-			else if(f->frame == 0)
-				frame.lr = x;
-		}
-	}
-	
-	if(pcbuf == nil && callback == nil)
-		n = nprint;
-
-	// For rationale, see long comment in traceback_x86.c.
-	if(callback != nil && n < max && defer != nil) {
-		if(defer != nil)
-			runtime·printf("runtime: g%D: leftover defer argp=%p pc=%p\n", gp->goid, defer->argp, defer->pc);
-		if(panic != nil)
-			runtime·printf("runtime: g%D: leftover panic argp=%p pc=%p\n", gp->goid, panic->defer->argp, panic->defer->pc);
-		for(defer = gp->defer; defer != nil; defer = defer->link)
-			runtime·printf("\tdefer %p argp=%p pc=%p\n", defer, defer->argp, defer->pc);
-		for(panic = gp->panic; panic != nil; panic = panic->link) {
-			runtime·printf("\tpanic %p defer %p", panic, panic->defer);
-			if(panic->defer != nil)
-				runtime·printf(" argp=%p pc=%p", panic->defer->argp, panic->defer->pc);
-			runtime·printf("\n");
-		}
-		runtime·throw("traceback has leftover defers or panics");
-	}
-
-	return n;		
-}
-
-void
-runtime·printcreatedby(G *gp)
-{
-	int32 line;
-	uintptr pc, tracepc;
-	Func *f;
-	String file;
-
-	// Show what created goroutine, except main goroutine (goid 1).
-	if((pc = gp->gopc) != 0 && (f = runtime·findfunc(pc)) != nil &&
-		runtime·showframe(f, gp) && gp->goid != 1) {
-		runtime·printf("created by %s\n", runtime·funcname(f));
-		tracepc = pc;	// back up to CALL instruction for funcline.
-		if(pc > f->entry)
-			tracepc -= PCQuantum;
-		line = runtime·funcline(f, tracepc, &file);
-		runtime·printf("\t%S:%d", file, line);
-		if(pc > f->entry)
-			runtime·printf(" +%p", (uintptr)(pc - f->entry));
-		runtime·printf("\n");
-	}
-}
-
-void
-runtime·traceback(uintptr pc, uintptr sp, uintptr lr, G *gp)
-{
-	int32 n;
-
-	if(gp->status == Gsyscall) {
-		// Override signal registers if blocked in system call.
-		pc = gp->syscallpc;
-		sp = gp->syscallsp;
-		lr = 0;
-	}
-
-	// Print traceback. By default, omits runtime frames.
-	// If that means we print nothing at all, repeat forcing all frames printed.
-	n = runtime·gentraceback(pc, sp, lr, gp, 0, nil, TracebackMaxFrames, nil, nil, false);
-	if(n == 0)
-		runtime·gentraceback(pc, sp, lr, gp, 0, nil, TracebackMaxFrames, nil, nil, true);
-	if(n == TracebackMaxFrames)
-		runtime·printf("...additional frames elided...\n");
-	runtime·printcreatedby(gp);
-}
-
-// func caller(n int) (pc uintptr, file string, line int, ok bool)
-int32
-runtime·callers(int32 skip, uintptr *pcbuf, int32 m)
-{
-	uintptr pc, sp;
-	
-	sp = runtime·getcallersp(&skip);
-	pc = (uintptr)runtime·getcallerpc(&skip);
-
-	return runtime·gentraceback(pc, sp, 0, g, skip, pcbuf, m, nil, nil, false);
-}
-
-int32
-runtime·gcallers(G *gp, int32 skip, uintptr *pcbuf, int32 m)
-{
-	return runtime·gentraceback(~(uintptr)0, ~(uintptr)0, 0, gp, skip, pcbuf, m, nil, nil, false);
-}
diff --git a/src/pkg/reflect/all_test.go b/src/reflect/all_test.go
index a6bacf32c..a6bacf32c 100644
--- a/src/pkg/reflect/all_test.go
+++ b/src/reflect/all_test.go
diff --git a/src/pkg/reflect/asm_386.s b/src/reflect/asm_386.s
index c028113a0..c028113a0 100644
--- a/src/pkg/reflect/asm_386.s
+++ b/src/reflect/asm_386.s
diff --git a/src/pkg/reflect/asm_amd64.s b/src/reflect/asm_amd64.s
index b3c54f048..b3c54f048 100644
--- a/src/pkg/reflect/asm_amd64.s
+++ b/src/reflect/asm_amd64.s
diff --git a/src/pkg/reflect/asm_amd64p32.s b/src/reflect/asm_amd64p32.s
index c028113a0..c028113a0 100644
--- a/src/pkg/reflect/asm_amd64p32.s
+++ b/src/reflect/asm_amd64p32.s
diff --git a/src/pkg/reflect/asm_arm.s b/src/reflect/asm_arm.s
index 6bd5d48ec..6bd5d48ec 100644
--- a/src/pkg/reflect/asm_arm.s
+++ b/src/reflect/asm_arm.s
diff --git a/src/pkg/reflect/asm_power64x.s b/src/reflect/asm_power64x.s
index e430cdf04..e430cdf04 100644
--- a/src/pkg/reflect/asm_power64x.s
+++ b/src/reflect/asm_power64x.s
diff --git a/src/pkg/reflect/deepequal.go b/src/reflect/deepequal.go
index f63715c9a..f63715c9a 100644
--- a/src/pkg/reflect/deepequal.go
+++ b/src/reflect/deepequal.go
diff --git a/src/pkg/reflect/example_test.go b/src/reflect/example_test.go
index cca28eeec..cca28eeec 100644
--- a/src/pkg/reflect/example_test.go
+++ b/src/reflect/example_test.go
diff --git a/src/pkg/reflect/export_test.go b/src/reflect/export_test.go
index 0778ad37f..0778ad37f 100644
--- a/src/pkg/reflect/export_test.go
+++ b/src/reflect/export_test.go
diff --git a/src/pkg/reflect/makefunc.go b/src/reflect/makefunc.go
index 0e61fdea7..0e61fdea7 100644
--- a/src/pkg/reflect/makefunc.go
+++ b/src/reflect/makefunc.go
diff --git a/src/pkg/reflect/set_test.go b/src/reflect/set_test.go
index 85dc55e68..85dc55e68 100644
--- a/src/pkg/reflect/set_test.go
+++ b/src/reflect/set_test.go
diff --git a/src/pkg/reflect/tostring_test.go b/src/reflect/tostring_test.go
index e416fd84d..e416fd84d 100644
--- a/src/pkg/reflect/tostring_test.go
+++ b/src/reflect/tostring_test.go
diff --git a/src/pkg/reflect/type.go b/src/reflect/type.go
index 47aecd002..6817cd74d 100644
--- a/src/pkg/reflect/type.go
+++ b/src/reflect/type.go
@@ -1563,7 +1563,7 @@ const (
 	bitsPointer = 2
 )
 
-// Make sure these routines stay in sync with ../../pkg/runtime/hashmap.go!
+// Make sure these routines stay in sync with ../../runtime/hashmap.go!
 // These types exist only for GC, so we only fill out GC relevant info.
 // Currently, that's just size and the GC program.  We also fill in string
 // for possible debugging use.
diff --git a/src/pkg/reflect/value.go b/src/reflect/value.go
index 6ffa63e98..b7cc755c9 100644
--- a/src/pkg/reflect/value.go
+++ b/src/reflect/value.go
@@ -2679,7 +2679,7 @@ func cvtI2I(v Value, typ Type) Value {
 	return cvtT2I(v.Elem(), typ)
 }
 
-// implemented in ../pkg/runtime
+// implemented in ../runtime
 func chancap(ch unsafe.Pointer) int
 func chanclose(ch unsafe.Pointer)
 func chanlen(ch unsafe.Pointer) int
diff --git a/src/pkg/regexp/all_test.go b/src/regexp/all_test.go
index 5fadb67c0..5fadb67c0 100644
--- a/src/pkg/regexp/all_test.go
+++ b/src/regexp/all_test.go
diff --git a/src/pkg/regexp/example_test.go b/src/regexp/example_test.go
index a4e0da8ea..a4e0da8ea 100644
--- a/src/pkg/regexp/example_test.go
+++ b/src/regexp/example_test.go
diff --git a/src/pkg/regexp/exec.go b/src/regexp/exec.go
index c4cb201f6..c4cb201f6 100644
--- a/src/pkg/regexp/exec.go
+++ b/src/regexp/exec.go
diff --git a/src/pkg/regexp/exec2_test.go b/src/regexp/exec2_test.go
index 7b86b4115..7b86b4115 100644
--- a/src/pkg/regexp/exec2_test.go
+++ b/src/regexp/exec2_test.go
diff --git a/src/pkg/regexp/exec_test.go b/src/regexp/exec_test.go
index 70d069c06..70d069c06 100644
--- a/src/pkg/regexp/exec_test.go
+++ b/src/regexp/exec_test.go
diff --git a/src/pkg/regexp/find_test.go b/src/regexp/find_test.go
index e07eb7d5c..e07eb7d5c 100644
--- a/src/pkg/regexp/find_test.go
+++ b/src/regexp/find_test.go
diff --git a/src/pkg/regexp/onepass.go b/src/regexp/onepass.go
index e6f428563..e6f428563 100644
--- a/src/pkg/regexp/onepass.go
+++ b/src/regexp/onepass.go
diff --git a/src/pkg/regexp/onepass_test.go b/src/regexp/onepass_test.go
index 7b2beea67..7b2beea67 100644
--- a/src/pkg/regexp/onepass_test.go
+++ b/src/regexp/onepass_test.go
diff --git a/src/pkg/regexp/regexp.go b/src/regexp/regexp.go
index 0b8336a04..0b8336a04 100644
--- a/src/pkg/regexp/regexp.go
+++ b/src/regexp/regexp.go
diff --git a/src/pkg/regexp/syntax/compile.go b/src/regexp/syntax/compile.go
index 95f6f1569..95f6f1569 100644
--- a/src/pkg/regexp/syntax/compile.go
+++ b/src/regexp/syntax/compile.go
diff --git a/src/pkg/regexp/syntax/doc.go b/src/regexp/syntax/doc.go
index 8e72c90d3..8e72c90d3 100644
--- a/src/pkg/regexp/syntax/doc.go
+++ b/src/regexp/syntax/doc.go
diff --git a/src/pkg/regexp/syntax/make_perl_groups.pl b/src/regexp/syntax/make_perl_groups.pl
index 90040fcb4..90040fcb4 100755
--- a/src/pkg/regexp/syntax/make_perl_groups.pl
+++ b/src/regexp/syntax/make_perl_groups.pl
diff --git a/src/pkg/regexp/syntax/parse.go b/src/regexp/syntax/parse.go
index 08f8d307a..08f8d307a 100644
--- a/src/pkg/regexp/syntax/parse.go
+++ b/src/regexp/syntax/parse.go
diff --git a/src/pkg/regexp/syntax/parse_test.go b/src/regexp/syntax/parse_test.go
index f3089294c..f3089294c 100644
--- a/src/pkg/regexp/syntax/parse_test.go
+++ b/src/regexp/syntax/parse_test.go
diff --git a/src/pkg/regexp/syntax/perl_groups.go b/src/regexp/syntax/perl_groups.go
index effe4e686..effe4e686 100644
--- a/src/pkg/regexp/syntax/perl_groups.go
+++ b/src/regexp/syntax/perl_groups.go
diff --git a/src/pkg/regexp/syntax/prog.go b/src/regexp/syntax/prog.go
index 29bd282d0..29bd282d0 100644
--- a/src/pkg/regexp/syntax/prog.go
+++ b/src/regexp/syntax/prog.go
diff --git a/src/pkg/regexp/syntax/prog_test.go b/src/regexp/syntax/prog_test.go
index 50bfa3d4b..50bfa3d4b 100644
--- a/src/pkg/regexp/syntax/prog_test.go
+++ b/src/regexp/syntax/prog_test.go
diff --git a/src/pkg/regexp/syntax/regexp.go b/src/regexp/syntax/regexp.go
index 329a90e01..329a90e01 100644
--- a/src/pkg/regexp/syntax/regexp.go
+++ b/src/regexp/syntax/regexp.go
diff --git a/src/pkg/regexp/syntax/simplify.go b/src/regexp/syntax/simplify.go
index 72390417b..72390417b 100644
--- a/src/pkg/regexp/syntax/simplify.go
+++ b/src/regexp/syntax/simplify.go
diff --git a/src/pkg/regexp/syntax/simplify_test.go b/src/regexp/syntax/simplify_test.go
index 879eff5be..879eff5be 100644
--- a/src/pkg/regexp/syntax/simplify_test.go
+++ b/src/regexp/syntax/simplify_test.go
diff --git a/src/pkg/regexp/testdata/README b/src/regexp/testdata/README
index b1b301be8..b1b301be8 100644
--- a/src/pkg/regexp/testdata/README
+++ b/src/regexp/testdata/README
diff --git a/src/pkg/regexp/testdata/basic.dat b/src/regexp/testdata/basic.dat
index 7859290ba..7859290ba 100644
--- a/src/pkg/regexp/testdata/basic.dat
+++ b/src/regexp/testdata/basic.dat
diff --git a/src/pkg/regexp/testdata/nullsubexpr.dat b/src/regexp/testdata/nullsubexpr.dat
index 2e18fbb91..2e18fbb91 100644
--- a/src/pkg/regexp/testdata/nullsubexpr.dat
+++ b/src/regexp/testdata/nullsubexpr.dat
diff --git a/src/pkg/regexp/testdata/re2-exhaustive.txt.bz2 b/src/regexp/testdata/re2-exhaustive.txt.bz2
index a357f2801..a357f2801 100644
--- a/src/pkg/regexp/testdata/re2-exhaustive.txt.bz2
+++ b/src/regexp/testdata/re2-exhaustive.txt.bz2
diff --git a/src/pkg/regexp/testdata/re2-search.txt b/src/regexp/testdata/re2-search.txt
index f648e5527..f648e5527 100644
--- a/src/pkg/regexp/testdata/re2-search.txt
+++ b/src/regexp/testdata/re2-search.txt
diff --git a/src/pkg/regexp/testdata/repetition.dat b/src/regexp/testdata/repetition.dat
index e6361f51a..e6361f51a 100644
--- a/src/pkg/regexp/testdata/repetition.dat
+++ b/src/regexp/testdata/repetition.dat
diff --git a/src/pkg/regexp/testdata/testregex.c b/src/regexp/testdata/testregex.c
index 37545d057..37545d057 100644
--- a/src/pkg/regexp/testdata/testregex.c
+++ b/src/regexp/testdata/testregex.c
diff --git a/src/pkg/runtime/Makefile b/src/runtime/Makefile
index 5827ce134..55087def0 100644
--- a/src/pkg/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -2,4 +2,4 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.dist
+include ../Make.dist
diff --git a/src/pkg/runtime/alg.go b/src/runtime/alg.go
index e9ed59503..e9ed59503 100644
--- a/src/pkg/runtime/alg.go
+++ b/src/runtime/alg.go
diff --git a/src/pkg/runtime/append_test.go b/src/runtime/append_test.go
index a67dc9b49..a67dc9b49 100644
--- a/src/pkg/runtime/append_test.go
+++ b/src/runtime/append_test.go
diff --git a/src/pkg/runtime/arch_386.go b/src/runtime/arch_386.go
index 287b67e27..287b67e27 100644
--- a/src/pkg/runtime/arch_386.go
+++ b/src/runtime/arch_386.go
diff --git a/src/pkg/runtime/arch_386.h b/src/runtime/arch_386.h
index 75a5ba77f..75a5ba77f 100644
--- a/src/pkg/runtime/arch_386.h
+++ b/src/runtime/arch_386.h
diff --git a/src/pkg/runtime/arch_amd64.go b/src/runtime/arch_amd64.go
index fe60c7066..fe60c7066 100644
--- a/src/pkg/runtime/arch_amd64.go
+++ b/src/runtime/arch_amd64.go
diff --git a/src/pkg/runtime/arch_amd64.h b/src/runtime/arch_amd64.h
index d7b81ee90..d7b81ee90 100644
--- a/src/pkg/runtime/arch_amd64.h
+++ b/src/runtime/arch_amd64.h
diff --git a/src/pkg/runtime/arch_amd64p32.go b/src/runtime/arch_amd64p32.go
index 90766b404..90766b404 100644
--- a/src/pkg/runtime/arch_amd64p32.go
+++ b/src/runtime/arch_amd64p32.go
diff --git a/src/pkg/runtime/arch_amd64p32.h b/src/runtime/arch_amd64p32.h
index d3e864987..d3e864987 100644
--- a/src/pkg/runtime/arch_amd64p32.h
+++ b/src/runtime/arch_amd64p32.h
diff --git a/src/pkg/runtime/arch_arm.go b/src/runtime/arch_arm.go
index 23f2711f6..23f2711f6 100644
--- a/src/pkg/runtime/arch_arm.go
+++ b/src/runtime/arch_arm.go
diff --git a/src/pkg/runtime/arch_arm.h b/src/runtime/arch_arm.h
index 637a334a0..637a334a0 100644
--- a/src/pkg/runtime/arch_arm.h
+++ b/src/runtime/arch_arm.h
diff --git a/src/pkg/runtime/arch_power64.h b/src/runtime/arch_power64.h
index 7cfb9da2f..7cfb9da2f 100644
--- a/src/pkg/runtime/arch_power64.h
+++ b/src/runtime/arch_power64.h
diff --git a/src/pkg/runtime/arch_power64le.h b/src/runtime/arch_power64le.h
index 684ac9953..684ac9953 100644
--- a/src/pkg/runtime/arch_power64le.h
+++ b/src/runtime/arch_power64le.h
diff --git a/src/pkg/runtime/asm_386.s b/src/runtime/asm_386.s
index 25026417b..25026417b 100644
--- a/src/pkg/runtime/asm_386.s
+++ b/src/runtime/asm_386.s
diff --git a/src/pkg/runtime/asm_amd64.s b/src/runtime/asm_amd64.s
index cc32ad8a1..cc32ad8a1 100644
--- a/src/pkg/runtime/asm_amd64.s
+++ b/src/runtime/asm_amd64.s
diff --git a/src/pkg/runtime/asm_amd64p32.s b/src/runtime/asm_amd64p32.s
index 6c10bec5c..6c10bec5c 100644
--- a/src/pkg/runtime/asm_amd64p32.s
+++ b/src/runtime/asm_amd64p32.s
diff --git a/src/pkg/runtime/asm_arm.s b/src/runtime/asm_arm.s
index 3db907945..3db907945 100644
--- a/src/pkg/runtime/asm_arm.s
+++ b/src/runtime/asm_arm.s
diff --git a/src/pkg/runtime/asm_power64x.s b/src/runtime/asm_power64x.s
index a0511de8e..a0511de8e 100644
--- a/src/pkg/runtime/asm_power64x.s
+++ b/src/runtime/asm_power64x.s
diff --git a/src/pkg/runtime/atomic.go b/src/runtime/atomic.go
index 7e9d9b3aa..7e9d9b3aa 100644
--- a/src/pkg/runtime/atomic.go
+++ b/src/runtime/atomic.go
diff --git a/src/pkg/runtime/atomic_386.c b/src/runtime/atomic_386.c
index 82d36f2d9..82d36f2d9 100644
--- a/src/pkg/runtime/atomic_386.c
+++ b/src/runtime/atomic_386.c
diff --git a/src/pkg/runtime/atomic_amd64x.c b/src/runtime/atomic_amd64x.c
index 7be57ac95..7be57ac95 100644
--- a/src/pkg/runtime/atomic_amd64x.c
+++ b/src/runtime/atomic_amd64x.c
diff --git a/src/pkg/runtime/atomic_arm.go b/src/runtime/atomic_arm.go
index b1632cdd1..b1632cdd1 100644
--- a/src/pkg/runtime/atomic_arm.go
+++ b/src/runtime/atomic_arm.go
diff --git a/src/pkg/runtime/atomic_power64x.s b/src/runtime/atomic_power64x.s
index c08590ac9..c08590ac9 100644
--- a/src/pkg/runtime/atomic_power64x.s
+++ b/src/runtime/atomic_power64x.s
diff --git a/src/pkg/runtime/cgo/asm_386.s b/src/runtime/cgo/asm_386.s
index a895083f1..a895083f1 100644
--- a/src/pkg/runtime/cgo/asm_386.s
+++ b/src/runtime/cgo/asm_386.s
diff --git a/src/pkg/runtime/cgo/asm_amd64.s b/src/runtime/cgo/asm_amd64.s
index 6095bd133..6095bd133 100644
--- a/src/pkg/runtime/cgo/asm_amd64.s
+++ b/src/runtime/cgo/asm_amd64.s
diff --git a/src/pkg/runtime/cgo/asm_arm.s b/src/runtime/cgo/asm_arm.s
index 6e57432e3..6e57432e3 100644
--- a/src/pkg/runtime/cgo/asm_arm.s
+++ b/src/runtime/cgo/asm_arm.s
diff --git a/src/pkg/runtime/cgo/asm_nacl_amd64p32.s b/src/runtime/cgo/asm_nacl_amd64p32.s
index eb92014ed..eb92014ed 100644
--- a/src/pkg/runtime/cgo/asm_nacl_amd64p32.s
+++ b/src/runtime/cgo/asm_nacl_amd64p32.s
diff --git a/src/pkg/runtime/cgo/callbacks.c b/src/runtime/cgo/callbacks.c
index f074237d5..f074237d5 100644
--- a/src/pkg/runtime/cgo/callbacks.c
+++ b/src/runtime/cgo/callbacks.c
diff --git a/src/pkg/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go
index 786ae515c..786ae515c 100644
--- a/src/pkg/runtime/cgo/cgo.go
+++ b/src/runtime/cgo/cgo.go
diff --git a/src/pkg/runtime/cgo/dragonfly.c b/src/runtime/cgo/dragonfly.c
index acf53e265..acf53e265 100644
--- a/src/pkg/runtime/cgo/dragonfly.c
+++ b/src/runtime/cgo/dragonfly.c
diff --git a/src/pkg/runtime/cgo/freebsd.c b/src/runtime/cgo/freebsd.c
index dfcfa3a21..dfcfa3a21 100644
--- a/src/pkg/runtime/cgo/freebsd.c
+++ b/src/runtime/cgo/freebsd.c
diff --git a/src/pkg/runtime/cgo/gcc_386.S b/src/runtime/cgo/gcc_386.S
index bf4142793..bf4142793 100644
--- a/src/pkg/runtime/cgo/gcc_386.S
+++ b/src/runtime/cgo/gcc_386.S
diff --git a/src/pkg/runtime/cgo/gcc_amd64.S b/src/runtime/cgo/gcc_amd64.S
index 32d0200cf..32d0200cf 100644
--- a/src/pkg/runtime/cgo/gcc_amd64.S
+++ b/src/runtime/cgo/gcc_amd64.S
diff --git a/src/pkg/runtime/cgo/gcc_android.c b/src/runtime/cgo/gcc_android.c
index be2772568..be2772568 100644
--- a/src/pkg/runtime/cgo/gcc_android.c
+++ b/src/runtime/cgo/gcc_android.c
diff --git a/src/pkg/runtime/cgo/gcc_android_arm.c b/src/runtime/cgo/gcc_android_arm.c
index 07f7e72e3..07f7e72e3 100644
--- a/src/pkg/runtime/cgo/gcc_android_arm.c
+++ b/src/runtime/cgo/gcc_android_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/runtime/cgo/gcc_arm.S
index 2e4b3528b..2e4b3528b 100644
--- a/src/pkg/runtime/cgo/gcc_arm.S
+++ b/src/runtime/cgo/gcc_arm.S
diff --git a/src/pkg/runtime/cgo/gcc_darwin_386.c b/src/runtime/cgo/gcc_darwin_386.c
index d1ef31ed4..d1ef31ed4 100644
--- a/src/pkg/runtime/cgo/gcc_darwin_386.c
+++ b/src/runtime/cgo/gcc_darwin_386.c
diff --git a/src/pkg/runtime/cgo/gcc_darwin_amd64.c b/src/runtime/cgo/gcc_darwin_amd64.c
index 358a2816a..358a2816a 100644
--- a/src/pkg/runtime/cgo/gcc_darwin_amd64.c
+++ b/src/runtime/cgo/gcc_darwin_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_dragonfly_386.c b/src/runtime/cgo/gcc_dragonfly_386.c
index 6af61ac49..6af61ac49 100644
--- a/src/pkg/runtime/cgo/gcc_dragonfly_386.c
+++ b/src/runtime/cgo/gcc_dragonfly_386.c
diff --git a/src/pkg/runtime/cgo/gcc_dragonfly_amd64.c b/src/runtime/cgo/gcc_dragonfly_amd64.c
index a29d52294..a29d52294 100644
--- a/src/pkg/runtime/cgo/gcc_dragonfly_amd64.c
+++ b/src/runtime/cgo/gcc_dragonfly_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_fatalf.c b/src/runtime/cgo/gcc_fatalf.c
index 21c1acfaa..21c1acfaa 100644
--- a/src/pkg/runtime/cgo/gcc_fatalf.c
+++ b/src/runtime/cgo/gcc_fatalf.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_386.c b/src/runtime/cgo/gcc_freebsd_386.c
index 6af61ac49..6af61ac49 100644
--- a/src/pkg/runtime/cgo/gcc_freebsd_386.c
+++ b/src/runtime/cgo/gcc_freebsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_amd64.c b/src/runtime/cgo/gcc_freebsd_amd64.c
index a29d52294..a29d52294 100644
--- a/src/pkg/runtime/cgo/gcc_freebsd_amd64.c
+++ b/src/runtime/cgo/gcc_freebsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_arm.c b/src/runtime/cgo/gcc_freebsd_arm.c
index 16530f020..16530f020 100644
--- a/src/pkg/runtime/cgo/gcc_freebsd_arm.c
+++ b/src/runtime/cgo/gcc_freebsd_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_386.c b/src/runtime/cgo/gcc_linux_386.c
index 82b156cbb..82b156cbb 100644
--- a/src/pkg/runtime/cgo/gcc_linux_386.c
+++ b/src/runtime/cgo/gcc_linux_386.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_amd64.c b/src/runtime/cgo/gcc_linux_amd64.c
index fdbf51c25..fdbf51c25 100644
--- a/src/pkg/runtime/cgo/gcc_linux_amd64.c
+++ b/src/runtime/cgo/gcc_linux_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_arm.c b/src/runtime/cgo/gcc_linux_arm.c
index ef16d2341..ef16d2341 100644
--- a/src/pkg/runtime/cgo/gcc_linux_arm.c
+++ b/src/runtime/cgo/gcc_linux_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_386.c b/src/runtime/cgo/gcc_netbsd_386.c
index a2b7ef3fc..a2b7ef3fc 100644
--- a/src/pkg/runtime/cgo/gcc_netbsd_386.c
+++ b/src/runtime/cgo/gcc_netbsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_amd64.c b/src/runtime/cgo/gcc_netbsd_amd64.c
index ccd08b73c..ccd08b73c 100644
--- a/src/pkg/runtime/cgo/gcc_netbsd_amd64.c
+++ b/src/runtime/cgo/gcc_netbsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_arm.c b/src/runtime/cgo/gcc_netbsd_arm.c
index 5c0603dc6..5c0603dc6 100644
--- a/src/pkg/runtime/cgo/gcc_netbsd_arm.c
+++ b/src/runtime/cgo/gcc_netbsd_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_openbsd_386.c b/src/runtime/cgo/gcc_openbsd_386.c
index 48b4bc739..48b4bc739 100644
--- a/src/pkg/runtime/cgo/gcc_openbsd_386.c
+++ b/src/runtime/cgo/gcc_openbsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_openbsd_amd64.c b/src/runtime/cgo/gcc_openbsd_amd64.c
index 5f0d3bb45..5f0d3bb45 100644
--- a/src/pkg/runtime/cgo/gcc_openbsd_amd64.c
+++ b/src/runtime/cgo/gcc_openbsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_setenv.c b/src/runtime/cgo/gcc_setenv.c
index 8b128b946..8b128b946 100644
--- a/src/pkg/runtime/cgo/gcc_setenv.c
+++ b/src/runtime/cgo/gcc_setenv.c
diff --git a/src/pkg/runtime/cgo/gcc_util.c b/src/runtime/cgo/gcc_util.c
index 143734e94..143734e94 100644
--- a/src/pkg/runtime/cgo/gcc_util.c
+++ b/src/runtime/cgo/gcc_util.c
diff --git a/src/pkg/runtime/cgo/gcc_windows_386.c b/src/runtime/cgo/gcc_windows_386.c
index 0935b74f2..0935b74f2 100644
--- a/src/pkg/runtime/cgo/gcc_windows_386.c
+++ b/src/runtime/cgo/gcc_windows_386.c
diff --git a/src/pkg/runtime/cgo/gcc_windows_amd64.c b/src/runtime/cgo/gcc_windows_amd64.c
index 4a2540a35..4a2540a35 100644
--- a/src/pkg/runtime/cgo/gcc_windows_amd64.c
+++ b/src/runtime/cgo/gcc_windows_amd64.c
diff --git a/src/pkg/runtime/cgo/iscgo.c b/src/runtime/cgo/iscgo.c
index 0907a1958..0907a1958 100644
--- a/src/pkg/runtime/cgo/iscgo.c
+++ b/src/runtime/cgo/iscgo.c
diff --git a/src/pkg/runtime/cgo/libcgo.h b/src/runtime/cgo/libcgo.h
index 799af05ea..799af05ea 100644
--- a/src/pkg/runtime/cgo/libcgo.h
+++ b/src/runtime/cgo/libcgo.h
diff --git a/src/pkg/runtime/cgo/netbsd.c b/src/runtime/cgo/netbsd.c
index b6403f686..b6403f686 100644
--- a/src/pkg/runtime/cgo/netbsd.c
+++ b/src/runtime/cgo/netbsd.c
diff --git a/src/pkg/runtime/cgo/openbsd.c b/src/runtime/cgo/openbsd.c
index 84e9f9eff..84e9f9eff 100644
--- a/src/pkg/runtime/cgo/openbsd.c
+++ b/src/runtime/cgo/openbsd.c
diff --git a/src/pkg/runtime/cgo/setenv.c b/src/runtime/cgo/setenv.c
index ee529904f..ee529904f 100644
--- a/src/pkg/runtime/cgo/setenv.c
+++ b/src/runtime/cgo/setenv.c
diff --git a/src/pkg/runtime/cgocall.go b/src/runtime/cgocall.go
index 76a533e93..76a533e93 100644
--- a/src/pkg/runtime/cgocall.go
+++ b/src/runtime/cgocall.go
diff --git a/src/pkg/runtime/cgocall.h b/src/runtime/cgocall.h
index c87a9cdc5..c87a9cdc5 100644
--- a/src/pkg/runtime/cgocall.h
+++ b/src/runtime/cgocall.h
diff --git a/src/pkg/runtime/chan.go b/src/runtime/chan.go
index 91ade4d37..91ade4d37 100644
--- a/src/pkg/runtime/chan.go
+++ b/src/runtime/chan.go
diff --git a/src/pkg/runtime/chan.h b/src/runtime/chan.h
index c34ff1533..c34ff1533 100644
--- a/src/pkg/runtime/chan.h
+++ b/src/runtime/chan.h
diff --git a/src/pkg/runtime/chan_test.go b/src/runtime/chan_test.go
index 01632892e..01632892e 100644
--- a/src/pkg/runtime/chan_test.go
+++ b/src/runtime/chan_test.go
diff --git a/src/pkg/runtime/closure_test.go b/src/runtime/closure_test.go
index ea65fbd5f..ea65fbd5f 100644
--- a/src/pkg/runtime/closure_test.go
+++ b/src/runtime/closure_test.go
diff --git a/src/pkg/runtime/compiler.go b/src/runtime/compiler.go
index 562a46022..562a46022 100644
--- a/src/pkg/runtime/compiler.go
+++ b/src/runtime/compiler.go
diff --git a/src/pkg/runtime/complex.go b/src/runtime/complex.go
index ec50f8947..ec50f8947 100644
--- a/src/pkg/runtime/complex.go
+++ b/src/runtime/complex.go
diff --git a/src/pkg/runtime/complex_test.go b/src/runtime/complex_test.go
index f41e6a357..f41e6a357 100644
--- a/src/pkg/runtime/complex_test.go
+++ b/src/runtime/complex_test.go
diff --git a/src/pkg/runtime/cpuprof.go b/src/runtime/cpuprof.go
index 8b1c1c632..8b1c1c632 100644
--- a/src/pkg/runtime/cpuprof.go
+++ b/src/runtime/cpuprof.go
diff --git a/src/pkg/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
index 4ff0084c2..4ff0084c2 100644
--- a/src/pkg/runtime/crash_cgo_test.go
+++ b/src/runtime/crash_cgo_test.go
diff --git a/src/pkg/runtime/crash_test.go b/src/runtime/crash_test.go
index c61fa162f..c61fa162f 100644
--- a/src/pkg/runtime/crash_test.go
+++ b/src/runtime/crash_test.go
diff --git a/src/pkg/runtime/debug.go b/src/runtime/debug.go
index bb4bd60ed..bb4bd60ed 100644
--- a/src/pkg/runtime/debug.go
+++ b/src/runtime/debug.go
diff --git a/src/pkg/runtime/debug/debug.c b/src/runtime/debug/debug.c
index a7292c477..a7292c477 100644
--- a/src/pkg/runtime/debug/debug.c
+++ b/src/runtime/debug/debug.c
diff --git a/src/pkg/runtime/debug/garbage.go b/src/runtime/debug/garbage.go
index 30994f219..30994f219 100644
--- a/src/pkg/runtime/debug/garbage.go
+++ b/src/runtime/debug/garbage.go
diff --git a/src/pkg/runtime/debug/garbage_test.go b/src/runtime/debug/garbage_test.go
index 149bafc6f..149bafc6f 100644
--- a/src/pkg/runtime/debug/garbage_test.go
+++ b/src/runtime/debug/garbage_test.go
diff --git a/src/pkg/runtime/debug/heapdump_test.go b/src/runtime/debug/heapdump_test.go
index 920190115..920190115 100644
--- a/src/pkg/runtime/debug/heapdump_test.go
+++ b/src/runtime/debug/heapdump_test.go
diff --git a/src/pkg/runtime/debug/stack.go b/src/runtime/debug/stack.go
index c29b0a226..c29b0a226 100644
--- a/src/pkg/runtime/debug/stack.go
+++ b/src/runtime/debug/stack.go
diff --git a/src/pkg/runtime/debug/stack_test.go b/src/runtime/debug/stack_test.go
index bbd662618..28691ee4d 100644
--- a/src/pkg/runtime/debug/stack_test.go
+++ b/src/runtime/debug/stack_test.go
@@ -22,15 +22,15 @@ func (t T) method() []byte {
 	The traceback should look something like this, modulo line numbers and hex constants.
 	Don't worry much about the base levels, but check the ones in our own package.
 
-		/Users/r/go/src/pkg/runtime/debug/stack_test.go:15 (0x13878)
+		/Users/r/go/src/runtime/debug/stack_test.go:15 (0x13878)
 			(*T).ptrmethod: return Stack()
-		/Users/r/go/src/pkg/runtime/debug/stack_test.go:18 (0x138dd)
+		/Users/r/go/src/runtime/debug/stack_test.go:18 (0x138dd)
 			T.method: return t.ptrmethod()
-		/Users/r/go/src/pkg/runtime/debug/stack_test.go:23 (0x13920)
+		/Users/r/go/src/runtime/debug/stack_test.go:23 (0x13920)
 			TestStack: b := T(0).method()
-		/Users/r/go/src/pkg/testing/testing.go:132 (0x14a7a)
+		/Users/r/go/src/testing/testing.go:132 (0x14a7a)
 			tRunner: test.F(t)
-		/Users/r/go/src/pkg/runtime/proc.c:145 (0xc970)
+		/Users/r/go/src/runtime/proc.c:145 (0xc970)
 			???: runtime·unlock(&runtime·sched);
 */
 func TestStack(t *testing.T) {
@@ -49,10 +49,10 @@ func TestStack(t *testing.T) {
 			n++
 		}
 	}
-	frame("src/pkg/runtime/debug/stack_test.go", "\t(*T).ptrmethod: return Stack()")
-	frame("src/pkg/runtime/debug/stack_test.go", "\tT.method: return t.ptrmethod()")
-	frame("src/pkg/runtime/debug/stack_test.go", "\tTestStack: b := T(0).method()")
-	frame("src/pkg/testing/testing.go", "")
+	frame("src/runtime/debug/stack_test.go", "\t(*T).ptrmethod: return Stack()")
+	frame("src/runtime/debug/stack_test.go", "\tT.method: return t.ptrmethod()")
+	frame("src/runtime/debug/stack_test.go", "\tTestStack: b := T(0).method()")
+	frame("src/testing/testing.go", "")
 }
 
 func check(t *testing.T, line, has string) {
diff --git a/src/pkg/runtime/debug/stubs.go b/src/runtime/debug/stubs.go
index 8fba6cf34..8fba6cf34 100644
--- a/src/pkg/runtime/debug/stubs.go
+++ b/src/runtime/debug/stubs.go
diff --git a/src/pkg/runtime/debug/stubs.s b/src/runtime/debug/stubs.s
index d56274f2d..d56274f2d 100644
--- a/src/pkg/runtime/debug/stubs.s
+++ b/src/runtime/debug/stubs.s
diff --git a/src/pkg/runtime/defs.c b/src/runtime/defs.c
index b0a9b20d7..b0a9b20d7 100644
--- a/src/pkg/runtime/defs.c
+++ b/src/runtime/defs.c
diff --git a/src/pkg/runtime/defs1_linux.go b/src/runtime/defs1_linux.go
index 87c6e02a4..87c6e02a4 100644
--- a/src/pkg/runtime/defs1_linux.go
+++ b/src/runtime/defs1_linux.go
diff --git a/src/pkg/runtime/defs2_linux.go b/src/runtime/defs2_linux.go
index 980df9ec3..980df9ec3 100644
--- a/src/pkg/runtime/defs2_linux.go
+++ b/src/runtime/defs2_linux.go
diff --git a/src/pkg/runtime/defs3_linux.go b/src/runtime/defs3_linux.go
index eb65f9d1e..eb65f9d1e 100644
--- a/src/pkg/runtime/defs3_linux.go
+++ b/src/runtime/defs3_linux.go
diff --git a/src/pkg/runtime/defs_android_arm.h b/src/runtime/defs_android_arm.h
index 3611b3a10..3611b3a10 100644
--- a/src/pkg/runtime/defs_android_arm.h
+++ b/src/runtime/defs_android_arm.h
diff --git a/src/pkg/runtime/defs_arm_linux.go b/src/runtime/defs_arm_linux.go
index afd6897e3..afd6897e3 100644
--- a/src/pkg/runtime/defs_arm_linux.go
+++ b/src/runtime/defs_arm_linux.go
diff --git a/src/pkg/runtime/defs_darwin.go b/src/runtime/defs_darwin.go
index 722013ba9..722013ba9 100644
--- a/src/pkg/runtime/defs_darwin.go
+++ b/src/runtime/defs_darwin.go
diff --git a/src/pkg/runtime/defs_darwin_386.h b/src/runtime/defs_darwin_386.h
index 0e0b4fbf7..0e0b4fbf7 100644
--- a/src/pkg/runtime/defs_darwin_386.h
+++ b/src/runtime/defs_darwin_386.h
diff --git a/src/pkg/runtime/defs_darwin_amd64.h b/src/runtime/defs_darwin_amd64.h
index 4bf83c1cb..4bf83c1cb 100644
--- a/src/pkg/runtime/defs_darwin_amd64.h
+++ b/src/runtime/defs_darwin_amd64.h
diff --git a/src/pkg/runtime/defs_dragonfly.go b/src/runtime/defs_dragonfly.go
index 555b8f595..555b8f595 100644
--- a/src/pkg/runtime/defs_dragonfly.go
+++ b/src/runtime/defs_dragonfly.go
diff --git a/src/pkg/runtime/defs_dragonfly_386.h b/src/runtime/defs_dragonfly_386.h
index f86b9c6b9..f86b9c6b9 100644
--- a/src/pkg/runtime/defs_dragonfly_386.h
+++ b/src/runtime/defs_dragonfly_386.h
diff --git a/src/pkg/runtime/defs_dragonfly_amd64.h b/src/runtime/defs_dragonfly_amd64.h
index 671555241..671555241 100644
--- a/src/pkg/runtime/defs_dragonfly_amd64.h
+++ b/src/runtime/defs_dragonfly_amd64.h
diff --git a/src/pkg/runtime/defs_freebsd.go b/src/runtime/defs_freebsd.go
index 0253685aa..0253685aa 100644
--- a/src/pkg/runtime/defs_freebsd.go
+++ b/src/runtime/defs_freebsd.go
diff --git a/src/pkg/runtime/defs_freebsd_386.h b/src/runtime/defs_freebsd_386.h
index 156dccba4..156dccba4 100644
--- a/src/pkg/runtime/defs_freebsd_386.h
+++ b/src/runtime/defs_freebsd_386.h
diff --git a/src/pkg/runtime/defs_freebsd_amd64.h b/src/runtime/defs_freebsd_amd64.h
index 4ba8956a2..4ba8956a2 100644
--- a/src/pkg/runtime/defs_freebsd_amd64.h
+++ b/src/runtime/defs_freebsd_amd64.h
diff --git a/src/pkg/runtime/defs_freebsd_arm.h b/src/runtime/defs_freebsd_arm.h
index 17deba68d..17deba68d 100644
--- a/src/pkg/runtime/defs_freebsd_arm.h
+++ b/src/runtime/defs_freebsd_arm.h
diff --git a/src/pkg/runtime/defs_linux.go b/src/runtime/defs_linux.go
index 553366a50..553366a50 100644
--- a/src/pkg/runtime/defs_linux.go
+++ b/src/runtime/defs_linux.go
diff --git a/src/pkg/runtime/defs_linux_386.h b/src/runtime/defs_linux_386.h
index 24a05d862..24a05d862 100644
--- a/src/pkg/runtime/defs_linux_386.h
+++ b/src/runtime/defs_linux_386.h
diff --git a/src/pkg/runtime/defs_linux_amd64.h b/src/runtime/defs_linux_amd64.h
index 14616dffe..14616dffe 100644
--- a/src/pkg/runtime/defs_linux_amd64.h
+++ b/src/runtime/defs_linux_amd64.h
diff --git a/src/pkg/runtime/defs_linux_arm.h b/src/runtime/defs_linux_arm.h
index 50b3c919e..50b3c919e 100644
--- a/src/pkg/runtime/defs_linux_arm.h
+++ b/src/runtime/defs_linux_arm.h
diff --git a/src/pkg/runtime/defs_linux_power64.h b/src/runtime/defs_linux_power64.h
index 64f145672..64f145672 100644
--- a/src/pkg/runtime/defs_linux_power64.h
+++ b/src/runtime/defs_linux_power64.h
diff --git a/src/pkg/runtime/defs_linux_power64le.h b/src/runtime/defs_linux_power64le.h
index 41db45ca1..41db45ca1 100644
--- a/src/pkg/runtime/defs_linux_power64le.h
+++ b/src/runtime/defs_linux_power64le.h
diff --git a/src/pkg/runtime/defs_nacl_386.h b/src/runtime/defs_nacl_386.h
index e8fbb38e1..e8fbb38e1 100644
--- a/src/pkg/runtime/defs_nacl_386.h
+++ b/src/runtime/defs_nacl_386.h
diff --git a/src/pkg/runtime/defs_nacl_amd64p32.h b/src/runtime/defs_nacl_amd64p32.h
index 45663d40a..45663d40a 100644
--- a/src/pkg/runtime/defs_nacl_amd64p32.h
+++ b/src/runtime/defs_nacl_amd64p32.h
diff --git a/src/pkg/runtime/defs_nacl_arm.h b/src/runtime/defs_nacl_arm.h
index 9ce07ccb2..9ce07ccb2 100644
--- a/src/pkg/runtime/defs_nacl_arm.h
+++ b/src/runtime/defs_nacl_arm.h
diff --git a/src/pkg/runtime/defs_netbsd.go b/src/runtime/defs_netbsd.go
index b27949e42..b27949e42 100644
--- a/src/pkg/runtime/defs_netbsd.go
+++ b/src/runtime/defs_netbsd.go
diff --git a/src/pkg/runtime/defs_netbsd_386.go b/src/runtime/defs_netbsd_386.go
index c26f24607..c26f24607 100644
--- a/src/pkg/runtime/defs_netbsd_386.go
+++ b/src/runtime/defs_netbsd_386.go
diff --git a/src/pkg/runtime/defs_netbsd_386.h b/src/runtime/defs_netbsd_386.h
index fd87804f9..fd87804f9 100644
--- a/src/pkg/runtime/defs_netbsd_386.h
+++ b/src/runtime/defs_netbsd_386.h
diff --git a/src/pkg/runtime/defs_netbsd_amd64.go b/src/runtime/defs_netbsd_amd64.go
index f18a7b1fe..f18a7b1fe 100644
--- a/src/pkg/runtime/defs_netbsd_amd64.go
+++ b/src/runtime/defs_netbsd_amd64.go
diff --git a/src/pkg/runtime/defs_netbsd_amd64.h b/src/runtime/defs_netbsd_amd64.h
index dac94b113..dac94b113 100644
--- a/src/pkg/runtime/defs_netbsd_amd64.h
+++ b/src/runtime/defs_netbsd_amd64.h
diff --git a/src/pkg/runtime/defs_netbsd_arm.go b/src/runtime/defs_netbsd_arm.go
index cb0dce66b..cb0dce66b 100644
--- a/src/pkg/runtime/defs_netbsd_arm.go
+++ b/src/runtime/defs_netbsd_arm.go
diff --git a/src/pkg/runtime/defs_netbsd_arm.h b/src/runtime/defs_netbsd_arm.h
index 70f34af47..70f34af47 100644
--- a/src/pkg/runtime/defs_netbsd_arm.h
+++ b/src/runtime/defs_netbsd_arm.h
diff --git a/src/pkg/runtime/defs_openbsd.go b/src/runtime/defs_openbsd.go
index 39224c988..39224c988 100644
--- a/src/pkg/runtime/defs_openbsd.go
+++ b/src/runtime/defs_openbsd.go
diff --git a/src/pkg/runtime/defs_openbsd_386.h b/src/runtime/defs_openbsd_386.h
index 6b77e0084..6b77e0084 100644
--- a/src/pkg/runtime/defs_openbsd_386.h
+++ b/src/runtime/defs_openbsd_386.h
diff --git a/src/pkg/runtime/defs_openbsd_amd64.h b/src/runtime/defs_openbsd_amd64.h
index 761e8e47d..761e8e47d 100644
--- a/src/pkg/runtime/defs_openbsd_amd64.h
+++ b/src/runtime/defs_openbsd_amd64.h
diff --git a/src/pkg/runtime/defs_plan9_386.h b/src/runtime/defs_plan9_386.h
index a762b8589..a762b8589 100644
--- a/src/pkg/runtime/defs_plan9_386.h
+++ b/src/runtime/defs_plan9_386.h
diff --git a/src/pkg/runtime/defs_plan9_amd64.h b/src/runtime/defs_plan9_amd64.h
index 20bca479c..20bca479c 100644
--- a/src/pkg/runtime/defs_plan9_amd64.h
+++ b/src/runtime/defs_plan9_amd64.h
diff --git a/src/pkg/runtime/defs_solaris.go b/src/runtime/defs_solaris.go
index ba44e5fd4..ba44e5fd4 100644
--- a/src/pkg/runtime/defs_solaris.go
+++ b/src/runtime/defs_solaris.go
diff --git a/src/pkg/runtime/defs_solaris_amd64.go b/src/runtime/defs_solaris_amd64.go
index 049317888..049317888 100644
--- a/src/pkg/runtime/defs_solaris_amd64.go
+++ b/src/runtime/defs_solaris_amd64.go
diff --git a/src/pkg/runtime/defs_solaris_amd64.h b/src/runtime/defs_solaris_amd64.h
index cb1cfeadc..cb1cfeadc 100644
--- a/src/pkg/runtime/defs_solaris_amd64.h
+++ b/src/runtime/defs_solaris_amd64.h
diff --git a/src/pkg/runtime/defs_windows.go b/src/runtime/defs_windows.go
index 01aea92de..01aea92de 100644
--- a/src/pkg/runtime/defs_windows.go
+++ b/src/runtime/defs_windows.go
diff --git a/src/pkg/runtime/defs_windows_386.h b/src/runtime/defs_windows_386.h
index db3629a1d..db3629a1d 100644
--- a/src/pkg/runtime/defs_windows_386.h
+++ b/src/runtime/defs_windows_386.h
diff --git a/src/pkg/runtime/defs_windows_amd64.h b/src/runtime/defs_windows_amd64.h
index fe26f5a84..fe26f5a84 100644
--- a/src/pkg/runtime/defs_windows_amd64.h
+++ b/src/runtime/defs_windows_amd64.h
diff --git a/src/pkg/runtime/env_plan9.go b/src/runtime/env_plan9.go
index 76e9867e0..76e9867e0 100644
--- a/src/pkg/runtime/env_plan9.go
+++ b/src/runtime/env_plan9.go
diff --git a/src/pkg/runtime/env_posix.go b/src/runtime/env_posix.go
index 6c04f6cc7..6c04f6cc7 100644
--- a/src/pkg/runtime/env_posix.go
+++ b/src/runtime/env_posix.go
diff --git a/src/pkg/runtime/error.go b/src/runtime/error.go
index 3ea93680c..3ea93680c 100644
--- a/src/pkg/runtime/error.go
+++ b/src/runtime/error.go
diff --git a/src/pkg/runtime/export_futex_test.go b/src/runtime/export_futex_test.go
index 96281f650..96281f650 100644
--- a/src/pkg/runtime/export_futex_test.go
+++ b/src/runtime/export_futex_test.go
diff --git a/src/pkg/runtime/export_test.go b/src/runtime/export_test.go
index 07ef26f25..07ef26f25 100644
--- a/src/pkg/runtime/export_test.go
+++ b/src/runtime/export_test.go
diff --git a/src/pkg/runtime/extern.go b/src/runtime/extern.go
index 3d06a23fc..3d06a23fc 100644
--- a/src/pkg/runtime/extern.go
+++ b/src/runtime/extern.go
diff --git a/src/pkg/runtime/float.c b/src/runtime/float.c
index 42082e434..42082e434 100644
--- a/src/pkg/runtime/float.c
+++ b/src/runtime/float.c
diff --git a/src/pkg/runtime/funcdata.h b/src/runtime/funcdata.h
index dc9c41363..dc9c41363 100644
--- a/src/pkg/runtime/funcdata.h
+++ b/src/runtime/funcdata.h
diff --git a/src/pkg/runtime/futex_test.go b/src/runtime/futex_test.go
index f57fc52b8..f57fc52b8 100644
--- a/src/pkg/runtime/futex_test.go
+++ b/src/runtime/futex_test.go
diff --git a/src/pkg/runtime/gc_test.go b/src/runtime/gc_test.go
index 6abec4cca..6abec4cca 100644
--- a/src/pkg/runtime/gc_test.go
+++ b/src/runtime/gc_test.go
diff --git a/src/pkg/runtime/gcinfo_test.go b/src/runtime/gcinfo_test.go
index 7d432983b..7d432983b 100644
--- a/src/pkg/runtime/gcinfo_test.go
+++ b/src/runtime/gcinfo_test.go
diff --git a/src/pkg/runtime/hash_test.go b/src/runtime/hash_test.go
index 41fff98eb..41fff98eb 100644
--- a/src/pkg/runtime/hash_test.go
+++ b/src/runtime/hash_test.go
diff --git a/src/pkg/runtime/hashmap.go b/src/runtime/hashmap.go
index 55287f6ff..55287f6ff 100644
--- a/src/pkg/runtime/hashmap.go
+++ b/src/runtime/hashmap.go
diff --git a/src/pkg/runtime/hashmap_fast.go b/src/runtime/hashmap_fast.go
index 8e21e02d6..8e21e02d6 100644
--- a/src/pkg/runtime/hashmap_fast.go
+++ b/src/runtime/hashmap_fast.go
diff --git a/src/pkg/runtime/heapdump.c b/src/runtime/heapdump.c
index 5696470f2..5696470f2 100644
--- a/src/pkg/runtime/heapdump.c
+++ b/src/runtime/heapdump.c
diff --git a/src/pkg/runtime/iface.go b/src/runtime/iface.go
index f60b6a79c..f60b6a79c 100644
--- a/src/pkg/runtime/iface.go
+++ b/src/runtime/iface.go
diff --git a/src/pkg/runtime/iface_test.go b/src/runtime/iface_test.go
index bca0ea0ee..bca0ea0ee 100644
--- a/src/pkg/runtime/iface_test.go
+++ b/src/runtime/iface_test.go
diff --git a/src/pkg/runtime/lfstack.c b/src/runtime/lfstack.c
index 57e0af282..57e0af282 100644
--- a/src/pkg/runtime/lfstack.c
+++ b/src/runtime/lfstack.c
diff --git a/src/pkg/runtime/lfstack_test.go b/src/runtime/lfstack_test.go
index e51877704..e51877704 100644
--- a/src/pkg/runtime/lfstack_test.go
+++ b/src/runtime/lfstack_test.go
diff --git a/src/pkg/runtime/lock_futex.go b/src/runtime/lock_futex.go
index 725962341..725962341 100644
--- a/src/pkg/runtime/lock_futex.go
+++ b/src/runtime/lock_futex.go
diff --git a/src/pkg/runtime/lock_sema.go b/src/runtime/lock_sema.go
index d136b8280..d136b8280 100644
--- a/src/pkg/runtime/lock_sema.go
+++ b/src/runtime/lock_sema.go
diff --git a/src/pkg/runtime/malloc.c b/src/runtime/malloc.c
index 91224a38f..91224a38f 100644
--- a/src/pkg/runtime/malloc.c
+++ b/src/runtime/malloc.c
diff --git a/src/pkg/runtime/malloc.go b/src/runtime/malloc.go
index ea3a467b8..ea3a467b8 100644
--- a/src/pkg/runtime/malloc.go
+++ b/src/runtime/malloc.go
diff --git a/src/pkg/runtime/malloc.h b/src/runtime/malloc.h
index f94157069..f94157069 100644
--- a/src/pkg/runtime/malloc.h
+++ b/src/runtime/malloc.h
diff --git a/src/pkg/runtime/malloc_test.go b/src/runtime/malloc_test.go
index b7795aa1d..b7795aa1d 100644
--- a/src/pkg/runtime/malloc_test.go
+++ b/src/runtime/malloc_test.go
diff --git a/src/pkg/runtime/map_test.go b/src/runtime/map_test.go
index 8bedc0568..8bedc0568 100644
--- a/src/pkg/runtime/map_test.go
+++ b/src/runtime/map_test.go
diff --git a/src/pkg/runtime/mapspeed_test.go b/src/runtime/mapspeed_test.go
index 119eb3f39..119eb3f39 100644
--- a/src/pkg/runtime/mapspeed_test.go
+++ b/src/runtime/mapspeed_test.go
diff --git a/src/pkg/runtime/mcache.c b/src/runtime/mcache.c
index bb1fc5403..bb1fc5403 100644
--- a/src/pkg/runtime/mcache.c
+++ b/src/runtime/mcache.c
diff --git a/src/pkg/runtime/mcentral.c b/src/runtime/mcentral.c
index fe6bcfeb1..fe6bcfeb1 100644
--- a/src/pkg/runtime/mcentral.c
+++ b/src/runtime/mcentral.c
diff --git a/src/pkg/runtime/mem.go b/src/runtime/mem.go
index 34391b2eb..34391b2eb 100644
--- a/src/pkg/runtime/mem.go
+++ b/src/runtime/mem.go
diff --git a/src/pkg/runtime/mem_darwin.c b/src/runtime/mem_darwin.c
index bf3ede577..bf3ede577 100644
--- a/src/pkg/runtime/mem_darwin.c
+++ b/src/runtime/mem_darwin.c
diff --git a/src/pkg/runtime/mem_dragonfly.c b/src/runtime/mem_dragonfly.c
index 11457b2c0..11457b2c0 100644
--- a/src/pkg/runtime/mem_dragonfly.c
+++ b/src/runtime/mem_dragonfly.c
diff --git a/src/pkg/runtime/mem_freebsd.c b/src/runtime/mem_freebsd.c
index 18a9a2f5b..18a9a2f5b 100644
--- a/src/pkg/runtime/mem_freebsd.c
+++ b/src/runtime/mem_freebsd.c
diff --git a/src/pkg/runtime/mem_linux.c b/src/runtime/mem_linux.c
index 52e02b34e..52e02b34e 100644
--- a/src/pkg/runtime/mem_linux.c
+++ b/src/runtime/mem_linux.c
diff --git a/src/pkg/runtime/mem_nacl.c b/src/runtime/mem_nacl.c
index 6c836f18a..6c836f18a 100644
--- a/src/pkg/runtime/mem_nacl.c
+++ b/src/runtime/mem_nacl.c
diff --git a/src/pkg/runtime/mem_netbsd.c b/src/runtime/mem_netbsd.c
index 31820e517..31820e517 100644
--- a/src/pkg/runtime/mem_netbsd.c
+++ b/src/runtime/mem_netbsd.c
diff --git a/src/pkg/runtime/mem_openbsd.c b/src/runtime/mem_openbsd.c
index 31820e517..31820e517 100644
--- a/src/pkg/runtime/mem_openbsd.c
+++ b/src/runtime/mem_openbsd.c
diff --git a/src/pkg/runtime/mem_plan9.c b/src/runtime/mem_plan9.c
index 402869f39..402869f39 100644
--- a/src/pkg/runtime/mem_plan9.c
+++ b/src/runtime/mem_plan9.c
diff --git a/src/pkg/runtime/mem_solaris.c b/src/runtime/mem_solaris.c
index 8e90ba1d9..8e90ba1d9 100644
--- a/src/pkg/runtime/mem_solaris.c
+++ b/src/runtime/mem_solaris.c
diff --git a/src/pkg/runtime/mem_windows.c b/src/runtime/mem_windows.c
index 7bc028bf3..7bc028bf3 100644
--- a/src/pkg/runtime/mem_windows.c
+++ b/src/runtime/mem_windows.c
diff --git a/src/pkg/runtime/memclr_386.s b/src/runtime/memclr_386.s
index 8b163923e..8b163923e 100644
--- a/src/pkg/runtime/memclr_386.s
+++ b/src/runtime/memclr_386.s
diff --git a/src/pkg/runtime/memclr_amd64.s b/src/runtime/memclr_amd64.s
index 35b3b4bee..35b3b4bee 100644
--- a/src/pkg/runtime/memclr_amd64.s
+++ b/src/runtime/memclr_amd64.s
diff --git a/src/pkg/runtime/memclr_arm.s b/src/runtime/memclr_arm.s
index 1824d33b1..1824d33b1 100644
--- a/src/pkg/runtime/memclr_arm.s
+++ b/src/runtime/memclr_arm.s
diff --git a/src/pkg/runtime/memclr_plan9_386.s b/src/runtime/memclr_plan9_386.s
index b4b671f77..b4b671f77 100644
--- a/src/pkg/runtime/memclr_plan9_386.s
+++ b/src/runtime/memclr_plan9_386.s
diff --git a/src/pkg/runtime/memclr_plan9_amd64.s b/src/runtime/memclr_plan9_amd64.s
index 37e61dfbc..37e61dfbc 100644
--- a/src/pkg/runtime/memclr_plan9_amd64.s
+++ b/src/runtime/memclr_plan9_amd64.s
diff --git a/src/pkg/runtime/memclr_power64x.s b/src/runtime/memclr_power64x.s
index 4a2437c20..4a2437c20 100644
--- a/src/pkg/runtime/memclr_power64x.s
+++ b/src/runtime/memclr_power64x.s
diff --git a/src/pkg/runtime/memmove_386.s b/src/runtime/memmove_386.s
index 4c0c74c1a..4c0c74c1a 100644
--- a/src/pkg/runtime/memmove_386.s
+++ b/src/runtime/memmove_386.s
diff --git a/src/pkg/runtime/memmove_amd64.s b/src/runtime/memmove_amd64.s
index f96843534..f96843534 100644
--- a/src/pkg/runtime/memmove_amd64.s
+++ b/src/runtime/memmove_amd64.s
diff --git a/src/pkg/runtime/memmove_arm.s b/src/runtime/memmove_arm.s
index f187d4267..f187d4267 100644
--- a/src/pkg/runtime/memmove_arm.s
+++ b/src/runtime/memmove_arm.s
diff --git a/src/pkg/runtime/memmove_linux_amd64_test.go b/src/runtime/memmove_linux_amd64_test.go
index f7221f4f5..f7221f4f5 100644
--- a/src/pkg/runtime/memmove_linux_amd64_test.go
+++ b/src/runtime/memmove_linux_amd64_test.go
diff --git a/src/pkg/runtime/memmove_nacl_amd64p32.s b/src/runtime/memmove_nacl_amd64p32.s
index 373607afe..373607afe 100644
--- a/src/pkg/runtime/memmove_nacl_amd64p32.s
+++ b/src/runtime/memmove_nacl_amd64p32.s
diff --git a/src/pkg/runtime/memmove_plan9_386.s b/src/runtime/memmove_plan9_386.s
index 025d4ce1b..025d4ce1b 100644
--- a/src/pkg/runtime/memmove_plan9_386.s
+++ b/src/runtime/memmove_plan9_386.s
diff --git a/src/pkg/runtime/memmove_plan9_amd64.s b/src/runtime/memmove_plan9_amd64.s
index 8e96b8717..8e96b8717 100644
--- a/src/pkg/runtime/memmove_plan9_amd64.s
+++ b/src/runtime/memmove_plan9_amd64.s
diff --git a/src/pkg/runtime/memmove_power64x.s b/src/runtime/memmove_power64x.s
index b618f0ad7..b618f0ad7 100644
--- a/src/pkg/runtime/memmove_power64x.s
+++ b/src/runtime/memmove_power64x.s
diff --git a/src/pkg/runtime/memmove_test.go b/src/runtime/memmove_test.go
index ffda4fe6c..ffda4fe6c 100644
--- a/src/pkg/runtime/memmove_test.go
+++ b/src/runtime/memmove_test.go
diff --git a/src/pkg/runtime/mfinal_test.go b/src/runtime/mfinal_test.go
index 6b53888ab..6b53888ab 100644
--- a/src/pkg/runtime/mfinal_test.go
+++ b/src/runtime/mfinal_test.go
diff --git a/src/pkg/runtime/mfixalloc.c b/src/runtime/mfixalloc.c
index d670629da..d670629da 100644
--- a/src/pkg/runtime/mfixalloc.c
+++ b/src/runtime/mfixalloc.c
diff --git a/src/pkg/runtime/mgc0.c b/src/runtime/mgc0.c
index 7ec9640eb..7ec9640eb 100644
--- a/src/pkg/runtime/mgc0.c
+++ b/src/runtime/mgc0.c
diff --git a/src/pkg/runtime/mgc0.go b/src/runtime/mgc0.go
index 2d9d76a47..2d9d76a47 100644
--- a/src/pkg/runtime/mgc0.go
+++ b/src/runtime/mgc0.go
diff --git a/src/pkg/runtime/mgc0.h b/src/runtime/mgc0.h
index cc7acfbe1..cc7acfbe1 100644
--- a/src/pkg/runtime/mgc0.h
+++ b/src/runtime/mgc0.h
diff --git a/src/pkg/runtime/mheap.c b/src/runtime/mheap.c
index 902a5c71a..902a5c71a 100644
--- a/src/pkg/runtime/mheap.c
+++ b/src/runtime/mheap.c
diff --git a/src/pkg/runtime/mknacl.sh b/src/runtime/mknacl.sh
index 47fb7bd88..47fb7bd88 100644
--- a/src/pkg/runtime/mknacl.sh
+++ b/src/runtime/mknacl.sh
diff --git a/src/pkg/runtime/mprof.go b/src/runtime/mprof.go
index 7177c8459..7177c8459 100644
--- a/src/pkg/runtime/mprof.go
+++ b/src/runtime/mprof.go
diff --git a/src/pkg/runtime/msize.c b/src/runtime/msize.c
index 7cb65dad0..7cb65dad0 100644
--- a/src/pkg/runtime/msize.c
+++ b/src/runtime/msize.c
diff --git a/src/pkg/runtime/netpoll.go b/src/runtime/netpoll.go
index 3456e0208..3456e0208 100644
--- a/src/pkg/runtime/netpoll.go
+++ b/src/runtime/netpoll.go
diff --git a/src/pkg/runtime/netpoll_epoll.go b/src/runtime/netpoll_epoll.go
index ecfc9cdde..ecfc9cdde 100644
--- a/src/pkg/runtime/netpoll_epoll.go
+++ b/src/runtime/netpoll_epoll.go
diff --git a/src/pkg/runtime/netpoll_kqueue.go b/src/runtime/netpoll_kqueue.go
index d6d55b97b..d6d55b97b 100644
--- a/src/pkg/runtime/netpoll_kqueue.go
+++ b/src/runtime/netpoll_kqueue.go
diff --git a/src/pkg/runtime/netpoll_nacl.go b/src/runtime/netpoll_nacl.go
index 5cbc30032..5cbc30032 100644
--- a/src/pkg/runtime/netpoll_nacl.go
+++ b/src/runtime/netpoll_nacl.go
diff --git a/src/pkg/runtime/netpoll_solaris.c b/src/runtime/netpoll_solaris.c
index d422719cf..d422719cf 100644
--- a/src/pkg/runtime/netpoll_solaris.c
+++ b/src/runtime/netpoll_solaris.c
diff --git a/src/pkg/runtime/netpoll_stub.c b/src/runtime/netpoll_stub.c
index b7a8f2944..b7a8f2944 100644
--- a/src/pkg/runtime/netpoll_stub.c
+++ b/src/runtime/netpoll_stub.c
diff --git a/src/pkg/runtime/netpoll_windows.c b/src/runtime/netpoll_windows.c
index 64da41ad9..64da41ad9 100644
--- a/src/pkg/runtime/netpoll_windows.c
+++ b/src/runtime/netpoll_windows.c
diff --git a/src/pkg/runtime/noasm_arm.go b/src/runtime/noasm_arm.go
index dd3ef8267..dd3ef8267 100644
--- a/src/pkg/runtime/noasm_arm.go
+++ b/src/runtime/noasm_arm.go
diff --git a/src/pkg/runtime/norace_test.go b/src/runtime/norace_test.go
index 3b171877a..3b171877a 100644
--- a/src/pkg/runtime/norace_test.go
+++ b/src/runtime/norace_test.go
diff --git a/src/pkg/runtime/os_android.c b/src/runtime/os_android.c
index 58e0dac93..58e0dac93 100644
--- a/src/pkg/runtime/os_android.c
+++ b/src/runtime/os_android.c
diff --git a/src/pkg/runtime/os_android.h b/src/runtime/os_android.h
index c7c1098e8..c7c1098e8 100644
--- a/src/pkg/runtime/os_android.h
+++ b/src/runtime/os_android.h
diff --git a/src/pkg/runtime/os_darwin.c b/src/runtime/os_darwin.c
index 536f688cf..536f688cf 100644
--- a/src/pkg/runtime/os_darwin.c
+++ b/src/runtime/os_darwin.c
diff --git a/src/pkg/runtime/os_darwin.go b/src/runtime/os_darwin.go
index e0f63ddb9..e0f63ddb9 100644
--- a/src/pkg/runtime/os_darwin.go
+++ b/src/runtime/os_darwin.go
diff --git a/src/pkg/runtime/os_darwin.h b/src/runtime/os_darwin.h
index e8bb45daf..e8bb45daf 100644
--- a/src/pkg/runtime/os_darwin.h
+++ b/src/runtime/os_darwin.h
diff --git a/src/pkg/runtime/os_dragonfly.c b/src/runtime/os_dragonfly.c
index d470f7c78..d470f7c78 100644
--- a/src/pkg/runtime/os_dragonfly.c
+++ b/src/runtime/os_dragonfly.c
diff --git a/src/pkg/runtime/os_dragonfly.go b/src/runtime/os_dragonfly.go
index cdaa06986..cdaa06986 100644
--- a/src/pkg/runtime/os_dragonfly.go
+++ b/src/runtime/os_dragonfly.go
diff --git a/src/pkg/runtime/os_dragonfly.h b/src/runtime/os_dragonfly.h
index 389736a32..389736a32 100644
--- a/src/pkg/runtime/os_dragonfly.h
+++ b/src/runtime/os_dragonfly.h
diff --git a/src/pkg/runtime/os_freebsd.c b/src/runtime/os_freebsd.c
index aae944ea1..aae944ea1 100644
--- a/src/pkg/runtime/os_freebsd.c
+++ b/src/runtime/os_freebsd.c
diff --git a/src/pkg/runtime/os_freebsd.go b/src/runtime/os_freebsd.go
index 96964f1e1..96964f1e1 100644
--- a/src/pkg/runtime/os_freebsd.go
+++ b/src/runtime/os_freebsd.go
diff --git a/src/pkg/runtime/os_freebsd.h b/src/runtime/os_freebsd.h
index b86bb393c..b86bb393c 100644
--- a/src/pkg/runtime/os_freebsd.h
+++ b/src/runtime/os_freebsd.h
diff --git a/src/pkg/runtime/os_freebsd_arm.c b/src/runtime/os_freebsd_arm.c
index 2f2d7767f..2f2d7767f 100644
--- a/src/pkg/runtime/os_freebsd_arm.c
+++ b/src/runtime/os_freebsd_arm.c
diff --git a/src/pkg/runtime/os_linux.c b/src/runtime/os_linux.c
index 2f67ca746..2f67ca746 100644
--- a/src/pkg/runtime/os_linux.c
+++ b/src/runtime/os_linux.c
diff --git a/src/pkg/runtime/os_linux.go b/src/runtime/os_linux.go
index a6799cd41..a6799cd41 100644
--- a/src/pkg/runtime/os_linux.go
+++ b/src/runtime/os_linux.go
diff --git a/src/pkg/runtime/os_linux.h b/src/runtime/os_linux.h
index 75606d615..75606d615 100644
--- a/src/pkg/runtime/os_linux.h
+++ b/src/runtime/os_linux.h
diff --git a/src/pkg/runtime/os_linux_386.c b/src/runtime/os_linux_386.c
index dc89d04e2..dc89d04e2 100644
--- a/src/pkg/runtime/os_linux_386.c
+++ b/src/runtime/os_linux_386.c
diff --git a/src/pkg/runtime/os_linux_arm.c b/src/runtime/os_linux_arm.c
index e3eda7c2d..e3eda7c2d 100644
--- a/src/pkg/runtime/os_linux_arm.c
+++ b/src/runtime/os_linux_arm.c
diff --git a/src/pkg/runtime/os_nacl.c b/src/runtime/os_nacl.c
index 37a1fcca0..37a1fcca0 100644
--- a/src/pkg/runtime/os_nacl.c
+++ b/src/runtime/os_nacl.c
diff --git a/src/pkg/runtime/os_nacl.go b/src/runtime/os_nacl.go
index 12a15aea0..12a15aea0 100644
--- a/src/pkg/runtime/os_nacl.go
+++ b/src/runtime/os_nacl.go
diff --git a/src/pkg/runtime/os_nacl.h b/src/runtime/os_nacl.h
index 7c9d9c242..7c9d9c242 100644
--- a/src/pkg/runtime/os_nacl.h
+++ b/src/runtime/os_nacl.h
diff --git a/src/pkg/runtime/os_nacl_arm.c b/src/runtime/os_nacl_arm.c
index 1248ea644..1248ea644 100644
--- a/src/pkg/runtime/os_nacl_arm.c
+++ b/src/runtime/os_nacl_arm.c
diff --git a/src/pkg/runtime/os_netbsd.c b/src/runtime/os_netbsd.c
index d6c3bc826..d6c3bc826 100644
--- a/src/pkg/runtime/os_netbsd.c
+++ b/src/runtime/os_netbsd.c
diff --git a/src/pkg/runtime/os_netbsd.go b/src/runtime/os_netbsd.go
index 8792f497e..8792f497e 100644
--- a/src/pkg/runtime/os_netbsd.go
+++ b/src/runtime/os_netbsd.go
diff --git a/src/pkg/runtime/os_netbsd.h b/src/runtime/os_netbsd.h
index f95db325f..f95db325f 100644
--- a/src/pkg/runtime/os_netbsd.h
+++ b/src/runtime/os_netbsd.h
diff --git a/src/pkg/runtime/os_netbsd_386.c b/src/runtime/os_netbsd_386.c
index 23e9db3c1..23e9db3c1 100644
--- a/src/pkg/runtime/os_netbsd_386.c
+++ b/src/runtime/os_netbsd_386.c
diff --git a/src/pkg/runtime/os_netbsd_amd64.c b/src/runtime/os_netbsd_amd64.c
index 226846cbb..226846cbb 100644
--- a/src/pkg/runtime/os_netbsd_amd64.c
+++ b/src/runtime/os_netbsd_amd64.c
diff --git a/src/pkg/runtime/os_netbsd_arm.c b/src/runtime/os_netbsd_arm.c
index 9dd4bcdc9..9dd4bcdc9 100644
--- a/src/pkg/runtime/os_netbsd_arm.c
+++ b/src/runtime/os_netbsd_arm.c
diff --git a/src/pkg/runtime/os_openbsd.c b/src/runtime/os_openbsd.c
index 59abc97b7..59abc97b7 100644
--- a/src/pkg/runtime/os_openbsd.c
+++ b/src/runtime/os_openbsd.c
diff --git a/src/pkg/runtime/os_openbsd.go b/src/runtime/os_openbsd.go
index 19e2b45a1..19e2b45a1 100644
--- a/src/pkg/runtime/os_openbsd.go
+++ b/src/runtime/os_openbsd.go
diff --git a/src/pkg/runtime/os_openbsd.h b/src/runtime/os_openbsd.h
index 6ad98109e..6ad98109e 100644
--- a/src/pkg/runtime/os_openbsd.h
+++ b/src/runtime/os_openbsd.h
diff --git a/src/pkg/runtime/os_plan9.c b/src/runtime/os_plan9.c
index 853f3ef7a..853f3ef7a 100644
--- a/src/pkg/runtime/os_plan9.c
+++ b/src/runtime/os_plan9.c
diff --git a/src/pkg/runtime/os_plan9.go b/src/runtime/os_plan9.go
index c45d22551..c45d22551 100644
--- a/src/pkg/runtime/os_plan9.go
+++ b/src/runtime/os_plan9.go
diff --git a/src/pkg/runtime/os_plan9.h b/src/runtime/os_plan9.h
index 57a2cafa7..57a2cafa7 100644
--- a/src/pkg/runtime/os_plan9.h
+++ b/src/runtime/os_plan9.h
diff --git a/src/pkg/runtime/os_plan9_386.c b/src/runtime/os_plan9_386.c
index 349086224..349086224 100644
--- a/src/pkg/runtime/os_plan9_386.c
+++ b/src/runtime/os_plan9_386.c
diff --git a/src/pkg/runtime/os_plan9_amd64.c b/src/runtime/os_plan9_amd64.c
index 6b0f8ae3a..6b0f8ae3a 100644
--- a/src/pkg/runtime/os_plan9_amd64.c
+++ b/src/runtime/os_plan9_amd64.c
diff --git a/src/pkg/runtime/os_solaris.c b/src/runtime/os_solaris.c
index e35d2b997..e35d2b997 100644
--- a/src/pkg/runtime/os_solaris.c
+++ b/src/runtime/os_solaris.c
diff --git a/src/pkg/runtime/os_solaris.go b/src/runtime/os_solaris.go
index a5e696678..a5e696678 100644
--- a/src/pkg/runtime/os_solaris.go
+++ b/src/runtime/os_solaris.go
diff --git a/src/pkg/runtime/os_solaris.h b/src/runtime/os_solaris.h
index 3d9e1a240..3d9e1a240 100644
--- a/src/pkg/runtime/os_solaris.h
+++ b/src/runtime/os_solaris.h
diff --git a/src/pkg/runtime/os_windows.c b/src/runtime/os_windows.c
index a4d77f6b7..a4d77f6b7 100644
--- a/src/pkg/runtime/os_windows.c
+++ b/src/runtime/os_windows.c
diff --git a/src/pkg/runtime/os_windows.go b/src/runtime/os_windows.go
index 6a3bfca41..6a3bfca41 100644
--- a/src/pkg/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
diff --git a/src/pkg/runtime/os_windows.h b/src/runtime/os_windows.h
index d5d168d77..d5d168d77 100644
--- a/src/pkg/runtime/os_windows.h
+++ b/src/runtime/os_windows.h
diff --git a/src/pkg/runtime/os_windows_386.c b/src/runtime/os_windows_386.c
index 15a5ea5d1..15a5ea5d1 100644
--- a/src/pkg/runtime/os_windows_386.c
+++ b/src/runtime/os_windows_386.c
diff --git a/src/pkg/runtime/os_windows_386.go b/src/runtime/os_windows_386.go
index 86a1906c0..86a1906c0 100644
--- a/src/pkg/runtime/os_windows_386.go
+++ b/src/runtime/os_windows_386.go
diff --git a/src/pkg/runtime/os_windows_amd64.c b/src/runtime/os_windows_amd64.c
index 9a69d73c0..9a69d73c0 100644
--- a/src/pkg/runtime/os_windows_amd64.c
+++ b/src/runtime/os_windows_amd64.c
diff --git a/src/pkg/runtime/os_windows_amd64.go b/src/runtime/os_windows_amd64.go
index 3f4d4d07c..3f4d4d07c 100644
--- a/src/pkg/runtime/os_windows_amd64.go
+++ b/src/runtime/os_windows_amd64.go
diff --git a/src/pkg/runtime/panic.c b/src/runtime/panic.c
index 50a7d3647..50a7d3647 100644
--- a/src/pkg/runtime/panic.c
+++ b/src/runtime/panic.c
diff --git a/src/pkg/runtime/panic.go b/src/runtime/panic.go
index 75d155b3f..75d155b3f 100644
--- a/src/pkg/runtime/panic.go
+++ b/src/runtime/panic.go
diff --git a/src/pkg/runtime/panic1.go b/src/runtime/panic1.go
index 9faae8a4b..9faae8a4b 100644
--- a/src/pkg/runtime/panic1.go
+++ b/src/runtime/panic1.go
diff --git a/src/pkg/runtime/parfor.c b/src/runtime/parfor.c
index 6023193b5..6023193b5 100644
--- a/src/pkg/runtime/parfor.c
+++ b/src/runtime/parfor.c
diff --git a/src/pkg/runtime/parfor_test.go b/src/runtime/parfor_test.go
index de64285b8..de64285b8 100644
--- a/src/pkg/runtime/parfor_test.go
+++ b/src/runtime/parfor_test.go
diff --git a/src/pkg/runtime/pprof/pprof.go b/src/runtime/pprof/pprof.go
index 236de54f3..236de54f3 100644
--- a/src/pkg/runtime/pprof/pprof.go
+++ b/src/runtime/pprof/pprof.go
diff --git a/src/pkg/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
index df271273c..54f93f861 100644
--- a/src/pkg/runtime/pprof/pprof_test.go
+++ b/src/runtime/pprof/pprof_test.go
@@ -310,45 +310,45 @@ func TestBlockProfile(t *testing.T) {
 	tests := [...]TestCase{
 		{"chan recv", blockChanRecv, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/pkg/runtime/chan.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanRecv\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/runtime/chan.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanRecv\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"chan send", blockChanSend, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.chansend1\+0x[0-9,a-f]+	.*/src/pkg/runtime/chan.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanSend\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.chansend1\+0x[0-9,a-f]+	.*/src/runtime/chan.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanSend\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"chan close", blockChanClose, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/pkg/runtime/chan.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanClose\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/runtime/chan.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanClose\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"select recv async", blockSelectRecvAsync, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/pkg/runtime/select.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectRecvAsync\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/runtime/select.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectRecvAsync\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"select send sync", blockSelectSendSync, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/pkg/runtime/select.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectSendSync\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/runtime/select.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectSendSync\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"mutex", blockMutex, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	sync\.\(\*Mutex\)\.Lock\+0x[0-9,a-f]+	.*/src/pkg/sync/mutex\.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockMutex\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	sync\.\(\*Mutex\)\.Lock\+0x[0-9,a-f]+	.*/src/sync/mutex\.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockMutex\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"cond", blockCond, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	sync\.\(\*Cond\)\.Wait\+0x[0-9,a-f]+	.*/src/pkg/sync/cond\.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockCond\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	sync\.\(\*Cond\)\.Wait\+0x[0-9,a-f]+	.*/src/sync/cond\.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockCond\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 	}
 
diff --git a/src/pkg/runtime/print1.go b/src/runtime/print1.go
index 93f83ed26..93f83ed26 100644
--- a/src/pkg/runtime/print1.go
+++ b/src/runtime/print1.go
diff --git a/src/pkg/runtime/proc.c b/src/runtime/proc.c
index d77f20abf..d77f20abf 100644
--- a/src/pkg/runtime/proc.c
+++ b/src/runtime/proc.c
diff --git a/src/pkg/runtime/proc.go b/src/runtime/proc.go
index 48b8cbe39..48b8cbe39 100644
--- a/src/pkg/runtime/proc.go
+++ b/src/runtime/proc.go
diff --git a/src/pkg/runtime/proc_test.go b/src/runtime/proc_test.go
index aa9bc81ac..aa9bc81ac 100644
--- a/src/pkg/runtime/proc_test.go
+++ b/src/runtime/proc_test.go
diff --git a/src/pkg/runtime/race.c b/src/runtime/race.c
index 9ac73fbcc..9ac73fbcc 100644
--- a/src/pkg/runtime/race.c
+++ b/src/runtime/race.c
diff --git a/src/pkg/runtime/race.go b/src/runtime/race.go
index c7573517d..c7573517d 100644
--- a/src/pkg/runtime/race.go
+++ b/src/runtime/race.go
diff --git a/src/pkg/runtime/race.h b/src/runtime/race.h
index fee31e09f..fee31e09f 100644
--- a/src/pkg/runtime/race.h
+++ b/src/runtime/race.h
diff --git a/src/pkg/runtime/race/README b/src/runtime/race/README
index 7f185359f..7f185359f 100644
--- a/src/pkg/runtime/race/README
+++ b/src/runtime/race/README
diff --git a/src/pkg/runtime/race/doc.go b/src/runtime/race/doc.go
index aef805dad..aef805dad 100644
--- a/src/pkg/runtime/race/doc.go
+++ b/src/runtime/race/doc.go
diff --git a/src/pkg/runtime/race/output_test.go b/src/runtime/race/output_test.go
index d2303f7af..d2303f7af 100644
--- a/src/pkg/runtime/race/output_test.go
+++ b/src/runtime/race/output_test.go
diff --git a/src/pkg/runtime/race/race.go b/src/runtime/race/race.go
index 3c297e84b..31deedd73 100644
--- a/src/pkg/runtime/race/race.go
+++ b/src/runtime/race/race.go
@@ -9,7 +9,7 @@ package race
 // This file merely ensures that we link in runtime/cgo in race build,
 // this is turn ensures that runtime uses pthread_create to create threads.
 // The prebuilt race runtime lives in race_GOOS_GOARCH.syso.
-// Calls to the runtime are done directly from src/pkg/runtime/race.c.
+// Calls to the runtime are done directly from src/runtime/race.c.
 
 // void __race_unused_func(void);
 import "C"
diff --git a/src/pkg/runtime/race/race_darwin_amd64.syso b/src/runtime/race/race_darwin_amd64.syso
index 81b48c6c9..81b48c6c9 100644
--- a/src/pkg/runtime/race/race_darwin_amd64.syso
+++ b/src/runtime/race/race_darwin_amd64.syso
diff --git a/src/pkg/runtime/race/race_freebsd_amd64.syso b/src/runtime/race/race_freebsd_amd64.syso
index 5bbe32229..5bbe32229 100644
--- a/src/pkg/runtime/race/race_freebsd_amd64.syso
+++ b/src/runtime/race/race_freebsd_amd64.syso
diff --git a/src/pkg/runtime/race/race_linux_amd64.syso b/src/runtime/race/race_linux_amd64.syso
index 49bf08ef3..49bf08ef3 100644
--- a/src/pkg/runtime/race/race_linux_amd64.syso
+++ b/src/runtime/race/race_linux_amd64.syso
diff --git a/src/pkg/runtime/race/race_test.go b/src/runtime/race/race_test.go
index 7e0ee866a..7e0ee866a 100644
--- a/src/pkg/runtime/race/race_test.go
+++ b/src/runtime/race/race_test.go
diff --git a/src/pkg/runtime/race/race_windows_amd64.syso b/src/runtime/race/race_windows_amd64.syso
index a4eae9bdd..a4eae9bdd 100644
--- a/src/pkg/runtime/race/race_windows_amd64.syso
+++ b/src/runtime/race/race_windows_amd64.syso
diff --git a/src/pkg/runtime/race/testdata/atomic_test.go b/src/runtime/race/testdata/atomic_test.go
index 232744b3d..232744b3d 100644
--- a/src/pkg/runtime/race/testdata/atomic_test.go
+++ b/src/runtime/race/testdata/atomic_test.go
diff --git a/src/pkg/runtime/race/testdata/cgo_test.go b/src/runtime/race/testdata/cgo_test.go
index ba7e7b562..ba7e7b562 100644
--- a/src/pkg/runtime/race/testdata/cgo_test.go
+++ b/src/runtime/race/testdata/cgo_test.go
diff --git a/src/pkg/runtime/race/testdata/cgo_test_main.go b/src/runtime/race/testdata/cgo_test_main.go
index 620cea18b..620cea18b 100644
--- a/src/pkg/runtime/race/testdata/cgo_test_main.go
+++ b/src/runtime/race/testdata/cgo_test_main.go
diff --git a/src/pkg/runtime/race/testdata/chan_test.go b/src/runtime/race/testdata/chan_test.go
index eabd81f40..eabd81f40 100644
--- a/src/pkg/runtime/race/testdata/chan_test.go
+++ b/src/runtime/race/testdata/chan_test.go
diff --git a/src/pkg/runtime/race/testdata/comp_test.go b/src/runtime/race/testdata/comp_test.go
index 27b2d0081..27b2d0081 100644
--- a/src/pkg/runtime/race/testdata/comp_test.go
+++ b/src/runtime/race/testdata/comp_test.go
diff --git a/src/pkg/runtime/race/testdata/finalizer_test.go b/src/runtime/race/testdata/finalizer_test.go
index 222cbf67a..222cbf67a 100644
--- a/src/pkg/runtime/race/testdata/finalizer_test.go
+++ b/src/runtime/race/testdata/finalizer_test.go
diff --git a/src/pkg/runtime/race/testdata/io_test.go b/src/runtime/race/testdata/io_test.go
index 9eb3552dc..9eb3552dc 100644
--- a/src/pkg/runtime/race/testdata/io_test.go
+++ b/src/runtime/race/testdata/io_test.go
diff --git a/src/pkg/runtime/race/testdata/map_test.go b/src/runtime/race/testdata/map_test.go
index a8d8148d0..a8d8148d0 100644
--- a/src/pkg/runtime/race/testdata/map_test.go
+++ b/src/runtime/race/testdata/map_test.go
diff --git a/src/pkg/runtime/race/testdata/mop_test.go b/src/runtime/race/testdata/mop_test.go
index cb17a27d3..cb17a27d3 100644
--- a/src/pkg/runtime/race/testdata/mop_test.go
+++ b/src/runtime/race/testdata/mop_test.go
diff --git a/src/pkg/runtime/race/testdata/mutex_test.go b/src/runtime/race/testdata/mutex_test.go
index 3cf03ae6b..3cf03ae6b 100644
--- a/src/pkg/runtime/race/testdata/mutex_test.go
+++ b/src/runtime/race/testdata/mutex_test.go
diff --git a/src/pkg/runtime/race/testdata/regression_test.go b/src/runtime/race/testdata/regression_test.go
index d461269d9..d461269d9 100644
--- a/src/pkg/runtime/race/testdata/regression_test.go
+++ b/src/runtime/race/testdata/regression_test.go
diff --git a/src/pkg/runtime/race/testdata/rwmutex_test.go b/src/runtime/race/testdata/rwmutex_test.go
index 85cb5df3c..85cb5df3c 100644
--- a/src/pkg/runtime/race/testdata/rwmutex_test.go
+++ b/src/runtime/race/testdata/rwmutex_test.go
diff --git a/src/pkg/runtime/race/testdata/select_test.go b/src/runtime/race/testdata/select_test.go
index 4a3a23647..4a3a23647 100644
--- a/src/pkg/runtime/race/testdata/select_test.go
+++ b/src/runtime/race/testdata/select_test.go
diff --git a/src/pkg/runtime/race/testdata/slice_test.go b/src/runtime/race/testdata/slice_test.go
index 5702d1ac8..5702d1ac8 100644
--- a/src/pkg/runtime/race/testdata/slice_test.go
+++ b/src/runtime/race/testdata/slice_test.go
diff --git a/src/pkg/runtime/race/testdata/sync_test.go b/src/runtime/race/testdata/sync_test.go
index 93af0b1e6..93af0b1e6 100644
--- a/src/pkg/runtime/race/testdata/sync_test.go
+++ b/src/runtime/race/testdata/sync_test.go
diff --git a/src/pkg/runtime/race/testdata/waitgroup_test.go b/src/runtime/race/testdata/waitgroup_test.go
index ff152b0ab..ff152b0ab 100644
--- a/src/pkg/runtime/race/testdata/waitgroup_test.go
+++ b/src/runtime/race/testdata/waitgroup_test.go
diff --git a/src/pkg/runtime/race0.go b/src/runtime/race0.go
index 5d90cc859..5d90cc859 100644
--- a/src/pkg/runtime/race0.go
+++ b/src/runtime/race0.go
diff --git a/src/pkg/runtime/race_amd64.s b/src/runtime/race_amd64.s
index bdea28c7c..bdea28c7c 100644
--- a/src/pkg/runtime/race_amd64.s
+++ b/src/runtime/race_amd64.s
diff --git a/src/pkg/runtime/rdebug.go b/src/runtime/rdebug.go
index e5e691122..e5e691122 100644
--- a/src/pkg/runtime/rdebug.go
+++ b/src/runtime/rdebug.go
diff --git a/src/pkg/runtime/rt0_android_arm.s b/src/runtime/rt0_android_arm.s
index 6b65fb47b..6b65fb47b 100644
--- a/src/pkg/runtime/rt0_android_arm.s
+++ b/src/runtime/rt0_android_arm.s
diff --git a/src/pkg/runtime/rt0_darwin_386.s b/src/runtime/rt0_darwin_386.s
index 4c8c92dda..4c8c92dda 100644
--- a/src/pkg/runtime/rt0_darwin_386.s
+++ b/src/runtime/rt0_darwin_386.s
diff --git a/src/pkg/runtime/rt0_darwin_amd64.s b/src/runtime/rt0_darwin_amd64.s
index 452d85455..452d85455 100644
--- a/src/pkg/runtime/rt0_darwin_amd64.s
+++ b/src/runtime/rt0_darwin_amd64.s
diff --git a/src/pkg/runtime/rt0_dragonfly_386.s b/src/runtime/rt0_dragonfly_386.s
index 548ba796a..548ba796a 100644
--- a/src/pkg/runtime/rt0_dragonfly_386.s
+++ b/src/runtime/rt0_dragonfly_386.s
diff --git a/src/pkg/runtime/rt0_dragonfly_amd64.s b/src/runtime/rt0_dragonfly_amd64.s
index fb56618d8..fb56618d8 100644
--- a/src/pkg/runtime/rt0_dragonfly_amd64.s
+++ b/src/runtime/rt0_dragonfly_amd64.s
diff --git a/src/pkg/runtime/rt0_freebsd_386.s b/src/runtime/rt0_freebsd_386.s
index cd7a915f8..cd7a915f8 100644
--- a/src/pkg/runtime/rt0_freebsd_386.s
+++ b/src/runtime/rt0_freebsd_386.s
diff --git a/src/pkg/runtime/rt0_freebsd_amd64.s b/src/runtime/rt0_freebsd_amd64.s
index 7989f7c3e..7989f7c3e 100644
--- a/src/pkg/runtime/rt0_freebsd_amd64.s
+++ b/src/runtime/rt0_freebsd_amd64.s
diff --git a/src/pkg/runtime/rt0_freebsd_arm.s b/src/runtime/rt0_freebsd_arm.s
index f31252698..f31252698 100644
--- a/src/pkg/runtime/rt0_freebsd_arm.s
+++ b/src/runtime/rt0_freebsd_arm.s
diff --git a/src/pkg/runtime/rt0_linux_386.s b/src/runtime/rt0_linux_386.s
index 74ddc94da..74ddc94da 100644
--- a/src/pkg/runtime/rt0_linux_386.s
+++ b/src/runtime/rt0_linux_386.s
diff --git a/src/pkg/runtime/rt0_linux_amd64.s b/src/runtime/rt0_linux_amd64.s
index 985426acc..985426acc 100644
--- a/src/pkg/runtime/rt0_linux_amd64.s
+++ b/src/runtime/rt0_linux_amd64.s
diff --git a/src/pkg/runtime/rt0_linux_arm.s b/src/runtime/rt0_linux_arm.s
index 8af3d3505..8af3d3505 100644
--- a/src/pkg/runtime/rt0_linux_arm.s
+++ b/src/runtime/rt0_linux_arm.s
diff --git a/src/pkg/runtime/rt0_linux_power64.s b/src/runtime/rt0_linux_power64.s
index e944bcdbf..e944bcdbf 100644
--- a/src/pkg/runtime/rt0_linux_power64.s
+++ b/src/runtime/rt0_linux_power64.s
diff --git a/src/pkg/runtime/rt0_linux_power64le.s b/src/runtime/rt0_linux_power64le.s
index 051815dbc..051815dbc 100644
--- a/src/pkg/runtime/rt0_linux_power64le.s
+++ b/src/runtime/rt0_linux_power64le.s
diff --git a/src/pkg/runtime/rt0_nacl_386.s b/src/runtime/rt0_nacl_386.s
index d4ba06306..d4ba06306 100644
--- a/src/pkg/runtime/rt0_nacl_386.s
+++ b/src/runtime/rt0_nacl_386.s
diff --git a/src/pkg/runtime/rt0_nacl_amd64p32.s b/src/runtime/rt0_nacl_amd64p32.s
index d8703dc0f..d8703dc0f 100644
--- a/src/pkg/runtime/rt0_nacl_amd64p32.s
+++ b/src/runtime/rt0_nacl_amd64p32.s
diff --git a/src/pkg/runtime/rt0_nacl_arm.s b/src/runtime/rt0_nacl_arm.s
index eadb4782d..eadb4782d 100644
--- a/src/pkg/runtime/rt0_nacl_arm.s
+++ b/src/runtime/rt0_nacl_arm.s
diff --git a/src/pkg/runtime/rt0_netbsd_386.s b/src/runtime/rt0_netbsd_386.s
index 70b853253..70b853253 100644
--- a/src/pkg/runtime/rt0_netbsd_386.s
+++ b/src/runtime/rt0_netbsd_386.s
diff --git a/src/pkg/runtime/rt0_netbsd_amd64.s b/src/runtime/rt0_netbsd_amd64.s
index fad56614e..fad56614e 100644
--- a/src/pkg/runtime/rt0_netbsd_amd64.s
+++ b/src/runtime/rt0_netbsd_amd64.s
diff --git a/src/pkg/runtime/rt0_netbsd_arm.s b/src/runtime/rt0_netbsd_arm.s
index bad66e06c..bad66e06c 100644
--- a/src/pkg/runtime/rt0_netbsd_arm.s
+++ b/src/runtime/rt0_netbsd_arm.s
diff --git a/src/pkg/runtime/rt0_openbsd_386.s b/src/runtime/rt0_openbsd_386.s
index f25d2e1cf..f25d2e1cf 100644
--- a/src/pkg/runtime/rt0_openbsd_386.s
+++ b/src/runtime/rt0_openbsd_386.s
diff --git a/src/pkg/runtime/rt0_openbsd_amd64.s b/src/runtime/rt0_openbsd_amd64.s
index 58fe66639..58fe66639 100644
--- a/src/pkg/runtime/rt0_openbsd_amd64.s
+++ b/src/runtime/rt0_openbsd_amd64.s
diff --git a/src/pkg/runtime/rt0_plan9_386.s b/src/runtime/rt0_plan9_386.s
index 7e2887b85..7e2887b85 100644
--- a/src/pkg/runtime/rt0_plan9_386.s
+++ b/src/runtime/rt0_plan9_386.s
diff --git a/src/pkg/runtime/rt0_plan9_amd64.s b/src/runtime/rt0_plan9_amd64.s
index a372a0ba8..a372a0ba8 100644
--- a/src/pkg/runtime/rt0_plan9_amd64.s
+++ b/src/runtime/rt0_plan9_amd64.s
diff --git a/src/pkg/runtime/rt0_solaris_amd64.s b/src/runtime/rt0_solaris_amd64.s
index 92a9fc295..92a9fc295 100644
--- a/src/pkg/runtime/rt0_solaris_amd64.s
+++ b/src/runtime/rt0_solaris_amd64.s
diff --git a/src/pkg/runtime/rt0_windows_386.s b/src/runtime/rt0_windows_386.s
index 00604372f..00604372f 100644
--- a/src/pkg/runtime/rt0_windows_386.s
+++ b/src/runtime/rt0_windows_386.s
diff --git a/src/pkg/runtime/rt0_windows_amd64.s b/src/runtime/rt0_windows_amd64.s
index 890a570d1..890a570d1 100644
--- a/src/pkg/runtime/rt0_windows_amd64.s
+++ b/src/runtime/rt0_windows_amd64.s
diff --git a/src/pkg/runtime/rune.go b/src/runtime/rune.go
index a9f683581..a9f683581 100644
--- a/src/pkg/runtime/rune.go
+++ b/src/runtime/rune.go
diff --git a/src/pkg/runtime/runtime-gdb.py b/src/runtime/runtime-gdb.py
index eedac7cf4..eedac7cf4 100644
--- a/src/pkg/runtime/runtime-gdb.py
+++ b/src/runtime/runtime-gdb.py
diff --git a/src/pkg/runtime/runtime.c b/src/runtime/runtime.c
index 42ce1dadf..42ce1dadf 100644
--- a/src/pkg/runtime/runtime.c
+++ b/src/runtime/runtime.c
diff --git a/src/pkg/runtime/runtime.go b/src/runtime/runtime.go
index d5b31559a..d5b31559a 100644
--- a/src/pkg/runtime/runtime.go
+++ b/src/runtime/runtime.go
diff --git a/src/pkg/runtime/runtime.h b/src/runtime/runtime.h
index 02563fd36..02563fd36 100644
--- a/src/pkg/runtime/runtime.h
+++ b/src/runtime/runtime.h
diff --git a/src/pkg/runtime/runtime_linux_test.go b/src/runtime/runtime_linux_test.go
index 5344ed205..5344ed205 100644
--- a/src/pkg/runtime/runtime_linux_test.go
+++ b/src/runtime/runtime_linux_test.go
diff --git a/src/pkg/runtime/runtime_test.go b/src/runtime/runtime_test.go
index 5e24e2570..cffc9f7d3 100644
--- a/src/pkg/runtime/runtime_test.go
+++ b/src/runtime/runtime_test.go
@@ -106,7 +106,7 @@ func TestRuntimeGogoBytes(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	out, err := exec.Command("go", "build", "-o", dir+"/hello", "../../../test/helloworld.go").CombinedOutput()
+	out, err := exec.Command("go", "build", "-o", dir+"/hello", "../../test/helloworld.go").CombinedOutput()
 	if err != nil {
 		t.Fatalf("building hello world: %v\n%s", err, out)
 	}
diff --git a/src/pkg/runtime/runtime_unix_test.go b/src/runtime/runtime_unix_test.go
index 963de8cdb..963de8cdb 100644
--- a/src/pkg/runtime/runtime_unix_test.go
+++ b/src/runtime/runtime_unix_test.go
diff --git a/src/pkg/runtime/select.go b/src/runtime/select.go
index 6d2531e7f..6d2531e7f 100644
--- a/src/pkg/runtime/select.go
+++ b/src/runtime/select.go
diff --git a/src/pkg/runtime/sema.go b/src/runtime/sema.go
index 87ba5463b..87ba5463b 100644
--- a/src/pkg/runtime/sema.go
+++ b/src/runtime/sema.go
diff --git a/src/pkg/runtime/signal.c b/src/runtime/signal.c
index 0674bfb22..0674bfb22 100644
--- a/src/pkg/runtime/signal.c
+++ b/src/runtime/signal.c
diff --git a/src/pkg/runtime/signal_386.c b/src/runtime/signal_386.c
index d55e30452..d55e30452 100644
--- a/src/pkg/runtime/signal_386.c
+++ b/src/runtime/signal_386.c
diff --git a/src/pkg/runtime/signal_amd64x.c b/src/runtime/signal_amd64x.c
index 44e68cecf..44e68cecf 100644
--- a/src/pkg/runtime/signal_amd64x.c
+++ b/src/runtime/signal_amd64x.c
diff --git a/src/pkg/runtime/signal_android_386.h b/src/runtime/signal_android_386.h
index 2a1bb4b3e..2a1bb4b3e 100644
--- a/src/pkg/runtime/signal_android_386.h
+++ b/src/runtime/signal_android_386.h
diff --git a/src/pkg/runtime/signal_android_arm.h b/src/runtime/signal_android_arm.h
index 8a05e21e5..8a05e21e5 100644
--- a/src/pkg/runtime/signal_android_arm.h
+++ b/src/runtime/signal_android_arm.h
diff --git a/src/pkg/runtime/signal_arm.c b/src/runtime/signal_arm.c
index 3571cf3ac..3571cf3ac 100644
--- a/src/pkg/runtime/signal_arm.c
+++ b/src/runtime/signal_arm.c
diff --git a/src/pkg/runtime/signal_darwin_386.h b/src/runtime/signal_darwin_386.h
index 5459e10a1..5459e10a1 100644
--- a/src/pkg/runtime/signal_darwin_386.h
+++ b/src/runtime/signal_darwin_386.h
diff --git a/src/pkg/runtime/signal_darwin_amd64.h b/src/runtime/signal_darwin_amd64.h
index e3da6de3a..e3da6de3a 100644
--- a/src/pkg/runtime/signal_darwin_amd64.h
+++ b/src/runtime/signal_darwin_amd64.h
diff --git a/src/pkg/runtime/signal_dragonfly_386.h b/src/runtime/signal_dragonfly_386.h
index a24f1ee96..a24f1ee96 100644
--- a/src/pkg/runtime/signal_dragonfly_386.h
+++ b/src/runtime/signal_dragonfly_386.h
diff --git a/src/pkg/runtime/signal_dragonfly_amd64.h b/src/runtime/signal_dragonfly_amd64.h
index 5b4f97782..5b4f97782 100644
--- a/src/pkg/runtime/signal_dragonfly_amd64.h
+++ b/src/runtime/signal_dragonfly_amd64.h
diff --git a/src/pkg/runtime/signal_freebsd_386.h b/src/runtime/signal_freebsd_386.h
index a24f1ee96..a24f1ee96 100644
--- a/src/pkg/runtime/signal_freebsd_386.h
+++ b/src/runtime/signal_freebsd_386.h
diff --git a/src/pkg/runtime/signal_freebsd_amd64.h b/src/runtime/signal_freebsd_amd64.h
index 7d35b7f85..7d35b7f85 100644
--- a/src/pkg/runtime/signal_freebsd_amd64.h
+++ b/src/runtime/signal_freebsd_amd64.h
diff --git a/src/pkg/runtime/signal_freebsd_arm.h b/src/runtime/signal_freebsd_arm.h
index 87a45aa27..87a45aa27 100644
--- a/src/pkg/runtime/signal_freebsd_arm.h
+++ b/src/runtime/signal_freebsd_arm.h
diff --git a/src/pkg/runtime/signal_linux_386.h b/src/runtime/signal_linux_386.h
index f77f1c9d5..f77f1c9d5 100644
--- a/src/pkg/runtime/signal_linux_386.h
+++ b/src/runtime/signal_linux_386.h
diff --git a/src/pkg/runtime/signal_linux_amd64.h b/src/runtime/signal_linux_amd64.h
index 5a9a3e5da..5a9a3e5da 100644
--- a/src/pkg/runtime/signal_linux_amd64.h
+++ b/src/runtime/signal_linux_amd64.h
diff --git a/src/pkg/runtime/signal_linux_arm.h b/src/runtime/signal_linux_arm.h
index a674c0d57..a674c0d57 100644
--- a/src/pkg/runtime/signal_linux_arm.h
+++ b/src/runtime/signal_linux_arm.h
diff --git a/src/pkg/runtime/signal_linux_power64.h b/src/runtime/signal_linux_power64.h
index 840648920..840648920 100644
--- a/src/pkg/runtime/signal_linux_power64.h
+++ b/src/runtime/signal_linux_power64.h
diff --git a/src/pkg/runtime/signal_linux_power64le.h b/src/runtime/signal_linux_power64le.h
index 840648920..840648920 100644
--- a/src/pkg/runtime/signal_linux_power64le.h
+++ b/src/runtime/signal_linux_power64le.h
diff --git a/src/pkg/runtime/signal_nacl_386.h b/src/runtime/signal_nacl_386.h
index c9481b5f4..c9481b5f4 100644
--- a/src/pkg/runtime/signal_nacl_386.h
+++ b/src/runtime/signal_nacl_386.h
diff --git a/src/pkg/runtime/signal_nacl_amd64p32.h b/src/runtime/signal_nacl_amd64p32.h
index f62305cb5..f62305cb5 100644
--- a/src/pkg/runtime/signal_nacl_amd64p32.h
+++ b/src/runtime/signal_nacl_amd64p32.h
diff --git a/src/pkg/runtime/signal_nacl_arm.h b/src/runtime/signal_nacl_arm.h
index e5bbb211d..e5bbb211d 100644
--- a/src/pkg/runtime/signal_nacl_arm.h
+++ b/src/runtime/signal_nacl_arm.h
diff --git a/src/pkg/runtime/signal_netbsd_386.h b/src/runtime/signal_netbsd_386.h
index d5a8a0c4b..d5a8a0c4b 100644
--- a/src/pkg/runtime/signal_netbsd_386.h
+++ b/src/runtime/signal_netbsd_386.h
diff --git a/src/pkg/runtime/signal_netbsd_amd64.h b/src/runtime/signal_netbsd_amd64.h
index 7ec4cd98c..7ec4cd98c 100644
--- a/src/pkg/runtime/signal_netbsd_amd64.h
+++ b/src/runtime/signal_netbsd_amd64.h
diff --git a/src/pkg/runtime/signal_netbsd_arm.h b/src/runtime/signal_netbsd_arm.h
index 12f5827a6..12f5827a6 100644
--- a/src/pkg/runtime/signal_netbsd_arm.h
+++ b/src/runtime/signal_netbsd_arm.h
diff --git a/src/pkg/runtime/signal_openbsd_386.h b/src/runtime/signal_openbsd_386.h
index 6742db8d4..6742db8d4 100644
--- a/src/pkg/runtime/signal_openbsd_386.h
+++ b/src/runtime/signal_openbsd_386.h
diff --git a/src/pkg/runtime/signal_openbsd_amd64.h b/src/runtime/signal_openbsd_amd64.h
index b46a5dfa6..b46a5dfa6 100644
--- a/src/pkg/runtime/signal_openbsd_amd64.h
+++ b/src/runtime/signal_openbsd_amd64.h
diff --git a/src/pkg/runtime/signal_power64x.c b/src/runtime/signal_power64x.c
index 89c5c7848..89c5c7848 100644
--- a/src/pkg/runtime/signal_power64x.c
+++ b/src/runtime/signal_power64x.c
diff --git a/src/pkg/runtime/signal_solaris_amd64.h b/src/runtime/signal_solaris_amd64.h
index c2e0a1549..c2e0a1549 100644
--- a/src/pkg/runtime/signal_solaris_amd64.h
+++ b/src/runtime/signal_solaris_amd64.h
diff --git a/src/pkg/runtime/signal_unix.c b/src/runtime/signal_unix.c
index 0e33ece49..0e33ece49 100644
--- a/src/pkg/runtime/signal_unix.c
+++ b/src/runtime/signal_unix.c
diff --git a/src/pkg/runtime/signal_unix.go b/src/runtime/signal_unix.go
index ba77b6e7b..ba77b6e7b 100644
--- a/src/pkg/runtime/signal_unix.go
+++ b/src/runtime/signal_unix.go
diff --git a/src/pkg/runtime/signal_unix.h b/src/runtime/signal_unix.h
index 2d84a0186..2d84a0186 100644
--- a/src/pkg/runtime/signal_unix.h
+++ b/src/runtime/signal_unix.h
diff --git a/src/pkg/runtime/signals_android.h b/src/runtime/signals_android.h
index 5140d8a18..5140d8a18 100644
--- a/src/pkg/runtime/signals_android.h
+++ b/src/runtime/signals_android.h
diff --git a/src/pkg/runtime/signals_darwin.h b/src/runtime/signals_darwin.h
index 229b58590..229b58590 100644
--- a/src/pkg/runtime/signals_darwin.h
+++ b/src/runtime/signals_darwin.h
diff --git a/src/pkg/runtime/signals_dragonfly.h b/src/runtime/signals_dragonfly.h
index 4d27e050d..4d27e050d 100644
--- a/src/pkg/runtime/signals_dragonfly.h
+++ b/src/runtime/signals_dragonfly.h
diff --git a/src/pkg/runtime/signals_freebsd.h b/src/runtime/signals_freebsd.h
index 8d45c50c3..8d45c50c3 100644
--- a/src/pkg/runtime/signals_freebsd.h
+++ b/src/runtime/signals_freebsd.h
diff --git a/src/pkg/runtime/signals_linux.h b/src/runtime/signals_linux.h
index 368afc1c8..368afc1c8 100644
--- a/src/pkg/runtime/signals_linux.h
+++ b/src/runtime/signals_linux.h
diff --git a/src/pkg/runtime/signals_nacl.h b/src/runtime/signals_nacl.h
index 229b58590..229b58590 100644
--- a/src/pkg/runtime/signals_nacl.h
+++ b/src/runtime/signals_nacl.h
diff --git a/src/pkg/runtime/signals_netbsd.h b/src/runtime/signals_netbsd.h
index 7140de86f..7140de86f 100644
--- a/src/pkg/runtime/signals_netbsd.h
+++ b/src/runtime/signals_netbsd.h
diff --git a/src/pkg/runtime/signals_openbsd.h b/src/runtime/signals_openbsd.h
index 7140de86f..7140de86f 100644
--- a/src/pkg/runtime/signals_openbsd.h
+++ b/src/runtime/signals_openbsd.h
diff --git a/src/pkg/runtime/signals_plan9.h b/src/runtime/signals_plan9.h
index 818f508cf..818f508cf 100644
--- a/src/pkg/runtime/signals_plan9.h
+++ b/src/runtime/signals_plan9.h
diff --git a/src/pkg/runtime/signals_solaris.h b/src/runtime/signals_solaris.h
index c272cad29..c272cad29 100644
--- a/src/pkg/runtime/signals_solaris.h
+++ b/src/runtime/signals_solaris.h
diff --git a/src/pkg/runtime/signals_windows.h b/src/runtime/signals_windows.h
index 6943714b0..6943714b0 100644
--- a/src/pkg/runtime/signals_windows.h
+++ b/src/runtime/signals_windows.h
diff --git a/src/pkg/runtime/sigqueue.go b/src/runtime/sigqueue.go
index 2d9c24d2d..2d9c24d2d 100644
--- a/src/pkg/runtime/sigqueue.go
+++ b/src/runtime/sigqueue.go
diff --git a/src/pkg/runtime/slice.go b/src/runtime/slice.go
index 3b88927c6..3b88927c6 100644
--- a/src/pkg/runtime/slice.go
+++ b/src/runtime/slice.go
diff --git a/src/pkg/runtime/softfloat64.go b/src/runtime/softfloat64.go
index 4fcf8f269..4fcf8f269 100644
--- a/src/pkg/runtime/softfloat64.go
+++ b/src/runtime/softfloat64.go
diff --git a/src/pkg/runtime/softfloat64_test.go b/src/runtime/softfloat64_test.go
index df63010fb..df63010fb 100644
--- a/src/pkg/runtime/softfloat64_test.go
+++ b/src/runtime/softfloat64_test.go
diff --git a/src/pkg/runtime/softfloat_arm.c b/src/runtime/softfloat_arm.c
index 3f3f33a19..3f3f33a19 100644
--- a/src/pkg/runtime/softfloat_arm.c
+++ b/src/runtime/softfloat_arm.c
diff --git a/src/pkg/runtime/sqrt.go b/src/runtime/sqrt.go
index 34a8c3806..34a8c3806 100644
--- a/src/pkg/runtime/sqrt.go
+++ b/src/runtime/sqrt.go
diff --git a/src/pkg/runtime/stack.c b/src/runtime/stack.c
index b85a84484..b85a84484 100644
--- a/src/pkg/runtime/stack.c
+++ b/src/runtime/stack.c
diff --git a/src/pkg/runtime/stack.go b/src/runtime/stack.go
index f1b7d32d2..f1b7d32d2 100644
--- a/src/pkg/runtime/stack.go
+++ b/src/runtime/stack.go
diff --git a/src/pkg/runtime/stack.h b/src/runtime/stack.h
index 7f8c43ee5..7f8c43ee5 100644
--- a/src/pkg/runtime/stack.h
+++ b/src/runtime/stack.h
diff --git a/src/pkg/runtime/stack_gen_test.go b/src/runtime/stack_gen_test.go
index 28101062c..28101062c 100644
--- a/src/pkg/runtime/stack_gen_test.go
+++ b/src/runtime/stack_gen_test.go
diff --git a/src/pkg/runtime/stack_test.go b/src/runtime/stack_test.go
index 7b9412af4..7b9412af4 100644
--- a/src/pkg/runtime/stack_test.go
+++ b/src/runtime/stack_test.go
diff --git a/src/pkg/runtime/string.c b/src/runtime/string.c
index 4f25adf8e..4f25adf8e 100644
--- a/src/pkg/runtime/string.c
+++ b/src/runtime/string.c
diff --git a/src/pkg/runtime/string.go b/src/runtime/string.go
index 31e6670a5..31e6670a5 100644
--- a/src/pkg/runtime/string.go
+++ b/src/runtime/string.go
diff --git a/src/pkg/runtime/string_test.go b/src/runtime/string_test.go
index e7ac51a5f..e7ac51a5f 100644
--- a/src/pkg/runtime/string_test.go
+++ b/src/runtime/string_test.go
diff --git a/src/pkg/runtime/stubs.go b/src/runtime/stubs.go
index 03f618e15..03f618e15 100644
--- a/src/pkg/runtime/stubs.go
+++ b/src/runtime/stubs.go
diff --git a/src/pkg/runtime/symtab.go b/src/runtime/symtab.go
index bd9e9924c..bd9e9924c 100644
--- a/src/pkg/runtime/symtab.go
+++ b/src/runtime/symtab.go
diff --git a/src/pkg/runtime/symtab_test.go b/src/runtime/symtab_test.go
index bd9fe18c4..bd9fe18c4 100644
--- a/src/pkg/runtime/symtab_test.go
+++ b/src/runtime/symtab_test.go
diff --git a/src/pkg/runtime/sys_arm.c b/src/runtime/sys_arm.c
index a65560e5b..a65560e5b 100644
--- a/src/pkg/runtime/sys_arm.c
+++ b/src/runtime/sys_arm.c
diff --git a/src/pkg/runtime/sys_darwin_386.s b/src/runtime/sys_darwin_386.s
index a961c71a8..a961c71a8 100644
--- a/src/pkg/runtime/sys_darwin_386.s
+++ b/src/runtime/sys_darwin_386.s
diff --git a/src/pkg/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s
index bd397d72a..bd397d72a 100644
--- a/src/pkg/runtime/sys_darwin_amd64.s
+++ b/src/runtime/sys_darwin_amd64.s
diff --git a/src/pkg/runtime/sys_dragonfly_386.s b/src/runtime/sys_dragonfly_386.s
index dd0e27e26..dd0e27e26 100644
--- a/src/pkg/runtime/sys_dragonfly_386.s
+++ b/src/runtime/sys_dragonfly_386.s
diff --git a/src/pkg/runtime/sys_dragonfly_amd64.s b/src/runtime/sys_dragonfly_amd64.s
index 2c756018c..2c756018c 100644
--- a/src/pkg/runtime/sys_dragonfly_amd64.s
+++ b/src/runtime/sys_dragonfly_amd64.s
diff --git a/src/pkg/runtime/sys_freebsd_386.s b/src/runtime/sys_freebsd_386.s
index ffc28560e..ffc28560e 100644
--- a/src/pkg/runtime/sys_freebsd_386.s
+++ b/src/runtime/sys_freebsd_386.s
diff --git a/src/pkg/runtime/sys_freebsd_amd64.s b/src/runtime/sys_freebsd_amd64.s
index 65f8c1a6e..65f8c1a6e 100644
--- a/src/pkg/runtime/sys_freebsd_amd64.s
+++ b/src/runtime/sys_freebsd_amd64.s
diff --git a/src/pkg/runtime/sys_freebsd_arm.s b/src/runtime/sys_freebsd_arm.s
index d875138b6..d875138b6 100644
--- a/src/pkg/runtime/sys_freebsd_arm.s
+++ b/src/runtime/sys_freebsd_arm.s
diff --git a/src/pkg/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index 0f6d4bbb5..0f6d4bbb5 100644
--- a/src/pkg/runtime/sys_linux_386.s
+++ b/src/runtime/sys_linux_386.s
diff --git a/src/pkg/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
index 33b91e872..33b91e872 100644
--- a/src/pkg/runtime/sys_linux_amd64.s
+++ b/src/runtime/sys_linux_amd64.s
diff --git a/src/pkg/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
index bd285f399..bd285f399 100644
--- a/src/pkg/runtime/sys_linux_arm.s
+++ b/src/runtime/sys_linux_arm.s
diff --git a/src/pkg/runtime/sys_linux_power64x.s b/src/runtime/sys_linux_power64x.s
index fbd59a052..fbd59a052 100644
--- a/src/pkg/runtime/sys_linux_power64x.s
+++ b/src/runtime/sys_linux_power64x.s
diff --git a/src/pkg/runtime/sys_nacl_386.s b/src/runtime/sys_nacl_386.s
index 47985f31f..47985f31f 100644
--- a/src/pkg/runtime/sys_nacl_386.s
+++ b/src/runtime/sys_nacl_386.s
diff --git a/src/pkg/runtime/sys_nacl_amd64p32.s b/src/runtime/sys_nacl_amd64p32.s
index c30c2a893..c30c2a893 100644
--- a/src/pkg/runtime/sys_nacl_amd64p32.s
+++ b/src/runtime/sys_nacl_amd64p32.s
diff --git a/src/pkg/runtime/sys_nacl_arm.s b/src/runtime/sys_nacl_arm.s
index d354ab483..d354ab483 100644
--- a/src/pkg/runtime/sys_nacl_arm.s
+++ b/src/runtime/sys_nacl_arm.s
diff --git a/src/pkg/runtime/sys_netbsd_386.s b/src/runtime/sys_netbsd_386.s
index 83a76cb34..83a76cb34 100644
--- a/src/pkg/runtime/sys_netbsd_386.s
+++ b/src/runtime/sys_netbsd_386.s
diff --git a/src/pkg/runtime/sys_netbsd_amd64.s b/src/runtime/sys_netbsd_amd64.s
index eb9766d3f..eb9766d3f 100644
--- a/src/pkg/runtime/sys_netbsd_amd64.s
+++ b/src/runtime/sys_netbsd_amd64.s
diff --git a/src/pkg/runtime/sys_netbsd_arm.s b/src/runtime/sys_netbsd_arm.s
index 039a0832e..039a0832e 100644
--- a/src/pkg/runtime/sys_netbsd_arm.s
+++ b/src/runtime/sys_netbsd_arm.s
diff --git a/src/pkg/runtime/sys_openbsd_386.s b/src/runtime/sys_openbsd_386.s
index 12d9c5c6b..12d9c5c6b 100644
--- a/src/pkg/runtime/sys_openbsd_386.s
+++ b/src/runtime/sys_openbsd_386.s
diff --git a/src/pkg/runtime/sys_openbsd_amd64.s b/src/runtime/sys_openbsd_amd64.s
index 4e9db2390..4e9db2390 100644
--- a/src/pkg/runtime/sys_openbsd_amd64.s
+++ b/src/runtime/sys_openbsd_amd64.s
diff --git a/src/pkg/runtime/sys_plan9_386.s b/src/runtime/sys_plan9_386.s
index 743298181..743298181 100644
--- a/src/pkg/runtime/sys_plan9_386.s
+++ b/src/runtime/sys_plan9_386.s
diff --git a/src/pkg/runtime/sys_plan9_amd64.s b/src/runtime/sys_plan9_amd64.s
index 954c0c27b..954c0c27b 100644
--- a/src/pkg/runtime/sys_plan9_amd64.s
+++ b/src/runtime/sys_plan9_amd64.s
diff --git a/src/pkg/runtime/sys_power64x.c b/src/runtime/sys_power64x.c
index 79d976255..79d976255 100644
--- a/src/pkg/runtime/sys_power64x.c
+++ b/src/runtime/sys_power64x.c
diff --git a/src/pkg/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s
index 093315c4a..093315c4a 100644
--- a/src/pkg/runtime/sys_solaris_amd64.s
+++ b/src/runtime/sys_solaris_amd64.s
diff --git a/src/pkg/runtime/sys_windows_386.s b/src/runtime/sys_windows_386.s
index a9e096f01..a9e096f01 100644
--- a/src/pkg/runtime/sys_windows_386.s
+++ b/src/runtime/sys_windows_386.s
diff --git a/src/pkg/runtime/sys_windows_amd64.s b/src/runtime/sys_windows_amd64.s
index 21f73daf0..21f73daf0 100644
--- a/src/pkg/runtime/sys_windows_amd64.s
+++ b/src/runtime/sys_windows_amd64.s
diff --git a/src/pkg/runtime/sys_x86.c b/src/runtime/sys_x86.c
index a450b3e58..a450b3e58 100644
--- a/src/pkg/runtime/sys_x86.c
+++ b/src/runtime/sys_x86.c
diff --git a/src/pkg/runtime/syscall_nacl.h b/src/runtime/syscall_nacl.h
index b33852ec8..b33852ec8 100644
--- a/src/pkg/runtime/syscall_nacl.h
+++ b/src/runtime/syscall_nacl.h
diff --git a/src/pkg/runtime/syscall_solaris.c b/src/runtime/syscall_solaris.c
index 13ac31bde..13ac31bde 100644
--- a/src/pkg/runtime/syscall_solaris.c
+++ b/src/runtime/syscall_solaris.c
diff --git a/src/pkg/runtime/syscall_solaris.go b/src/runtime/syscall_solaris.go
index d0a3fc8dd..d0a3fc8dd 100644
--- a/src/pkg/runtime/syscall_solaris.go
+++ b/src/runtime/syscall_solaris.go
diff --git a/src/pkg/runtime/syscall_windows.c b/src/runtime/syscall_windows.c
index e7903b517..e7903b517 100644
--- a/src/pkg/runtime/syscall_windows.c
+++ b/src/runtime/syscall_windows.c
diff --git a/src/pkg/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
index 0592c57e1..0592c57e1 100644
--- a/src/pkg/runtime/syscall_windows.go
+++ b/src/runtime/syscall_windows.go
diff --git a/src/pkg/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go
index fabf935d8..fabf935d8 100644
--- a/src/pkg/runtime/syscall_windows_test.go
+++ b/src/runtime/syscall_windows_test.go
diff --git a/src/pkg/runtime/thunk.s b/src/runtime/thunk.s
index 8cd9afe60..8cd9afe60 100644
--- a/src/pkg/runtime/thunk.s
+++ b/src/runtime/thunk.s
diff --git a/src/pkg/runtime/thunk_solaris_amd64.s b/src/runtime/thunk_solaris_amd64.s
index 352011e04..f61188c14 100644
--- a/src/pkg/runtime/thunk_solaris_amd64.s
+++ b/src/runtime/thunk_solaris_amd64.s
@@ -5,7 +5,7 @@
 // This file exposes various external library functions to Go code in the runtime.
 
 #include "zasm_GOOS_GOARCH.h"
-#include "../../cmd/ld/textflag.h"
+#include "textflag.h"
 
 TEXT runtime·libc_chdir(SB),NOSPLIT,$0
 	MOVQ	libc·chdir(SB), AX
diff --git a/src/pkg/runtime/time.go b/src/runtime/time.go
index 8cf9eecf8..8cf9eecf8 100644
--- a/src/pkg/runtime/time.go
+++ b/src/runtime/time.go
diff --git a/src/pkg/runtime/tls_arm.s b/src/runtime/tls_arm.s
index 7a247ab19..7a247ab19 100644
--- a/src/pkg/runtime/tls_arm.s
+++ b/src/runtime/tls_arm.s
diff --git a/src/pkg/runtime/traceback.go b/src/runtime/traceback.go
index ec7be28dc..ec7be28dc 100644
--- a/src/pkg/runtime/traceback.go
+++ b/src/runtime/traceback.go
diff --git a/src/pkg/runtime/traceback_windows.go b/src/runtime/traceback_windows.go
index 89dc1336e..89dc1336e 100644
--- a/src/pkg/runtime/traceback_windows.go
+++ b/src/runtime/traceback_windows.go
diff --git a/src/pkg/runtime/type.h b/src/runtime/type.h
index de82e886f..de82e886f 100644
--- a/src/pkg/runtime/type.h
+++ b/src/runtime/type.h
diff --git a/src/pkg/runtime/typekind.go b/src/runtime/typekind.go
index 598553628..598553628 100644
--- a/src/pkg/runtime/typekind.go
+++ b/src/runtime/typekind.go
diff --git a/src/pkg/runtime/typekind.h b/src/runtime/typekind.h
index 7c611e8ba..7c611e8ba 100644
--- a/src/pkg/runtime/typekind.h
+++ b/src/runtime/typekind.h
diff --git a/src/pkg/runtime/vdso_linux_amd64.c b/src/runtime/vdso_linux_amd64.c
index 38e115243..38e115243 100644
--- a/src/pkg/runtime/vdso_linux_amd64.c
+++ b/src/runtime/vdso_linux_amd64.c
diff --git a/src/pkg/runtime/vlop_386.s b/src/runtime/vlop_386.s
index ce8e7d064..ce8e7d064 100644
--- a/src/pkg/runtime/vlop_386.s
+++ b/src/runtime/vlop_386.s
diff --git a/src/pkg/runtime/vlop_arm.s b/src/runtime/vlop_arm.s
index b4b905bb7..b4b905bb7 100644
--- a/src/pkg/runtime/vlop_arm.s
+++ b/src/runtime/vlop_arm.s
diff --git a/src/pkg/runtime/vlop_arm_test.go b/src/runtime/vlop_arm_test.go
index cd28419ad..cd28419ad 100644
--- a/src/pkg/runtime/vlop_arm_test.go
+++ b/src/runtime/vlop_arm_test.go
diff --git a/src/pkg/runtime/vlrt.c b/src/runtime/vlrt.c
index cb0d14796..cb0d14796 100644
--- a/src/pkg/runtime/vlrt.c
+++ b/src/runtime/vlrt.c
diff --git a/src/pkg/runtime/vlrt.go b/src/runtime/vlrt.go
index 6370732ca..6370732ca 100644
--- a/src/pkg/runtime/vlrt.go
+++ b/src/runtime/vlrt.go
diff --git a/src/pkg/sort/example_interface_test.go b/src/sort/example_interface_test.go
index 442204ea9..442204ea9 100644
--- a/src/pkg/sort/example_interface_test.go
+++ b/src/sort/example_interface_test.go
diff --git a/src/pkg/sort/example_keys_test.go b/src/sort/example_keys_test.go
index a8e47e492..a8e47e492 100644
--- a/src/pkg/sort/example_keys_test.go
+++ b/src/sort/example_keys_test.go
diff --git a/src/pkg/sort/example_multi_test.go b/src/sort/example_multi_test.go
index ac316540f..ac316540f 100644
--- a/src/pkg/sort/example_multi_test.go
+++ b/src/sort/example_multi_test.go
diff --git a/src/pkg/sort/example_test.go b/src/sort/example_test.go
index f7372bec3..f7372bec3 100644
--- a/src/pkg/sort/example_test.go
+++ b/src/sort/example_test.go
diff --git a/src/pkg/sort/example_wrapper_test.go b/src/sort/example_wrapper_test.go
index cf6d74cf7..cf6d74cf7 100644
--- a/src/pkg/sort/example_wrapper_test.go
+++ b/src/sort/example_wrapper_test.go
diff --git a/src/pkg/sort/export_test.go b/src/sort/export_test.go
index b6e30ceb5..b6e30ceb5 100644
--- a/src/pkg/sort/export_test.go
+++ b/src/sort/export_test.go
diff --git a/src/pkg/sort/search.go b/src/sort/search.go
index 8a2c1c33b..8a2c1c33b 100644
--- a/src/pkg/sort/search.go
+++ b/src/sort/search.go
diff --git a/src/pkg/sort/search_test.go b/src/sort/search_test.go
index 29b8d62df..29b8d62df 100644
--- a/src/pkg/sort/search_test.go
+++ b/src/sort/search_test.go
diff --git a/src/pkg/sort/sort.go b/src/sort/sort.go
index e980c295c..e980c295c 100644
--- a/src/pkg/sort/sort.go
+++ b/src/sort/sort.go
diff --git a/src/pkg/sort/sort_test.go b/src/sort/sort_test.go
index 6c36f30e0..6c36f30e0 100644
--- a/src/pkg/sort/sort_test.go
+++ b/src/sort/sort_test.go
diff --git a/src/pkg/strconv/atob.go b/src/strconv/atob.go
index d0cb09721..d0cb09721 100644
--- a/src/pkg/strconv/atob.go
+++ b/src/strconv/atob.go
diff --git a/src/pkg/strconv/atob_test.go b/src/strconv/atob_test.go
index 28f469f58..28f469f58 100644
--- a/src/pkg/strconv/atob_test.go
+++ b/src/strconv/atob_test.go
diff --git a/src/pkg/strconv/atof.go b/src/strconv/atof.go
index 286206481..286206481 100644
--- a/src/pkg/strconv/atof.go
+++ b/src/strconv/atof.go
diff --git a/src/pkg/strconv/atof_test.go b/src/strconv/atof_test.go
index ba4933218..ba4933218 100644
--- a/src/pkg/strconv/atof_test.go
+++ b/src/strconv/atof_test.go
diff --git a/src/pkg/strconv/atoi.go b/src/strconv/atoi.go
index 9ecec5a58..9ecec5a58 100644
--- a/src/pkg/strconv/atoi.go
+++ b/src/strconv/atoi.go
diff --git a/src/pkg/strconv/atoi_test.go b/src/strconv/atoi_test.go
index 940757307..940757307 100644
--- a/src/pkg/strconv/atoi_test.go
+++ b/src/strconv/atoi_test.go
diff --git a/src/pkg/strconv/decimal.go b/src/strconv/decimal.go
index 42601283d..42601283d 100644
--- a/src/pkg/strconv/decimal.go
+++ b/src/strconv/decimal.go
diff --git a/src/pkg/strconv/decimal_test.go b/src/strconv/decimal_test.go
index 13a127f5b..13a127f5b 100644
--- a/src/pkg/strconv/decimal_test.go
+++ b/src/strconv/decimal_test.go
diff --git a/src/pkg/strconv/extfloat.go b/src/strconv/extfloat.go
index bed8b16bd..bed8b16bd 100644
--- a/src/pkg/strconv/extfloat.go
+++ b/src/strconv/extfloat.go
diff --git a/src/pkg/strconv/fp_test.go b/src/strconv/fp_test.go
index 6de2f8bc6..6de2f8bc6 100644
--- a/src/pkg/strconv/fp_test.go
+++ b/src/strconv/fp_test.go
diff --git a/src/pkg/strconv/ftoa.go b/src/strconv/ftoa.go
index 1a9c41b85..1a9c41b85 100644
--- a/src/pkg/strconv/ftoa.go
+++ b/src/strconv/ftoa.go
diff --git a/src/pkg/strconv/ftoa_test.go b/src/strconv/ftoa_test.go
index 39b861547..39b861547 100644
--- a/src/pkg/strconv/ftoa_test.go
+++ b/src/strconv/ftoa_test.go
diff --git a/src/pkg/strconv/internal_test.go b/src/strconv/internal_test.go
index d0fa80edf..d0fa80edf 100644
--- a/src/pkg/strconv/internal_test.go
+++ b/src/strconv/internal_test.go
diff --git a/src/pkg/strconv/isprint.go b/src/strconv/isprint.go
index 80738ed71..80738ed71 100644
--- a/src/pkg/strconv/isprint.go
+++ b/src/strconv/isprint.go
diff --git a/src/pkg/strconv/itoa.go b/src/strconv/itoa.go
index 67f17d866..67f17d866 100644
--- a/src/pkg/strconv/itoa.go
+++ b/src/strconv/itoa.go
diff --git a/src/pkg/strconv/itoa_test.go b/src/strconv/itoa_test.go
index e0213ae9a..e0213ae9a 100644
--- a/src/pkg/strconv/itoa_test.go
+++ b/src/strconv/itoa_test.go
diff --git a/src/pkg/strconv/makeisprint.go b/src/strconv/makeisprint.go
index 588d0a00b..588d0a00b 100644
--- a/src/pkg/strconv/makeisprint.go
+++ b/src/strconv/makeisprint.go
diff --git a/src/pkg/strconv/quote.go b/src/strconv/quote.go
index 4469c688b..4469c688b 100644
--- a/src/pkg/strconv/quote.go
+++ b/src/strconv/quote.go
diff --git a/src/pkg/strconv/quote_example_test.go b/src/strconv/quote_example_test.go
index 405a57eb5..405a57eb5 100644
--- a/src/pkg/strconv/quote_example_test.go
+++ b/src/strconv/quote_example_test.go
diff --git a/src/pkg/strconv/quote_test.go b/src/strconv/quote_test.go
index 3bf162f98..3bf162f98 100644
--- a/src/pkg/strconv/quote_test.go
+++ b/src/strconv/quote_test.go
diff --git a/src/pkg/strconv/strconv_test.go b/src/strconv/strconv_test.go
index 9a007dde4..9a007dde4 100644
--- a/src/pkg/strconv/strconv_test.go
+++ b/src/strconv/strconv_test.go
diff --git a/src/pkg/strconv/testdata/testfp.txt b/src/strconv/testdata/testfp.txt
index 08d3c4ef0..08d3c4ef0 100644
--- a/src/pkg/strconv/testdata/testfp.txt
+++ b/src/strconv/testdata/testfp.txt
diff --git a/src/pkg/strings/example_test.go b/src/strings/example_test.go
index 7243e16b1..7243e16b1 100644
--- a/src/pkg/strings/example_test.go
+++ b/src/strings/example_test.go
diff --git a/src/pkg/strings/export_test.go b/src/strings/export_test.go
index 17c806aa5..17c806aa5 100644
--- a/src/pkg/strings/export_test.go
+++ b/src/strings/export_test.go
diff --git a/src/pkg/strings/reader.go b/src/strings/reader.go
index 82df97439..82df97439 100644
--- a/src/pkg/strings/reader.go
+++ b/src/strings/reader.go
diff --git a/src/pkg/strings/reader_test.go b/src/strings/reader_test.go
index bee90eb25..bee90eb25 100644
--- a/src/pkg/strings/reader_test.go
+++ b/src/strings/reader_test.go
diff --git a/src/pkg/strings/replace.go b/src/strings/replace.go
index 4752641be..4752641be 100644
--- a/src/pkg/strings/replace.go
+++ b/src/strings/replace.go
diff --git a/src/pkg/strings/replace_test.go b/src/strings/replace_test.go
index 77e48b988..77e48b988 100644
--- a/src/pkg/strings/replace_test.go
+++ b/src/strings/replace_test.go
diff --git a/src/pkg/strings/search.go b/src/strings/search.go
index f77c879c5..f77c879c5 100644
--- a/src/pkg/strings/search.go
+++ b/src/strings/search.go
diff --git a/src/pkg/strings/search_test.go b/src/strings/search_test.go
index 966c05e65..966c05e65 100644
--- a/src/pkg/strings/search_test.go
+++ b/src/strings/search_test.go
diff --git a/src/pkg/strings/strings.go b/src/strings/strings.go
index 761f32a06..761f32a06 100644
--- a/src/pkg/strings/strings.go
+++ b/src/strings/strings.go
diff --git a/src/pkg/strings/strings.s b/src/strings/strings.s
index 55103bae0..55103bae0 100644
--- a/src/pkg/strings/strings.s
+++ b/src/strings/strings.s
diff --git a/src/pkg/strings/strings_decl.go b/src/strings/strings_decl.go
index 810a696af..810a696af 100644
--- a/src/pkg/strings/strings_decl.go
+++ b/src/strings/strings_decl.go
diff --git a/src/pkg/strings/strings_test.go b/src/strings/strings_test.go
index 7bb81ef3c..7bb81ef3c 100644
--- a/src/pkg/strings/strings_test.go
+++ b/src/strings/strings_test.go
diff --git a/src/pkg/sync/atomic/64bit_arm.go b/src/sync/atomic/64bit_arm.go
index c08f214c7..c08f214c7 100644
--- a/src/pkg/sync/atomic/64bit_arm.go
+++ b/src/sync/atomic/64bit_arm.go
diff --git a/src/pkg/sync/atomic/asm_386.s b/src/sync/atomic/asm_386.s
index 740dfe76b..740dfe76b 100644
--- a/src/pkg/sync/atomic/asm_386.s
+++ b/src/sync/atomic/asm_386.s
diff --git a/src/pkg/sync/atomic/asm_amd64.s b/src/sync/atomic/asm_amd64.s
index 6e53ebedd..6e53ebedd 100644
--- a/src/pkg/sync/atomic/asm_amd64.s
+++ b/src/sync/atomic/asm_amd64.s
diff --git a/src/pkg/sync/atomic/asm_amd64p32.s b/src/sync/atomic/asm_amd64p32.s
index d77cc2c08..d77cc2c08 100644
--- a/src/pkg/sync/atomic/asm_amd64p32.s
+++ b/src/sync/atomic/asm_amd64p32.s
diff --git a/src/pkg/sync/atomic/asm_arm.s b/src/sync/atomic/asm_arm.s
index 47639a80e..47639a80e 100644
--- a/src/pkg/sync/atomic/asm_arm.s
+++ b/src/sync/atomic/asm_arm.s
diff --git a/src/pkg/sync/atomic/asm_freebsd_arm.s b/src/sync/atomic/asm_freebsd_arm.s
index 06b975e89..06b975e89 100644
--- a/src/pkg/sync/atomic/asm_freebsd_arm.s
+++ b/src/sync/atomic/asm_freebsd_arm.s
diff --git a/src/pkg/sync/atomic/asm_linux_arm.s b/src/sync/atomic/asm_linux_arm.s
index 63f1f9e38..63f1f9e38 100644
--- a/src/pkg/sync/atomic/asm_linux_arm.s
+++ b/src/sync/atomic/asm_linux_arm.s
diff --git a/src/pkg/sync/atomic/asm_nacl_arm.s b/src/sync/atomic/asm_nacl_arm.s
index 76f623336..76f623336 100644
--- a/src/pkg/sync/atomic/asm_nacl_arm.s
+++ b/src/sync/atomic/asm_nacl_arm.s
diff --git a/src/pkg/sync/atomic/asm_netbsd_arm.s b/src/sync/atomic/asm_netbsd_arm.s
index dbe80898f..dbe80898f 100644
--- a/src/pkg/sync/atomic/asm_netbsd_arm.s
+++ b/src/sync/atomic/asm_netbsd_arm.s
diff --git a/src/pkg/sync/atomic/asm_power64x.s b/src/sync/atomic/asm_power64x.s
index bdb1dcff4..bdb1dcff4 100644
--- a/src/pkg/sync/atomic/asm_power64x.s
+++ b/src/sync/atomic/asm_power64x.s
diff --git a/src/pkg/sync/atomic/atomic_linux_arm_test.go b/src/sync/atomic/atomic_linux_arm_test.go
index b6965b99b..b6965b99b 100644
--- a/src/pkg/sync/atomic/atomic_linux_arm_test.go
+++ b/src/sync/atomic/atomic_linux_arm_test.go
diff --git a/src/pkg/sync/atomic/atomic_test.go b/src/sync/atomic/atomic_test.go
index 9f13af48b..9f13af48b 100644
--- a/src/pkg/sync/atomic/atomic_test.go
+++ b/src/sync/atomic/atomic_test.go
diff --git a/src/pkg/sync/atomic/doc.go b/src/sync/atomic/doc.go
index 10fb8c917..10fb8c917 100644
--- a/src/pkg/sync/atomic/doc.go
+++ b/src/sync/atomic/doc.go
diff --git a/src/pkg/sync/atomic/export_linux_arm_test.go b/src/sync/atomic/export_linux_arm_test.go
index 5cd43353e..5cd43353e 100644
--- a/src/pkg/sync/atomic/export_linux_arm_test.go
+++ b/src/sync/atomic/export_linux_arm_test.go
diff --git a/src/pkg/sync/atomic/race.s b/src/sync/atomic/race.s
index 4dadc9ed7..bdce7668b 100644
--- a/src/pkg/sync/atomic/race.s
+++ b/src/sync/atomic/race.s
@@ -5,4 +5,4 @@
 // +build race
 
 // This file is here only to allow external functions.
-// The operations are implemented in src/pkg/runtime/race_amd64.s
+// The operations are implemented in src/runtime/race_amd64.s
diff --git a/src/pkg/sync/cond.go b/src/sync/cond.go
index 9e6bc170f..9e6bc170f 100644
--- a/src/pkg/sync/cond.go
+++ b/src/sync/cond.go
diff --git a/src/pkg/sync/cond_test.go b/src/sync/cond_test.go
index 467c80621..467c80621 100644
--- a/src/pkg/sync/cond_test.go
+++ b/src/sync/cond_test.go
diff --git a/src/pkg/sync/example_test.go b/src/sync/example_test.go
index bdd3af6fe..bdd3af6fe 100644
--- a/src/pkg/sync/example_test.go
+++ b/src/sync/example_test.go
diff --git a/src/pkg/sync/export_test.go b/src/sync/export_test.go
index fa5983a2d..fa5983a2d 100644
--- a/src/pkg/sync/export_test.go
+++ b/src/sync/export_test.go
diff --git a/src/pkg/sync/mutex.go b/src/sync/mutex.go
index 73b337702..73b337702 100644
--- a/src/pkg/sync/mutex.go
+++ b/src/sync/mutex.go
diff --git a/src/pkg/sync/mutex_test.go b/src/sync/mutex_test.go
index 151b25c10..151b25c10 100644
--- a/src/pkg/sync/mutex_test.go
+++ b/src/sync/mutex_test.go
diff --git a/src/pkg/sync/once.go b/src/sync/once.go
index 161ae3b3e..161ae3b3e 100644
--- a/src/pkg/sync/once.go
+++ b/src/sync/once.go
diff --git a/src/pkg/sync/once_test.go b/src/sync/once_test.go
index 8afda82f3..8afda82f3 100644
--- a/src/pkg/sync/once_test.go
+++ b/src/sync/once_test.go
diff --git a/src/pkg/sync/pool.go b/src/sync/pool.go
index 1f08707cd..1f08707cd 100644
--- a/src/pkg/sync/pool.go
+++ b/src/sync/pool.go
diff --git a/src/pkg/sync/pool_test.go b/src/sync/pool_test.go
index cf5c8bd90..cf5c8bd90 100644
--- a/src/pkg/sync/pool_test.go
+++ b/src/sync/pool_test.go
diff --git a/src/pkg/sync/race.go b/src/sync/race.go
index fd0277dcc..fd0277dcc 100644
--- a/src/pkg/sync/race.go
+++ b/src/sync/race.go
diff --git a/src/pkg/sync/race0.go b/src/sync/race0.go
index 65ada1c5d..65ada1c5d 100644
--- a/src/pkg/sync/race0.go
+++ b/src/sync/race0.go
diff --git a/src/pkg/sync/runtime.go b/src/sync/runtime.go
index 3b866303a..3b866303a 100644
--- a/src/pkg/sync/runtime.go
+++ b/src/sync/runtime.go
diff --git a/src/pkg/sync/runtime_sema_test.go b/src/sync/runtime_sema_test.go
index 5b7dd3df3..5b7dd3df3 100644
--- a/src/pkg/sync/runtime_sema_test.go
+++ b/src/sync/runtime_sema_test.go
diff --git a/src/pkg/sync/rwmutex.go b/src/sync/rwmutex.go
index 0e8a58e5f..0e8a58e5f 100644
--- a/src/pkg/sync/rwmutex.go
+++ b/src/sync/rwmutex.go
diff --git a/src/pkg/sync/rwmutex_test.go b/src/sync/rwmutex_test.go
index f625bc3a5..f625bc3a5 100644
--- a/src/pkg/sync/rwmutex_test.go
+++ b/src/sync/rwmutex_test.go
diff --git a/src/pkg/sync/waitgroup.go b/src/sync/waitgroup.go
index 92cc57d2c..92cc57d2c 100644
--- a/src/pkg/sync/waitgroup.go
+++ b/src/sync/waitgroup.go
diff --git a/src/pkg/sync/waitgroup_test.go b/src/sync/waitgroup_test.go
index 4c0a043c0..4c0a043c0 100644
--- a/src/pkg/sync/waitgroup_test.go
+++ b/src/sync/waitgroup_test.go
diff --git a/src/pkg/syscall/asm_darwin_386.s b/src/syscall/asm_darwin_386.s
index dfe94fb52..dfe94fb52 100644
--- a/src/pkg/syscall/asm_darwin_386.s
+++ b/src/syscall/asm_darwin_386.s
diff --git a/src/pkg/syscall/asm_darwin_amd64.s b/src/syscall/asm_darwin_amd64.s
index d6f1c96f5..d6f1c96f5 100644
--- a/src/pkg/syscall/asm_darwin_amd64.s
+++ b/src/syscall/asm_darwin_amd64.s
diff --git a/src/pkg/syscall/asm_dragonfly_386.s b/src/syscall/asm_dragonfly_386.s
index 37d655fba..37d655fba 100644
--- a/src/pkg/syscall/asm_dragonfly_386.s
+++ b/src/syscall/asm_dragonfly_386.s
diff --git a/src/pkg/syscall/asm_dragonfly_amd64.s b/src/syscall/asm_dragonfly_amd64.s
index c8434f96b..c8434f96b 100644
--- a/src/pkg/syscall/asm_dragonfly_amd64.s
+++ b/src/syscall/asm_dragonfly_amd64.s
diff --git a/src/pkg/syscall/asm_freebsd_386.s b/src/syscall/asm_freebsd_386.s
index f50b5a09b..f50b5a09b 100644
--- a/src/pkg/syscall/asm_freebsd_386.s
+++ b/src/syscall/asm_freebsd_386.s
diff --git a/src/pkg/syscall/asm_freebsd_amd64.s b/src/syscall/asm_freebsd_amd64.s
index 58cbfe1a9..58cbfe1a9 100644
--- a/src/pkg/syscall/asm_freebsd_amd64.s
+++ b/src/syscall/asm_freebsd_amd64.s
diff --git a/src/pkg/syscall/asm_freebsd_arm.s b/src/syscall/asm_freebsd_arm.s
index 5eb40334b..5eb40334b 100644
--- a/src/pkg/syscall/asm_freebsd_arm.s
+++ b/src/syscall/asm_freebsd_arm.s
diff --git a/src/pkg/syscall/asm_linux_386.s b/src/syscall/asm_linux_386.s
index 05cf89aa2..05cf89aa2 100644
--- a/src/pkg/syscall/asm_linux_386.s
+++ b/src/syscall/asm_linux_386.s
diff --git a/src/pkg/syscall/asm_linux_amd64.s b/src/syscall/asm_linux_amd64.s
index 514693283..514693283 100644
--- a/src/pkg/syscall/asm_linux_amd64.s
+++ b/src/syscall/asm_linux_amd64.s
diff --git a/src/pkg/syscall/asm_linux_arm.s b/src/syscall/asm_linux_arm.s
index 3be0a13e1..3be0a13e1 100644
--- a/src/pkg/syscall/asm_linux_arm.s
+++ b/src/syscall/asm_linux_arm.s
diff --git a/src/pkg/syscall/asm_linux_power64x.s b/src/syscall/asm_linux_power64x.s
index c9b0fe320..c9b0fe320 100644
--- a/src/pkg/syscall/asm_linux_power64x.s
+++ b/src/syscall/asm_linux_power64x.s
diff --git a/src/pkg/syscall/asm_nacl_386.s b/src/syscall/asm_nacl_386.s
index 3c86decd3..3c86decd3 100644
--- a/src/pkg/syscall/asm_nacl_386.s
+++ b/src/syscall/asm_nacl_386.s
diff --git a/src/pkg/syscall/asm_nacl_amd64p32.s b/src/syscall/asm_nacl_amd64p32.s
index b91e09bd6..b91e09bd6 100644
--- a/src/pkg/syscall/asm_nacl_amd64p32.s
+++ b/src/syscall/asm_nacl_amd64p32.s
diff --git a/src/pkg/syscall/asm_nacl_arm.s b/src/syscall/asm_nacl_arm.s
index cc4b9cd2d..cc4b9cd2d 100644
--- a/src/pkg/syscall/asm_nacl_arm.s
+++ b/src/syscall/asm_nacl_arm.s
diff --git a/src/pkg/syscall/asm_netbsd_386.s b/src/syscall/asm_netbsd_386.s
index c58263254..c58263254 100644
--- a/src/pkg/syscall/asm_netbsd_386.s
+++ b/src/syscall/asm_netbsd_386.s
diff --git a/src/pkg/syscall/asm_netbsd_amd64.s b/src/syscall/asm_netbsd_amd64.s
index 8285382ce..8285382ce 100644
--- a/src/pkg/syscall/asm_netbsd_amd64.s
+++ b/src/syscall/asm_netbsd_amd64.s
diff --git a/src/pkg/syscall/asm_netbsd_arm.s b/src/syscall/asm_netbsd_arm.s
index b06118049..b06118049 100644
--- a/src/pkg/syscall/asm_netbsd_arm.s
+++ b/src/syscall/asm_netbsd_arm.s
diff --git a/src/pkg/syscall/asm_openbsd_386.s b/src/syscall/asm_openbsd_386.s
index 17fbb65c8..17fbb65c8 100644
--- a/src/pkg/syscall/asm_openbsd_386.s
+++ b/src/syscall/asm_openbsd_386.s
diff --git a/src/pkg/syscall/asm_openbsd_amd64.s b/src/syscall/asm_openbsd_amd64.s
index fe61482cd..fe61482cd 100644
--- a/src/pkg/syscall/asm_openbsd_amd64.s
+++ b/src/syscall/asm_openbsd_amd64.s
diff --git a/src/pkg/syscall/asm_plan9_386.s b/src/syscall/asm_plan9_386.s
index aaa8b9a69..aaa8b9a69 100644
--- a/src/pkg/syscall/asm_plan9_386.s
+++ b/src/syscall/asm_plan9_386.s
diff --git a/src/pkg/syscall/asm_plan9_amd64.s b/src/syscall/asm_plan9_amd64.s
index 22dc5f957..22dc5f957 100644
--- a/src/pkg/syscall/asm_plan9_amd64.s
+++ b/src/syscall/asm_plan9_amd64.s
diff --git a/src/pkg/syscall/asm_solaris_amd64.s b/src/syscall/asm_solaris_amd64.s
index d0d271c76..d0d271c76 100644
--- a/src/pkg/syscall/asm_solaris_amd64.s
+++ b/src/syscall/asm_solaris_amd64.s
diff --git a/src/pkg/syscall/asm_windows.s b/src/syscall/asm_windows.s
index abb6641a2..abb6641a2 100644
--- a/src/pkg/syscall/asm_windows.s
+++ b/src/syscall/asm_windows.s
diff --git a/src/pkg/syscall/bpf_bsd.go b/src/syscall/bpf_bsd.go
index cc6c1e77c..cc6c1e77c 100644
--- a/src/pkg/syscall/bpf_bsd.go
+++ b/src/syscall/bpf_bsd.go
diff --git a/src/pkg/syscall/creds_test.go b/src/syscall/creds_test.go
index b1894c66b..b1894c66b 100644
--- a/src/pkg/syscall/creds_test.go
+++ b/src/syscall/creds_test.go
diff --git a/src/pkg/syscall/dir_plan9.go b/src/syscall/dir_plan9.go
index 697bf5499..697bf5499 100644
--- a/src/pkg/syscall/dir_plan9.go
+++ b/src/syscall/dir_plan9.go
diff --git a/src/pkg/syscall/dll_windows.go b/src/syscall/dll_windows.go
index d29e9921c..d29e9921c 100644
--- a/src/pkg/syscall/dll_windows.go
+++ b/src/syscall/dll_windows.go
diff --git a/src/pkg/syscall/env_plan9.go b/src/syscall/env_plan9.go
index 9587ab5af..9587ab5af 100644
--- a/src/pkg/syscall/env_plan9.go
+++ b/src/syscall/env_plan9.go
diff --git a/src/pkg/syscall/env_unix.go b/src/syscall/env_unix.go
index ad354ed05..ad354ed05 100644
--- a/src/pkg/syscall/env_unix.go
+++ b/src/syscall/env_unix.go
diff --git a/src/pkg/syscall/env_windows.go b/src/syscall/env_windows.go
index 420b38724..420b38724 100644
--- a/src/pkg/syscall/env_windows.go
+++ b/src/syscall/env_windows.go
diff --git a/src/pkg/syscall/exec_bsd.go b/src/syscall/exec_bsd.go
index ff78f197f..ff78f197f 100644
--- a/src/pkg/syscall/exec_bsd.go
+++ b/src/syscall/exec_bsd.go
diff --git a/src/pkg/syscall/exec_linux.go b/src/syscall/exec_linux.go
index f27950f73..f27950f73 100644
--- a/src/pkg/syscall/exec_linux.go
+++ b/src/syscall/exec_linux.go
diff --git a/src/pkg/syscall/exec_plan9.go b/src/syscall/exec_plan9.go
index 45ee542bb..45ee542bb 100644
--- a/src/pkg/syscall/exec_plan9.go
+++ b/src/syscall/exec_plan9.go
diff --git a/src/pkg/syscall/exec_solaris.go b/src/syscall/exec_solaris.go
index 97de6ca00..97de6ca00 100644
--- a/src/pkg/syscall/exec_solaris.go
+++ b/src/syscall/exec_solaris.go
diff --git a/src/pkg/syscall/exec_unix.go b/src/syscall/exec_unix.go
index 890bfdc22..890bfdc22 100644
--- a/src/pkg/syscall/exec_unix.go
+++ b/src/syscall/exec_unix.go
diff --git a/src/pkg/syscall/exec_windows.go b/src/syscall/exec_windows.go
index 936aeb577..936aeb577 100644
--- a/src/pkg/syscall/exec_windows.go
+++ b/src/syscall/exec_windows.go
diff --git a/src/pkg/syscall/fd_nacl.go b/src/syscall/fd_nacl.go
index 74324142a..74324142a 100644
--- a/src/pkg/syscall/fd_nacl.go
+++ b/src/syscall/fd_nacl.go
diff --git a/src/pkg/syscall/flock.go b/src/syscall/flock.go
index 62736ae9d..62736ae9d 100644
--- a/src/pkg/syscall/flock.go
+++ b/src/syscall/flock.go
diff --git a/src/pkg/syscall/flock_linux_32bit.go b/src/syscall/flock_linux_32bit.go
index 500a97344..500a97344 100644
--- a/src/pkg/syscall/flock_linux_32bit.go
+++ b/src/syscall/flock_linux_32bit.go
diff --git a/src/pkg/syscall/fs_nacl.go b/src/syscall/fs_nacl.go
index 4abc9b81c..4abc9b81c 100644
--- a/src/pkg/syscall/fs_nacl.go
+++ b/src/syscall/fs_nacl.go
diff --git a/src/pkg/syscall/lsf_linux.go b/src/syscall/lsf_linux.go
index ee07fea3f..ee07fea3f 100644
--- a/src/pkg/syscall/lsf_linux.go
+++ b/src/syscall/lsf_linux.go
diff --git a/src/pkg/syscall/mkall.sh b/src/syscall/mkall.sh
index febd5a262..febd5a262 100755
--- a/src/pkg/syscall/mkall.sh
+++ b/src/syscall/mkall.sh
diff --git a/src/pkg/syscall/mkall_windows.bat b/src/syscall/mkall_windows.bat
index 9c91a1064..9c91a1064 100644
--- a/src/pkg/syscall/mkall_windows.bat
+++ b/src/syscall/mkall_windows.bat
diff --git a/src/pkg/syscall/mkerrors.sh b/src/syscall/mkerrors.sh
index 4711f307a..4711f307a 100755
--- a/src/pkg/syscall/mkerrors.sh
+++ b/src/syscall/mkerrors.sh
diff --git a/src/pkg/syscall/mksyscall.pl b/src/syscall/mksyscall.pl
index 6d35fa689..6d35fa689 100755
--- a/src/pkg/syscall/mksyscall.pl
+++ b/src/syscall/mksyscall.pl
diff --git a/src/pkg/syscall/mksyscall_solaris.pl b/src/syscall/mksyscall_solaris.pl
index 130d043d9..130d043d9 100755
--- a/src/pkg/syscall/mksyscall_solaris.pl
+++ b/src/syscall/mksyscall_solaris.pl
diff --git a/src/pkg/syscall/mksyscall_windows.go b/src/syscall/mksyscall_windows.go
index 1cdd6b4d2..1cdd6b4d2 100644
--- a/src/pkg/syscall/mksyscall_windows.go
+++ b/src/syscall/mksyscall_windows.go
diff --git a/src/pkg/syscall/mksysctl_openbsd.pl b/src/syscall/mksysctl_openbsd.pl
index c2e2ea925..c2e2ea925 100755
--- a/src/pkg/syscall/mksysctl_openbsd.pl
+++ b/src/syscall/mksysctl_openbsd.pl
diff --git a/src/pkg/syscall/mksysnum_darwin.pl b/src/syscall/mksysnum_darwin.pl
index e3470435d..e3470435d 100755
--- a/src/pkg/syscall/mksysnum_darwin.pl
+++ b/src/syscall/mksysnum_darwin.pl
diff --git a/src/pkg/syscall/mksysnum_dragonfly.pl b/src/syscall/mksysnum_dragonfly.pl
index 3eba3ab3d..3eba3ab3d 100755
--- a/src/pkg/syscall/mksysnum_dragonfly.pl
+++ b/src/syscall/mksysnum_dragonfly.pl
diff --git a/src/pkg/syscall/mksysnum_freebsd.pl b/src/syscall/mksysnum_freebsd.pl
index cd675780b..cd675780b 100755
--- a/src/pkg/syscall/mksysnum_freebsd.pl
+++ b/src/syscall/mksysnum_freebsd.pl
diff --git a/src/pkg/syscall/mksysnum_linux.pl b/src/syscall/mksysnum_linux.pl
index c7e5cf73a..c7e5cf73a 100755
--- a/src/pkg/syscall/mksysnum_linux.pl
+++ b/src/syscall/mksysnum_linux.pl
diff --git a/src/pkg/syscall/mksysnum_netbsd.pl b/src/syscall/mksysnum_netbsd.pl
index f1534ed58..f1534ed58 100755
--- a/src/pkg/syscall/mksysnum_netbsd.pl
+++ b/src/syscall/mksysnum_netbsd.pl
diff --git a/src/pkg/syscall/mksysnum_openbsd.pl b/src/syscall/mksysnum_openbsd.pl
index ad1ccc12a..ad1ccc12a 100755
--- a/src/pkg/syscall/mksysnum_openbsd.pl
+++ b/src/syscall/mksysnum_openbsd.pl
diff --git a/src/pkg/syscall/mksysnum_plan9.sh b/src/syscall/mksysnum_plan9.sh
index fc619f090..fc619f090 100755
--- a/src/pkg/syscall/mksysnum_plan9.sh
+++ b/src/syscall/mksysnum_plan9.sh
diff --git a/src/pkg/syscall/mmap_unix_test.go b/src/syscall/mmap_unix_test.go
index 01f778302..01f778302 100644
--- a/src/pkg/syscall/mmap_unix_test.go
+++ b/src/syscall/mmap_unix_test.go
diff --git a/src/pkg/syscall/net_nacl.go b/src/syscall/net_nacl.go
index b5cb53030..b5cb53030 100644
--- a/src/pkg/syscall/net_nacl.go
+++ b/src/syscall/net_nacl.go
diff --git a/src/pkg/syscall/netlink_linux.go b/src/syscall/netlink_linux.go
index 1b73dce82..1b73dce82 100644
--- a/src/pkg/syscall/netlink_linux.go
+++ b/src/syscall/netlink_linux.go
diff --git a/src/pkg/syscall/race.go b/src/syscall/race.go
index e69c1119a..e69c1119a 100644
--- a/src/pkg/syscall/race.go
+++ b/src/syscall/race.go
diff --git a/src/pkg/syscall/race0.go b/src/syscall/race0.go
index b02f882fd..b02f882fd 100644
--- a/src/pkg/syscall/race0.go
+++ b/src/syscall/race0.go
diff --git a/src/pkg/syscall/route_bsd.go b/src/syscall/route_bsd.go
index 48af58745..48af58745 100644
--- a/src/pkg/syscall/route_bsd.go
+++ b/src/syscall/route_bsd.go
diff --git a/src/pkg/syscall/route_darwin.go b/src/syscall/route_darwin.go
index ad2790723..ad2790723 100644
--- a/src/pkg/syscall/route_darwin.go
+++ b/src/syscall/route_darwin.go
diff --git a/src/pkg/syscall/route_dragonfly.go b/src/syscall/route_dragonfly.go
index 79190d2b0..79190d2b0 100644
--- a/src/pkg/syscall/route_dragonfly.go
+++ b/src/syscall/route_dragonfly.go
diff --git a/src/pkg/syscall/route_freebsd.go b/src/syscall/route_freebsd.go
index 15897b1ac..15897b1ac 100644
--- a/src/pkg/syscall/route_freebsd.go
+++ b/src/syscall/route_freebsd.go
diff --git a/src/pkg/syscall/route_freebsd_32bit.go b/src/syscall/route_freebsd_32bit.go
index 93efdddb3..93efdddb3 100644
--- a/src/pkg/syscall/route_freebsd_32bit.go
+++ b/src/syscall/route_freebsd_32bit.go
diff --git a/src/pkg/syscall/route_freebsd_64bit.go b/src/syscall/route_freebsd_64bit.go
index 9377f2fed..9377f2fed 100644
--- a/src/pkg/syscall/route_freebsd_64bit.go
+++ b/src/syscall/route_freebsd_64bit.go
diff --git a/src/pkg/syscall/route_netbsd.go b/src/syscall/route_netbsd.go
index 9883aebaf..9883aebaf 100644
--- a/src/pkg/syscall/route_netbsd.go
+++ b/src/syscall/route_netbsd.go
diff --git a/src/pkg/syscall/route_openbsd.go b/src/syscall/route_openbsd.go
index 19f902db7..19f902db7 100644
--- a/src/pkg/syscall/route_openbsd.go
+++ b/src/syscall/route_openbsd.go
diff --git a/src/pkg/syscall/security_windows.go b/src/syscall/security_windows.go
index b22ecf578..b22ecf578 100644
--- a/src/pkg/syscall/security_windows.go
+++ b/src/syscall/security_windows.go
diff --git a/src/pkg/syscall/so_solaris.go b/src/syscall/so_solaris.go
index bf1b75604..bf1b75604 100644
--- a/src/pkg/syscall/so_solaris.go
+++ b/src/syscall/so_solaris.go
diff --git a/src/pkg/syscall/sockcmsg_linux.go b/src/syscall/sockcmsg_linux.go
index a2e26a1f4..a2e26a1f4 100644
--- a/src/pkg/syscall/sockcmsg_linux.go
+++ b/src/syscall/sockcmsg_linux.go
diff --git a/src/pkg/syscall/sockcmsg_unix.go b/src/syscall/sockcmsg_unix.go
index 045a012c0..045a012c0 100644
--- a/src/pkg/syscall/sockcmsg_unix.go
+++ b/src/syscall/sockcmsg_unix.go
diff --git a/src/pkg/syscall/srpc_nacl.go b/src/syscall/srpc_nacl.go
index dd07373d1..dd07373d1 100644
--- a/src/pkg/syscall/srpc_nacl.go
+++ b/src/syscall/srpc_nacl.go
diff --git a/src/pkg/syscall/str.go b/src/syscall/str.go
index 0fce842e8..0fce842e8 100644
--- a/src/pkg/syscall/str.go
+++ b/src/syscall/str.go
diff --git a/src/pkg/syscall/syscall.go b/src/syscall/syscall.go
index 3fd95798f..3fd95798f 100644
--- a/src/pkg/syscall/syscall.go
+++ b/src/syscall/syscall.go
diff --git a/src/pkg/syscall/syscall_bsd.go b/src/syscall/syscall_bsd.go
index 2556fa874..2556fa874 100644
--- a/src/pkg/syscall/syscall_bsd.go
+++ b/src/syscall/syscall_bsd.go
diff --git a/src/pkg/syscall/syscall_bsd_test.go b/src/syscall/syscall_bsd_test.go
index c2ea089d5..c2ea089d5 100644
--- a/src/pkg/syscall/syscall_bsd_test.go
+++ b/src/syscall/syscall_bsd_test.go
diff --git a/src/pkg/syscall/syscall_darwin.go b/src/syscall/syscall_darwin.go
index 97414dcda..97414dcda 100644
--- a/src/pkg/syscall/syscall_darwin.go
+++ b/src/syscall/syscall_darwin.go
diff --git a/src/pkg/syscall/syscall_darwin_386.go b/src/syscall/syscall_darwin_386.go
index 2074e7ac2..2074e7ac2 100644
--- a/src/pkg/syscall/syscall_darwin_386.go
+++ b/src/syscall/syscall_darwin_386.go
diff --git a/src/pkg/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
index 81b1fd3d2..81b1fd3d2 100644
--- a/src/pkg/syscall/syscall_darwin_amd64.go
+++ b/src/syscall/syscall_darwin_amd64.go
diff --git a/src/pkg/syscall/syscall_dragonfly.go b/src/syscall/syscall_dragonfly.go
index 39c51df7e..39c51df7e 100644
--- a/src/pkg/syscall/syscall_dragonfly.go
+++ b/src/syscall/syscall_dragonfly.go
diff --git a/src/pkg/syscall/syscall_dragonfly_386.go b/src/syscall/syscall_dragonfly_386.go
index ebd3d4c9c..ebd3d4c9c 100644
--- a/src/pkg/syscall/syscall_dragonfly_386.go
+++ b/src/syscall/syscall_dragonfly_386.go
diff --git a/src/pkg/syscall/syscall_dragonfly_amd64.go b/src/syscall/syscall_dragonfly_amd64.go
index 70c2ffb03..70c2ffb03 100644
--- a/src/pkg/syscall/syscall_dragonfly_amd64.go
+++ b/src/syscall/syscall_dragonfly_amd64.go
diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/syscall/syscall_freebsd.go
index 3d834f52b..3d834f52b 100644
--- a/src/pkg/syscall/syscall_freebsd.go
+++ b/src/syscall/syscall_freebsd.go
diff --git a/src/pkg/syscall/syscall_freebsd_386.go b/src/syscall/syscall_freebsd_386.go
index ebd3d4c9c..ebd3d4c9c 100644
--- a/src/pkg/syscall/syscall_freebsd_386.go
+++ b/src/syscall/syscall_freebsd_386.go
diff --git a/src/pkg/syscall/syscall_freebsd_amd64.go b/src/syscall/syscall_freebsd_amd64.go
index 70c2ffb03..70c2ffb03 100644
--- a/src/pkg/syscall/syscall_freebsd_amd64.go
+++ b/src/syscall/syscall_freebsd_amd64.go
diff --git a/src/pkg/syscall/syscall_freebsd_arm.go b/src/syscall/syscall_freebsd_arm.go
index ab72871dd..ab72871dd 100644
--- a/src/pkg/syscall/syscall_freebsd_arm.go
+++ b/src/syscall/syscall_freebsd_arm.go
diff --git a/src/pkg/syscall/syscall_linux.go b/src/syscall/syscall_linux.go
index 36ba0518d..36ba0518d 100644
--- a/src/pkg/syscall/syscall_linux.go
+++ b/src/syscall/syscall_linux.go
diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/syscall/syscall_linux_386.go
index 3cb201998..3cb201998 100644
--- a/src/pkg/syscall/syscall_linux_386.go
+++ b/src/syscall/syscall_linux_386.go
diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/syscall/syscall_linux_amd64.go
index 74a89fb67..74a89fb67 100644
--- a/src/pkg/syscall/syscall_linux_amd64.go
+++ b/src/syscall/syscall_linux_amd64.go
diff --git a/src/pkg/syscall/syscall_linux_arm.go b/src/syscall/syscall_linux_arm.go
index 3631b59db..3631b59db 100644
--- a/src/pkg/syscall/syscall_linux_arm.go
+++ b/src/syscall/syscall_linux_arm.go
diff --git a/src/pkg/syscall/syscall_linux_power64x.go b/src/syscall/syscall_linux_power64x.go
index fd043627a..fd043627a 100644
--- a/src/pkg/syscall/syscall_linux_power64x.go
+++ b/src/syscall/syscall_linux_power64x.go
diff --git a/src/pkg/syscall/syscall_nacl.go b/src/syscall/syscall_nacl.go
index c2788b20a..c2788b20a 100644
--- a/src/pkg/syscall/syscall_nacl.go
+++ b/src/syscall/syscall_nacl.go
diff --git a/src/pkg/syscall/syscall_nacl_386.go b/src/syscall/syscall_nacl_386.go
index d12f8e2d6..d12f8e2d6 100644
--- a/src/pkg/syscall/syscall_nacl_386.go
+++ b/src/syscall/syscall_nacl_386.go
diff --git a/src/pkg/syscall/syscall_nacl_amd64p32.go b/src/syscall/syscall_nacl_amd64p32.go
index d12f8e2d6..d12f8e2d6 100644
--- a/src/pkg/syscall/syscall_nacl_amd64p32.go
+++ b/src/syscall/syscall_nacl_amd64p32.go
diff --git a/src/pkg/syscall/syscall_nacl_arm.go b/src/syscall/syscall_nacl_arm.go
index fc0cdda5d..fc0cdda5d 100644
--- a/src/pkg/syscall/syscall_nacl_arm.go
+++ b/src/syscall/syscall_nacl_arm.go
diff --git a/src/pkg/syscall/syscall_netbsd.go b/src/syscall/syscall_netbsd.go
index 97812717f..97812717f 100644
--- a/src/pkg/syscall/syscall_netbsd.go
+++ b/src/syscall/syscall_netbsd.go
diff --git a/src/pkg/syscall/syscall_netbsd_386.go b/src/syscall/syscall_netbsd_386.go
index 2dbff07f1..2dbff07f1 100644
--- a/src/pkg/syscall/syscall_netbsd_386.go
+++ b/src/syscall/syscall_netbsd_386.go
diff --git a/src/pkg/syscall/syscall_netbsd_amd64.go b/src/syscall/syscall_netbsd_amd64.go
index 5784db99a..5784db99a 100644
--- a/src/pkg/syscall/syscall_netbsd_amd64.go
+++ b/src/syscall/syscall_netbsd_amd64.go
diff --git a/src/pkg/syscall/syscall_netbsd_arm.go b/src/syscall/syscall_netbsd_arm.go
index 659698aac..659698aac 100644
--- a/src/pkg/syscall/syscall_netbsd_arm.go
+++ b/src/syscall/syscall_netbsd_arm.go
diff --git a/src/pkg/syscall/syscall_no_getwd.go b/src/syscall/syscall_no_getwd.go
index 0080c5ca0..0080c5ca0 100644
--- a/src/pkg/syscall/syscall_no_getwd.go
+++ b/src/syscall/syscall_no_getwd.go
diff --git a/src/pkg/syscall/syscall_openbsd.go b/src/syscall/syscall_openbsd.go
index 8d3f825f8..8d3f825f8 100644
--- a/src/pkg/syscall/syscall_openbsd.go
+++ b/src/syscall/syscall_openbsd.go
diff --git a/src/pkg/syscall/syscall_openbsd_386.go b/src/syscall/syscall_openbsd_386.go
index ad5ae14bf..ad5ae14bf 100644
--- a/src/pkg/syscall/syscall_openbsd_386.go
+++ b/src/syscall/syscall_openbsd_386.go
diff --git a/src/pkg/syscall/syscall_openbsd_amd64.go b/src/syscall/syscall_openbsd_amd64.go
index 6181344cd..6181344cd 100644
--- a/src/pkg/syscall/syscall_openbsd_amd64.go
+++ b/src/syscall/syscall_openbsd_amd64.go
diff --git a/src/pkg/syscall/syscall_plan9.go b/src/syscall/syscall_plan9.go
index ddd93ad5d..ddd93ad5d 100644
--- a/src/pkg/syscall/syscall_plan9.go
+++ b/src/syscall/syscall_plan9.go
diff --git a/src/pkg/syscall/syscall_solaris.go b/src/syscall/syscall_solaris.go
index adc52b1f7..adc52b1f7 100644
--- a/src/pkg/syscall/syscall_solaris.go
+++ b/src/syscall/syscall_solaris.go
diff --git a/src/pkg/syscall/syscall_solaris_amd64.go b/src/syscall/syscall_solaris_amd64.go
index 37cf06d70..37cf06d70 100644
--- a/src/pkg/syscall/syscall_solaris_amd64.go
+++ b/src/syscall/syscall_solaris_amd64.go
diff --git a/src/pkg/syscall/syscall_test.go b/src/syscall/syscall_test.go
index 2a39b54f1..2a39b54f1 100644
--- a/src/pkg/syscall/syscall_test.go
+++ b/src/syscall/syscall_test.go
diff --git a/src/pkg/syscall/syscall_unix.go b/src/syscall/syscall_unix.go
index f18dfca5e..f18dfca5e 100644
--- a/src/pkg/syscall/syscall_unix.go
+++ b/src/syscall/syscall_unix.go
diff --git a/src/pkg/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go
index a0afb91fc..a0afb91fc 100644
--- a/src/pkg/syscall/syscall_unix_test.go
+++ b/src/syscall/syscall_unix_test.go
diff --git a/src/pkg/syscall/syscall_windows.go b/src/syscall/syscall_windows.go
index bda8214c3..bda8214c3 100644
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/syscall/syscall_windows.go
diff --git a/src/pkg/syscall/syscall_windows_386.go b/src/syscall/syscall_windows_386.go
index 61d2d8cb6..61d2d8cb6 100644
--- a/src/pkg/syscall/syscall_windows_386.go
+++ b/src/syscall/syscall_windows_386.go
diff --git a/src/pkg/syscall/syscall_windows_amd64.go b/src/syscall/syscall_windows_amd64.go
index 61d2d8cb6..61d2d8cb6 100644
--- a/src/pkg/syscall/syscall_windows_amd64.go
+++ b/src/syscall/syscall_windows_amd64.go
diff --git a/src/pkg/syscall/syscall_windows_test.go b/src/syscall/syscall_windows_test.go
index 86842f2ad..86842f2ad 100644
--- a/src/pkg/syscall/syscall_windows_test.go
+++ b/src/syscall/syscall_windows_test.go
diff --git a/src/pkg/syscall/tables_nacl.go b/src/syscall/tables_nacl.go
index 08f4ced53..08f4ced53 100644
--- a/src/pkg/syscall/tables_nacl.go
+++ b/src/syscall/tables_nacl.go
diff --git a/src/pkg/syscall/time_nacl_386.s b/src/syscall/time_nacl_386.s
index c0c89dccc..c0c89dccc 100644
--- a/src/pkg/syscall/time_nacl_386.s
+++ b/src/syscall/time_nacl_386.s
diff --git a/src/pkg/syscall/time_nacl_amd64p32.s b/src/syscall/time_nacl_amd64p32.s
index c0c89dccc..c0c89dccc 100644
--- a/src/pkg/syscall/time_nacl_amd64p32.s
+++ b/src/syscall/time_nacl_amd64p32.s
diff --git a/src/pkg/syscall/time_nacl_arm.s b/src/syscall/time_nacl_arm.s
index 4f4b4d89a..4f4b4d89a 100644
--- a/src/pkg/syscall/time_nacl_arm.s
+++ b/src/syscall/time_nacl_arm.s
diff --git a/src/pkg/syscall/types_darwin.go b/src/syscall/types_darwin.go
index a043071f2..a043071f2 100644
--- a/src/pkg/syscall/types_darwin.go
+++ b/src/syscall/types_darwin.go
diff --git a/src/pkg/syscall/types_dragonfly.go b/src/syscall/types_dragonfly.go
index fb7fd1bb4..fb7fd1bb4 100644
--- a/src/pkg/syscall/types_dragonfly.go
+++ b/src/syscall/types_dragonfly.go
diff --git a/src/pkg/syscall/types_freebsd.go b/src/syscall/types_freebsd.go
index 68a69312b..68a69312b 100644
--- a/src/pkg/syscall/types_freebsd.go
+++ b/src/syscall/types_freebsd.go
diff --git a/src/pkg/syscall/types_linux.go b/src/syscall/types_linux.go
index 5e9f698cf..5e9f698cf 100644
--- a/src/pkg/syscall/types_linux.go
+++ b/src/syscall/types_linux.go
diff --git a/src/pkg/syscall/types_netbsd.go b/src/syscall/types_netbsd.go
index 04354a32a..04354a32a 100644
--- a/src/pkg/syscall/types_netbsd.go
+++ b/src/syscall/types_netbsd.go
diff --git a/src/pkg/syscall/types_openbsd.go b/src/syscall/types_openbsd.go
index e6d1ea704..e6d1ea704 100644
--- a/src/pkg/syscall/types_openbsd.go
+++ b/src/syscall/types_openbsd.go
diff --git a/src/pkg/syscall/types_plan9.c b/src/syscall/types_plan9.c
index cd9e15fa8..cd9e15fa8 100644
--- a/src/pkg/syscall/types_plan9.c
+++ b/src/syscall/types_plan9.c
diff --git a/src/pkg/syscall/types_solaris.go b/src/syscall/types_solaris.go
index 53fa35068..53fa35068 100644
--- a/src/pkg/syscall/types_solaris.go
+++ b/src/syscall/types_solaris.go
diff --git a/src/pkg/syscall/unzip_nacl.go b/src/syscall/unzip_nacl.go
index 5845e44f0..5845e44f0 100644
--- a/src/pkg/syscall/unzip_nacl.go
+++ b/src/syscall/unzip_nacl.go
diff --git a/src/pkg/syscall/zerrors_darwin_386.go b/src/syscall/zerrors_darwin_386.go
index bb3a1610c..bb3a1610c 100644
--- a/src/pkg/syscall/zerrors_darwin_386.go
+++ b/src/syscall/zerrors_darwin_386.go
diff --git a/src/pkg/syscall/zerrors_darwin_amd64.go b/src/syscall/zerrors_darwin_amd64.go
index 05ab48ee3..05ab48ee3 100644
--- a/src/pkg/syscall/zerrors_darwin_amd64.go
+++ b/src/syscall/zerrors_darwin_amd64.go
diff --git a/src/pkg/syscall/zerrors_dragonfly_386.go b/src/syscall/zerrors_dragonfly_386.go
index 701a1c381..701a1c381 100644
--- a/src/pkg/syscall/zerrors_dragonfly_386.go
+++ b/src/syscall/zerrors_dragonfly_386.go
diff --git a/src/pkg/syscall/zerrors_dragonfly_amd64.go b/src/syscall/zerrors_dragonfly_amd64.go
index 59bff751c..59bff751c 100644
--- a/src/pkg/syscall/zerrors_dragonfly_amd64.go
+++ b/src/syscall/zerrors_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zerrors_freebsd_386.go b/src/syscall/zerrors_freebsd_386.go
index cd3aa80a9..cd3aa80a9 100644
--- a/src/pkg/syscall/zerrors_freebsd_386.go
+++ b/src/syscall/zerrors_freebsd_386.go
diff --git a/src/pkg/syscall/zerrors_freebsd_amd64.go b/src/syscall/zerrors_freebsd_amd64.go
index 9edce6e2f..9edce6e2f 100644
--- a/src/pkg/syscall/zerrors_freebsd_amd64.go
+++ b/src/syscall/zerrors_freebsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_freebsd_arm.go b/src/syscall/zerrors_freebsd_arm.go
index f29dd057b..f29dd057b 100644
--- a/src/pkg/syscall/zerrors_freebsd_arm.go
+++ b/src/syscall/zerrors_freebsd_arm.go
diff --git a/src/pkg/syscall/zerrors_linux_386.go b/src/syscall/zerrors_linux_386.go
index 7aa8ff07a..7aa8ff07a 100644
--- a/src/pkg/syscall/zerrors_linux_386.go
+++ b/src/syscall/zerrors_linux_386.go
diff --git a/src/pkg/syscall/zerrors_linux_amd64.go b/src/syscall/zerrors_linux_amd64.go
index 94d051d8a..94d051d8a 100644
--- a/src/pkg/syscall/zerrors_linux_amd64.go
+++ b/src/syscall/zerrors_linux_amd64.go
diff --git a/src/pkg/syscall/zerrors_linux_arm.go b/src/syscall/zerrors_linux_arm.go
index dcaaef742..dcaaef742 100644
--- a/src/pkg/syscall/zerrors_linux_arm.go
+++ b/src/syscall/zerrors_linux_arm.go
diff --git a/src/pkg/syscall/zerrors_linux_power64.go b/src/syscall/zerrors_linux_power64.go
index 15e0770c1..15e0770c1 100644
--- a/src/pkg/syscall/zerrors_linux_power64.go
+++ b/src/syscall/zerrors_linux_power64.go
diff --git a/src/pkg/syscall/zerrors_linux_power64le.go b/src/syscall/zerrors_linux_power64le.go
index fdecdf24d..fdecdf24d 100644
--- a/src/pkg/syscall/zerrors_linux_power64le.go
+++ b/src/syscall/zerrors_linux_power64le.go
diff --git a/src/pkg/syscall/zerrors_netbsd_386.go b/src/syscall/zerrors_netbsd_386.go
index 1e3dff7fa..1e3dff7fa 100644
--- a/src/pkg/syscall/zerrors_netbsd_386.go
+++ b/src/syscall/zerrors_netbsd_386.go
diff --git a/src/pkg/syscall/zerrors_netbsd_amd64.go b/src/syscall/zerrors_netbsd_amd64.go
index 1469d00b7..1469d00b7 100644
--- a/src/pkg/syscall/zerrors_netbsd_amd64.go
+++ b/src/syscall/zerrors_netbsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_netbsd_arm.go b/src/syscall/zerrors_netbsd_arm.go
index 1a88c0d22..1a88c0d22 100644
--- a/src/pkg/syscall/zerrors_netbsd_arm.go
+++ b/src/syscall/zerrors_netbsd_arm.go
diff --git a/src/pkg/syscall/zerrors_openbsd_386.go b/src/syscall/zerrors_openbsd_386.go
index 082983494..082983494 100644
--- a/src/pkg/syscall/zerrors_openbsd_386.go
+++ b/src/syscall/zerrors_openbsd_386.go
diff --git a/src/pkg/syscall/zerrors_openbsd_amd64.go b/src/syscall/zerrors_openbsd_amd64.go
index e9fa37cde..e9fa37cde 100644
--- a/src/pkg/syscall/zerrors_openbsd_amd64.go
+++ b/src/syscall/zerrors_openbsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_plan9_386.go b/src/syscall/zerrors_plan9_386.go
index ede3d6a32..ede3d6a32 100644
--- a/src/pkg/syscall/zerrors_plan9_386.go
+++ b/src/syscall/zerrors_plan9_386.go
diff --git a/src/pkg/syscall/zerrors_plan9_amd64.go b/src/syscall/zerrors_plan9_amd64.go
index ede3d6a32..ede3d6a32 100644
--- a/src/pkg/syscall/zerrors_plan9_amd64.go
+++ b/src/syscall/zerrors_plan9_amd64.go
diff --git a/src/pkg/syscall/zerrors_solaris_amd64.go b/src/syscall/zerrors_solaris_amd64.go
index 3f4cbfd98..3f4cbfd98 100644
--- a/src/pkg/syscall/zerrors_solaris_amd64.go
+++ b/src/syscall/zerrors_solaris_amd64.go
diff --git a/src/pkg/syscall/zerrors_windows.go b/src/syscall/zerrors_windows.go
index afdeae2bc..afdeae2bc 100644
--- a/src/pkg/syscall/zerrors_windows.go
+++ b/src/syscall/zerrors_windows.go
diff --git a/src/pkg/syscall/zerrors_windows_386.go b/src/syscall/zerrors_windows_386.go
index d1008bd03..d1008bd03 100644
--- a/src/pkg/syscall/zerrors_windows_386.go
+++ b/src/syscall/zerrors_windows_386.go
diff --git a/src/pkg/syscall/zerrors_windows_amd64.go b/src/syscall/zerrors_windows_amd64.go
index d1008bd03..d1008bd03 100644
--- a/src/pkg/syscall/zerrors_windows_amd64.go
+++ b/src/syscall/zerrors_windows_amd64.go
diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/syscall/zsyscall_darwin_386.go
index a6a176b60..a6a176b60 100644
--- a/src/pkg/syscall/zsyscall_darwin_386.go
+++ b/src/syscall/zsyscall_darwin_386.go
diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/syscall/zsyscall_darwin_amd64.go
index f5867c45d..f5867c45d 100644
--- a/src/pkg/syscall/zsyscall_darwin_amd64.go
+++ b/src/syscall/zsyscall_darwin_amd64.go
diff --git a/src/pkg/syscall/zsyscall_dragonfly_386.go b/src/syscall/zsyscall_dragonfly_386.go
index 0ec813232..0ec813232 100644
--- a/src/pkg/syscall/zsyscall_dragonfly_386.go
+++ b/src/syscall/zsyscall_dragonfly_386.go
diff --git a/src/pkg/syscall/zsyscall_dragonfly_amd64.go b/src/syscall/zsyscall_dragonfly_amd64.go
index 8c7cce54e..8c7cce54e 100644
--- a/src/pkg/syscall/zsyscall_dragonfly_amd64.go
+++ b/src/syscall/zsyscall_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_386.go b/src/syscall/zsyscall_freebsd_386.go
index 5befe83c6..5befe83c6 100644
--- a/src/pkg/syscall/zsyscall_freebsd_386.go
+++ b/src/syscall/zsyscall_freebsd_386.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_amd64.go b/src/syscall/zsyscall_freebsd_amd64.go
index ab2eb80c6..ab2eb80c6 100644
--- a/src/pkg/syscall/zsyscall_freebsd_amd64.go
+++ b/src/syscall/zsyscall_freebsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_arm.go b/src/syscall/zsyscall_freebsd_arm.go
index c1f0f907c..c1f0f907c 100644
--- a/src/pkg/syscall/zsyscall_freebsd_arm.go
+++ b/src/syscall/zsyscall_freebsd_arm.go
diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/syscall/zsyscall_linux_386.go
index bfac41655..bfac41655 100644
--- a/src/pkg/syscall/zsyscall_linux_386.go
+++ b/src/syscall/zsyscall_linux_386.go
diff --git a/src/pkg/syscall/zsyscall_linux_amd64.go b/src/syscall/zsyscall_linux_amd64.go
index 537b08088..537b08088 100644
--- a/src/pkg/syscall/zsyscall_linux_amd64.go
+++ b/src/syscall/zsyscall_linux_amd64.go
diff --git a/src/pkg/syscall/zsyscall_linux_arm.go b/src/syscall/zsyscall_linux_arm.go
index 3665a3203..3665a3203 100644
--- a/src/pkg/syscall/zsyscall_linux_arm.go
+++ b/src/syscall/zsyscall_linux_arm.go
diff --git a/src/pkg/syscall/zsyscall_linux_power64.go b/src/syscall/zsyscall_linux_power64.go
index 7808059cc..7808059cc 100644
--- a/src/pkg/syscall/zsyscall_linux_power64.go
+++ b/src/syscall/zsyscall_linux_power64.go
diff --git a/src/pkg/syscall/zsyscall_linux_power64le.go b/src/syscall/zsyscall_linux_power64le.go
index 7808059cc..7808059cc 100644
--- a/src/pkg/syscall/zsyscall_linux_power64le.go
+++ b/src/syscall/zsyscall_linux_power64le.go
diff --git a/src/pkg/syscall/zsyscall_nacl_386.go b/src/syscall/zsyscall_nacl_386.go
index 32eed339a..32eed339a 100644
--- a/src/pkg/syscall/zsyscall_nacl_386.go
+++ b/src/syscall/zsyscall_nacl_386.go
diff --git a/src/pkg/syscall/zsyscall_nacl_amd64p32.go b/src/syscall/zsyscall_nacl_amd64p32.go
index 8bc81fac9..8bc81fac9 100644
--- a/src/pkg/syscall/zsyscall_nacl_amd64p32.go
+++ b/src/syscall/zsyscall_nacl_amd64p32.go
diff --git a/src/pkg/syscall/zsyscall_nacl_arm.go b/src/syscall/zsyscall_nacl_arm.go
index adbaed0e7..adbaed0e7 100644
--- a/src/pkg/syscall/zsyscall_nacl_arm.go
+++ b/src/syscall/zsyscall_nacl_arm.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_386.go b/src/syscall/zsyscall_netbsd_386.go
index 281208f41..281208f41 100644
--- a/src/pkg/syscall/zsyscall_netbsd_386.go
+++ b/src/syscall/zsyscall_netbsd_386.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_amd64.go b/src/syscall/zsyscall_netbsd_amd64.go
index ed9a87df6..ed9a87df6 100644
--- a/src/pkg/syscall/zsyscall_netbsd_amd64.go
+++ b/src/syscall/zsyscall_netbsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_arm.go b/src/syscall/zsyscall_netbsd_arm.go
index c5c9a9f2c..c5c9a9f2c 100644
--- a/src/pkg/syscall/zsyscall_netbsd_arm.go
+++ b/src/syscall/zsyscall_netbsd_arm.go
diff --git a/src/pkg/syscall/zsyscall_openbsd_386.go b/src/syscall/zsyscall_openbsd_386.go
index 785e7c3b8..785e7c3b8 100644
--- a/src/pkg/syscall/zsyscall_openbsd_386.go
+++ b/src/syscall/zsyscall_openbsd_386.go
diff --git a/src/pkg/syscall/zsyscall_openbsd_amd64.go b/src/syscall/zsyscall_openbsd_amd64.go
index 7a8d9b6f1..7a8d9b6f1 100644
--- a/src/pkg/syscall/zsyscall_openbsd_amd64.go
+++ b/src/syscall/zsyscall_openbsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_plan9_386.go b/src/syscall/zsyscall_plan9_386.go
index 5ffa0e439..5ffa0e439 100644
--- a/src/pkg/syscall/zsyscall_plan9_386.go
+++ b/src/syscall/zsyscall_plan9_386.go
diff --git a/src/pkg/syscall/zsyscall_plan9_amd64.go b/src/syscall/zsyscall_plan9_amd64.go
index c64533f49..c64533f49 100644
--- a/src/pkg/syscall/zsyscall_plan9_amd64.go
+++ b/src/syscall/zsyscall_plan9_amd64.go
diff --git a/src/pkg/syscall/zsyscall_solaris_amd64.go b/src/syscall/zsyscall_solaris_amd64.go
index 8847cad01..8847cad01 100644
--- a/src/pkg/syscall/zsyscall_solaris_amd64.go
+++ b/src/syscall/zsyscall_solaris_amd64.go
diff --git a/src/pkg/syscall/zsyscall_windows.go b/src/syscall/zsyscall_windows.go
index 1f44750b7..1f44750b7 100644
--- a/src/pkg/syscall/zsyscall_windows.go
+++ b/src/syscall/zsyscall_windows.go
diff --git a/src/pkg/syscall/zsysctl_openbsd.go b/src/syscall/zsysctl_openbsd.go
index 923b2c29f..923b2c29f 100644
--- a/src/pkg/syscall/zsysctl_openbsd.go
+++ b/src/syscall/zsysctl_openbsd.go
diff --git a/src/pkg/syscall/zsysnum_darwin_386.go b/src/syscall/zsysnum_darwin_386.go
index abdef7743..abdef7743 100644
--- a/src/pkg/syscall/zsysnum_darwin_386.go
+++ b/src/syscall/zsysnum_darwin_386.go
diff --git a/src/pkg/syscall/zsysnum_darwin_amd64.go b/src/syscall/zsysnum_darwin_amd64.go
index abdef7743..abdef7743 100644
--- a/src/pkg/syscall/zsysnum_darwin_amd64.go
+++ b/src/syscall/zsysnum_darwin_amd64.go
diff --git a/src/pkg/syscall/zsysnum_dragonfly_386.go b/src/syscall/zsysnum_dragonfly_386.go
index 4b086b921..4b086b921 100644
--- a/src/pkg/syscall/zsysnum_dragonfly_386.go
+++ b/src/syscall/zsysnum_dragonfly_386.go
diff --git a/src/pkg/syscall/zsysnum_dragonfly_amd64.go b/src/syscall/zsysnum_dragonfly_amd64.go
index 4b086b921..4b086b921 100644
--- a/src/pkg/syscall/zsysnum_dragonfly_amd64.go
+++ b/src/syscall/zsysnum_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_386.go b/src/syscall/zsysnum_freebsd_386.go
index dfca558bb..dfca558bb 100644
--- a/src/pkg/syscall/zsysnum_freebsd_386.go
+++ b/src/syscall/zsysnum_freebsd_386.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_amd64.go b/src/syscall/zsysnum_freebsd_amd64.go
index dfca558bb..dfca558bb 100644
--- a/src/pkg/syscall/zsysnum_freebsd_amd64.go
+++ b/src/syscall/zsysnum_freebsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_arm.go b/src/syscall/zsysnum_freebsd_arm.go
index dfca558bb..dfca558bb 100644
--- a/src/pkg/syscall/zsysnum_freebsd_arm.go
+++ b/src/syscall/zsysnum_freebsd_arm.go
diff --git a/src/pkg/syscall/zsysnum_linux_386.go b/src/syscall/zsysnum_linux_386.go
index c40b5f1ac..c40b5f1ac 100644
--- a/src/pkg/syscall/zsysnum_linux_386.go
+++ b/src/syscall/zsysnum_linux_386.go
diff --git a/src/pkg/syscall/zsysnum_linux_amd64.go b/src/syscall/zsysnum_linux_amd64.go
index 7cf70a4d8..7cf70a4d8 100644
--- a/src/pkg/syscall/zsysnum_linux_amd64.go
+++ b/src/syscall/zsysnum_linux_amd64.go
diff --git a/src/pkg/syscall/zsysnum_linux_arm.go b/src/syscall/zsysnum_linux_arm.go
index 7068e4e21..7068e4e21 100644
--- a/src/pkg/syscall/zsysnum_linux_arm.go
+++ b/src/syscall/zsysnum_linux_arm.go
diff --git a/src/pkg/syscall/zsysnum_linux_power64.go b/src/syscall/zsysnum_linux_power64.go
index 0567fd0ea..0567fd0ea 100644
--- a/src/pkg/syscall/zsysnum_linux_power64.go
+++ b/src/syscall/zsysnum_linux_power64.go
diff --git a/src/pkg/syscall/zsysnum_linux_power64le.go b/src/syscall/zsysnum_linux_power64le.go
index 52c63e3d3..52c63e3d3 100644
--- a/src/pkg/syscall/zsysnum_linux_power64le.go
+++ b/src/syscall/zsysnum_linux_power64le.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_386.go b/src/syscall/zsysnum_netbsd_386.go
index c57096523..c57096523 100644
--- a/src/pkg/syscall/zsysnum_netbsd_386.go
+++ b/src/syscall/zsysnum_netbsd_386.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_amd64.go b/src/syscall/zsysnum_netbsd_amd64.go
index c57096523..c57096523 100644
--- a/src/pkg/syscall/zsysnum_netbsd_amd64.go
+++ b/src/syscall/zsysnum_netbsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_arm.go b/src/syscall/zsysnum_netbsd_arm.go
index c57096523..c57096523 100644
--- a/src/pkg/syscall/zsysnum_netbsd_arm.go
+++ b/src/syscall/zsysnum_netbsd_arm.go
diff --git a/src/pkg/syscall/zsysnum_openbsd_386.go b/src/syscall/zsysnum_openbsd_386.go
index 3b9ac4c94..3b9ac4c94 100644
--- a/src/pkg/syscall/zsysnum_openbsd_386.go
+++ b/src/syscall/zsysnum_openbsd_386.go
diff --git a/src/pkg/syscall/zsysnum_openbsd_amd64.go b/src/syscall/zsysnum_openbsd_amd64.go
index 3b9ac4c94..3b9ac4c94 100644
--- a/src/pkg/syscall/zsysnum_openbsd_amd64.go
+++ b/src/syscall/zsysnum_openbsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_plan9_386.go b/src/syscall/zsysnum_plan9_386.go
index 07498c489..07498c489 100644
--- a/src/pkg/syscall/zsysnum_plan9_386.go
+++ b/src/syscall/zsysnum_plan9_386.go
diff --git a/src/pkg/syscall/zsysnum_plan9_amd64.go b/src/syscall/zsysnum_plan9_amd64.go
index 07498c489..07498c489 100644
--- a/src/pkg/syscall/zsysnum_plan9_amd64.go
+++ b/src/syscall/zsysnum_plan9_amd64.go
diff --git a/src/pkg/syscall/zsysnum_solaris_amd64.go b/src/syscall/zsysnum_solaris_amd64.go
index 43b3d8b40..43b3d8b40 100644
--- a/src/pkg/syscall/zsysnum_solaris_amd64.go
+++ b/src/syscall/zsysnum_solaris_amd64.go
diff --git a/src/pkg/syscall/zsysnum_windows_386.go b/src/syscall/zsysnum_windows_386.go
index 36bf065d1..36bf065d1 100644
--- a/src/pkg/syscall/zsysnum_windows_386.go
+++ b/src/syscall/zsysnum_windows_386.go
diff --git a/src/pkg/syscall/zsysnum_windows_amd64.go b/src/syscall/zsysnum_windows_amd64.go
index 36bf065d1..36bf065d1 100644
--- a/src/pkg/syscall/zsysnum_windows_amd64.go
+++ b/src/syscall/zsysnum_windows_amd64.go
diff --git a/src/pkg/syscall/ztypes_darwin_386.go b/src/syscall/ztypes_darwin_386.go
index 13724c3cc..13724c3cc 100644
--- a/src/pkg/syscall/ztypes_darwin_386.go
+++ b/src/syscall/ztypes_darwin_386.go
diff --git a/src/pkg/syscall/ztypes_darwin_amd64.go b/src/syscall/ztypes_darwin_amd64.go
index 65b02ae4f..65b02ae4f 100644
--- a/src/pkg/syscall/ztypes_darwin_amd64.go
+++ b/src/syscall/ztypes_darwin_amd64.go
diff --git a/src/pkg/syscall/ztypes_dragonfly_386.go b/src/syscall/ztypes_dragonfly_386.go
index 6b6ec1525..6b6ec1525 100644
--- a/src/pkg/syscall/ztypes_dragonfly_386.go
+++ b/src/syscall/ztypes_dragonfly_386.go
diff --git a/src/pkg/syscall/ztypes_dragonfly_amd64.go b/src/syscall/ztypes_dragonfly_amd64.go
index 954ffd7ab..954ffd7ab 100644
--- a/src/pkg/syscall/ztypes_dragonfly_amd64.go
+++ b/src/syscall/ztypes_dragonfly_amd64.go
diff --git a/src/pkg/syscall/ztypes_freebsd_386.go b/src/syscall/ztypes_freebsd_386.go
index b809eea37..b809eea37 100644
--- a/src/pkg/syscall/ztypes_freebsd_386.go
+++ b/src/syscall/ztypes_freebsd_386.go
diff --git a/src/pkg/syscall/ztypes_freebsd_amd64.go b/src/syscall/ztypes_freebsd_amd64.go
index a05908aed..a05908aed 100644
--- a/src/pkg/syscall/ztypes_freebsd_amd64.go
+++ b/src/syscall/ztypes_freebsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_freebsd_arm.go b/src/syscall/ztypes_freebsd_arm.go
index 9303816f9..9303816f9 100644
--- a/src/pkg/syscall/ztypes_freebsd_arm.go
+++ b/src/syscall/ztypes_freebsd_arm.go
diff --git a/src/pkg/syscall/ztypes_linux_386.go b/src/syscall/ztypes_linux_386.go
index daecb1ded..daecb1ded 100644
--- a/src/pkg/syscall/ztypes_linux_386.go
+++ b/src/syscall/ztypes_linux_386.go
diff --git a/src/pkg/syscall/ztypes_linux_amd64.go b/src/syscall/ztypes_linux_amd64.go
index 694fe1eac..694fe1eac 100644
--- a/src/pkg/syscall/ztypes_linux_amd64.go
+++ b/src/syscall/ztypes_linux_amd64.go
diff --git a/src/pkg/syscall/ztypes_linux_arm.go b/src/syscall/ztypes_linux_arm.go
index 5f21a948d..5f21a948d 100644
--- a/src/pkg/syscall/ztypes_linux_arm.go
+++ b/src/syscall/ztypes_linux_arm.go
diff --git a/src/pkg/syscall/ztypes_linux_power64.go b/src/syscall/ztypes_linux_power64.go
index 204d80685..204d80685 100644
--- a/src/pkg/syscall/ztypes_linux_power64.go
+++ b/src/syscall/ztypes_linux_power64.go
diff --git a/src/pkg/syscall/ztypes_linux_power64le.go b/src/syscall/ztypes_linux_power64le.go
index df481f5c7..df481f5c7 100644
--- a/src/pkg/syscall/ztypes_linux_power64le.go
+++ b/src/syscall/ztypes_linux_power64le.go
diff --git a/src/pkg/syscall/ztypes_netbsd_386.go b/src/syscall/ztypes_netbsd_386.go
index 6add325a3..6add325a3 100644
--- a/src/pkg/syscall/ztypes_netbsd_386.go
+++ b/src/syscall/ztypes_netbsd_386.go
diff --git a/src/pkg/syscall/ztypes_netbsd_amd64.go b/src/syscall/ztypes_netbsd_amd64.go
index 4451fc1f0..4451fc1f0 100644
--- a/src/pkg/syscall/ztypes_netbsd_amd64.go
+++ b/src/syscall/ztypes_netbsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_netbsd_arm.go b/src/syscall/ztypes_netbsd_arm.go
index 4e853eaa2..4e853eaa2 100644
--- a/src/pkg/syscall/ztypes_netbsd_arm.go
+++ b/src/syscall/ztypes_netbsd_arm.go
diff --git a/src/pkg/syscall/ztypes_openbsd_386.go b/src/syscall/ztypes_openbsd_386.go
index 2e4d9dd17..2e4d9dd17 100644
--- a/src/pkg/syscall/ztypes_openbsd_386.go
+++ b/src/syscall/ztypes_openbsd_386.go
diff --git a/src/pkg/syscall/ztypes_openbsd_amd64.go b/src/syscall/ztypes_openbsd_amd64.go
index f07bc714e..f07bc714e 100644
--- a/src/pkg/syscall/ztypes_openbsd_amd64.go
+++ b/src/syscall/ztypes_openbsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_plan9_386.go b/src/syscall/ztypes_plan9_386.go
index 3e3a8d1f3..3e3a8d1f3 100644
--- a/src/pkg/syscall/ztypes_plan9_386.go
+++ b/src/syscall/ztypes_plan9_386.go
diff --git a/src/pkg/syscall/ztypes_plan9_amd64.go b/src/syscall/ztypes_plan9_amd64.go
index 3e3a8d1f3..3e3a8d1f3 100644
--- a/src/pkg/syscall/ztypes_plan9_amd64.go
+++ b/src/syscall/ztypes_plan9_amd64.go
diff --git a/src/pkg/syscall/ztypes_solaris_amd64.go b/src/syscall/ztypes_solaris_amd64.go
index 77275a54e..77275a54e 100644
--- a/src/pkg/syscall/ztypes_solaris_amd64.go
+++ b/src/syscall/ztypes_solaris_amd64.go
diff --git a/src/pkg/syscall/ztypes_windows.go b/src/syscall/ztypes_windows.go
index 1363da01a..1363da01a 100644
--- a/src/pkg/syscall/ztypes_windows.go
+++ b/src/syscall/ztypes_windows.go
diff --git a/src/pkg/syscall/ztypes_windows_386.go b/src/syscall/ztypes_windows_386.go
index 734ee6e0f..734ee6e0f 100644
--- a/src/pkg/syscall/ztypes_windows_386.go
+++ b/src/syscall/ztypes_windows_386.go
diff --git a/src/pkg/syscall/ztypes_windows_amd64.go b/src/syscall/ztypes_windows_amd64.go
index 78aa55b2e..78aa55b2e 100644
--- a/src/pkg/syscall/ztypes_windows_amd64.go
+++ b/src/syscall/ztypes_windows_amd64.go
diff --git a/src/pkg/testing/allocs.go b/src/testing/allocs.go
index 9ec47bd46..9ec47bd46 100644
--- a/src/pkg/testing/allocs.go
+++ b/src/testing/allocs.go
diff --git a/src/pkg/testing/benchmark.go b/src/testing/benchmark.go
index ffd537684..ffd537684 100644
--- a/src/pkg/testing/benchmark.go
+++ b/src/testing/benchmark.go
diff --git a/src/pkg/testing/benchmark_test.go b/src/testing/benchmark_test.go
index 431bb537b..431bb537b 100644
--- a/src/pkg/testing/benchmark_test.go
+++ b/src/testing/benchmark_test.go
diff --git a/src/pkg/testing/cover.go b/src/testing/cover.go
index eb7249dcc..eb7249dcc 100644
--- a/src/pkg/testing/cover.go
+++ b/src/testing/cover.go
diff --git a/src/pkg/testing/example.go b/src/testing/example.go
index f5762e4db..f5762e4db 100644
--- a/src/pkg/testing/example.go
+++ b/src/testing/example.go
diff --git a/src/pkg/testing/export_test.go b/src/testing/export_test.go
index 89781b439..89781b439 100644
--- a/src/pkg/testing/export_test.go
+++ b/src/testing/export_test.go
diff --git a/src/pkg/testing/iotest/logger.go b/src/testing/iotest/logger.go
index 1475d9b0c..1475d9b0c 100644
--- a/src/pkg/testing/iotest/logger.go
+++ b/src/testing/iotest/logger.go
diff --git a/src/pkg/testing/iotest/reader.go b/src/testing/iotest/reader.go
index a5bccca90..a5bccca90 100644
--- a/src/pkg/testing/iotest/reader.go
+++ b/src/testing/iotest/reader.go
diff --git a/src/pkg/testing/iotest/writer.go b/src/testing/iotest/writer.go
index af61ab858..af61ab858 100644
--- a/src/pkg/testing/iotest/writer.go
+++ b/src/testing/iotest/writer.go
diff --git a/src/pkg/testing/quick/quick.go b/src/testing/quick/quick.go
index 909c65f78..909c65f78 100644
--- a/src/pkg/testing/quick/quick.go
+++ b/src/testing/quick/quick.go
diff --git a/src/pkg/testing/quick/quick_test.go b/src/testing/quick/quick_test.go
index e925ba675..e925ba675 100644
--- a/src/pkg/testing/quick/quick_test.go
+++ b/src/testing/quick/quick_test.go
diff --git a/src/pkg/testing/testing.go b/src/testing/testing.go
index 731762cb1..731762cb1 100644
--- a/src/pkg/testing/testing.go
+++ b/src/testing/testing.go
diff --git a/src/pkg/text/scanner/scanner.go b/src/text/scanner/scanner.go
index 5199ee4fc..5199ee4fc 100644
--- a/src/pkg/text/scanner/scanner.go
+++ b/src/text/scanner/scanner.go
diff --git a/src/pkg/text/scanner/scanner_test.go b/src/text/scanner/scanner_test.go
index 702fac2b1..702fac2b1 100644
--- a/src/pkg/text/scanner/scanner_test.go
+++ b/src/text/scanner/scanner_test.go
diff --git a/src/pkg/text/tabwriter/example_test.go b/src/text/tabwriter/example_test.go
index 20443cb1f..20443cb1f 100644
--- a/src/pkg/text/tabwriter/example_test.go
+++ b/src/text/tabwriter/example_test.go
diff --git a/src/pkg/text/tabwriter/tabwriter.go b/src/text/tabwriter/tabwriter.go
index c0c32d5de..c0c32d5de 100644
--- a/src/pkg/text/tabwriter/tabwriter.go
+++ b/src/text/tabwriter/tabwriter.go
diff --git a/src/pkg/text/tabwriter/tabwriter_test.go b/src/text/tabwriter/tabwriter_test.go
index 9d3111e2c..9d3111e2c 100644
--- a/src/pkg/text/tabwriter/tabwriter_test.go
+++ b/src/text/tabwriter/tabwriter_test.go
diff --git a/src/pkg/text/template/doc.go b/src/text/template/doc.go
index 7c6efd59c..7c6efd59c 100644
--- a/src/pkg/text/template/doc.go
+++ b/src/text/template/doc.go
diff --git a/src/pkg/text/template/example_test.go b/src/text/template/example_test.go
index de1d51851..de1d51851 100644
--- a/src/pkg/text/template/example_test.go
+++ b/src/text/template/example_test.go
diff --git a/src/pkg/text/template/examplefiles_test.go b/src/text/template/examplefiles_test.go
index a15c7a62a..a15c7a62a 100644
--- a/src/pkg/text/template/examplefiles_test.go
+++ b/src/text/template/examplefiles_test.go
diff --git a/src/pkg/text/template/examplefunc_test.go b/src/text/template/examplefunc_test.go
index 080b5e3a0..080b5e3a0 100644
--- a/src/pkg/text/template/examplefunc_test.go
+++ b/src/text/template/examplefunc_test.go
diff --git a/src/pkg/text/template/exec.go b/src/text/template/exec.go
index 8e155d478..8e155d478 100644
--- a/src/pkg/text/template/exec.go
+++ b/src/text/template/exec.go
diff --git a/src/pkg/text/template/exec_test.go b/src/text/template/exec_test.go
index 663aaf3af..663aaf3af 100644
--- a/src/pkg/text/template/exec_test.go
+++ b/src/text/template/exec_test.go
diff --git a/src/pkg/text/template/funcs.go b/src/text/template/funcs.go
index e85412262..e85412262 100644
--- a/src/pkg/text/template/funcs.go
+++ b/src/text/template/funcs.go
diff --git a/src/pkg/text/template/helper.go b/src/text/template/helper.go
index 3636fb54d..3636fb54d 100644
--- a/src/pkg/text/template/helper.go
+++ b/src/text/template/helper.go
diff --git a/src/pkg/text/template/multi_test.go b/src/text/template/multi_test.go
index e4e804880..e4e804880 100644
--- a/src/pkg/text/template/multi_test.go
+++ b/src/text/template/multi_test.go
diff --git a/src/pkg/text/template/parse/lex.go b/src/text/template/parse/lex.go
index 1674aaf9c..1674aaf9c 100644
--- a/src/pkg/text/template/parse/lex.go
+++ b/src/text/template/parse/lex.go
diff --git a/src/pkg/text/template/parse/lex_test.go b/src/text/template/parse/lex_test.go
index d251ccffb..d251ccffb 100644
--- a/src/pkg/text/template/parse/lex_test.go
+++ b/src/text/template/parse/lex_test.go
diff --git a/src/pkg/text/template/parse/node.go b/src/text/template/parse/node.go
index 55c37f6db..55c37f6db 100644
--- a/src/pkg/text/template/parse/node.go
+++ b/src/text/template/parse/node.go
diff --git a/src/pkg/text/template/parse/parse.go b/src/text/template/parse/parse.go
index af33880c1..af33880c1 100644
--- a/src/pkg/text/template/parse/parse.go
+++ b/src/text/template/parse/parse.go
diff --git a/src/pkg/text/template/parse/parse_test.go b/src/text/template/parse/parse_test.go
index 4a504fa7c..4a504fa7c 100644
--- a/src/pkg/text/template/parse/parse_test.go
+++ b/src/text/template/parse/parse_test.go
diff --git a/src/pkg/text/template/template.go b/src/text/template/template.go
index 249d0cbfb..249d0cbfb 100644
--- a/src/pkg/text/template/template.go
+++ b/src/text/template/template.go
diff --git a/src/pkg/text/template/testdata/file1.tmpl b/src/text/template/testdata/file1.tmpl
index febf9d9f8..febf9d9f8 100644
--- a/src/pkg/text/template/testdata/file1.tmpl
+++ b/src/text/template/testdata/file1.tmpl
diff --git a/src/pkg/text/template/testdata/file2.tmpl b/src/text/template/testdata/file2.tmpl
index 39bf6fb9e..39bf6fb9e 100644
--- a/src/pkg/text/template/testdata/file2.tmpl
+++ b/src/text/template/testdata/file2.tmpl
diff --git a/src/pkg/text/template/testdata/tmpl1.tmpl b/src/text/template/testdata/tmpl1.tmpl
index b72b3a340..b72b3a340 100644
--- a/src/pkg/text/template/testdata/tmpl1.tmpl
+++ b/src/text/template/testdata/tmpl1.tmpl
diff --git a/src/pkg/text/template/testdata/tmpl2.tmpl b/src/text/template/testdata/tmpl2.tmpl
index 16beba6e7..16beba6e7 100644
--- a/src/pkg/text/template/testdata/tmpl2.tmpl
+++ b/src/text/template/testdata/tmpl2.tmpl
diff --git a/src/pkg/time/example_test.go b/src/time/example_test.go
index a37e8b86d..a37e8b86d 100644
--- a/src/pkg/time/example_test.go
+++ b/src/time/example_test.go
diff --git a/src/pkg/time/export_test.go b/src/time/export_test.go
index 6cd535f6b..6cd535f6b 100644
--- a/src/pkg/time/export_test.go
+++ b/src/time/export_test.go
diff --git a/src/pkg/time/export_windows_test.go b/src/time/export_windows_test.go
index 7e689b829..7e689b829 100644
--- a/src/pkg/time/export_windows_test.go
+++ b/src/time/export_windows_test.go
diff --git a/src/pkg/time/format.go b/src/time/format.go
index 04e79f32d..04e79f32d 100644
--- a/src/pkg/time/format.go
+++ b/src/time/format.go
diff --git a/src/pkg/time/format_test.go b/src/time/format_test.go
index ecc5c8f28..ecc5c8f28 100644
--- a/src/pkg/time/format_test.go
+++ b/src/time/format_test.go
diff --git a/src/pkg/time/genzabbrs.go b/src/time/genzabbrs.go
index 9eb0728a4..9eb0728a4 100644
--- a/src/pkg/time/genzabbrs.go
+++ b/src/time/genzabbrs.go
diff --git a/src/pkg/time/internal_test.go b/src/time/internal_test.go
index edd523bc8..edd523bc8 100644
--- a/src/pkg/time/internal_test.go
+++ b/src/time/internal_test.go
diff --git a/src/pkg/time/sleep.go b/src/time/sleep.go
index 33c349de4..33c349de4 100644
--- a/src/pkg/time/sleep.go
+++ b/src/time/sleep.go
diff --git a/src/pkg/time/sleep_test.go b/src/time/sleep_test.go
index 2cfb6a59c..2cfb6a59c 100644
--- a/src/pkg/time/sleep_test.go
+++ b/src/time/sleep_test.go
diff --git a/src/pkg/time/sys_plan9.go b/src/time/sys_plan9.go
index 848472944..848472944 100644
--- a/src/pkg/time/sys_plan9.go
+++ b/src/time/sys_plan9.go
diff --git a/src/pkg/time/sys_unix.go b/src/time/sys_unix.go
index 379e13d6a..379e13d6a 100644
--- a/src/pkg/time/sys_unix.go
+++ b/src/time/sys_unix.go
diff --git a/src/pkg/time/sys_windows.go b/src/time/sys_windows.go
index de63b4bf4..de63b4bf4 100644
--- a/src/pkg/time/sys_windows.go
+++ b/src/time/sys_windows.go
diff --git a/src/pkg/time/tick.go b/src/time/tick.go
index 19007841e..19007841e 100644
--- a/src/pkg/time/tick.go
+++ b/src/time/tick.go
diff --git a/src/pkg/time/tick_test.go b/src/time/tick_test.go
index 32f4740ad..32f4740ad 100644
--- a/src/pkg/time/tick_test.go
+++ b/src/time/tick_test.go
diff --git a/src/pkg/time/time.go b/src/time/time.go
index 4f76d79ee..4f76d79ee 100644
--- a/src/pkg/time/time.go
+++ b/src/time/time.go
diff --git a/src/pkg/time/time_test.go b/src/time/time_test.go
index 7e31dd78a..7e31dd78a 100644
--- a/src/pkg/time/time_test.go
+++ b/src/time/time_test.go
diff --git a/src/pkg/time/zoneinfo.go b/src/time/zoneinfo.go
index c8e53a27c..c8e53a27c 100644
--- a/src/pkg/time/zoneinfo.go
+++ b/src/time/zoneinfo.go
diff --git a/src/pkg/time/zoneinfo_abbrs_windows.go b/src/time/zoneinfo_abbrs_windows.go
index 51a1a2f66..51a1a2f66 100644
--- a/src/pkg/time/zoneinfo_abbrs_windows.go
+++ b/src/time/zoneinfo_abbrs_windows.go
diff --git a/src/pkg/time/zoneinfo_plan9.go b/src/time/zoneinfo_plan9.go
index 4bb0cb390..4bb0cb390 100644
--- a/src/pkg/time/zoneinfo_plan9.go
+++ b/src/time/zoneinfo_plan9.go
diff --git a/src/pkg/time/zoneinfo_read.go b/src/time/zoneinfo_read.go
index de9ebb41c..de9ebb41c 100644
--- a/src/pkg/time/zoneinfo_read.go
+++ b/src/time/zoneinfo_read.go
diff --git a/src/pkg/time/zoneinfo_test.go b/src/time/zoneinfo_test.go
index 4ca7fad93..4ca7fad93 100644
--- a/src/pkg/time/zoneinfo_test.go
+++ b/src/time/zoneinfo_test.go
diff --git a/src/pkg/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
index ab7e4612e..ab7e4612e 100644
--- a/src/pkg/time/zoneinfo_unix.go
+++ b/src/time/zoneinfo_unix.go
diff --git a/src/pkg/time/zoneinfo_windows.go b/src/time/zoneinfo_windows.go
index 02d8e0edc..02d8e0edc 100644
--- a/src/pkg/time/zoneinfo_windows.go
+++ b/src/time/zoneinfo_windows.go
diff --git a/src/pkg/time/zoneinfo_windows_test.go b/src/time/zoneinfo_windows_test.go
index 9db81b7cf..9db81b7cf 100644
--- a/src/pkg/time/zoneinfo_windows_test.go
+++ b/src/time/zoneinfo_windows_test.go
diff --git a/src/pkg/unicode/casetables.go b/src/unicode/casetables.go
index 29bf167e5..29bf167e5 100644
--- a/src/pkg/unicode/casetables.go
+++ b/src/unicode/casetables.go
diff --git a/src/pkg/unicode/digit.go b/src/unicode/digit.go
index 53171b396..53171b396 100644
--- a/src/pkg/unicode/digit.go
+++ b/src/unicode/digit.go
diff --git a/src/pkg/unicode/digit_test.go b/src/unicode/digit_test.go
index 551c42a24..551c42a24 100644
--- a/src/pkg/unicode/digit_test.go
+++ b/src/unicode/digit_test.go
diff --git a/src/pkg/unicode/graphic.go b/src/unicode/graphic.go
index ba90b4e51..ba90b4e51 100644
--- a/src/pkg/unicode/graphic.go
+++ b/src/unicode/graphic.go
diff --git a/src/pkg/unicode/graphic_test.go b/src/unicode/graphic_test.go
index c9f289c7f..c9f289c7f 100644
--- a/src/pkg/unicode/graphic_test.go
+++ b/src/unicode/graphic_test.go
diff --git a/src/pkg/unicode/letter.go b/src/unicode/letter.go
index 7fe4241ed..7fe4241ed 100644
--- a/src/pkg/unicode/letter.go
+++ b/src/unicode/letter.go
diff --git a/src/pkg/unicode/letter_test.go b/src/unicode/letter_test.go
index 4ee11fb36..4ee11fb36 100644
--- a/src/pkg/unicode/letter_test.go
+++ b/src/unicode/letter_test.go
diff --git a/src/pkg/unicode/maketables.go b/src/unicode/maketables.go
index d1c9aa04a..d1c9aa04a 100644
--- a/src/pkg/unicode/maketables.go
+++ b/src/unicode/maketables.go
diff --git a/src/pkg/unicode/script_test.go b/src/unicode/script_test.go
index 795cb4e17..795cb4e17 100644
--- a/src/pkg/unicode/script_test.go
+++ b/src/unicode/script_test.go
diff --git a/src/pkg/unicode/tables.go b/src/unicode/tables.go
index 8b77dd603..8b77dd603 100644
--- a/src/pkg/unicode/tables.go
+++ b/src/unicode/tables.go
diff --git a/src/pkg/unicode/utf16/export_test.go b/src/unicode/utf16/export_test.go
index 306247e48..306247e48 100644
--- a/src/pkg/unicode/utf16/export_test.go
+++ b/src/unicode/utf16/export_test.go
diff --git a/src/pkg/unicode/utf16/utf16.go b/src/unicode/utf16/utf16.go
index c0e47c535..c0e47c535 100644
--- a/src/pkg/unicode/utf16/utf16.go
+++ b/src/unicode/utf16/utf16.go
diff --git a/src/pkg/unicode/utf16/utf16_test.go b/src/unicode/utf16/utf16_test.go
index 3dca472bb..3dca472bb 100644
--- a/src/pkg/unicode/utf16/utf16_test.go
+++ b/src/unicode/utf16/utf16_test.go
diff --git a/src/pkg/unicode/utf8/example_test.go b/src/unicode/utf8/example_test.go
index 7b3e7ac74..7b3e7ac74 100644
--- a/src/pkg/unicode/utf8/example_test.go
+++ b/src/unicode/utf8/example_test.go
diff --git a/src/pkg/unicode/utf8/utf8.go b/src/unicode/utf8/utf8.go
index 253295ad3..253295ad3 100644
--- a/src/pkg/unicode/utf8/utf8.go
+++ b/src/unicode/utf8/utf8.go
diff --git a/src/pkg/unicode/utf8/utf8_test.go b/src/unicode/utf8/utf8_test.go
index 758d7a0f8..758d7a0f8 100644
--- a/src/pkg/unicode/utf8/utf8_test.go
+++ b/src/unicode/utf8/utf8_test.go
diff --git a/src/pkg/unsafe/unsafe.go b/src/unsafe/unsafe.go
index 83b2e1405..83b2e1405 100644
--- a/src/pkg/unsafe/unsafe.go
+++ b/src/unsafe/unsafe.go
diff --git a/test/bench/garbage/parser.go b/test/bench/garbage/parser.go
index d85110b63..a685507c5 100644
--- a/test/bench/garbage/parser.go
+++ b/test/bench/garbage/parser.go
@@ -85,7 +85,7 @@ func main() {
 	var t0 time.Time
 	var numGC uint32
 	var pauseTotalNs uint64
-	pkgroot := runtime.GOROOT() + "/src/pkg/"
+	pkgroot := runtime.GOROOT() + "/src/"
 	for pass := 0; pass < 2; pass++ {
 		// Once the heap is grown to full size, reset counters.
 		// This hides the start-up pauses, which are much smaller
diff --git a/test/stress/parsego.go b/test/stress/parsego.go
index a781f1993..a5856dd80 100644
--- a/test/stress/parsego.go
+++ b/test/stress/parsego.go
@@ -64,7 +64,7 @@ func parseDir(dirpath string) map[string]*ast.Package {
 }
 
 func stressParseGo() {
-	pkgroot := runtime.GOROOT() + "/src/pkg/"
+	pkgroot := runtime.GOROOT() + "/src/"
 	for {
 		m := make(map[string]map[string]*ast.Package)
 		for _, pkg := range packages {