go.sys: fix imports to cgc/p/go.sys, add build tags

Approach but probably not achieve a green build.

LGTM=adg
R=golang-codereviews, adg
CC=golang-codereviews
https://golang.org/cl/126120043

plan9/race.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build race
+// +build plan9,race
 
 package plan9
 

plan9/race0.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !race
+// +build plan9,!race
 
 package plan9
 

plan9/str.go

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build plan9
+
 package plan9
 
 func itoa(val int) string { // do it here rather than with fmt to avoid dependency

plan9/syscall.go

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build plan9
+
 // Package plan9 contains an interface to the low-level operating system
 // primitives.  OS details vary depending on the underlying system, and
 // by default, godoc will display the OS-specific documentation for the current

plan9/syscall_test.go

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build plan9
+
 package plan9_test
 
 import (

unix/creds_test.go

@@ -11,7 +11,8 @@ import (
 	"net"
 	"os"
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 // TestSCMCredentials tests the sending and receiving of credentials

unix/flock.go

@@ -4,6 +4,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 package unix
 
 import "unsafe"

unix/mksyscall_solaris.pl

@@ -264,7 +264,7 @@ package $package
 import "unsafe"
 EOF
 
-print "import \"unix\"\n" if $package ne "unix";
+print "import \"code.google.com/p/go.sys/unix\"\n" if $package ne "unix";
 
 print <<EOF;
 

unix/mmap_unix_test.go

@@ -8,7 +8,8 @@ package unix_test
 
 import (
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 func TestMmap(t *testing.T) {

unix/race.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build race
+// +build darwin,race dragonfly,race freebsd,race linux,race netbsd,race openbsd,race
 
 package unix
 

unix/race0.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !race
+// +build darwin,!race dragonfly,!race freebsd,!race linux,!race netbsd,!race openbsd,!race
 
 package unix
 

unix/str.go

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 package unix
 
 func itoa(val int) string { // do it here rather than with fmt to avoid dependency

unix/syscall.go

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 // Package unix contains an interface to the low-level operating system
 // primitives.  OS details vary depending on the underlying system, and
 // by default, godoc will display OS-specific documentation for the current

unix/syscall_bsd_test.go

@@ -8,7 +8,8 @@ package unix_test
 
 import (
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 const MNT_WAIT = 1

unix/syscall_test.go

@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
 package unix_test
 
 import (
 	"testing"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {

unix/syscall_unix_test.go

@@ -17,7 +17,8 @@ import (
 	"runtime"
 	"testing"
 	"time"
-	"unix"
+
+	"code.google.com/p/go.sys/unix"
 )
 
 // Tests that below functions, structures and constants are consistent

windows/mksyscall_windows.go

@@ -661,7 +661,7 @@ const srcTemplate = `
 package {{packagename}}
 
 import "unsafe"{{if windowsdot}}
-import "windows"{{end}}
+import "code.google.com/p/go.sys/windows"{{end}}
 
 var (
 {{template "dlls" .}}

windows/race.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build race
+// +build windows,race
 
 package windows
 

windows/race0.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !race
+// +build windows,!race
 
 package windows
 

windows/str.go

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build windows
+
 package windows
 
 func itoa(val int) string { // do it here rather than with fmt to avoid dependency

windows/syscall.go

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build windows
+
 // Package windows contains an interface to the low-level operating system
 // primitives.  OS details vary depending on the underlying system, and
 // by default, godoc will display the OS-specific documentation for the current

windows/syscall_test.go

@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build windows
+
 package windows_test
 
 import (
 	"testing"
-	"windows"
+
+	"code.google.com/p/go.sys/windows"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {

windows/syscall_windows_test.go

@@ -9,7 +9,8 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
-	"windows"
+
+	"code.google.com/p/go.sys/windows"
 )
 
 func TestWin32finddata(t *testing.T) {