convert non-low-level non-google pkg code

to whole-package compilation.

R=r
OCL=33070
CL=33101

14 files changed, 23 insertions, 129 deletions

diff --git a/src/pkg/syscall/Makefile b/src/pkg/syscall/Makefile
index a5cc042d7..2800a8470 100644
--- a/src/pkg/syscall/Makefile
+++ b/src/pkg/syscall/Makefile
@@ -2,96 +2,22 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# DO NOT EDIT.  Automatically generated by gobuild.
-# gobuild -m asm_${GOOS}_${GOARCH}.s errstr.go exec.go syscall.go syscall_${GOOS}.go syscall_${GOOS}_${GOARCH}.go zerrors_${GOOS}_${GOARCH}.go zsyscall_${GOOS}_${GOARCH}.go zsysnum_${GOOS}_${GOARCH}.go ztypes_${GOOS}_${GOARCH}.go >Makefile
-
-D=
-
 include $(GOROOT)/src/Make.$(GOARCH)
-AR=gopack
-
-default: packages
-
-clean:
-	rm -rf *.[$(OS)] *.a [$(OS)].out _obj
-
-test: packages
-	gotest
-
-coverage: packages
-	gotest
-	6cov -g `pwd` | grep -v '_test\.go:'
-
-%.$O: %.go
-	$(GC) -I_obj $*.go
 
-%.$O: %.c
-	$(CC) $*.c
-
-%.$O: %.s
-	$(AS) $*.s
-
-O1=\
+TARG=syscall
+GOFILES=\
+	errstr.go\
+	exec.go\
+	syscall.go\
+	syscall_$(GOOS).go\
+	syscall_$(GOOS)_$(GOARCH).go\
+	zerrors_$(GOOS)_$(GOARCH).go\
+	zsyscall_$(GOOS)_$(GOARCH).go\
+	zsysnum_$(GOOS)_$(GOARCH).go\
+	ztypes_$(GOOS)_$(GOARCH).go\
+
+OFILES=\
 	asm_$(GOOS)_$(GOARCH).$O\
-	syscall.$O\
-	zerrors_$(GOOS)_$(GOARCH).$O\
-	zsysnum_$(GOOS)_$(GOARCH).$O\
-	ztypes_$(GOOS)_$(GOARCH).$O\
-
-O2=\
-	errstr.$O\
-	zsyscall_$(GOOS)_$(GOARCH).$O\
-
-O3=\
-	syscall_$(GOOS)_$(GOARCH).$O\
-
-O4=\
-	syscall_$(GOOS).$O\
-
-O5=\
-	exec.$O\
-
-
-phases: a1 a2 a3 a4 a5
-_obj$D/syscall.a: phases
-
-a1: $(O1)
-	$(AR) grc _obj$D/syscall.a asm_$(GOOS)_$(GOARCH).$O syscall.$O zerrors_$(GOOS)_$(GOARCH).$O zsysnum_$(GOOS)_$(GOARCH).$O ztypes_$(GOOS)_$(GOARCH).$O
-	rm -f $(O1)
-
-a2: $(O2)
-	$(AR) grc _obj$D/syscall.a errstr.$O zsyscall_$(GOOS)_$(GOARCH).$O
-	rm -f $(O2)
-
-a3: $(O3)
-	$(AR) grc _obj$D/syscall.a syscall_$(GOOS)_$(GOARCH).$O
-	rm -f $(O3)
-
-a4: $(O4)
-	$(AR) grc _obj$D/syscall.a syscall_$(GOOS).$O
-	rm -f $(O4)
-
-a5: $(O5)
-	$(AR) grc _obj$D/syscall.a exec.$O
-	rm -f $(O5)
-
-
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/syscall.a
-
-$(O1): newpkg
-$(O2): a1
-$(O3): a2
-$(O4): a3
-$(O5): a4
-$(O6): a5
-
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/syscall.a
-
-packages: _obj$D/syscall.a
+	types_$(GOOS)_$(GOARCH).$O\
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/syscall.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/syscall.a
+include $(GOROOT)/src/Make.pkg
diff --git a/src/pkg/syscall/errstr.go b/src/pkg/syscall/errstr.go
index 67a529d34..12a2c0d62 100644
--- a/src/pkg/syscall/errstr.go
+++ b/src/pkg/syscall/errstr.go
@@ -4,7 +4,6 @@
 
 package syscall
 
