syscall: update bootstrap scripts to sync with new go command

R=rsc
CC=golang-dev
https://golang.org/cl/5615054

diff --git a/src/pkg/syscall/mkall.sh b/src/pkg/syscall/mkall.sh
index 4a3e4323742ba5408c58b7a804a7494824b2a2f4..853c3f7a08568af6a16c85f92fb439076bec5392 100755 (executable)
--- a/src/pkg/syscall/mkall.sh
+++ b/src/pkg/syscall/mkall.sh
@@ -113,52 +113,52 @@ darwin_386)
        mkerrors="$mkerrors -m32"
        mksyscall="./mksyscall.pl -l32"
        mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 darwin_amd64)
        mkerrors="$mkerrors -m64"
        mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 freebsd_386)
        mkerrors="$mkerrors -m32"
        mksyscall="./mksyscall.pl -l32"
        mksysnum="curl -s 'http://svn.freebsd.org/base/head/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 freebsd_amd64)
        mkerrors="$mkerrors -m64"
        mksysnum="curl -s 'http://svn.freebsd.org/base/head/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 linux_386)
        mkerrors="$mkerrors -m32"
        mksyscall="./mksyscall.pl -l32"
        mksysnum="./mksysnum_linux.pl /usr/include/asm/unistd_32.h"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 linux_amd64)
        mkerrors="$mkerrors -m64"
        mksysnum="./mksysnum_linux.pl /usr/include/asm/unistd_64.h"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 linux_arm)
        mkerrors="$mkerrors"
        mksyscall="./mksyscall.pl -b32"
        mksysnum="./mksysnum_linux.pl /usr/include/asm/unistd.h"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 netbsd_386)
        mkerrors="$mkerrors -m32"
        mksyscall="./mksyscall.pl -l32 -netbsd"
        mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 netbsd_amd64)
        mkerrors="$mkerrors -m64"
        mksyscall="./mksyscall.pl -netbsd"
        mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 openbsd_386)
        mkerrors="$mkerrors -m32"
@@ -166,7 +166,7 @@ openbsd_386)
        mksysctl="./mksysctl_openbsd.pl"
        zsysctl="zsysctl_openbsd.go"
        mksysnum="curl -s 'http://www.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 openbsd_amd64)
        mkerrors="$mkerrors -m64"
@@ -174,7 +174,7 @@ openbsd_amd64)
        mksysctl="./mksysctl_openbsd.pl"
        zsysctl="zsysctl_openbsd.go"
        mksysnum="curl -s 'http://www.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-       mktypes="GOARCH=$GOARCH cgo -godefs"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
        ;;
 plan9_386)
        mkerrors=

diff --git a/src/pkg/syscall/mkerrors.sh b/src/pkg/syscall/mkerrors.sh
index 9a50cdf8b1afe4cd58c90134f0958f81b1d8e864..8666667f0112027978c7bc42ebf873e3dda3ae65 100755 (executable)
--- a/src/pkg/syscall/mkerrors.sh
+++ b/src/pkg/syscall/mkerrors.sh
@@ -146,7 +146,7 @@ includes='
 
 ccflags="$@"
 
-# Write cgo -godefs input.
+# Write go tool cgo -godefs input.
 (
        echo package syscall
        echo
@@ -224,7 +224,7 @@ echo '#include <errno.h>' | $GCC -x c - -E -dM $ccflags |
 echo '// mkerrors.sh' "$@"
 echo '// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT'
 echo
-cgo -godefs -- "$@" _const.go >_error.out
+go tool cgo -godefs -- "$@" _const.go >_error.out
 cat _error.out | grep -vf _error.grep
 echo
 echo '// Errors'