build: more adjustments for move from src/pkg to src

These were missed in CL 134570043.

Fixes nacl, solaris builds.

TBR=r
CC=golang-codereviews
https://golang.org/cl/136320043

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
+		archive
+			tar
 				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
+			zip
 				testdata
 					+
-				draw
-				gif
-				jpeg
-				png
-					testdata
-						+
-			io
+		compress
+			bzip2
+				testdata
+					+
+			flate
+			gzip
+				testdata
+					+
+			lzw
+			testdata
 				+
-			mime
+			zlib
+		crypto
+			rsa
 				testdata
 					+
-				multipart
-					testdata
-						+
-			net
-				http
-					+
+			tls
 				testdata
 					+
-			os
+		debug
+			dwarf
+				testdata
+					+
+			elf
+				testdata
+					+
+			macho
+				testdata
+					+
+			pe
+				testdata
+					+
+			plan9obj
+				testdata
+					+
+		go
+			build
 				+
-			path
-				filepath
-					+
-			regexp
+			doc
 				testdata
 					+
-			strconv
+			format
+				+
+			parser
+				+
+			printer
+				+
+		image
+			testdata
+				+
+			draw
+			gif
+			jpeg
+			png
+				testdata
+					+
+		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

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

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