-import "syscall"
 
 func str(val int) string {  // do it here rather than with fmt to avoid dependency
 	if val < 0 {
diff --git a/src/pkg/syscall/exec.go b/src/pkg/syscall/exec.go
index 3dd0727f8..91d8a3f8c 100644
--- a/src/pkg/syscall/exec.go
+++ b/src/pkg/syscall/exec.go
@@ -8,7 +8,6 @@ package syscall
 
 import (
 	"sync";
-	"syscall";
 	"unsafe";
 )
 
diff --git a/src/pkg/syscall/syscall.go b/src/pkg/syscall/syscall.go
index 5ee44e3e8..59f35b2bf 100644
--- a/src/pkg/syscall/syscall.go
+++ b/src/pkg/syscall/syscall.go
@@ -11,10 +11,7 @@
 // the manuals for the appropriate operating system.
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
 func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr)
diff --git a/src/pkg/syscall/syscall_darwin.go b/src/pkg/syscall/syscall_darwin.go
index 49d2815b3..b19d42782 100644
--- a/src/pkg/syscall/syscall_darwin.go
+++ b/src/pkg/syscall/syscall_darwin.go
@@ -11,10 +11,7 @@
 
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 const OS = "darwin"
 
diff --git a/src/pkg/syscall/syscall_darwin_386.go b/src/pkg/syscall/syscall_darwin_386.go
index 6792109d7..aa558c217 100644
--- a/src/pkg/syscall/syscall_darwin_386.go
+++ b/src/pkg/syscall/syscall_darwin_386.go
@@ -4,8 +4,6 @@
 
 package syscall
 
-import "syscall"
-
 func Getpagesize() int {
 	return 4096
 }
diff --git a/src/pkg/syscall/syscall_darwin_amd64.go b/src/pkg/syscall/syscall_darwin_amd64.go
index f7a93f121..34e83ec6b 100644
--- a/src/pkg/syscall/syscall_darwin_amd64.go
+++ b/src/pkg/syscall/syscall_darwin_amd64.go
@@ -4,8 +4,6 @@
 
 package syscall
 
-import "syscall"
-
 func Getpagesize() int {
 	return 4096
 }
diff --git a/src/pkg/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index ac77942a3..10fedb939 100644
--- a/src/pkg/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
@@ -11,10 +11,7 @@
 
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 const OS = "linux"
 
diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go
index b44428e11..dc64ae79f 100644
--- a/src/pkg/syscall/syscall_linux_386.go
+++ b/src/pkg/syscall/syscall_linux_386.go
@@ -4,10 +4,7 @@
 
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 func Getpagesize() int {
 	return 4096
diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/pkg/syscall/syscall_linux_amd64.go
index 4f7b33bc1..28d74b758 100644
--- a/src/pkg/syscall/syscall_linux_amd64.go
+++ b/src/pkg/syscall/syscall_linux_amd64.go
@@ -4,8 +4,6 @@
 
 package syscall
 
-import "syscall"
-
 //sys	Chown(path string, uid int, gid int) (errno int)
 //sys	Fchown(fd int, uid int, gid int) (errno int)
 //sys	Fstat(fd int, stat *Stat_t) (errno int)
diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go
index c83e63de3..688649abf 100644
--- a/src/pkg/syscall/zsyscall_darwin_386.go
+++ b/src/pkg/syscall/zsyscall_darwin_386.go
@@ -3,10 +3,7 @@
 
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 func getgroups(ngid int, gid *_Gid_t) (n int, errno int) {
 	r0, r1, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go
index 7afb20953..28d04c626 100644
--- a/src/pkg/syscall/zsyscall_darwin_amd64.go
+++ b/src/pkg/syscall/zsyscall_darwin_amd64.go
@@ -3,10 +3,7 @@
 
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 func getgroups(ngid int, gid *_Gid_t) (n int, errno int) {
 	r0, r1, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/pkg/syscall/zsyscall_linux_386.go
index 11d08d2c7..3444c6dfb 100644
--- a/src/pkg/syscall/zsyscall_linux_386.go
+++ b/src/pkg/syscall/zsyscall_linux_386.go
@@ -3,10 +3,7 @@
 
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 func pipe(p *[2]_C_int) (errno int) {
 	r0, r1, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0);
diff --git a/src/pkg/syscall/zsyscall_linux_amd64.go b/src/pkg/syscall/zsyscall_linux_amd64.go
index 743c5285b..7834cfbea 100644
--- a/src/pkg/syscall/zsyscall_linux_amd64.go
+++ b/src/pkg/syscall/zsyscall_linux_amd64.go
@@ -3,10 +3,7 @@
 
 package syscall
 
-import (
-	"syscall";
-	"unsafe";
-)
+import "unsafe"
 
 func pipe(p *[2]_C_int) (errno int) {
 	r0, r1, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0);