1) Change default gofmt default settings for

   parsing and printing to new syntax.

   Use -oldparser to parse the old syntax,
   use -oldprinter to print the old syntax.

2) Change default gofmt formatting settings
   to use tabs for indentation only and to use
   spaces for alignment. This will make the code
   alignment insensitive to an editor's tabwidth.

   Use -spaces=false to use tabs for alignment.

3) Manually changed src/exp/parser/parser_test.go
   so that it doesn't try to parse the parser's
   source files using the old syntax (they have
   new syntax now).

4) gofmt -w src misc test/bench

4th set of files.

R=rsc
CC=golang-dev
http://codereview.appspot.com/180049

47 files changed, 10253 insertions, 10253 deletions

diff --git a/src/pkg/syscall/errstr.go b/src/pkg/syscall/errstr.go
index 87c354d05..94a799a80 100644
--- a/src/pkg/syscall/errstr.go
+++ b/src/pkg/syscall/errstr.go
@@ -5,24 +5,24 @@
 package syscall
 
 
-func str(val int) string {	// do it here rather than with fmt to avoid dependency
+func str(val int) string { // do it here rather than with fmt to avoid dependency
 	if val < 0 {
 		return "-" + str(-val)
 	}
-	var buf [32]byte;	// big enough for int64
-	i := len(buf) - 1;
+	var buf [32]byte // big enough for int64
+	i := len(buf) - 1
 	for val >= 10 {
-		buf[i] = byte(val%10 + '0');
-		i--;
-		val /= 10;
+		buf[i] = byte(val%10 + '0')
+		i--
+		val /= 10
 	}
-	buf[i] = byte(val + '0');
-	return string(buf[i:]);
+	buf[i] = byte(val + '0')
+	return string(buf[i:])
 }
 
 func Errstr(errno int) string {
 	if errno < 0 || errno >= int(len(errors)) {
 		return "error " + str(errno)
 	}
-	return errors[errno];
+	return errors[errno]
 }
diff --git a/src/pkg/syscall/exec.go b/src/pkg/syscall/exec.go
index a3be959bd..3418ff088 100644
--- a/src/pkg/syscall/exec.go
+++ b/src/pkg/syscall/exec.go
@@ -7,8 +7,8 @@
 package syscall
 
 import (
-	"sync";
-	"unsafe";
+	"sync"
+	"unsafe"
 )
 
 // Lock synchronizing creation of new file descriptors with fork.
@@ -63,18 +63,18 @@ var ForkLock sync.RWMutex
 // Convert array of string to array
 // of NUL-terminated byte pointer.
 func StringArrayPtr(ss []string) []*byte {
-	bb := make([]*byte, len(ss)+1);
+	bb := make([]*byte, len(ss)+1)
 	for i := 0; i < len(ss); i++ {
 		bb[i] = StringBytePtr(ss[i])
 	}
-	bb[len(ss)] = nil;
-	return bb;
+	bb[len(ss)] = nil
+	return bb
 }
 
-func CloseOnExec(fd int)	{ fcntl(fd, F_SETFD, FD_CLOEXEC) }
+func CloseOnExec(fd int) { fcntl(fd, F_SETFD, FD_CLOEXEC) }
 
 func SetNonblock(fd int, nonblocking bool) (errno int) {
-	flag, err := fcntl(fd, F_GETFL, 0);
+	flag, err := fcntl(fd, F_GETFL, 0)
 	if err != 0 {
 		return err
 	}
@@ -83,8 +83,8 @@ func SetNonblock(fd int, nonblocking bool) (errno int) {
 	} else {
 		flag &= ^O_NONBLOCK
 	}
-	_, err = fcntl(fd, F_SETFL, flag);
-	return err;
+	_, err = fcntl(fd, F_SETFL, flag)
+	return err
 }
 
 
@@ -99,15 +99,15 @@ func SetNonblock(fd int, nonblocking bool) (errno int) {
 func forkAndExecInChild(argv0 *byte, argv []*byte, envv []*byte, traceme bool, dir *byte, fd []int, pipe int) (pid int, err int) {
 	// Declare all variables at top in case any
 	// declarations require heap allocation (e.g., err1).
-	var r1, r2, err1 uintptr;
-	var nextfd int;
-	var i int;
+	var r1, r2, err1 uintptr
+	var nextfd int
+	var i int
 
-	darwin := OS == "darwin";
+	darwin := OS == "darwin"
 
 	// About to call fork.
 	// No more allocation or calls of non-assembly functions.
-	r1, r2, err1 = RawSyscall(SYS_FORK, 0, 0, 0);
+	r1, r2, err1 = RawSyscall(SYS_FORK, 0, 0, 0)
 	if err1 != 0 {
 		return 0, int(err1)
 	}
@@ -129,7 +129,7 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []*byte, traceme bool, d
 
 	// Enable tracing if requested.
 	if traceme {
-		_, _, err1 = RawSyscall(SYS_PTRACE, uintptr(PTRACE_TRACEME), 0, 0);
+		_, _, err1 = RawSyscall(SYS_PTRACE, uintptr(PTRACE_TRACEME), 0, 0)
 		if err1 != 0 {
 			goto childerror
 		}
@@ -137,7 +137,7 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []*byte, traceme bool, d
 
 	// Chdir
 	if dir != nil {
-		_, _, err1 = RawSyscall(SYS_CHDIR, uintptr(unsafe.Pointer(dir)), 0, 0);
+		_, _, err1 = RawSyscall(SYS_CHDIR, uintptr(unsafe.Pointer(dir)), 0, 0)
 		if err1 != 0 {
 			goto childerror
 		}
@@ -145,26 +145,26 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []*byte, traceme bool, d
 
 	// Pass 1: look for fd[i] < i and move those up above len(fd)
 	// so that pass 2 won't stomp on an fd it needs later.
-	nextfd = int(len(fd));
+	nextfd = int(len(fd))
 	if pipe < nextfd {
-		_, _, err1 = RawSyscall(SYS_DUP2, uintptr(pipe), uintptr(nextfd), 0);
+		_, _, err1 = RawSyscall(SYS_DUP2, uintptr(pipe), uintptr(nextfd), 0)
 		if err1 != 0 {
 			goto childerror
 		}
-		RawSyscall(SYS_FCNTL, uintptr(nextfd), F_SETFD, FD_CLOEXEC);
-		pipe = nextfd;
-		nextfd++;
+		RawSyscall(SYS_FCNTL, uintptr(nextfd), F_SETFD, FD_CLOEXEC)
+		pipe = nextfd
+		nextfd++
 	}
 	for i = 0; i < len(fd); i++ {
 		if fd[i] >= 0 && fd[i] < int(i) {
-			_, _, err1 = RawSyscall(SYS_DUP2, uintptr(fd[i]), uintptr(nextfd), 0);
+			_, _, err1 = RawSyscall(SYS_DUP2, uintptr(fd[i]), uintptr(nextfd), 0)
 			if err1 != 0 {
 				goto childerror
 			}
-			RawSyscall(SYS_FCNTL, uintptr(nextfd), F_SETFD, FD_CLOEXEC);
-			fd[i] = nextfd;
-			nextfd++;
-			if nextfd == pipe {	// don't stomp on pipe
+			RawSyscall(SYS_FCNTL, uintptr(nextfd), F_SETFD, FD_CLOEXEC)
+			fd[i] = nextfd
+			nextfd++
+			if nextfd == pipe { // don't stomp on pipe
 				nextfd++
 			}
 		}
@@ -173,21 +173,21 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []*byte, traceme bool, d
 	// Pass 2: dup fd[i] down onto i.
 	for i = 0; i < len(fd); i++ {
 		if fd[i] == -1 {
-			RawSyscall(SYS_CLOSE, uintptr(i), 0, 0);
-			continue;
+			RawSyscall(SYS_CLOSE, uintptr(i), 0, 0)
+			continue
 		}
 		if fd[i] == int(i) {
 			// dup2(i, i) won't clear close-on-exec flag on Linux,
 			// probably not elsewhere either.
-			_, _, err1 = RawSyscall(SYS_FCNTL, uintptr(fd[i]), F_SETFD, 0);
+			_, _, err1 = RawSyscall(SYS_FCNTL, uintptr(fd[i]), F_SETFD, 0)
 			if err1 != 0 {
 				goto childerror
 			}
-			continue;
+			continue
 		}
 		// The new fd is created NOT close-on-exec,
 		// which is exactly what we want.
-		_, _, err1 = RawSyscall(SYS_DUP2, uintptr(fd[i]), uintptr(i), 0);
+		_, _, err1 = RawSyscall(SYS_DUP2, uintptr(fd[i]), uintptr(i), 0)
 		if err1 != 0 {
 			goto childerror
 		}
@@ -205,11 +205,11 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []*byte, traceme bool, d
 	_, _, err1 = RawSyscall(SYS_EXECVE,
 		uintptr(unsafe.Pointer(argv0)),
 		uintptr(unsafe.Pointer(&argv[0])),
-		uintptr(unsafe.Pointer(&envv[0])));
+		uintptr(unsafe.Pointer(&envv[0])))
 
 childerror:
 	// send error code on pipe
-	RawSyscall(SYS_WRITE, uintptr(pipe), uintptr(unsafe.Pointer(&err1)), uintptr(unsafe.Sizeof(err1)));
+	RawSyscall(SYS_WRITE, uintptr(pipe), uintptr(unsafe.Pointer(&err1)), uintptr(unsafe.Sizeof(err1)))
 	for {
 		RawSyscall(SYS_EXIT, 253, 0, 0)
 	}
@@ -217,23 +217,23 @@ childerror:
 	// Calling panic is not actually safe,
 	// but the for loop above won't break
 	// and this shuts up the compiler.
-	panic("unreached");
+	panic("unreached")
 }
 
 func forkExec(argv0 string, argv []string, envv []string, traceme bool, dir string, fd []int) (pid int, err int) {
-	var p [2]int;
-	var n int;
-	var err1 uintptr;
-	var wstatus WaitStatus;
+	var p [2]int
+	var n int
+	var err1 uintptr
+	var wstatus WaitStatus
 
-	p[0] = -1;
-	p[1] = -1;
+	p[0] = -1
+	p[1] = -1
 
 	// Convert args to C form.
-	argv0p := StringBytePtr(argv0);
-	argvp := StringArrayPtr(argv);
-	envvp := StringArrayPtr(envv);
-	var dirp *byte;
+	argv0p := StringBytePtr(argv0)
+	argvp := StringArrayPtr(argv)
+	envvp := StringArrayPtr(envv)
+	var dirp *byte
 	if len(dir) > 0 {
 		dirp = StringBytePtr(dir)
 	}
@@ -241,7 +241,7 @@ func forkExec(argv0 string, argv []string, envv []string, traceme bool, dir stri
 	// Acquire the fork lock so that no other threads
 	// create new fds that are not yet close-on-exec
 	// before we fork.
-	ForkLock.Lock();
+	ForkLock.Lock()
 
 	// Allocate child status pipe close on exec.
 	if err = Pipe(&p); err != 0 {
@@ -255,22 +255,22 @@ func forkExec(argv0 string, argv []string, envv []string, traceme bool, dir stri
 	}
 
 	// Kick off child.
-	pid, err = forkAndExecInChild(argv0p, argvp, envvp, traceme, dirp, fd, p[1]);
+	pid, err = forkAndExecInChild(argv0p, argvp, envvp, traceme, dirp, fd, p[1])
 	if err != 0 {
 	error:
 		if p[0] >= 0 {
-			Close(p[0]);
-			Close(p[1]);
+			Close(p[0])
+			Close(p[1])
 		}
-		ForkLock.Unlock();
-		return 0, err;
+		ForkLock.Unlock()
+		return 0, err
 	}
-	ForkLock.Unlock();
+	ForkLock.Unlock()
 
 	// Read child error status from pipe.
-	Close(p[1]);
-	n, err = read(p[0], (*byte)(unsafe.Pointer(&err1)), unsafe.Sizeof(err1));
-	Close(p[0]);
+	Close(p[1])
+	n, err = read(p[0], (*byte)(unsafe.Pointer(&err1)), unsafe.Sizeof(err1))
+	Close(p[0])
 	if err != 0 || n != 0 {
 		if n == unsafe.Sizeof(err1) {
 			err = int(err1)
@@ -281,15 +281,15 @@ func forkExec(argv0 string, argv []string, envv []string, traceme bool, dir stri
 
 		// Child failed; wait for it to exit, to make sure
 		// the zombies don't accumulate.
-		_, err1 := Wait4(pid, &wstatus, 0, nil);
+		_, err1 := Wait4(pid, &wstatus, 0, nil)
 		for err1 == EINTR {
 			_, err1 = Wait4(pid, &wstatus, 0, nil)
 		}
-		return 0, err;
+		return 0, err
 	}
 
 	// Read got EOF, so pipe closed on exec, so exec succeeded.
-	return pid, 0;
+	return pid, 0
 }
 
 // Combination of fork and exec, careful to be thread safe.
@@ -307,6 +307,6 @@ func Exec(argv0 string, argv []string, envv []string) (err int) {
 	_, _, err1 := RawSyscall(SYS_EXECVE,
 		uintptr(unsafe.Pointer(StringBytePtr(argv0))),
 		uintptr(unsafe.Pointer(&StringArrayPtr(argv)[0])),
-		uintptr(unsafe.Pointer(&StringArrayPtr(envv)[0])));
-	return int(err1);
+		uintptr(unsafe.Pointer(&StringArrayPtr(envv)[0])))
+	return int(err1)
 }
diff --git a/src/pkg/syscall/syscall.go b/src/pkg/syscall/syscall.go
index 06f3635d6..372149bf2 100644
--- a/src/pkg/syscall/syscall.go
+++ b/src/pkg/syscall/syscall.go
@@ -18,13 +18,13 @@ func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
 // StringByteSlice returns a NUL-terminated slice of bytes
 // containing the text of s.
 func StringByteSlice(s string) []byte {
-	a := make([]byte, len(s)+1);
+	a := make([]byte, len(s)+1)
 	for i := 0; i < len(s); i++ {
 		a[i] = s[i]
 	}
-	return a;
+	return a
 }
 
 // StringBytePtr returns a pointer to a NUL-terminated array of bytes
 // containing the text of s.
-func StringBytePtr(s string) *byte	{ return &StringByteSlice(s)[0] }
+func StringBytePtr(s string) *byte { return &StringByteSlice(s)[0] }
diff --git a/src/pkg/syscall/syscall_darwin.go b/src/pkg/syscall/syscall_darwin.go
index bb28bc1e9..20f9fa24e 100644
--- a/src/pkg/syscall/syscall_darwin.go
+++ b/src/pkg/syscall/syscall_darwin.go
@@ -23,7 +23,7 @@ const OS = "darwin"
 // even linking this function into the binary.  See ../os/getwd.go.
 const ImplementsGetwd = false
 
-func Getwd() (string, int)	{ return "", ENOTSUP }
+func Getwd() (string, int) { return "", ENOTSUP }
 
 
 /*
@@ -34,7 +34,7 @@ func Getwd() (string, int)	{ return "", ENOTSUP }
 //sys	setgroups(ngid int, gid *_Gid_t) (errno int)
 
 func Getgroups() (gids []int, errno int) {
-	n, err := getgroups(0, nil);
+	n, err := getgroups(0, nil)
 	if err != 0 {
 		return nil, errno
 	}
@@ -47,16 +47,16 @@ func Getgroups() (gids []int, errno int) {
 		return nil, EINVAL
 	}
 
-	a := make([]_Gid_t, n);
-	n, err = getgroups(n, &a[0]);
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
 	if err != 0 {
 		return nil, errno
 	}
-	gids = make([]int, n);
+	gids = make([]int, n)
 	for i, v := range a[0:n] {
 		gids[i] = int(v)
 	}
-	return;
+	return
 }
 
 func Setgroups(gids []int) (errno int) {
@@ -64,11 +64,11 @@ func Setgroups(gids []int) (errno int) {
 		return setgroups(0, nil)
 	}
 
-	a := make([]_Gid_t, len(gids));
+	a := make([]_Gid_t, len(gids))
 	for i, v := range gids {
 		a[i] = _Gid_t(v)
 	}
-	return setgroups(len(a), &a[0]);
+	return setgroups(len(a), &a[0])
 }
 
 // Wait status is 7 bits at bottom, either 0 (exited),
@@ -80,44 +80,44 @@ func Setgroups(gids []int) (errno int) {
 type WaitStatus uint32
 
 const (
-	mask	= 0x7F;
-	core	= 0x80;
-	shift	= 8;
+	mask  = 0x7F
+	core  = 0x80
+	shift = 8
 
-	exited	= 0;
-	stopped	= 0x7F;
+	exited  = 0
+	stopped = 0x7F
 )
 
-func (w WaitStatus) Exited() bool	{ return w&mask == exited }
+func (w WaitStatus) Exited() bool { return w&mask == exited }
 
 func (w WaitStatus) ExitStatus() int {
 	if w&mask != exited {
 		return -1
 	}
-	return int(w >> shift);
+	return int(w >> shift)
 }
 
-func (w WaitStatus) Signaled() bool	{ return w&mask != stopped && w&mask != 0 }
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
 
 func (w WaitStatus) Signal() int {
-	sig := int(w & mask);
+	sig := int(w & mask)
 	if sig == stopped || sig == 0 {
 		return -1
 	}
-	return sig;
+	return sig
 }
 
-func (w WaitStatus) CoreDump() bool	{ return w.Signaled() && w&core != 0 }
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
 
-func (w WaitStatus) Stopped() bool	{ return w&mask == stopped && w>>shift != SIGSTOP }
+func (w WaitStatus) Stopped() bool { return w&mask == stopped && w>>shift != SIGSTOP }
 
-func (w WaitStatus) Continued() bool	{ return w&mask == stopped && w>>shift == SIGSTOP }
+func (w WaitStatus) Continued() bool { return w&mask == stopped && w>>shift == SIGSTOP }
 
 func (w WaitStatus) StopSignal() int {
 	if !w.Stopped() {
 		return -1
 	}
-	return int(w>>shift) & 0xFF;
+	return int(w>>shift) & 0xFF
 }
 
 func (w WaitStatus) TrapCause() int {
@@ -128,12 +128,12 @@ func (w WaitStatus) TrapCause() int {
 //sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int)
 
 func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, errno int) {
-	var status _C_int;
-	wpid, errno = wait4(pid, &status, options, rusage);
+	var status _C_int
+	wpid, errno = wait4(pid, &status, options, rusage)
 	if wstatus != nil {
 		*wstatus = WaitStatus(status)
 	}
-	return;
+	return
 }
 
 //sys	pipe() (r int, w int, errno int)
@@ -142,13 +142,13 @@ func Pipe(p []int) (errno int) {
 	if len(p) != 2 {
 		return EINVAL
 	}
-	p[0], p[1], errno = pipe();
-	return;
+	p[0], p[1], errno = pipe()
+	return
 }
 
 func Sleep(ns int64) (errno int) {
-	tv := NsecToTimeval(ns);
-	return Select(0, nil, nil, nil, &tv);
+	tv := NsecToTimeval(ns)
+	return Select(0, nil, nil, nil, &tv)
 }
 
 //sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int)
@@ -165,173 +165,173 @@ func Sleep(ns int64) (errno int) {
 var SocketDisableIPv6 bool
 
 type Sockaddr interface {
-	sockaddr() (ptr uintptr, len _Socklen, errno int);	// lowercase; only we can define Sockaddrs
+	sockaddr() (ptr uintptr, len _Socklen, errno int) // lowercase; only we can define Sockaddrs
 }
 
 type SockaddrInet4 struct {
-	Port	int;
-	Addr	[4]byte;
-	raw	RawSockaddrInet4;
+	Port int
+	Addr [4]byte
+	raw  RawSockaddrInet4
 }
 
 func (sa *SockaddrInet4) sockaddr() (uintptr, _Socklen, int) {
 	if sa.Port < 0 || sa.Port > 0xFFFF {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Len = SizeofSockaddrInet4;
-	sa.raw.Family = AF_INET;
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port));
-	p[0] = byte(sa.Port >> 8);
-	p[1] = byte(sa.Port);
+	sa.raw.Len = SizeofSockaddrInet4
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
 	for i := 0; i < len(sa.Addr); i++ {
 		sa.raw.Addr[i] = sa.Addr[i]
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0
 }
 
 type SockaddrInet6 struct {
-	Port	int;
-	Addr	[16]byte;
-	raw	RawSockaddrInet6;
+	Port int
+	Addr [16]byte
+	raw  RawSockaddrInet6
 }
 
 func (sa *SockaddrInet6) sockaddr() (uintptr, _Socklen, int) {
 	if sa.Port < 0 || sa.Port > 0xFFFF {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Len = SizeofSockaddrInet6;
-	sa.raw.Family = AF_INET6;
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port));
-	p[0] = byte(sa.Port >> 8);
-	p[1] = byte(sa.Port);
+	sa.raw.Len = SizeofSockaddrInet6
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
 	for i := 0; i < len(sa.Addr); i++ {
 		sa.raw.Addr[i] = sa.Addr[i]
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0
 }
 
 type SockaddrUnix struct {
-	Name	string;
-	raw	RawSockaddrUnix;
+	Name string
+	raw  RawSockaddrUnix
 }
 
 func (sa *SockaddrUnix) sockaddr() (uintptr, _Socklen, int) {
-	name := sa.Name;
-	n := len(name);
+	name := sa.Name
+	n := len(name)
 	if n >= len(sa.raw.Path) || n == 0 {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Len = byte(3 + n);	// 2 for Family, Len; 1 for NUL
-	sa.raw.Family = AF_UNIX;
+	sa.raw.Len = byte(3 + n) // 2 for Family, Len; 1 for NUL
+	sa.raw.Family = AF_UNIX
 	for i := 0; i < n; i++ {
 		sa.raw.Path[i] = int8(name[i])
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0
 }
 
 func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) {
 	switch rsa.Addr.Family {
 	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa));
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
 		if pp.Len < 3 || pp.Len > SizeofSockaddrUnix {
 			return nil, EINVAL
 		}
-		sa := new(SockaddrUnix);
-		n := int(pp.Len) - 3;	// subtract leading Family, Len, terminating NUL
+		sa := new(SockaddrUnix)
+		n := int(pp.Len) - 3 // subtract leading Family, Len, terminating NUL
 		for i := 0; i < n; i++ {
 			if pp.Path[i] == 0 {
 				// found early NUL; assume Len is overestimating
-				n = i;
-				break;
+				n = i
+				break
 			}
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]));
-		sa.Name = string(bytes[0:n]);
-		return sa, 0;
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))
+		sa.Name = string(bytes[0:n])
+		return sa, 0
 
 	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa));
-		sa := new(SockaddrInet4);
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port));
-		sa.Port = int(p[0])<<8 + int(p[1]);
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
 		for i := 0; i < len(sa.Addr); i++ {
 			sa.Addr[i] = pp.Addr[i]
 		}
-		return sa, 0;
+		return sa, 0
 
 	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa));
-		sa := new(SockaddrInet6);
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port));
-		sa.Port = int(p[0])<<8 + int(p[1]);
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
 		for i := 0; i < len(sa.Addr); i++ {
 			sa.Addr[i] = pp.Addr[i]
 		}
-		return sa, 0;
+		return sa, 0
 	}
-	return nil, EAFNOSUPPORT;
+	return nil, EAFNOSUPPORT
 }
 
 func Accept(fd int) (nfd int, sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
-	nfd, errno = accept(fd, &rsa, &len);
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, errno = accept(fd, &rsa, &len)
 	if errno != 0 {
 		return
 	}
-	sa, errno = anyToSockaddr(&rsa);
+	sa, errno = anyToSockaddr(&rsa)
 	if errno != 0 {
-		Close(nfd);
-		nfd = 0;
+		Close(nfd)
+		nfd = 0
 	}
-	return;
+	return
 }
 
 func Getsockname(fd int) (sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if errno = getsockname(fd, &rsa, &len); errno != 0 {
 		return
 	}
-	return anyToSockaddr(&rsa);
+	return anyToSockaddr(&rsa)
 }
 
 func Getpeername(fd int) (sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if errno = getpeername(fd, &rsa, &len); errno != 0 {
 		return
 	}
-	return anyToSockaddr(&rsa);
+	return anyToSockaddr(&rsa)
 }
 
 func Bind(fd int, sa Sockaddr) (errno int) {
-	ptr, n, err := sa.sockaddr();
+	ptr, n, err := sa.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return bind(fd, ptr, n);
+	return bind(fd, ptr, n)
 }
 
 func Connect(fd int, sa Sockaddr) (errno int) {
-	ptr, n, err := sa.sockaddr();
+	ptr, n, err := sa.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return connect(fd, ptr, n);
+	return connect(fd, ptr, n)
 }
 
 func Socket(domain, typ, proto int) (fd, errno int) {
 	if domain == AF_INET6 && SocketDisableIPv6 {
 		return -1, EAFNOSUPPORT
 	}
-	fd, errno = socket(domain, typ, proto);
-	return;
+	fd, errno = socket(domain, typ, proto)
+	return
 }
 
 func SetsockoptInt(fd, level, opt int, value int) (errno int) {
-	var n = int32(value);
-	return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&n)), 4);
+	var n = int32(value)
+	return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&n)), 4)
 }
 
 func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (errno int) {
@@ -346,44 +346,44 @@ func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) {
 //sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int)
 
 func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if n, errno = recvfrom(fd, p, flags, &rsa, &len); errno != 0 {
 		return
 	}
-	from, errno = anyToSockaddr(&rsa);
-	return;
+	from, errno = anyToSockaddr(&rsa)
+	return
 }
 
 //sys sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int)
 
 func Sendto(fd int, p []byte, flags int, to Sockaddr) (errno int) {
-	ptr, n, err := to.sockaddr();
+	ptr, n, err := to.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return sendto(fd, p, flags, ptr, n);
+	return sendto(fd, p, flags, ptr, n)
 }
 
 //sys	kevent(kq int, change uintptr, nchange int, event uintptr, nevent int, timeout *Timespec) (n int, errno int)
 
 func Kevent(kq int, changes, events []Kevent_t, timeout *Timespec) (n int, errno int) {
-	var change, event uintptr;
+	var change, event uintptr
 	if len(changes) > 0 {
 		change = uintptr(unsafe.Pointer(&changes[0]))
 	}
 	if len(events) > 0 {
 		event = uintptr(unsafe.Pointer(&events[0]))
 	}
-	return kevent(kq, change, len(changes), event, len(events), timeout);
+	return kevent(kq, change, len(changes), event, len(events), timeout)
 }
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (errno int) = SYS___SYSCTL
 
 // Translate "kern.hostname" to []_C_int{0,1,2,3}.
 func nametomib(name string) (mib []_C_int, errno int) {
-	const CTL_MAXNAME = 12;
-	const siz = uintptr(unsafe.Sizeof(mib[0]));
+	const CTL_MAXNAME = 12
+	const siz = uintptr(unsafe.Sizeof(mib[0]))
 
 	// NOTE(rsc): It seems strange to set the buffer to have
 	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
@@ -392,29 +392,29 @@ func nametomib(name string) (mib []_C_int, errno int) {
 	// I am scared that if we don't include the +2 here, the kernel
 	// will silently write 2 words farther than we specify
 	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int;
-	n := uintptr(CTL_MAXNAME) * siz;
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
 
-	p := (*byte)(unsafe.Pointer(&buf[0]));
-	bytes := StringByteSlice(name);
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes := StringByteSlice(name)
 
 	// Magic sysctl: "setting" 0.3 to a string name
 	// lets you read back the array of integers form.
 	if errno = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); errno != 0 {
 		return nil, errno
 	}
-	return buf[0 : n/siz], 0;
+	return buf[0 : n/siz], 0
 }
 
 func Sysctl(name string) (value string, errno int) {
 	// Translate name to mib number.
-	mib, errno := nametomib(name);
+	mib, errno := nametomib(name)
 	if errno != 0 {
 		return "", errno
 	}
 
 	// Find size.
-	n := uintptr(0);
+	n := uintptr(0)
 	if errno = sysctl(mib, nil, &n, nil, 0); errno != 0 {
 		return "", errno
 	}
@@ -423,7 +423,7 @@ func Sysctl(name string) (value string, errno int) {
 	}
 
 	// Read into buffer of that size.
-	buf := make([]byte, n);
+	buf := make([]byte, n)
 	if errno = sysctl(mib, &buf[0], &n, nil, 0); errno != 0 {
 		return "", errno
 	}
@@ -432,26 +432,26 @@ func Sysctl(name string) (value string, errno int) {
 	if n > 0 && buf[n-1] == '\x00' {
 		n--
 	}
-	return string(buf[0:n]), 0;
+	return string(buf[0:n]), 0
 }
 
 func SysctlUint32(name string) (value uint32, errno int) {
 	// Translate name to mib number.
-	mib, errno := nametomib(name);
+	mib, errno := nametomib(name)
 	if errno != 0 {
 		return 0, errno
 	}
 
 	// Read into buffer of that size.
-	n := uintptr(4);
-	buf := make([]byte, 4);
+	n := uintptr(4)
+	buf := make([]byte, 4)
 	if errno = sysctl(mib, &buf[0], &n, nil, 0); errno != 0 {
 		return 0, errno
 	}
 	if n != 4 {
 		return 0, EIO
 	}
-	return *(*uint32)(unsafe.Pointer(&buf[0])), 0;
+	return *(*uint32)(unsafe.Pointer(&buf[0])), 0
 }
 
 // TODO: wrap
diff --git a/src/pkg/syscall/syscall_darwin_386.go b/src/pkg/syscall/syscall_darwin_386.go
index a5296fbd7..3fd72efe3 100644
--- a/src/pkg/syscall/syscall_darwin_386.go
+++ b/src/pkg/syscall/syscall_darwin_386.go
@@ -4,23 +4,23 @@
 
 package syscall
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
-func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9);
-	ts.Nsec = int32(nsec % 1e9);
-	return;
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
 }
 
-func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999;	// round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3);
-	tv.Sec = int32(nsec / 1e9);
-	return;
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int32(nsec / 1e9)
+	return
 }
 
 //sys	gettimeofday(tp *Timeval) (sec int32, usec int32, errno int)
@@ -28,14 +28,14 @@ func Gettimeofday(tv *Timeval) (errno int) {
 	// The tv passed to gettimeofday must be non-nil
 	// but is otherwise unused.  The answers come back
 	// in the two registers.
-	sec, usec, err := gettimeofday(tv);
-	tv.Sec = int32(sec);
-	tv.Usec = int32(usec);
-	return err;
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = int32(sec)
+	tv.Usec = int32(usec)
+	return err
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd);
-	k.Filter = int16(mode);
-	k.Flags = uint16(flags);
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
 }
diff --git a/src/pkg/syscall/syscall_darwin_amd64.go b/src/pkg/syscall/syscall_darwin_amd64.go
index 941124fb7..df8d37588 100644
--- a/src/pkg/syscall/syscall_darwin_amd64.go
+++ b/src/pkg/syscall/syscall_darwin_amd64.go
@@ -4,23 +4,23 @@
 
 package syscall
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
-func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9;
-	ts.Nsec = nsec % 1e9;
-	return;
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
 }
 
-func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999;	// round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3);
-	tv.Sec = int64(nsec / 1e9);
-	return;
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
 }
 
 //sys	gettimeofday(tp *Timeval) (sec int64, usec int32, errno int)
@@ -28,14 +28,14 @@ func Gettimeofday(tv *Timeval) (errno int) {
 	// The tv passed to gettimeofday must be non-nil
 	// but is otherwise unused.  The answers come back
 	// in the two registers.
-	sec, usec, err := gettimeofday(tv);
-	tv.Sec = sec;
-	tv.Usec = usec;
-	return err;
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = sec
+	tv.Usec = usec
+	return err
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd);
-	k.Filter = int16(mode);
-	k.Flags = uint16(flags);
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
 }
diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/pkg/syscall/syscall_freebsd.go
index e0ad92fad..9b4ecd320 100644
--- a/src/pkg/syscall/syscall_freebsd.go
+++ b/src/pkg/syscall/syscall_freebsd.go
@@ -23,7 +23,7 @@ const OS = "freebsd"
 // even linking this function into the binary.  See ../os/getwd.go.
 const ImplementsGetwd = false
 
-func Getwd() (string, int)	{ return "", ENOTSUP }
+func Getwd() (string, int) { return "", ENOTSUP }
 
 
 /*
@@ -34,7 +34,7 @@ func Getwd() (string, int)	{ return "", ENOTSUP }
 //sys	setgroups(ngid int, gid *_Gid_t) (errno int)
 
 func Getgroups() (gids []int, errno int) {
-	n, err := getgroups(0, nil);
+	n, err := getgroups(0, nil)
 	if err != 0 {
 		return nil, errno
 	}
@@ -47,16 +47,16 @@ func Getgroups() (gids []int, errno int) {
 		return nil, EINVAL
 	}
 
-	a := make([]_Gid_t, n);
-	n, err = getgroups(n, &a[0]);
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
 	if err != 0 {
 		return nil, errno
 	}
-	gids = make([]int, n);
+	gids = make([]int, n)
 	for i, v := range a[0:n] {
 		gids[i] = int(v)
 	}
-	return;
+	return
 }
 
 func Setgroups(gids []int) (errno int) {
@@ -64,11 +64,11 @@ func Setgroups(gids []int) (errno int) {
 		return setgroups(0, nil)
 	}
 
-	a := make([]_Gid_t, len(gids));
+	a := make([]_Gid_t, len(gids))
 	for i, v := range gids {
 		a[i] = _Gid_t(v)
 	}
-	return setgroups(len(a), &a[0]);
+	return setgroups(len(a), &a[0])
 }
 
 // Wait status is 7 bits at bottom, either 0 (exited),
@@ -80,44 +80,44 @@ func Setgroups(gids []int) (errno int) {
 type WaitStatus uint32
 
 const (
-	mask	= 0x7F;
-	core	= 0x80;
-	shift	= 8;
+	mask  = 0x7F
+	core  = 0x80
+	shift = 8
 
-	exited	= 0;
-	stopped	= 0x7F;
+	exited  = 0
+	stopped = 0x7F
 )
 
-func (w WaitStatus) Exited() bool	{ return w&mask == exited }
+func (w WaitStatus) Exited() bool { return w&mask == exited }
 
 func (w WaitStatus) ExitStatus() int {
 	if w&mask != exited {
 		return -1
 	}
-	return int(w >> shift);
+	return int(w >> shift)
 }
 
-func (w WaitStatus) Signaled() bool	{ return w&mask != stopped && w&mask != 0 }
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
 
 func (w WaitStatus) Signal() int {
-	sig := int(w & mask);
+	sig := int(w & mask)
 	if sig == stopped || sig == 0 {
 		return -1
 	}
-	return sig;
+	return sig
 }
 
-func (w WaitStatus) CoreDump() bool	{ return w.Signaled() && w&core != 0 }
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
 
-func (w WaitStatus) Stopped() bool	{ return w&mask == stopped && w>>shift != SIGSTOP }
+func (w WaitStatus) Stopped() bool { return w&mask == stopped && w>>shift != SIGSTOP }
 
-func (w WaitStatus) Continued() bool	{ return w&mask == stopped && w>>shift == SIGSTOP }
+func (w WaitStatus) Continued() bool { return w&mask == stopped && w>>shift == SIGSTOP }
 
 func (w WaitStatus) StopSignal() int {
 	if !w.Stopped() {
 		return -1
 	}
-	return int(w>>shift) & 0xFF;
+	return int(w>>shift) & 0xFF
 }
 
 func (w WaitStatus) TrapCause() int {
@@ -128,12 +128,12 @@ func (w WaitStatus) TrapCause() int {
 //sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int)
 
 func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, errno int) {
-	var status _C_int;
-	wpid, errno = wait4(pid, &status, options, rusage);
+	var status _C_int
+	wpid, errno = wait4(pid, &status, options, rusage)
 	if wstatus != nil {
 		*wstatus = WaitStatus(status)
 	}
-	return;
+	return
 }
 
 //sys	pipe() (r int, w int, errno int)
@@ -142,13 +142,13 @@ func Pipe(p []int) (errno int) {
 	if len(p) != 2 {
 		return EINVAL
 	}
-	p[0], p[1], errno = pipe();
-	return;
+	p[0], p[1], errno = pipe()
+	return
 }
 
 func Sleep(ns int64) (errno int) {
-	tv := NsecToTimeval(ns);
-	return Select(0, nil, nil, nil, &tv);
+	tv := NsecToTimeval(ns)
+	return Select(0, nil, nil, nil, &tv)
 }
 
 //sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int)
@@ -165,173 +165,173 @@ func Sleep(ns int64) (errno int) {
 var SocketDisableIPv6 bool
 
 type Sockaddr interface {
-	sockaddr() (ptr uintptr, len _Socklen, errno int);	// lowercase; only we can define Sockaddrs
+	sockaddr() (ptr uintptr, len _Socklen, errno int) // lowercase; only we can define Sockaddrs
 }
 
 type SockaddrInet4 struct {
-	Port	int;
-	Addr	[4]byte;
-	raw	RawSockaddrInet4;
+	Port int
+	Addr [4]byte
+	raw  RawSockaddrInet4
 }
 
 func (sa *SockaddrInet4) sockaddr() (uintptr, _Socklen, int) {
 	if sa.Port < 0 || sa.Port > 0xFFFF {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Len = SizeofSockaddrInet4;
-	sa.raw.Family = AF_INET;
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port));
-	p[0] = byte(sa.Port >> 8);
-	p[1] = byte(sa.Port);
+	sa.raw.Len = SizeofSockaddrInet4
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
 	for i := 0; i < len(sa.Addr); i++ {
 		sa.raw.Addr[i] = sa.Addr[i]
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0
 }
 
 type SockaddrInet6 struct {
-	Port	int;
-	Addr	[16]byte;
-	raw	RawSockaddrInet6;
+	Port int
+	Addr [16]byte
+	raw  RawSockaddrInet6
 }
 
 func (sa *SockaddrInet6) sockaddr() (uintptr, _Socklen, int) {
 	if sa.Port < 0 || sa.Port > 0xFFFF {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Len = SizeofSockaddrInet6;
-	sa.raw.Family = AF_INET6;
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port));
-	p[0] = byte(sa.Port >> 8);
-	p[1] = byte(sa.Port);
+	sa.raw.Len = SizeofSockaddrInet6
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
 	for i := 0; i < len(sa.Addr); i++ {
 		sa.raw.Addr[i] = sa.Addr[i]
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0
 }
 
 type SockaddrUnix struct {
-	Name	string;
-	raw	RawSockaddrUnix;
+	Name string
+	raw  RawSockaddrUnix
 }
 
 func (sa *SockaddrUnix) sockaddr() (uintptr, _Socklen, int) {
-	name := sa.Name;
-	n := len(name);
+	name := sa.Name
+	n := len(name)
 	if n >= len(sa.raw.Path) || n == 0 {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Len = byte(3 + n);	// 2 for Family, Len; 1 for NUL
-	sa.raw.Family = AF_UNIX;
+	sa.raw.Len = byte(3 + n) // 2 for Family, Len; 1 for NUL
+	sa.raw.Family = AF_UNIX
 	for i := 0; i < n; i++ {
 		sa.raw.Path[i] = int8(name[i])
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), _Socklen(sa.raw.Len), 0
 }
 
 func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) {
 	switch rsa.Addr.Family {
 	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa));
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
 		if pp.Len < 3 || pp.Len > SizeofSockaddrUnix {
 			return nil, EINVAL
 		}
-		sa := new(SockaddrUnix);
-		n := int(pp.Len) - 3;	// subtract leading Family, Len, terminating NUL
+		sa := new(SockaddrUnix)
+		n := int(pp.Len) - 3 // subtract leading Family, Len, terminating NUL
 		for i := 0; i < n; i++ {
 			if pp.Path[i] == 0 {
 				// found early NUL; assume Len is overestimating
-				n = i;
-				break;
+				n = i
+				break
 			}
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]));
-		sa.Name = string(bytes[0:n]);
-		return sa, 0;
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))
+		sa.Name = string(bytes[0:n])
+		return sa, 0
 
 	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa));
-		sa := new(SockaddrInet4);
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port));
-		sa.Port = int(p[0])<<8 + int(p[1]);
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
 		for i := 0; i < len(sa.Addr); i++ {
 			sa.Addr[i] = pp.Addr[i]
 		}
-		return sa, 0;
+		return sa, 0
 
 	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa));
-		sa := new(SockaddrInet6);
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port));
-		sa.Port = int(p[0])<<8 + int(p[1]);
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
 		for i := 0; i < len(sa.Addr); i++ {
 			sa.Addr[i] = pp.Addr[i]
 		}
-		return sa, 0;
+		return sa, 0
 	}
-	return nil, EAFNOSUPPORT;
+	return nil, EAFNOSUPPORT
 }
 
 func Accept(fd int) (nfd int, sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
-	nfd, errno = accept(fd, &rsa, &len);
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, errno = accept(fd, &rsa, &len)
 	if errno != 0 {
 		return
 	}
-	sa, errno = anyToSockaddr(&rsa);
+	sa, errno = anyToSockaddr(&rsa)
 	if errno != 0 {
-		Close(nfd);
-		nfd = 0;
+		Close(nfd)
+		nfd = 0
 	}
-	return;
+	return
 }
 
 func Getsockname(fd int) (sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if errno = getsockname(fd, &rsa, &len); errno != 0 {
 		return
 	}
-	return anyToSockaddr(&rsa);
+	return anyToSockaddr(&rsa)
 }
 
 func Getpeername(fd int) (sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if errno = getpeername(fd, &rsa, &len); errno != 0 {
 		return
 	}
-	return anyToSockaddr(&rsa);
+	return anyToSockaddr(&rsa)
 }
 
 func Bind(fd int, sa Sockaddr) (errno int) {
-	ptr, n, err := sa.sockaddr();
+	ptr, n, err := sa.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return bind(fd, ptr, n);
+	return bind(fd, ptr, n)
 }
 
 func Connect(fd int, sa Sockaddr) (errno int) {
-	ptr, n, err := sa.sockaddr();
+	ptr, n, err := sa.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return connect(fd, ptr, n);
+	return connect(fd, ptr, n)
 }
 
 func Socket(domain, typ, proto int) (fd, errno int) {
 	if domain == AF_INET6 && SocketDisableIPv6 {
 		return -1, EAFNOSUPPORT
 	}
-	fd, errno = socket(domain, typ, proto);
-	return;
+	fd, errno = socket(domain, typ, proto)
+	return
 }
 
 func SetsockoptInt(fd, level, opt int, value int) (errno int) {
-	var n = int32(value);
-	return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&n)), 4);
+	var n = int32(value)
+	return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&n)), 4)
 }
 
 func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (errno int) {
@@ -346,44 +346,44 @@ func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) {
 //sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int)
 
 func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if n, errno = recvfrom(fd, p, flags, &rsa, &len); errno != 0 {
 		return
 	}
-	from, errno = anyToSockaddr(&rsa);
-	return;
+	from, errno = anyToSockaddr(&rsa)
+	return
 }
 
 //sys sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int)
 
 func Sendto(fd int, p []byte, flags int, to Sockaddr) (errno int) {
-	ptr, n, err := to.sockaddr();
+	ptr, n, err := to.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return sendto(fd, p, flags, ptr, n);
+	return sendto(fd, p, flags, ptr, n)
 }
 
 //sys	kevent(kq int, change uintptr, nchange int, event uintptr, nevent int, timeout *Timespec) (n int, errno int)
 
 func Kevent(kq int, changes, events []Kevent_t, timeout *Timespec) (n int, errno int) {
-	var change, event uintptr;
+	var change, event uintptr
 	if len(changes) > 0 {
 		change = uintptr(unsafe.Pointer(&changes[0]))
 	}
 	if len(events) > 0 {
 		event = uintptr(unsafe.Pointer(&events[0]))
 	}
-	return kevent(kq, change, len(changes), event, len(events), timeout);
+	return kevent(kq, change, len(changes), event, len(events), timeout)
 }
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (errno int) = SYS___SYSCTL
 
 // Translate "kern.hostname" to []_C_int{0,1,2,3}.
 func nametomib(name string) (mib []_C_int, errno int) {
-	const CTL_MAXNAME = 12;
-	const siz = uintptr(unsafe.Sizeof(mib[0]));
+	const CTL_MAXNAME = 12
+	const siz = uintptr(unsafe.Sizeof(mib[0]))
 
 	// NOTE(rsc): It seems strange to set the buffer to have
 	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
@@ -392,29 +392,29 @@ func nametomib(name string) (mib []_C_int, errno int) {
 	// I am scared that if we don't include the +2 here, the kernel
 	// will silently write 2 words farther than we specify
 	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int;
-	n := uintptr(CTL_MAXNAME) * siz;
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
 
-	p := (*byte)(unsafe.Pointer(&buf[0]));
-	bytes := StringByteSlice(name);
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes := StringByteSlice(name)
 
 	// Magic sysctl: "setting" 0.3 to a string name
 	// lets you read back the array of integers form.
 	if errno = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); errno != 0 {
 		return nil, errno
 	}
-	return buf[0 : n/siz], 0;
+	return buf[0 : n/siz], 0
 }
 
 func Sysctl(name string) (value string, errno int) {
 	// Translate name to mib number.
-	mib, errno := nametomib(name);
+	mib, errno := nametomib(name)
 	if errno != 0 {
 		return "", errno
 	}
 
 	// Find size.
-	n := uintptr(0);
+	n := uintptr(0)
 	if errno = sysctl(mib, nil, &n, nil, 0); errno != 0 {
 		return "", errno
 	}
@@ -423,7 +423,7 @@ func Sysctl(name string) (value string, errno int) {
 	}
 
 	// Read into buffer of that size.
-	buf := make([]byte, n);
+	buf := make([]byte, n)
 	if errno = sysctl(mib, &buf[0], &n, nil, 0); errno != 0 {
 		return "", errno
 	}
@@ -432,26 +432,26 @@ func Sysctl(name string) (value string, errno int) {
 	if n > 0 && buf[n-1] == '\x00' {
 		n--
 	}
-	return string(buf[0:n]), 0;
+	return string(buf[0:n]), 0
 }
 
 func SysctlUint32(name string) (value uint32, errno int) {
 	// Translate name to mib number.
-	mib, errno := nametomib(name);
+	mib, errno := nametomib(name)
 	if errno != 0 {
 		return 0, errno
 	}
 
 	// Read into buffer of that size.
-	n := uintptr(4);
-	buf := make([]byte, 4);
+	n := uintptr(4)
+	buf := make([]byte, 4)
 	if errno = sysctl(mib, &buf[0], &n, nil, 0); errno != 0 {
 		return 0, errno
 	}
 	if n != 4 {
 		return 0, EIO
 	}
-	return *(*uint32)(unsafe.Pointer(&buf[0])), 0;
+	return *(*uint32)(unsafe.Pointer(&buf[0])), 0
 }
 
 // TODO: wrap
diff --git a/src/pkg/syscall/syscall_freebsd_386.go b/src/pkg/syscall/syscall_freebsd_386.go
index a85950508..0aa577ee6 100644
--- a/src/pkg/syscall/syscall_freebsd_386.go
+++ b/src/pkg/syscall/syscall_freebsd_386.go
@@ -4,27 +4,27 @@
 
 package syscall
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
-func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9);
-	ts.Nsec = int32(nsec % 1e9);
-	return;
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
 }
 
-func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999;	// round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3);
-	tv.Sec = int32(nsec / 1e9);
-	return;
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int32(nsec / 1e9)
+	return
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd);
-	k.Filter = int16(mode);
-	k.Flags = uint16(flags);
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
 }
diff --git a/src/pkg/syscall/syscall_freebsd_amd64.go b/src/pkg/syscall/syscall_freebsd_amd64.go
index 70a4df8f8..ef5aff6ef 100644
--- a/src/pkg/syscall/syscall_freebsd_amd64.go
+++ b/src/pkg/syscall/syscall_freebsd_amd64.go
@@ -4,27 +4,27 @@
 
 package syscall
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
-func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9;
-	ts.Nsec = nsec % 1e9;
-	return;
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
 }
 
-func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999;	// round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3;
-	tv.Sec = int64(nsec / 1e9);
-	return;
+	nsec += 999 // round up to microsecond
+	tv.Usec = nsec % 1e9 / 1e3
+	tv.Sec = int64(nsec / 1e9)
+	return
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd);
-	k.Filter = int16(mode);
-	k.Flags = uint16(flags);
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
 }
diff --git a/src/pkg/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index 0c2d1aa79..53ddf1c0e 100644
--- a/src/pkg/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
@@ -24,11 +24,11 @@ func Pipe(p []int) (errno int) {
 	if len(p) != 2 {
 		return EINVAL
 	}
-	var pp [2]_C_int;
-	errno = pipe(&pp);
-	p[0] = int(pp[0]);
-	p[1] = int(pp[1]);
-	return;
+	var pp [2]_C_int
+	errno = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
 }
 
 //sys	utimes(path string, times *[2]Timeval) (errno int)
@@ -36,7 +36,7 @@ func Utimes(path string, tv []Timeval) (errno int) {
 	if len(tv) != 2 {
 		return EINVAL
 	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])));
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
 //sys	futimesat(dirfd int, path string, times *[2]Timeval) (errno int)
@@ -44,15 +44,15 @@ func Futimesat(dirfd int, path string, tv []Timeval) (errno int) {
 	if len(tv) != 2 {
 		return EINVAL
 	}
-	return futimesat(dirfd, path, (*[2]Timeval)(unsafe.Pointer(&tv[0])));
+	return futimesat(dirfd, path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
 const ImplementsGetwd = true
 
 //sys	Getcwd(buf []byte) (n int, errno int)
 func Getwd() (wd string, errno int) {
-	var buf [PathMax]byte;
-	n, err := Getcwd(&buf);
+	var buf [PathMax]byte
+	n, err := Getcwd(&buf)
 	if err != 0 {
 		return "", err
 	}
@@ -60,11 +60,11 @@ func Getwd() (wd string, errno int) {
 	if n < 1 || n > len(buf) || buf[n-1] != 0 {
 		return "", EINVAL
 	}
-	return string(buf[0 : n-1]), 0;
+	return string(buf[0 : n-1]), 0
 }
 
 func Getgroups() (gids []int, errno int) {
-	n, err := getgroups(0, nil);
+	n, err := getgroups(0, nil)
 	if err != 0 {
 		return nil, errno
 	}
@@ -77,16 +77,16 @@ func Getgroups() (gids []int, errno int) {
 		return nil, EINVAL
 	}
 
-	a := make([]_Gid_t, n);
-	n, err = getgroups(n, &a[0]);
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
 	if err != 0 {
 		return nil, errno
 	}
-	gids = make([]int, n);
+	gids = make([]int, n)
 	for i, v := range a[0:n] {
 		gids[i] = int(v)
 	}
-	return;
+	return
 }
 
 func Setgroups(gids []int) (errno int) {
@@ -94,11 +94,11 @@ func Setgroups(gids []int) (errno int) {
 		return setgroups(0, nil)
 	}
 
-	a := make([]_Gid_t, len(gids));
+	a := make([]_Gid_t, len(gids))
 	for i, v := range gids {
 		a[i] = _Gid_t(v)
 	}
-	return setgroups(len(a), &a[0]);
+	return setgroups(len(a), &a[0])
 }
 
 type WaitStatus uint32
@@ -113,65 +113,65 @@ type WaitStatus uint32
 // from stopped via the core dump bit.
 
 const (
-	mask	= 0x7F;
-	core	= 0x80;
-	exited	= 0x00;
-	stopped	= 0x7F;
-	shift	= 8;
+	mask    = 0x7F
+	core    = 0x80
+	exited  = 0x00
+	stopped = 0x7F
+	shift   = 8
 )
 
-func (w WaitStatus) Exited() bool	{ return w&mask == exited }
+func (w WaitStatus) Exited() bool { return w&mask == exited }
 
-func (w WaitStatus) Signaled() bool	{ return w&mask != stopped && w&mask != exited }
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != exited }
 
-func (w WaitStatus) Stopped() bool	{ return w&0xFF == stopped }
+func (w WaitStatus) Stopped() bool { return w&0xFF == stopped }
 
-func (w WaitStatus) Continued() bool	{ return w == 0xFFFF }
+func (w WaitStatus) Continued() bool { return w == 0xFFFF }
 
-func (w WaitStatus) CoreDump() bool	{ return w.Signaled() && w&core != 0 }
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
 
 func (w WaitStatus) ExitStatus() int {
 	if !w.Exited() {
 		return -1
 	}
-	return int(w>>shift) & 0xFF;
+	return int(w>>shift) & 0xFF
 }
 
 func (w WaitStatus) Signal() int {
 	if !w.Signaled() {
 		return -1
 	}
-	return int(w & mask);
+	return int(w & mask)
 }
 
 func (w WaitStatus) StopSignal() int {
 	if !w.Stopped() {
 		return -1
 	}
-	return int(w>>shift) & 0xFF;
+	return int(w>>shift) & 0xFF
 }
 
 func (w WaitStatus) TrapCause() int {
 	if w.StopSignal() != SIGTRAP {
 		return -1
 	}
-	return int(w>>shift) >> 8;
+	return int(w>>shift) >> 8
 }
 
 //sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int)
 func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, errno int) {
-	var status _C_int;
-	wpid, errno = wait4(pid, &status, options, rusage);
+	var status _C_int
+	wpid, errno = wait4(pid, &status, options, rusage)
 	if wstatus != nil {
 		*wstatus = WaitStatus(status)
 	}
-	return;
+	return
 }
 
 func Sleep(nsec int64) (errno int) {
-	tv := NsecToTimeval(nsec);
-	_, err := Select(0, nil, nil, nil, &tv);
-	return err;
+	tv := NsecToTimeval(nsec)
+	_, err := Select(0, nil, nil, nil, &tv)
+	return err
 }
 
 // For testing: clients can set this flag to force
@@ -179,61 +179,61 @@ func Sleep(nsec int64) (errno int) {
 var SocketDisableIPv6 bool
 
 type Sockaddr interface {
-	sockaddr() (ptr uintptr, len _Socklen, errno int);	// lowercase; only we can define Sockaddrs
+	sockaddr() (ptr uintptr, len _Socklen, errno int) // lowercase; only we can define Sockaddrs
 }
 
 type SockaddrInet4 struct {
-	Port	int;
-	Addr	[4]byte;
-	raw	RawSockaddrInet4;
+	Port int
+	Addr [4]byte
+	raw  RawSockaddrInet4
 }
 
 func (sa *SockaddrInet4) sockaddr() (uintptr, _Socklen, int) {
 	if sa.Port < 0 || sa.Port > 0xFFFF {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Family = AF_INET;
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port));
-	p[0] = byte(sa.Port >> 8);
-	p[1] = byte(sa.Port);
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
 	for i := 0; i < len(sa.Addr); i++ {
 		sa.raw.Addr[i] = sa.Addr[i]
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), SizeofSockaddrInet4, 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), SizeofSockaddrInet4, 0
 }
 
 type SockaddrInet6 struct {
-	Port	int;
-	Addr	[16]byte;
-	raw	RawSockaddrInet6;
+	Port int
+	Addr [16]byte
+	raw  RawSockaddrInet6
 }
 
 func (sa *SockaddrInet6) sockaddr() (uintptr, _Socklen, int) {
 	if sa.Port < 0 || sa.Port > 0xFFFF {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Family = AF_INET6;
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port));
-	p[0] = byte(sa.Port >> 8);
-	p[1] = byte(sa.Port);
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
 	for i := 0; i < len(sa.Addr); i++ {
 		sa.raw.Addr[i] = sa.Addr[i]
 	}
-	return uintptr(unsafe.Pointer(&sa.raw)), SizeofSockaddrInet6, 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), SizeofSockaddrInet6, 0
 }
 
 type SockaddrUnix struct {
-	Name	string;
-	raw	RawSockaddrUnix;
+	Name string
+	raw  RawSockaddrUnix
 }
 
 func (sa *SockaddrUnix) sockaddr() (uintptr, _Socklen, int) {
-	name := sa.Name;
-	n := len(name);
+	name := sa.Name
+	n := len(name)
 	if n >= len(sa.raw.Path) || n == 0 {
 		return 0, 0, EINVAL
 	}
-	sa.raw.Family = AF_UNIX;
+	sa.raw.Family = AF_UNIX
 	for i := 0; i < n; i++ {
 		sa.raw.Path[i] = int8(name[i])
 	}
@@ -242,14 +242,14 @@ func (sa *SockaddrUnix) sockaddr() (uintptr, _Socklen, int) {
 	}
 
 	// length is family, name, NUL.
-	return uintptr(unsafe.Pointer(&sa.raw)), 1 + _Socklen(n) + 1, 0;
+	return uintptr(unsafe.Pointer(&sa.raw)), 1 + _Socklen(n) + 1, 0
 }
 
 func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) {
 	switch rsa.Addr.Family {
 	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa));
-		sa := new(SockaddrUnix);
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
+		sa := new(SockaddrUnix)
 		if pp.Path[0] == 0 {
 			// "Abstract" Unix domain socket.
 			// Rewrite leading NUL as @ for textual display.
@@ -264,97 +264,97 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, int) {
 		// abstract Unix domain sockets--they are supposed
 		// to be uninterpreted fixed-size binary blobs--but
 		// everyone uses this convention.
-		n := 0;
+		n := 0
 		for n < len(pp.Path) && pp.Path[n] != 0 {
 			n++
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]));
-		sa.Name = string(bytes[0:n]);
-		return sa, 0;
+		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))
+		sa.Name = string(bytes[0:n])
+		return sa, 0
 
 	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa));
-		sa := new(SockaddrInet4);
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port));
-		sa.Port = int(p[0])<<8 + int(p[1]);
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
 		for i := 0; i < len(sa.Addr); i++ {
 			sa.Addr[i] = pp.Addr[i]
 		}
-		return sa, 0;
+		return sa, 0
 
 	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa));
-		sa := new(SockaddrInet6);
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port));
-		sa.Port = int(p[0])<<8 + int(p[1]);
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
 		for i := 0; i < len(sa.Addr); i++ {
 			sa.Addr[i] = pp.Addr[i]
 		}
-		return sa, 0;
+		return sa, 0
 	}
-	return nil, EAFNOSUPPORT;
+	return nil, EAFNOSUPPORT
 }
 
 func Accept(fd int) (nfd int, sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
-	nfd, errno = accept(fd, &rsa, &len);
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, errno = accept(fd, &rsa, &len)
 	if errno != 0 {
 		return
 	}
-	sa, errno = anyToSockaddr(&rsa);
+	sa, errno = anyToSockaddr(&rsa)
 	if errno != 0 {
-		Close(nfd);
-		nfd = 0;
+		Close(nfd)
+		nfd = 0
 	}
-	return;
+	return
 }
 
 func Getsockname(fd int) (sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if errno = getsockname(fd, &rsa, &len); errno != 0 {
 		return
 	}
-	return anyToSockaddr(&rsa);
+	return anyToSockaddr(&rsa)
 }
 
 func Getpeername(fd int) (sa Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if errno = getpeername(fd, &rsa, &len); errno != 0 {
 		return
 	}
-	return anyToSockaddr(&rsa);
+	return anyToSockaddr(&rsa)
 }
 
 func Bind(fd int, sa Sockaddr) (errno int) {
-	ptr, n, err := sa.sockaddr();
+	ptr, n, err := sa.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return bind(fd, ptr, n);
+	return bind(fd, ptr, n)
 }
 
 func Connect(fd int, sa Sockaddr) (errno int) {
-	ptr, n, err := sa.sockaddr();
+	ptr, n, err := sa.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return connect(fd, ptr, n);
+	return connect(fd, ptr, n)
 }
 
 func Socket(domain, typ, proto int) (fd, errno int) {
 	if domain == AF_INET6 && SocketDisableIPv6 {
 		return -1, EAFNOSUPPORT
 	}
-	fd, errno = socket(domain, typ, proto);
-	return;
+	fd, errno = socket(domain, typ, proto)
+	return
 }
 
 func SetsockoptInt(fd, level, opt int, value int) (errno int) {
-	var n = int32(value);
-	return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&n)), 4);
+	var n = int32(value)
+	return setsockopt(fd, level, opt, uintptr(unsafe.Pointer(&n)), 4)
 }
 
 func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (errno int) {
@@ -366,21 +366,21 @@ func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) {
 }
 
 func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, errno int) {
-	var rsa RawSockaddrAny;
-	var len _Socklen = SizeofSockaddrAny;
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
 	if n, errno = recvfrom(fd, p, flags, &rsa, &len); errno != 0 {
 		return
 	}
-	from, errno = anyToSockaddr(&rsa);
-	return;
+	from, errno = anyToSockaddr(&rsa)
+	return
 }
 
 func Sendto(fd int, p []byte, flags int, to Sockaddr) (errno int) {
-	ptr, n, err := to.sockaddr();
+	ptr, n, err := to.sockaddr()
 	if err != 0 {
 		return err
 	}
-	return sendto(fd, p, flags, ptr, n);
+	return sendto(fd, p, flags, ptr, n)
 }
 
 //sys	ptrace(request int, pid int, addr uintptr, data uintptr) (errno int)
@@ -392,37 +392,37 @@ func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, errno in
 	// The ptrace syscall differs from glibc's ptrace.
 	// Peeks returns the word in *data, not as the return value.
 
-	var buf [sizeofPtr]byte;
+	var buf [sizeofPtr]byte
 
 	// Leading edge.  PEEKTEXT/PEEKDATA don't require aligned
 	// access (PEEKUSER warns that it might), but if we don't
 	// align our reads, we might straddle an unmapped page
 	// boundary and not get the bytes leading up to the page
 	// boundary.
-	n := 0;
+	n := 0
 	if addr%sizeofPtr != 0 {
-		errno = ptrace(req, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])));
+		errno = ptrace(req, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
 		if errno != 0 {
 			return 0, errno
 		}
-		n += copy(out, buf[addr%sizeofPtr:]);
-		out = out[n:];
+		n += copy(out, buf[addr%sizeofPtr:])
+		out = out[n:]
 	}
 
 	// Remainder.
 	for len(out) > 0 {
 		// We use an internal buffer to gaurantee alignment.
 		// It's not documented if this is necessary, but we're paranoid.
-		errno = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])));
+		errno = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
 		if errno != 0 {
 			return n, errno
 		}
-		copied := copy(out, &buf);
-		n += copied;
-		out = out[copied:];
+		copied := copy(out, &buf)
+		n += copied
+		out = out[copied:]
 	}
 
-	return n, 0;
+	return n, 0
 }
 
 func PtracePeekText(pid int, addr uintptr, out []byte) (count int, errno int) {
@@ -438,50 +438,50 @@ func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (c
 	// with the possibility of straddling an invalid page.
 
 	// Leading edge.
-	n := 0;
+	n := 0
 	if addr%sizeofPtr != 0 {
-		var buf [sizeofPtr]byte;
-		errno = ptrace(peekReq, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])));
+		var buf [sizeofPtr]byte
+		errno = ptrace(peekReq, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
 		if errno != 0 {
 			return 0, errno
 		}
-		n += copy(buf[addr%sizeofPtr:], data);
-		word := *((*uintptr)(unsafe.Pointer(&buf[0])));
-		errno = ptrace(pokeReq, pid, addr-addr%sizeofPtr, word);
+		n += copy(buf[addr%sizeofPtr:], data)
+		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
+		errno = ptrace(pokeReq, pid, addr-addr%sizeofPtr, word)
 		if errno != 0 {
 			return 0, errno
 		}
-		data = data[n:];
+		data = data[n:]
 	}
 
 	// Interior.
 	for len(data) > sizeofPtr {
-		word := *((*uintptr)(unsafe.Pointer(&data[0])));
-		errno = ptrace(pokeReq, pid, addr+uintptr(n), word);
+		word := *((*uintptr)(unsafe.Pointer(&data[0])))
+		errno = ptrace(pokeReq, pid, addr+uintptr(n), word)
 		if errno != 0 {
 			return n, errno
 		}
-		n += sizeofPtr;
-		data = data[sizeofPtr:];
+		n += sizeofPtr
+		data = data[sizeofPtr:]
 	}
 
 	// Trailing edge.
 	if len(data) > 0 {
-		var buf [sizeofPtr]byte;
-		errno = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])));
+		var buf [sizeofPtr]byte
+		errno = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
 		if errno != 0 {
 			return n, errno
 		}
-		copy(&buf, data);
-		word := *((*uintptr)(unsafe.Pointer(&buf[0])));
-		errno = ptrace(pokeReq, pid, addr+uintptr(n), word);
+		copy(&buf, data)
+		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
+		errno = ptrace(pokeReq, pid, addr+uintptr(n), word)
 		if errno != 0 {
 			return n, errno
 		}
-		n += len(data);
+		n += len(data)
 	}
 
-	return n, 0;
+	return n, 0
 }
 
 func PtracePokeText(pid int, addr uintptr, data []byte) (count int, errno int) {
@@ -505,21 +505,21 @@ func PtraceSetOptions(pid int, options int) (errno int) {
 }
 
 func PtraceGetEventMsg(pid int) (msg uint, errno int) {
-	var data _C_long;
-	errno = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)));
-	msg = uint(data);
-	return;
+	var data _C_long
+	errno = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)))
+	msg = uint(data)
+	return
 }
 
 func PtraceCont(pid int, signal int) (errno int) {
 	return ptrace(PTRACE_CONT, pid, 0, uintptr(signal))
 }
 
-func PtraceSingleStep(pid int) (errno int)	{ return ptrace(PTRACE_SINGLESTEP, pid, 0, 0) }
+func PtraceSingleStep(pid int) (errno int) { return ptrace(PTRACE_SINGLESTEP, pid, 0, 0) }
 
-func PtraceAttach(pid int) (errno int)	{ return ptrace(PTRACE_ATTACH, pid, 0, 0) }
+func PtraceAttach(pid int) (errno int) { return ptrace(PTRACE_ATTACH, pid, 0, 0) }
 
-func PtraceDetach(pid int) (errno int)	{ return ptrace(PTRACE_DETACH, pid, 0, 0) }
+func PtraceDetach(pid int) (errno int) { return ptrace(PTRACE_DETACH, pid, 0, 0) }
 
 // Sendto
 // Recvfrom
diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go
index 8f212f32b..4dfaddc43 100644
--- a/src/pkg/syscall/syscall_linux_386.go
+++ b/src/pkg/syscall/syscall_linux_386.go
@@ -6,23 +6,23 @@ package syscall
 
 import "unsafe"
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
-func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9);
-	ts.Nsec = int32(nsec % 1e9);
-	return;
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
 }
 
-func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999;	// round up to microsecond
-	tv.Sec = int32(nsec / 1e9);
-	tv.Usec = int32(nsec % 1e9 / 1e3);
-	return;
+	nsec += 999 // round up to microsecond
+	tv.Sec = int32(nsec / 1e9)
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	return
 }
 
 // 64-bit file system and 32-bit uid calls
@@ -64,102 +64,102 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, errno int)
 
 const (
 	// see linux/net.h
-	_SOCKET		= 1;
-	_BIND		= 2;
-	_CONNECT	= 3;
-	_LISTEN		= 4;
-	_ACCEPT		= 5;
-	_GETSOCKNAME	= 6;
-	_GETPEERNAME	= 7;
-	_SOCKETPAIR	= 8;
-	_SEND		= 9;
-	_RECV		= 10;
-	_SENDTO		= 11;
-	_RECVFROM	= 12;
-	_SHUTDOWN	= 13;
-	_SETSOCKOPT	= 14;
-	_GETSOCKOPT	= 15;
-	_SENDMSG	= 16;
-	_RECVMSG	= 17;
+	_SOCKET      = 1
+	_BIND        = 2
+	_CONNECT     = 3
+	_LISTEN      = 4
+	_ACCEPT      = 5
+	_GETSOCKNAME = 6
+	_GETPEERNAME = 7
+	_SOCKETPAIR  = 8
+	_SEND        = 9
+	_RECV        = 10
+	_SENDTO      = 11
+	_RECVFROM    = 12
+	_SHUTDOWN    = 13
+	_SETSOCKOPT  = 14
+	_GETSOCKOPT  = 15
+	_SENDMSG     = 16
+	_RECVMSG     = 17
 )
 
 func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, errno int)
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
-	fd, errno = socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0);
-	return;
+	fd, errno = socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	return
 }
 
 func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, errno = socketcall(_GETSOCKNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0);
-	return;
+	_, errno = socketcall(_GETSOCKNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	return
 }
 
 func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, errno = socketcall(_GETPEERNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0);
-	return;
+	_, errno = socketcall(_GETPEERNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	return
 }
 
 func bind(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, errno = socketcall(_BIND, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0);
-	return;
+	_, errno = socketcall(_BIND, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	return
 }
 
 func connect(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, errno = socketcall(_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0);
-	return;
+	_, errno = socketcall(_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	return
 }
 
 func socket(domain int, typ int, proto int) (fd int, errno int) {
-	fd, errno = socketcall(_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0);
-	return;
+	fd, errno = socketcall(_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
+	return
 }
 
 func setsockopt(s int, level int, name int, val uintptr, vallen int) (errno int) {
-	_, errno = socketcall(_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0);
-	return;
+	_, errno = socketcall(_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	return
 }
 
 func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) {
-	var base uintptr;
+	var base uintptr
 	if len(p) > 0 {
 		base = uintptr(unsafe.Pointer(&p[0]))
 	}
-	n, errno = socketcall(_RECVFROM, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)));
-	return;
+	n, errno = socketcall(_RECVFROM, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	return
 }
 
 func sendto(s int, p []byte, flags int, to uintptr, addrlen _Socklen) (errno int) {
-	var base uintptr;
+	var base uintptr
 	if len(p) > 0 {
 		base = uintptr(unsafe.Pointer(&p[0]))
 	}
-	_, errno = socketcall(_SENDTO, uintptr(s), base, uintptr(len(p)), uintptr(flags), to, uintptr(addrlen));
-	return;
+	_, errno = socketcall(_SENDTO, uintptr(s), base, uintptr(len(p)), uintptr(flags), to, uintptr(addrlen))
+	return
 }
 
 func Listen(s int, n int) (errno int) {
-	_, errno = socketcall(_LISTEN, uintptr(s), uintptr(n), 0, 0, 0, 0);
-	return;
+	_, errno = socketcall(_LISTEN, uintptr(s), uintptr(n), 0, 0, 0, 0)
+	return
 }
 
 func Shutdown(s, how int) (errno int) {
-	_, errno = socketcall(_SHUTDOWN, uintptr(s), uintptr(how), 0, 0, 0, 0);
-	return;
+	_, errno = socketcall(_SHUTDOWN, uintptr(s), uintptr(how), 0, 0, 0, 0)
+	return
 }
 
 func Fstatfs(fd int, buf *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Sizeof(*buf)), uintptr(unsafe.Pointer(buf)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Sizeof(*buf)), uintptr(unsafe.Pointer(buf)))
+	errno = int(e1)
+	return
 }
 
 func Statfs(path string, buf *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Sizeof(*buf)), uintptr(unsafe.Pointer(buf)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Sizeof(*buf)), uintptr(unsafe.Pointer(buf)))
+	errno = int(e1)
+	return
 }
 
-func (r *PtraceRegs) PC() uint64	{ return uint64(uint32(r.Eip)) }
+func (r *PtraceRegs) PC() uint64 { return uint64(uint32(r.Eip)) }
 
-func (r *PtraceRegs) SetPC(pc uint64)	{ r.Eip = int32(pc) }
+func (r *PtraceRegs) SetPC(pc uint64) { r.Eip = int32(pc) }
diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/pkg/syscall/syscall_linux_amd64.go
index e3a3daed6..8e5471af7 100644
--- a/src/pkg/syscall/syscall_linux_amd64.go
+++ b/src/pkg/syscall/syscall_linux_amd64.go
@@ -42,25 +42,25 @@ package syscall
 //sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int)
 //sys	sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int)
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
-func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9;
-	ts.Nsec = nsec % 1e9;
-	return;
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
 }
 
-func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999;	// round up to microsecond
-	tv.Sec = nsec / 1e9;
-	tv.Usec = nsec % 1e9 / 1e3;
-	return;
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
 }
 
-func (r *PtraceRegs) PC() uint64	{ return r.Rip }
+func (r *PtraceRegs) PC() uint64 { return r.Rip }
 
-func (r *PtraceRegs) SetPC(pc uint64)	{ r.Rip = pc }
+func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }
diff --git a/src/pkg/syscall/syscall_linux_arm.go b/src/pkg/syscall/syscall_linux_arm.go
index 86731bf41..390f8a853 100644
--- a/src/pkg/syscall/syscall_linux_arm.go
+++ b/src/pkg/syscall/syscall_linux_arm.go
@@ -4,21 +4,21 @@
 
 package syscall
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
-func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9);
-	ts.Nsec = int32(nsec % 1e9);
-	return;
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999;	// round up to microsecond
-	tv.Sec = int32(nsec / 1e9);
-	tv.Usec = int32(nsec % 1e9 / 1e3);
-	return;
+	nsec += 999 // round up to microsecond
+	tv.Sec = int32(nsec / 1e9)
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	return
 }
 
 //sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int)
@@ -58,6 +58,6 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 //sys	Statfs(path string, buf *Statfs_t) (errno int)
 
 // TODO(kaib): add support for tracing
-func (r *PtraceRegs) PC() uint64	{ return 0 }
+func (r *PtraceRegs) PC() uint64 { return 0 }
 
-func (r *PtraceRegs) SetPC(pc uint64)	{}
+func (r *PtraceRegs) SetPC(pc uint64) {}
diff --git a/src/pkg/syscall/syscall_nacl.go b/src/pkg/syscall/syscall_nacl.go
index a3f6740c9..6a5d9c2d6 100644
--- a/src/pkg/syscall/syscall_nacl.go
+++ b/src/pkg/syscall/syscall_nacl.go
@@ -54,8 +54,8 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
 	if int64(int32(offset)) != offset {
 		return 0, ERANGE
 	}
-	o, _, e := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence));
-	return int64(o), int(e);
+	o, _, e := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	return int64(o), int(e)
 }
 
 // Sleep by waiting on a condition variable that will never be signaled.
@@ -63,34 +63,34 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
 var tcv, tmu int
 
 func init() {
-	tmu, _ = MutexCreate();
-	tcv, _ = CondCreate();
+	tmu, _ = MutexCreate()
+	tcv, _ = CondCreate()
 }
 
 func Sleep(ns int64) (errno int) {
-	ts := NsecToTimespec(ns);
-	var tv Timeval;
+	ts := NsecToTimespec(ns)
+	var tv Timeval
 	if errno = Gettimeofday(&tv); errno != 0 {
 		return
 	}
-	ts.Sec += tv.Sec;
-	ts.Nsec += tv.Usec * 1000;
+	ts.Sec += tv.Sec
+	ts.Nsec += tv.Usec * 1000
 	switch {
 	case ts.Nsec >= 1e9:
-		ts.Nsec -= 1e9;
-		ts.Sec++;
+		ts.Nsec -= 1e9
+		ts.Sec++
 	case ts.Nsec <= -1e9:
-		ts.Nsec += 1e9;
-		ts.Sec--;
+		ts.Nsec += 1e9
+		ts.Sec--
 	}
 	if errno = MutexLock(tmu); errno != 0 {
 		return
 	}
-	errno = CondTimedWaitAbs(tcv, tmu, &ts);
+	errno = CondTimedWaitAbs(tcv, tmu, &ts)
 	if e := MutexUnlock(tmu); e != 0 && errno == 0 {
 		errno = e
 	}
-	return;
+	return
 }
 
 // Implemented in NaCl but not here; maybe later:
@@ -111,10 +111,10 @@ func Sleep(ns int64) (errno int) {
 // Not implemented in NaCl but needed to compile other packages.
 
 const (
-	SIGTRAP = 5;
+	SIGTRAP = 5
 )
 
-func Pipe(p []int) (errno int)	{ return ENACL }
+func Pipe(p []int) (errno int) { return ENACL }
 
 func fcntl(fd, cmd, arg int) (val int, errno int) {
 	return 0, ENACL
@@ -128,25 +128,25 @@ func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
 	return 0, ENACL
 }
 
-func Mkdir(path string, mode int) (errno int)	{ return ENACL }
+func Mkdir(path string, mode int) (errno int) { return ENACL }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
 	return ENACL
 }
 
-func Chdir(path string) (errno int)	{ return ENACL }
+func Chdir(path string) (errno int) { return ENACL }
 
-func Fchdir(fd int) (errno int)	{ return ENACL }
+func Fchdir(fd int) (errno int) { return ENACL }
 
-func Unlink(path string) (errno int)	{ return ENACL }
+func Unlink(path string) (errno int) { return ENACL }
 
-func Rmdir(path string) (errno int)	{ return ENACL }
+func Rmdir(path string) (errno int) { return ENACL }
 
 func Link(oldpath, newpath string) (errno int) {
 	return ENACL
 }
 
-func Symlink(path, link string) (errno int)	{ return ENACL }
+func Symlink(path, link string) (errno int) { return ENACL }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
 	return 0, ENACL
@@ -156,7 +156,7 @@ func Rename(oldpath, newpath string) (errno int) {
 	return ENACL
 }
 
-func Fchmod(fd int, mode int) (errno int)	{ return ENACL }
+func Fchmod(fd int, mode int) (errno int) { return ENACL }
 
 func Chown(path string, uid int, gid int) (errno int) {
 	return ENACL
@@ -184,65 +184,65 @@ func Ftruncate(fd int, length int64) (errno int) {
 
 const ImplementsGetwd = true
 
-func Getwd() (wd string, errno int)	{ return "", ENACL }
+func Getwd() (wd string, errno int) { return "", ENACL }
 
-func Getuid() (uid int)	{ return -1 }
+func Getuid() (uid int) { return -1 }
 
-func Geteuid() (euid int)	{ return -1 }
+func Geteuid() (euid int) { return -1 }
 
-func Getgid() (gid int)	{ return -1 }
+func Getgid() (gid int) { return -1 }
 
-func Getegid() (egid int)	{ return -1 }
+func Getegid() (egid int) { return -1 }
 
-func Getppid() (ppid int)	{ return -1 }
+func Getppid() (ppid int) { return -1 }
 
-func Getgroups() (gids []int, errno int)	{ return nil, ENACL }
+func Getgroups() (gids []int, errno int) { return nil, ENACL }
 
 type Sockaddr interface {
-	sockaddr();
+	sockaddr()
 }
 
 type SockaddrInet4 struct {
-	Port	int;
-	Addr	[4]byte;
+	Port int
+	Addr [4]byte
 }
 
-func (*SockaddrInet4) sockaddr()	{}
+func (*SockaddrInet4) sockaddr() {}
 
 type SockaddrInet6 struct {
-	Port	int;
-	Addr	[16]byte;
+	Port int
+	Addr [16]byte
 }
 
-func (*SockaddrInet6) sockaddr()	{}
+func (*SockaddrInet6) sockaddr() {}
 
 type SockaddrUnix struct {
-	Name string;
+	Name string
 }
 
-func (*SockaddrUnix) sockaddr()	{}
+func (*SockaddrUnix) sockaddr() {}
 
 const (
-	AF_INET	= 1 + iota;
-	AF_INET6;
-	AF_UNIX;
-	IPPROTO_TCP;
-	SOCK_DGRAM;
-	SOCK_STREAM;
-	SOL_SOCKET;
-	SOMAXCONN;
-	SO_DONTROUTE;
-	SO_KEEPALIVE;
-	SO_LINGER;
-	SO_RCVBUF;
-	SO_REUSEADDR;
-	SO_SNDBUF;
-	TCP_NODELAY;
-	WNOHANG;
-	WSTOPPED;
-	PTRACE_TRACEME;
-	SO_BROADCAST	= 0;
-	SHUT_RDWR	= 0;
+	AF_INET = 1 + iota
+	AF_INET6
+	AF_UNIX
+	IPPROTO_TCP
+	SOCK_DGRAM
+	SOCK_STREAM
+	SOL_SOCKET
+	SOMAXCONN
+	SO_DONTROUTE
+	SO_KEEPALIVE
+	SO_LINGER
+	SO_RCVBUF
+	SO_REUSEADDR
+	SO_SNDBUF
+	TCP_NODELAY
+	WNOHANG
+	WSTOPPED
+	PTRACE_TRACEME
+	SO_BROADCAST = 0
+	SHUT_RDWR    = 0
 )
 
 func Accept(fd int) (nfd int, sa Sockaddr, errno int) {
@@ -257,9 +257,9 @@ func Getpeername(fd int) (sa Sockaddr, errno int) {
 	return nil, ENACL
 }
 
-func Bind(fd int, sa Sockaddr) (errno int)	{ return ENACL }
+func Bind(fd int, sa Sockaddr) (errno int) { return ENACL }
 
-func Connect(fd int, sa Sockaddr) (errno int)	{ return ENACL }
+func Connect(fd int, sa Sockaddr) (errno int) { return ENACL }
 
 func Socket(domain, typ, proto int) (fd, errno int) {
 	return 0, ENACL
@@ -269,7 +269,7 @@ func SetsockoptInt(fd, level, opt int, value int) (errno int) {
 	return ENACL
 }
 
-func Shutdown(fd, how int) (errno int)	{ return ENACL }
+func Shutdown(fd, how int) (errno int) { return ENACL }
 
 func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, errno int) {
 	return 0, nil, ENACL
@@ -284,33 +284,33 @@ func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (errno int) {
 }
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) {
 	return ENACL
 }
 
-func Listen(s int, n int) (errno int)	{ return ENACL }
+func Listen(s int, n int) (errno int) { return ENACL }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int32;
-	Ixrss		int32;
-	Idrss		int32;
-	Isrss		int32;
-	Minflt		int32;
-	Majflt		int32;
-	Nswap		int32;
-	Inblock		int32;
-	Oublock		int32;
-	Msgsnd		int32;
-	Msgrcv		int32;
-	Nsignals	int32;
-	Nvcsw		int32;
-	Nivcsw		int32;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
 }
 
 func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, errno int) {
@@ -319,20 +319,20 @@ func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int,
 
 type WaitStatus uint32
 
-func (WaitStatus) Exited() bool	{ return false }
+func (WaitStatus) Exited() bool { return false }
 
-func (WaitStatus) ExitStatus() int	{ return -1 }
+func (WaitStatus) ExitStatus() int { return -1 }
 
-func (WaitStatus) Signal() int	{ return -1 }
+func (WaitStatus) Signal() int { return -1 }
 
-func (WaitStatus) CoreDump() bool	{ return false }
+func (WaitStatus) CoreDump() bool { return false }
 
-func (WaitStatus) Stopped() bool	{ return false }
+func (WaitStatus) Stopped() bool { return false }
 
-func (WaitStatus) Continued() bool	{ return false }
+func (WaitStatus) Continued() bool { return false }
 
-func (WaitStatus) StopSignal() int	{ return -1 }
+func (WaitStatus) StopSignal() int { return -1 }
 
-func (WaitStatus) Signaled() bool	{ return false }
+func (WaitStatus) Signaled() bool { return false }
 
-func (WaitStatus) TrapCause() int	{ return -1 }
+func (WaitStatus) TrapCause() int { return -1 }
diff --git a/src/pkg/syscall/syscall_nacl_386.go b/src/pkg/syscall/syscall_nacl_386.go
index 22626cbd3..86ed66f88 100644
--- a/src/pkg/syscall/syscall_nacl_386.go
+++ b/src/pkg/syscall/syscall_nacl_386.go
@@ -4,16 +4,16 @@
 
 package syscall
 
-func Getpagesize() int	{ return 4096 }
+func Getpagesize() int { return 4096 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
-	tv.Sec = int32(nsec / 1e9);
-	tv.Usec = int32(nsec % 1e9 / 1e3);
-	return;
+	tv.Sec = int32(nsec / 1e9)
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	return
 }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9);
-	ts.Nsec = int32(nsec % 1e9);
-	return;
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
 }
diff --git a/src/pkg/syscall/zerrors_darwin_386.go b/src/pkg/syscall/zerrors_darwin_386.go
index 84a07e3c2..76660a844 100644
--- a/src/pkg/syscall/zerrors_darwin_386.go
+++ b/src/pkg/syscall/zerrors_darwin_386.go
@@ -9,525 +9,525 @@ package syscall
 
 // Constants
 const (
-	AF_APPLETALK			= 0x10;
-	AF_CCITT			= 0xa;
-	AF_CHAOS			= 0x5;
-	AF_CNT				= 0x15;
-	AF_COIP				= 0x14;
-	AF_DATAKIT			= 0x9;
-	AF_DECnet			= 0xc;
-	AF_DLI				= 0xd;
-	AF_E164				= 0x1c;
-	AF_ECMA				= 0x8;
-	AF_HYLINK			= 0xf;
-	AF_IEEE80211			= 0x25;
-	AF_IMPLINK			= 0x3;
-	AF_INET				= 0x2;
-	AF_INET6			= 0x1e;
-	AF_IPX				= 0x17;
-	AF_ISDN				= 0x1c;
-	AF_ISO				= 0x7;
-	AF_LAT				= 0xe;
-	AF_LINK				= 0x12;
-	AF_LOCAL			= 0x1;
-	AF_MAX				= 0x26;
-	AF_NATM				= 0x1f;
-	AF_NDRV				= 0x1b;
-	AF_NETBIOS			= 0x21;
-	AF_NS				= 0x6;
-	AF_OSI				= 0x7;
-	AF_PPP				= 0x22;
-	AF_PUP				= 0x4;
-	AF_RESERVED_36			= 0x24;
-	AF_ROUTE			= 0x11;
-	AF_SIP				= 0x18;
-	AF_SNA				= 0xb;
-	AF_SYSTEM			= 0x20;
-	AF_UNIX				= 0x1;
-	AF_UNSPEC			= 0;
-	E2BIG				= 0x7;
-	EACCES				= 0xd;
-	EADDRINUSE			= 0x30;
-	EADDRNOTAVAIL			= 0x31;
-	EAFNOSUPPORT			= 0x2f;
-	EAGAIN				= 0x23;
-	EALREADY			= 0x25;
-	EAUTH				= 0x50;
-	EBADARCH			= 0x56;
-	EBADEXEC			= 0x55;
-	EBADF				= 0x9;
-	EBADMACHO			= 0x58;
-	EBADMSG				= 0x5e;
-	EBADRPC				= 0x48;
-	EBUSY				= 0x10;
-	ECANCELED			= 0x59;
-	ECHILD				= 0xa;
-	ECONNABORTED			= 0x35;
-	ECONNREFUSED			= 0x3d;
-	ECONNRESET			= 0x36;
-	EDEADLK				= 0xb;
-	EDESTADDRREQ			= 0x27;
-	EDEVERR				= 0x53;
-	EDOM				= 0x21;
-	EDQUOT				= 0x45;
-	EEXIST				= 0x11;
-	EFAULT				= 0xe;
-	EFBIG				= 0x1b;
-	EFTYPE				= 0x4f;
-	EHOSTDOWN			= 0x40;
-	EHOSTUNREACH			= 0x41;
-	EIDRM				= 0x5a;
-	EILSEQ				= 0x5c;
-	EINPROGRESS			= 0x24;
-	EINTR				= 0x4;
-	EINVAL				= 0x16;
-	EIO				= 0x5;
-	EISCONN				= 0x38;
-	EISDIR				= 0x15;
-	ELAST				= 0x67;
-	ELOOP				= 0x3e;
-	EMFILE				= 0x18;
-	EMLINK				= 0x1f;
-	EMSGSIZE			= 0x28;
-	EMULTIHOP			= 0x5f;
-	ENAMETOOLONG			= 0x3f;
-	ENEEDAUTH			= 0x51;
-	ENETDOWN			= 0x32;
-	ENETRESET			= 0x34;
-	ENETUNREACH			= 0x33;
-	ENFILE				= 0x17;
-	ENOATTR				= 0x5d;
-	ENOBUFS				= 0x37;
-	ENODATA				= 0x60;
-	ENODEV				= 0x13;
-	ENOENT				= 0x2;
-	ENOEXEC				= 0x8;
-	ENOLCK				= 0x4d;
-	ENOLINK				= 0x61;
-	ENOMEM				= 0xc;
-	ENOMSG				= 0x5b;
-	ENOPOLICY			= 0x67;
-	ENOPROTOOPT			= 0x2a;
-	ENOSPC				= 0x1c;
-	ENOSR				= 0x62;
-	ENOSTR				= 0x63;
-	ENOSYS				= 0x4e;
-	ENOTBLK				= 0xf;
-	ENOTCONN			= 0x39;
-	ENOTDIR				= 0x14;
-	ENOTEMPTY			= 0x42;
-	ENOTSOCK			= 0x26;
-	ENOTSUP				= 0x2d;
-	ENOTTY				= 0x19;
-	ENXIO				= 0x6;
-	EOPNOTSUPP			= 0x66;
-	EOVERFLOW			= 0x54;
-	EPERM				= 0x1;
-	EPFNOSUPPORT			= 0x2e;
-	EPIPE				= 0x20;
-	EPROCLIM			= 0x43;
-	EPROCUNAVAIL			= 0x4c;
-	EPROGMISMATCH			= 0x4b;
-	EPROGUNAVAIL			= 0x4a;
-	EPROTO				= 0x64;
-	EPROTONOSUPPORT			= 0x2b;
-	EPROTOTYPE			= 0x29;
-	EPWROFF				= 0x52;
-	ERANGE				= 0x22;
-	EREMOTE				= 0x47;
-	EROFS				= 0x1e;
-	ERPCMISMATCH			= 0x49;
-	ESHLIBVERS			= 0x57;
-	ESHUTDOWN			= 0x3a;
-	ESOCKTNOSUPPORT			= 0x2c;
-	ESPIPE				= 0x1d;
-	ESRCH				= 0x3;
-	ESTALE				= 0x46;
-	ETIME				= 0x65;
-	ETIMEDOUT			= 0x3c;
-	ETOOMANYREFS			= 0x3b;
-	ETXTBSY				= 0x1a;
-	EUSERS				= 0x44;
-	EVFILT_AIO			= -0x3;
-	EVFILT_FS			= -0x9;
-	EVFILT_MACHPORT			= -0x8;
-	EVFILT_PROC			= -0x5;
-	EVFILT_READ			= -0x1;
-	EVFILT_SESSION			= -0xb;
-	EVFILT_SIGNAL			= -0x6;
-	EVFILT_SYSCOUNT			= 0xb;
-	EVFILT_THREADMARKER		= 0xb;
-	EVFILT_TIMER			= -0x7;
-	EVFILT_USER			= -0xa;
-	EVFILT_VNODE			= -0x4;
-	EVFILT_WRITE			= -0x2;
-	EV_ADD				= 0x1;
-	EV_CLEAR			= 0x20;
-	EV_DELETE			= 0x2;
-	EV_DISABLE			= 0x8;
-	EV_DISPATCH			= 0x80;
-	EV_ENABLE			= 0x4;
-	EV_EOF				= 0x8000;
-	EV_ERROR			= 0x4000;
-	EV_FLAG0			= 0x1000;
-	EV_FLAG1			= 0x2000;
-	EV_ONESHOT			= 0x10;
-	EV_OOBAND			= 0x2000;
-	EV_POLL				= 0x1000;
-	EV_RECEIPT			= 0x40;
-	EV_SYSFLAGS			= 0xf000;
-	EV_TRIGGER			= 0x100;
-	EWOULDBLOCK			= 0x23;
-	EXDEV				= 0x12;
-	FD_CLOEXEC			= 0x1;
-	FD_SETSIZE			= 0x400;
-	F_ADDFILESIGS			= 0x3d;
-	F_ADDSIGS			= 0x3b;
-	F_ALLOCATEALL			= 0x4;
-	F_ALLOCATECONTIG		= 0x2;
-	F_CHKCLEAN			= 0x29;
-	F_DUPFD				= 0;
-	F_FREEZE_FS			= 0x35;
-	F_FULLFSYNC			= 0x33;
-	F_GETFD				= 0x1;
-	F_GETFL				= 0x3;
-	F_GETLK				= 0x7;
-	F_GETOWN			= 0x5;
-	F_GETPATH			= 0x32;
-	F_GLOBAL_NOCACHE		= 0x37;
-	F_LOG2PHYS			= 0x31;
-	F_MARKDEPENDENCY		= 0x3c;
-	F_NOCACHE			= 0x30;
-	F_PATHPKG_CHECK			= 0x34;
-	F_PEOFPOSMODE			= 0x3;
-	F_PREALLOCATE			= 0x2a;
-	F_RDADVISE			= 0x2c;
-	F_RDAHEAD			= 0x2d;
-	F_RDLCK				= 0x1;
-	F_READBOOTSTRAP			= 0x2e;
-	F_SETFD				= 0x2;
-	F_SETFL				= 0x4;
-	F_SETLK				= 0x8;
-	F_SETLKW			= 0x9;
-	F_SETOWN			= 0x6;
-	F_SETSIZE			= 0x2b;
-	F_THAW_FS			= 0x36;
-	F_UNLCK				= 0x2;
-	F_VOLPOSMODE			= 0x4;
-	F_WRITEBOOTSTRAP		= 0x2f;
-	F_WRLCK				= 0x3;
-	IPPROTO_3PC			= 0x22;
-	IPPROTO_ADFS			= 0x44;
-	IPPROTO_AH			= 0x33;
-	IPPROTO_AHIP			= 0x3d;
-	IPPROTO_APES			= 0x63;
-	IPPROTO_ARGUS			= 0xd;
-	IPPROTO_AX25			= 0x5d;
-	IPPROTO_BHA			= 0x31;
-	IPPROTO_BLT			= 0x1e;
-	IPPROTO_BRSATMON		= 0x4c;
-	IPPROTO_CFTP			= 0x3e;
-	IPPROTO_CHAOS			= 0x10;
-	IPPROTO_CMTP			= 0x26;
-	IPPROTO_CPHB			= 0x49;
-	IPPROTO_CPNX			= 0x48;
-	IPPROTO_DDP			= 0x25;
-	IPPROTO_DGP			= 0x56;
-	IPPROTO_DIVERT			= 0xfe;
-	IPPROTO_DONE			= 0x101;
-	IPPROTO_DSTOPTS			= 0x3c;
-	IPPROTO_EGP			= 0x8;
-	IPPROTO_EMCON			= 0xe;
-	IPPROTO_ENCAP			= 0x62;
-	IPPROTO_EON			= 0x50;
-	IPPROTO_ESP			= 0x32;
-	IPPROTO_ETHERIP			= 0x61;
-	IPPROTO_FRAGMENT		= 0x2c;
-	IPPROTO_GGP			= 0x3;
-	IPPROTO_GMTP			= 0x64;
-	IPPROTO_GRE			= 0x2f;
-	IPPROTO_HELLO			= 0x3f;
-	IPPROTO_HMP			= 0x14;
-	IPPROTO_HOPOPTS			= 0;
-	IPPROTO_ICMP			= 0x1;
-	IPPROTO_ICMPV6			= 0x3a;
-	IPPROTO_IDP			= 0x16;
-	IPPROTO_IDPR			= 0x23;
-	IPPROTO_IDRP			= 0x2d;
-	IPPROTO_IGMP			= 0x2;
-	IPPROTO_IGP			= 0x55;
-	IPPROTO_IGRP			= 0x58;
-	IPPROTO_IL			= 0x28;
-	IPPROTO_INLSP			= 0x34;
-	IPPROTO_INP			= 0x20;
-	IPPROTO_IP			= 0;
-	IPPROTO_IPCOMP			= 0x6c;
-	IPPROTO_IPCV			= 0x47;
-	IPPROTO_IPEIP			= 0x5e;
-	IPPROTO_IPIP			= 0x4;
-	IPPROTO_IPPC			= 0x43;
-	IPPROTO_IPV4			= 0x4;
-	IPPROTO_IPV6			= 0x29;
-	IPPROTO_IRTP			= 0x1c;
-	IPPROTO_KRYPTOLAN		= 0x41;
-	IPPROTO_LARP			= 0x5b;
-	IPPROTO_LEAF1			= 0x19;
-	IPPROTO_LEAF2			= 0x1a;
-	IPPROTO_MAX			= 0x100;
-	IPPROTO_MAXID			= 0x34;
-	IPPROTO_MEAS			= 0x13;
-	IPPROTO_MHRP			= 0x30;
-	IPPROTO_MICP			= 0x5f;
-	IPPROTO_MTP			= 0x5c;
-	IPPROTO_MUX			= 0x12;
-	IPPROTO_ND			= 0x4d;
-	IPPROTO_NHRP			= 0x36;
-	IPPROTO_NONE			= 0x3b;
-	IPPROTO_NSP			= 0x1f;
-	IPPROTO_NVPII			= 0xb;
-	IPPROTO_OSPFIGP			= 0x59;
-	IPPROTO_PGM			= 0x71;
-	IPPROTO_PIGP			= 0x9;
-	IPPROTO_PIM			= 0x67;
-	IPPROTO_PRM			= 0x15;
-	IPPROTO_PUP			= 0xc;
-	IPPROTO_PVP			= 0x4b;
-	IPPROTO_RAW			= 0xff;
-	IPPROTO_RCCMON			= 0xa;
-	IPPROTO_RDP			= 0x1b;
-	IPPROTO_ROUTING			= 0x2b;
-	IPPROTO_RSVP			= 0x2e;
-	IPPROTO_RVD			= 0x42;
-	IPPROTO_SATEXPAK		= 0x40;
-	IPPROTO_SATMON			= 0x45;
-	IPPROTO_SCCSP			= 0x60;
-	IPPROTO_SDRP			= 0x2a;
-	IPPROTO_SEP			= 0x21;
-	IPPROTO_SRPC			= 0x5a;
-	IPPROTO_ST			= 0x7;
-	IPPROTO_SVMTP			= 0x52;
-	IPPROTO_SWIPE			= 0x35;
-	IPPROTO_TCF			= 0x57;
-	IPPROTO_TCP			= 0x6;
-	IPPROTO_TP			= 0x1d;
-	IPPROTO_TPXX			= 0x27;
-	IPPROTO_TRUNK1			= 0x17;
-	IPPROTO_TRUNK2			= 0x18;
-	IPPROTO_TTP			= 0x54;
-	IPPROTO_UDP			= 0x11;
-	IPPROTO_VINES			= 0x53;
-	IPPROTO_VISA			= 0x46;
-	IPPROTO_VMTP			= 0x51;
-	IPPROTO_WBEXPAK			= 0x4f;
-	IPPROTO_WBMON			= 0x4e;
-	IPPROTO_WSN			= 0x4a;
-	IPPROTO_XNET			= 0xf;
-	IPPROTO_XTP			= 0x24;
-	IP_ADD_MEMBERSHIP		= 0xc;
-	IP_BOUND_IF			= 0x19;
-	IP_DEFAULT_MULTICAST_LOOP	= 0x1;
-	IP_DEFAULT_MULTICAST_TTL	= 0x1;
-	IP_DROP_MEMBERSHIP		= 0xd;
-	IP_DUMMYNET_CONFIGURE		= 0x3c;
-	IP_DUMMYNET_DEL			= 0x3d;
-	IP_DUMMYNET_FLUSH		= 0x3e;
-	IP_DUMMYNET_GET			= 0x40;
-	IP_FAITH			= 0x16;
-	IP_FW_ADD			= 0x28;
-	IP_FW_DEL			= 0x29;
-	IP_FW_FLUSH			= 0x2a;
-	IP_FW_GET			= 0x2c;
-	IP_FW_RESETLOG			= 0x2d;
-	IP_FW_ZERO			= 0x2b;
-	IP_HDRINCL			= 0x2;
-	IP_IPSEC_POLICY			= 0x15;
-	IP_MAX_MEMBERSHIPS		= 0x14;
-	IP_MULTICAST_IF			= 0x9;
-	IP_MULTICAST_LOOP		= 0xb;
-	IP_MULTICAST_TTL		= 0xa;
-	IP_MULTICAST_VIF		= 0xe;
-	IP_NAT__XXX			= 0x37;
-	IP_OLD_FW_ADD			= 0x32;
-	IP_OLD_FW_DEL			= 0x33;
-	IP_OLD_FW_FLUSH			= 0x34;
-	IP_OLD_FW_GET			= 0x36;
-	IP_OLD_FW_RESETLOG		= 0x38;
-	IP_OLD_FW_ZERO			= 0x35;
-	IP_OPTIONS			= 0x1;
-	IP_PORTRANGE			= 0x13;
-	IP_PORTRANGE_DEFAULT		= 0;
-	IP_PORTRANGE_HIGH		= 0x1;
-	IP_PORTRANGE_LOW		= 0x2;
-	IP_RECVDSTADDR			= 0x7;
-	IP_RECVIF			= 0x14;
-	IP_RECVOPTS			= 0x5;
-	IP_RECVRETOPTS			= 0x6;
-	IP_RECVTTL			= 0x18;
-	IP_RETOPTS			= 0x8;
-	IP_RSVP_OFF			= 0x10;
-	IP_RSVP_ON			= 0xf;
-	IP_RSVP_VIF_OFF			= 0x12;
-	IP_RSVP_VIF_ON			= 0x11;
-	IP_STRIPHDR			= 0x17;
-	IP_TOS				= 0x3;
-	IP_TRAFFIC_MGT_BACKGROUND	= 0x41;
-	IP_TTL				= 0x4;
-	O_ACCMODE			= 0x3;
-	O_ALERT				= 0x20000000;
-	O_APPEND			= 0x8;
-	O_ASYNC				= 0x40;
-	O_CREAT				= 0x200;
-	O_DIRECTORY			= 0x100000;
-	O_DSYNC				= 0x400000;
-	O_EVTONLY			= 0x8000;
-	O_EXCL				= 0x800;
-	O_EXLOCK			= 0x20;
-	O_FSYNC				= 0x80;
-	O_NDELAY			= 0x4;
-	O_NOCTTY			= 0x20000;
-	O_NOFOLLOW			= 0x100;
-	O_NONBLOCK			= 0x4;
-	O_POPUP				= 0x80000000;
-	O_RDONLY			= 0;
-	O_RDWR				= 0x2;
-	O_SHLOCK			= 0x10;
-	O_SYMLINK			= 0x200000;
-	O_SYNC				= 0x80;
-	O_TRUNC				= 0x400;
-	O_WRONLY			= 0x1;
-	SHUT_RD				= 0;
-	SHUT_RDWR			= 0x2;
-	SHUT_WR				= 0x1;
-	SIGABRT				= 0x6;
-	SIGALRM				= 0xe;
-	SIGBUS				= 0xa;
-	SIGCHLD				= 0x14;
-	SIGCONT				= 0x13;
-	SIGEMT				= 0x7;
-	SIGFPE				= 0x8;
-	SIGHUP				= 0x1;
-	SIGILL				= 0x4;
-	SIGINFO				= 0x1d;
-	SIGINT				= 0x2;
-	SIGIO				= 0x17;
-	SIGIOT				= 0x6;
-	SIGKILL				= 0x9;
-	SIGPIPE				= 0xd;
-	SIGPROF				= 0x1b;
-	SIGQUIT				= 0x3;
-	SIGSEGV				= 0xb;
-	SIGSTOP				= 0x11;
-	SIGSYS				= 0xc;
-	SIGTERM				= 0xf;
-	SIGTRAP				= 0x5;
-	SIGTSTP				= 0x12;
-	SIGTTIN				= 0x15;
-	SIGTTOU				= 0x16;
-	SIGURG				= 0x10;
-	SIGUSR1				= 0x1e;
-	SIGUSR2				= 0x1f;
-	SIGVTALRM			= 0x1a;
-	SIGWINCH			= 0x1c;
-	SIGXCPU				= 0x18;
-	SIGXFSZ				= 0x19;
-	SOCK_DGRAM			= 0x2;
-	SOCK_MAXADDRLEN			= 0xff;
-	SOCK_RAW			= 0x3;
-	SOCK_RDM			= 0x4;
-	SOCK_SEQPACKET			= 0x5;
-	SOCK_STREAM			= 0x1;
-	SOL_SOCKET			= 0xffff;
-	SOMAXCONN			= 0x80;
-	SO_ACCEPTCONN			= 0x2;
-	SO_BROADCAST			= 0x20;
-	SO_DEBUG			= 0x1;
-	SO_DONTROUTE			= 0x10;
-	SO_DONTTRUNC			= 0x2000;
-	SO_ERROR			= 0x1007;
-	SO_KEEPALIVE			= 0x8;
-	SO_LABEL			= 0x1010;
-	SO_LINGER			= 0x80;
-	SO_LINGER_SEC			= 0x1080;
-	SO_NKE				= 0x1021;
-	SO_NOADDRERR			= 0x1023;
-	SO_NOSIGPIPE			= 0x1022;
-	SO_NOTIFYCONFLICT		= 0x1026;
-	SO_NP_EXTENSIONS		= 0x1083;
-	SO_NREAD			= 0x1020;
-	SO_NWRITE			= 0x1024;
-	SO_OOBINLINE			= 0x100;
-	SO_PEERLABEL			= 0x1011;
-	SO_RANDOMPORT			= 0x1082;
-	SO_RCVBUF			= 0x1002;
-	SO_RCVLOWAT			= 0x1004;
-	SO_RCVTIMEO			= 0x1006;
-	SO_RESTRICTIONS			= 0x1081;
-	SO_RESTRICT_DENYIN		= 0x1;
-	SO_RESTRICT_DENYOUT		= 0x2;
-	SO_RESTRICT_DENYSET		= 0x80000000;
-	SO_REUSEADDR			= 0x4;
-	SO_REUSEPORT			= 0x200;
-	SO_REUSESHAREUID		= 0x1025;
-	SO_SNDBUF			= 0x1001;
-	SO_SNDLOWAT			= 0x1003;
-	SO_SNDTIMEO			= 0x1005;
-	SO_TIMESTAMP			= 0x400;
-	SO_TYPE				= 0x1008;
-	SO_UPCALLCLOSEWAIT		= 0x1027;
-	SO_USELOOPBACK			= 0x40;
-	SO_WANTMORE			= 0x4000;
-	SO_WANTOOBFLAG			= 0x8000;
-	S_IEXEC				= 0x40;
-	S_IFBLK				= 0x6000;
-	S_IFCHR				= 0x2000;
-	S_IFDIR				= 0x4000;
-	S_IFIFO				= 0x1000;
-	S_IFLNK				= 0xa000;
-	S_IFMT				= 0xf000;
-	S_IFREG				= 0x8000;
-	S_IFSOCK			= 0xc000;
-	S_IFWHT				= 0xe000;
-	S_IREAD				= 0x100;
-	S_IRGRP				= 0x20;
-	S_IROTH				= 0x4;
-	S_IRUSR				= 0x100;
-	S_IRWXG				= 0x38;
-	S_IRWXO				= 0x7;
-	S_IRWXU				= 0x1c0;
-	S_ISGID				= 0x400;
-	S_ISTXT				= 0x200;
-	S_ISUID				= 0x800;
-	S_ISVTX				= 0x200;
-	S_IWGRP				= 0x10;
-	S_IWOTH				= 0x2;
-	S_IWRITE			= 0x80;
-	S_IWUSR				= 0x80;
-	S_IXGRP				= 0x8;
-	S_IXOTH				= 0x1;
-	S_IXUSR				= 0x40;
-	TCP_CONNECTIONTIMEOUT		= 0x20;
-	TCP_KEEPALIVE			= 0x10;
-	TCP_MAXBURST			= 0x4;
-	TCP_MAXHLEN			= 0x3c;
-	TCP_MAXOLEN			= 0x28;
-	TCP_MAXSEG			= 0x2;
-	TCP_MAXWIN			= 0xffff;
-	TCP_MAX_SACK			= 0x3;
-	TCP_MAX_WINSHIFT		= 0xe;
-	TCP_MINMSS			= 0xd8;
-	TCP_MINMSSOVERLOAD		= 0x3e8;
-	TCP_MSS				= 0x200;
-	TCP_NODELAY			= 0x1;
-	TCP_NOOPT			= 0x8;
-	TCP_NOPUSH			= 0x4;
-	WCONTINUED			= 0x10;
-	WCOREFLAG			= 0x80;
-	WEXITED				= 0x4;
-	WNOHANG				= 0x1;
-	WNOWAIT				= 0x20;
-	WORDSIZE			= 0x40;
-	WSTOPPED			= 0x7f;
-	WUNTRACED			= 0x2;
+	AF_APPLETALK              = 0x10
+	AF_CCITT                  = 0xa
+	AF_CHAOS                  = 0x5
+	AF_CNT                    = 0x15
+	AF_COIP                   = 0x14
+	AF_DATAKIT                = 0x9
+	AF_DECnet                 = 0xc
+	AF_DLI                    = 0xd
+	AF_E164                   = 0x1c
+	AF_ECMA                   = 0x8
+	AF_HYLINK                 = 0xf
+	AF_IEEE80211              = 0x25
+	AF_IMPLINK                = 0x3
+	AF_INET                   = 0x2
+	AF_INET6                  = 0x1e
+	AF_IPX                    = 0x17
+	AF_ISDN                   = 0x1c
+	AF_ISO                    = 0x7
+	AF_LAT                    = 0xe
+	AF_LINK                   = 0x12
+	AF_LOCAL                  = 0x1
+	AF_MAX                    = 0x26
+	AF_NATM                   = 0x1f
+	AF_NDRV                   = 0x1b
+	AF_NETBIOS                = 0x21
+	AF_NS                     = 0x6
+	AF_OSI                    = 0x7
+	AF_PPP                    = 0x22
+	AF_PUP                    = 0x4
+	AF_RESERVED_36            = 0x24
+	AF_ROUTE                  = 0x11
+	AF_SIP                    = 0x18
+	AF_SNA                    = 0xb
+	AF_SYSTEM                 = 0x20
+	AF_UNIX                   = 0x1
+	AF_UNSPEC                 = 0
+	E2BIG                     = 0x7
+	EACCES                    = 0xd
+	EADDRINUSE                = 0x30
+	EADDRNOTAVAIL             = 0x31
+	EAFNOSUPPORT              = 0x2f
+	EAGAIN                    = 0x23
+	EALREADY                  = 0x25
+	EAUTH                     = 0x50
+	EBADARCH                  = 0x56
+	EBADEXEC                  = 0x55
+	EBADF                     = 0x9
+	EBADMACHO                 = 0x58
+	EBADMSG                   = 0x5e
+	EBADRPC                   = 0x48
+	EBUSY                     = 0x10
+	ECANCELED                 = 0x59
+	ECHILD                    = 0xa
+	ECONNABORTED              = 0x35
+	ECONNREFUSED              = 0x3d
+	ECONNRESET                = 0x36
+	EDEADLK                   = 0xb
+	EDESTADDRREQ              = 0x27
+	EDEVERR                   = 0x53
+	EDOM                      = 0x21
+	EDQUOT                    = 0x45
+	EEXIST                    = 0x11
+	EFAULT                    = 0xe
+	EFBIG                     = 0x1b
+	EFTYPE                    = 0x4f
+	EHOSTDOWN                 = 0x40
+	EHOSTUNREACH              = 0x41
+	EIDRM                     = 0x5a
+	EILSEQ                    = 0x5c
+	EINPROGRESS               = 0x24
+	EINTR                     = 0x4
+	EINVAL                    = 0x16
+	EIO                       = 0x5
+	EISCONN                   = 0x38
+	EISDIR                    = 0x15
+	ELAST                     = 0x67
+	ELOOP                     = 0x3e
+	EMFILE                    = 0x18
+	EMLINK                    = 0x1f
+	EMSGSIZE                  = 0x28
+	EMULTIHOP                 = 0x5f
+	ENAMETOOLONG              = 0x3f
+	ENEEDAUTH                 = 0x51
+	ENETDOWN                  = 0x32
+	ENETRESET                 = 0x34
+	ENETUNREACH               = 0x33
+	ENFILE                    = 0x17
+	ENOATTR                   = 0x5d
+	ENOBUFS                   = 0x37
+	ENODATA                   = 0x60
+	ENODEV                    = 0x13
+	ENOENT                    = 0x2
+	ENOEXEC                   = 0x8
+	ENOLCK                    = 0x4d
+	ENOLINK                   = 0x61
+	ENOMEM                    = 0xc
+	ENOMSG                    = 0x5b
+	ENOPOLICY                 = 0x67
+	ENOPROTOOPT               = 0x2a
+	ENOSPC                    = 0x1c
+	ENOSR                     = 0x62
+	ENOSTR                    = 0x63
+	ENOSYS                    = 0x4e
+	ENOTBLK                   = 0xf
+	ENOTCONN                  = 0x39
+	ENOTDIR                   = 0x14
+	ENOTEMPTY                 = 0x42
+	ENOTSOCK                  = 0x26
+	ENOTSUP                   = 0x2d
+	ENOTTY                    = 0x19
+	ENXIO                     = 0x6
+	EOPNOTSUPP                = 0x66
+	EOVERFLOW                 = 0x54
+	EPERM                     = 0x1
+	EPFNOSUPPORT              = 0x2e
+	EPIPE                     = 0x20
+	EPROCLIM                  = 0x43
+	EPROCUNAVAIL              = 0x4c
+	EPROGMISMATCH             = 0x4b
+	EPROGUNAVAIL              = 0x4a
+	EPROTO                    = 0x64
+	EPROTONOSUPPORT           = 0x2b
+	EPROTOTYPE                = 0x29
+	EPWROFF                   = 0x52
+	ERANGE                    = 0x22
+	EREMOTE                   = 0x47
+	EROFS                     = 0x1e
+	ERPCMISMATCH              = 0x49
+	ESHLIBVERS                = 0x57
+	ESHUTDOWN                 = 0x3a
+	ESOCKTNOSUPPORT           = 0x2c
+	ESPIPE                    = 0x1d
+	ESRCH                     = 0x3
+	ESTALE                    = 0x46
+	ETIME                     = 0x65
+	ETIMEDOUT                 = 0x3c
+	ETOOMANYREFS              = 0x3b
+	ETXTBSY                   = 0x1a
+	EUSERS                    = 0x44
+	EVFILT_AIO                = -0x3
+	EVFILT_FS                 = -0x9
+	EVFILT_MACHPORT           = -0x8
+	EVFILT_PROC               = -0x5
+	EVFILT_READ               = -0x1
+	EVFILT_SESSION            = -0xb
+	EVFILT_SIGNAL             = -0x6
+	EVFILT_SYSCOUNT           = 0xb
+	EVFILT_THREADMARKER       = 0xb
+	EVFILT_TIMER              = -0x7
+	EVFILT_USER               = -0xa
+	EVFILT_VNODE              = -0x4
+	EVFILT_WRITE              = -0x2
+	EV_ADD                    = 0x1
+	EV_CLEAR                  = 0x20
+	EV_DELETE                 = 0x2
+	EV_DISABLE                = 0x8
+	EV_DISPATCH               = 0x80
+	EV_ENABLE                 = 0x4
+	EV_EOF                    = 0x8000
+	EV_ERROR                  = 0x4000
+	EV_FLAG0                  = 0x1000
+	EV_FLAG1                  = 0x2000
+	EV_ONESHOT                = 0x10
+	EV_OOBAND                 = 0x2000
+	EV_POLL                   = 0x1000
+	EV_RECEIPT                = 0x40
+	EV_SYSFLAGS               = 0xf000
+	EV_TRIGGER                = 0x100
+	EWOULDBLOCK               = 0x23
+	EXDEV                     = 0x12
+	FD_CLOEXEC                = 0x1
+	FD_SETSIZE                = 0x400
+	F_ADDFILESIGS             = 0x3d
+	F_ADDSIGS                 = 0x3b
+	F_ALLOCATEALL             = 0x4
+	F_ALLOCATECONTIG          = 0x2
+	F_CHKCLEAN                = 0x29
+	F_DUPFD                   = 0
+	F_FREEZE_FS               = 0x35
+	F_FULLFSYNC               = 0x33
+	F_GETFD                   = 0x1
+	F_GETFL                   = 0x3
+	F_GETLK                   = 0x7
+	F_GETOWN                  = 0x5
+	F_GETPATH                 = 0x32
+	F_GLOBAL_NOCACHE          = 0x37
+	F_LOG2PHYS                = 0x31
+	F_MARKDEPENDENCY          = 0x3c
+	F_NOCACHE                 = 0x30
+	F_PATHPKG_CHECK           = 0x34
+	F_PEOFPOSMODE             = 0x3
+	F_PREALLOCATE             = 0x2a
+	F_RDADVISE                = 0x2c
+	F_RDAHEAD                 = 0x2d
+	F_RDLCK                   = 0x1
+	F_READBOOTSTRAP           = 0x2e
+	F_SETFD                   = 0x2
+	F_SETFL                   = 0x4
+	F_SETLK                   = 0x8
+	F_SETLKW                  = 0x9
+	F_SETOWN                  = 0x6
+	F_SETSIZE                 = 0x2b
+	F_THAW_FS                 = 0x36
+	F_UNLCK                   = 0x2
+	F_VOLPOSMODE              = 0x4
+	F_WRITEBOOTSTRAP          = 0x2f
+	F_WRLCK                   = 0x3
+	IPPROTO_3PC               = 0x22
+	IPPROTO_ADFS              = 0x44
+	IPPROTO_AH                = 0x33
+	IPPROTO_AHIP              = 0x3d
+	IPPROTO_APES              = 0x63
+	IPPROTO_ARGUS             = 0xd
+	IPPROTO_AX25              = 0x5d
+	IPPROTO_BHA               = 0x31
+	IPPROTO_BLT               = 0x1e
+	IPPROTO_BRSATMON          = 0x4c
+	IPPROTO_CFTP              = 0x3e
+	IPPROTO_CHAOS             = 0x10
+	IPPROTO_CMTP              = 0x26
+	IPPROTO_CPHB              = 0x49
+	IPPROTO_CPNX              = 0x48
+	IPPROTO_DDP               = 0x25
+	IPPROTO_DGP               = 0x56
+	IPPROTO_DIVERT            = 0xfe
+	IPPROTO_DONE              = 0x101
+	IPPROTO_DSTOPTS           = 0x3c
+	IPPROTO_EGP               = 0x8
+	IPPROTO_EMCON             = 0xe
+	IPPROTO_ENCAP             = 0x62
+	IPPROTO_EON               = 0x50
+	IPPROTO_ESP               = 0x32
+	IPPROTO_ETHERIP           = 0x61
+	IPPROTO_FRAGMENT          = 0x2c
+	IPPROTO_GGP               = 0x3
+	IPPROTO_GMTP              = 0x64
+	IPPROTO_GRE               = 0x2f
+	IPPROTO_HELLO             = 0x3f
+	IPPROTO_HMP               = 0x14
+	IPPROTO_HOPOPTS           = 0
+	IPPROTO_ICMP              = 0x1
+	IPPROTO_ICMPV6            = 0x3a
+	IPPROTO_IDP               = 0x16
+	IPPROTO_IDPR              = 0x23
+	IPPROTO_IDRP              = 0x2d
+	IPPROTO_IGMP              = 0x2
+	IPPROTO_IGP               = 0x55
+	IPPROTO_IGRP              = 0x58
+	IPPROTO_IL                = 0x28
+	IPPROTO_INLSP             = 0x34
+	IPPROTO_INP               = 0x20
+	IPPROTO_IP                = 0
+	IPPROTO_IPCOMP            = 0x6c
+	IPPROTO_IPCV              = 0x47
+	IPPROTO_IPEIP             = 0x5e
+	IPPROTO_IPIP              = 0x4
+	IPPROTO_IPPC              = 0x43
+	IPPROTO_IPV4              = 0x4
+	IPPROTO_IPV6              = 0x29
+	IPPROTO_IRTP              = 0x1c
+	IPPROTO_KRYPTOLAN         = 0x41
+	IPPROTO_LARP              = 0x5b
+	IPPROTO_LEAF1             = 0x19
+	IPPROTO_LEAF2             = 0x1a
+	IPPROTO_MAX               = 0x100
+	IPPROTO_MAXID             = 0x34
+	IPPROTO_MEAS              = 0x13
+	IPPROTO_MHRP              = 0x30
+	IPPROTO_MICP              = 0x5f
+	IPPROTO_MTP               = 0x5c
+	IPPROTO_MUX               = 0x12
+	IPPROTO_ND                = 0x4d
+	IPPROTO_NHRP              = 0x36
+	IPPROTO_NONE              = 0x3b
+	IPPROTO_NSP               = 0x1f
+	IPPROTO_NVPII             = 0xb
+	IPPROTO_OSPFIGP           = 0x59
+	IPPROTO_PGM               = 0x71
+	IPPROTO_PIGP              = 0x9
+	IPPROTO_PIM               = 0x67
+	IPPROTO_PRM               = 0x15
+	IPPROTO_PUP               = 0xc
+	IPPROTO_PVP               = 0x4b
+	IPPROTO_RAW               = 0xff
+	IPPROTO_RCCMON            = 0xa
+	IPPROTO_RDP               = 0x1b
+	IPPROTO_ROUTING           = 0x2b
+	IPPROTO_RSVP              = 0x2e
+	IPPROTO_RVD               = 0x42
+	IPPROTO_SATEXPAK          = 0x40
+	IPPROTO_SATMON            = 0x45
+	IPPROTO_SCCSP             = 0x60
+	IPPROTO_SDRP              = 0x2a
+	IPPROTO_SEP               = 0x21
+	IPPROTO_SRPC              = 0x5a
+	IPPROTO_ST                = 0x7
+	IPPROTO_SVMTP             = 0x52
+	IPPROTO_SWIPE             = 0x35
+	IPPROTO_TCF               = 0x57
+	IPPROTO_TCP               = 0x6
+	IPPROTO_TP                = 0x1d
+	IPPROTO_TPXX              = 0x27
+	IPPROTO_TRUNK1            = 0x17
+	IPPROTO_TRUNK2            = 0x18
+	IPPROTO_TTP               = 0x54
+	IPPROTO_UDP               = 0x11
+	IPPROTO_VINES             = 0x53
+	IPPROTO_VISA              = 0x46
+	IPPROTO_VMTP              = 0x51
+	IPPROTO_WBEXPAK           = 0x4f
+	IPPROTO_WBMON             = 0x4e
+	IPPROTO_WSN               = 0x4a
+	IPPROTO_XNET              = 0xf
+	IPPROTO_XTP               = 0x24
+	IP_ADD_MEMBERSHIP         = 0xc
+	IP_BOUND_IF               = 0x19
+	IP_DEFAULT_MULTICAST_LOOP = 0x1
+	IP_DEFAULT_MULTICAST_TTL  = 0x1
+	IP_DROP_MEMBERSHIP        = 0xd
+	IP_DUMMYNET_CONFIGURE     = 0x3c
+	IP_DUMMYNET_DEL           = 0x3d
+	IP_DUMMYNET_FLUSH         = 0x3e
+	IP_DUMMYNET_GET           = 0x40
+	IP_FAITH                  = 0x16
+	IP_FW_ADD                 = 0x28
+	IP_FW_DEL                 = 0x29
+	IP_FW_FLUSH               = 0x2a
+	IP_FW_GET                 = 0x2c
+	IP_FW_RESETLOG            = 0x2d
+	IP_FW_ZERO                = 0x2b
+	IP_HDRINCL                = 0x2
+	IP_IPSEC_POLICY           = 0x15
+	IP_MAX_MEMBERSHIPS        = 0x14
+	IP_MULTICAST_IF           = 0x9
+	IP_MULTICAST_LOOP         = 0xb
+	IP_MULTICAST_TTL          = 0xa
+	IP_MULTICAST_VIF          = 0xe
+	IP_NAT__XXX               = 0x37
+	IP_OLD_FW_ADD             = 0x32
+	IP_OLD_FW_DEL             = 0x33
+	IP_OLD_FW_FLUSH           = 0x34
+	IP_OLD_FW_GET             = 0x36
+	IP_OLD_FW_RESETLOG        = 0x38
+	IP_OLD_FW_ZERO            = 0x35
+	IP_OPTIONS                = 0x1
+	IP_PORTRANGE              = 0x13
+	IP_PORTRANGE_DEFAULT      = 0
+	IP_PORTRANGE_HIGH         = 0x1
+	IP_PORTRANGE_LOW          = 0x2
+	IP_RECVDSTADDR            = 0x7
+	IP_RECVIF                 = 0x14
+	IP_RECVOPTS               = 0x5
+	IP_RECVRETOPTS            = 0x6
+	IP_RECVTTL                = 0x18
+	IP_RETOPTS                = 0x8
+	IP_RSVP_OFF               = 0x10
+	IP_RSVP_ON                = 0xf
+	IP_RSVP_VIF_OFF           = 0x12
+	IP_RSVP_VIF_ON            = 0x11
+	IP_STRIPHDR               = 0x17
+	IP_TOS                    = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND = 0x41
+	IP_TTL                    = 0x4
+	O_ACCMODE                 = 0x3
+	O_ALERT                   = 0x20000000
+	O_APPEND                  = 0x8
+	O_ASYNC                   = 0x40
+	O_CREAT                   = 0x200
+	O_DIRECTORY               = 0x100000
+	O_DSYNC                   = 0x400000
+	O_EVTONLY                 = 0x8000
+	O_EXCL                    = 0x800
+	O_EXLOCK                  = 0x20
+	O_FSYNC                   = 0x80
+	O_NDELAY                  = 0x4
+	O_NOCTTY                  = 0x20000
+	O_NOFOLLOW                = 0x100
+	O_NONBLOCK                = 0x4
+	O_POPUP                   = 0x80000000
+	O_RDONLY                  = 0
+	O_RDWR                    = 0x2
+	O_SHLOCK                  = 0x10
+	O_SYMLINK                 = 0x200000
+	O_SYNC                    = 0x80
+	O_TRUNC                   = 0x400
+	O_WRONLY                  = 0x1
+	SHUT_RD                   = 0
+	SHUT_RDWR                 = 0x2
+	SHUT_WR                   = 0x1
+	SIGABRT                   = 0x6
+	SIGALRM                   = 0xe
+	SIGBUS                    = 0xa
+	SIGCHLD                   = 0x14
+	SIGCONT                   = 0x13
+	SIGEMT                    = 0x7
+	SIGFPE                    = 0x8
+	SIGHUP                    = 0x1
+	SIGILL                    = 0x4
+	SIGINFO                   = 0x1d
+	SIGINT                    = 0x2
+	SIGIO                     = 0x17
+	SIGIOT                    = 0x6
+	SIGKILL                   = 0x9
+	SIGPIPE                   = 0xd
+	SIGPROF                   = 0x1b
+	SIGQUIT                   = 0x3
+	SIGSEGV                   = 0xb
+	SIGSTOP                   = 0x11
+	SIGSYS                    = 0xc
+	SIGTERM                   = 0xf
+	SIGTRAP                   = 0x5
+	SIGTSTP                   = 0x12
+	SIGTTIN                   = 0x15
+	SIGTTOU                   = 0x16
+	SIGURG                    = 0x10
+	SIGUSR1                   = 0x1e
+	SIGUSR2                   = 0x1f
+	SIGVTALRM                 = 0x1a
+	SIGWINCH                  = 0x1c
+	SIGXCPU                   = 0x18
+	SIGXFSZ                   = 0x19
+	SOCK_DGRAM                = 0x2
+	SOCK_MAXADDRLEN           = 0xff
+	SOCK_RAW                  = 0x3
+	SOCK_RDM                  = 0x4
+	SOCK_SEQPACKET            = 0x5
+	SOCK_STREAM               = 0x1
+	SOL_SOCKET                = 0xffff
+	SOMAXCONN                 = 0x80
+	SO_ACCEPTCONN             = 0x2
+	SO_BROADCAST              = 0x20
+	SO_DEBUG                  = 0x1
+	SO_DONTROUTE              = 0x10
+	SO_DONTTRUNC              = 0x2000
+	SO_ERROR                  = 0x1007
+	SO_KEEPALIVE              = 0x8
+	SO_LABEL                  = 0x1010
+	SO_LINGER                 = 0x80
+	SO_LINGER_SEC             = 0x1080
+	SO_NKE                    = 0x1021
+	SO_NOADDRERR              = 0x1023
+	SO_NOSIGPIPE              = 0x1022
+	SO_NOTIFYCONFLICT         = 0x1026
+	SO_NP_EXTENSIONS          = 0x1083
+	SO_NREAD                  = 0x1020
+	SO_NWRITE                 = 0x1024
+	SO_OOBINLINE              = 0x100
+	SO_PEERLABEL              = 0x1011
+	SO_RANDOMPORT             = 0x1082
+	SO_RCVBUF                 = 0x1002
+	SO_RCVLOWAT               = 0x1004
+	SO_RCVTIMEO               = 0x1006
+	SO_RESTRICTIONS           = 0x1081
+	SO_RESTRICT_DENYIN        = 0x1
+	SO_RESTRICT_DENYOUT       = 0x2
+	SO_RESTRICT_DENYSET       = 0x80000000
+	SO_REUSEADDR              = 0x4
+	SO_REUSEPORT              = 0x200
+	SO_REUSESHAREUID          = 0x1025
+	SO_SNDBUF                 = 0x1001
+	SO_SNDLOWAT               = 0x1003
+	SO_SNDTIMEO               = 0x1005
+	SO_TIMESTAMP              = 0x400
+	SO_TYPE                   = 0x1008
+	SO_UPCALLCLOSEWAIT        = 0x1027
+	SO_USELOOPBACK            = 0x40
+	SO_WANTMORE               = 0x4000
+	SO_WANTOOBFLAG            = 0x8000
+	S_IEXEC                   = 0x40
+	S_IFBLK                   = 0x6000
+	S_IFCHR                   = 0x2000
+	S_IFDIR                   = 0x4000
+	S_IFIFO                   = 0x1000
+	S_IFLNK                   = 0xa000
+	S_IFMT                    = 0xf000
+	S_IFREG                   = 0x8000
+	S_IFSOCK                  = 0xc000
+	S_IFWHT                   = 0xe000
+	S_IREAD                   = 0x100
+	S_IRGRP                   = 0x20
+	S_IROTH                   = 0x4
+	S_IRUSR                   = 0x100
+	S_IRWXG                   = 0x38
+	S_IRWXO                   = 0x7
+	S_IRWXU                   = 0x1c0
+	S_ISGID                   = 0x400
+	S_ISTXT                   = 0x200
+	S_ISUID                   = 0x800
+	S_ISVTX                   = 0x200
+	S_IWGRP                   = 0x10
+	S_IWOTH                   = 0x2
+	S_IWRITE                  = 0x80
+	S_IWUSR                   = 0x80
+	S_IXGRP                   = 0x8
+	S_IXOTH                   = 0x1
+	S_IXUSR                   = 0x40
+	TCP_CONNECTIONTIMEOUT     = 0x20
+	TCP_KEEPALIVE             = 0x10
+	TCP_MAXBURST              = 0x4
+	TCP_MAXHLEN               = 0x3c
+	TCP_MAXOLEN               = 0x28
+	TCP_MAXSEG                = 0x2
+	TCP_MAXWIN                = 0xffff
+	TCP_MAX_SACK              = 0x3
+	TCP_MAX_WINSHIFT          = 0xe
+	TCP_MINMSS                = 0xd8
+	TCP_MINMSSOVERLOAD        = 0x3e8
+	TCP_MSS                   = 0x200
+	TCP_NODELAY               = 0x1
+	TCP_NOOPT                 = 0x8
+	TCP_NOPUSH                = 0x4
+	WCONTINUED                = 0x10
+	WCOREFLAG                 = 0x80
+	WEXITED                   = 0x4
+	WNOHANG                   = 0x1
+	WNOWAIT                   = 0x20
+	WORDSIZE                  = 0x40
+	WSTOPPED                  = 0x7f
+	WUNTRACED                 = 0x2
 )
 
 // Types
diff --git a/src/pkg/syscall/zerrors_darwin_amd64.go b/src/pkg/syscall/zerrors_darwin_amd64.go
index 84a07e3c2..76660a844 100644
--- a/src/pkg/syscall/zerrors_darwin_amd64.go
+++ b/src/pkg/syscall/zerrors_darwin_amd64.go
@@ -9,525 +9,525 @@ package syscall
 
 // Constants
 const (
-	AF_APPLETALK			= 0x10;
-	AF_CCITT			= 0xa;
-	AF_CHAOS			= 0x5;
-	AF_CNT				= 0x15;
-	AF_COIP				= 0x14;
-	AF_DATAKIT			= 0x9;
-	AF_DECnet			= 0xc;
-	AF_DLI				= 0xd;
-	AF_E164				= 0x1c;
-	AF_ECMA				= 0x8;
-	AF_HYLINK			= 0xf;
-	AF_IEEE80211			= 0x25;
-	AF_IMPLINK			= 0x3;
-	AF_INET				= 0x2;
-	AF_INET6			= 0x1e;
-	AF_IPX				= 0x17;
-	AF_ISDN				= 0x1c;
-	AF_ISO				= 0x7;
-	AF_LAT				= 0xe;
-	AF_LINK				= 0x12;
-	AF_LOCAL			= 0x1;
-	AF_MAX				= 0x26;
-	AF_NATM				= 0x1f;
-	AF_NDRV				= 0x1b;
-	AF_NETBIOS			= 0x21;
-	AF_NS				= 0x6;
-	AF_OSI				= 0x7;
-	AF_PPP				= 0x22;
-	AF_PUP				= 0x4;
-	AF_RESERVED_36			= 0x24;
-	AF_ROUTE			= 0x11;
-	AF_SIP				= 0x18;
-	AF_SNA				= 0xb;
-	AF_SYSTEM			= 0x20;
-	AF_UNIX				= 0x1;
-	AF_UNSPEC			= 0;
-	E2BIG				= 0x7;
-	EACCES				= 0xd;
-	EADDRINUSE			= 0x30;
-	EADDRNOTAVAIL			= 0x31;
-	EAFNOSUPPORT			= 0x2f;
-	EAGAIN				= 0x23;
-	EALREADY			= 0x25;
-	EAUTH				= 0x50;
-	EBADARCH			= 0x56;
-	EBADEXEC			= 0x55;
-	EBADF				= 0x9;
-	EBADMACHO			= 0x58;
-	EBADMSG				= 0x5e;
-	EBADRPC				= 0x48;
-	EBUSY				= 0x10;
-	ECANCELED			= 0x59;
-	ECHILD				= 0xa;
-	ECONNABORTED			= 0x35;
-	ECONNREFUSED			= 0x3d;
-	ECONNRESET			= 0x36;
-	EDEADLK				= 0xb;
-	EDESTADDRREQ			= 0x27;
-	EDEVERR				= 0x53;
-	EDOM				= 0x21;
-	EDQUOT				= 0x45;
-	EEXIST				= 0x11;
-	EFAULT				= 0xe;
-	EFBIG				= 0x1b;
-	EFTYPE				= 0x4f;
-	EHOSTDOWN			= 0x40;
-	EHOSTUNREACH			= 0x41;
-	EIDRM				= 0x5a;
-	EILSEQ				= 0x5c;
-	EINPROGRESS			= 0x24;
-	EINTR				= 0x4;
-	EINVAL				= 0x16;
-	EIO				= 0x5;
-	EISCONN				= 0x38;
-	EISDIR				= 0x15;
-	ELAST				= 0x67;
-	ELOOP				= 0x3e;
-	EMFILE				= 0x18;
-	EMLINK				= 0x1f;
-	EMSGSIZE			= 0x28;
-	EMULTIHOP			= 0x5f;
-	ENAMETOOLONG			= 0x3f;
-	ENEEDAUTH			= 0x51;
-	ENETDOWN			= 0x32;
-	ENETRESET			= 0x34;
-	ENETUNREACH			= 0x33;
-	ENFILE				= 0x17;
-	ENOATTR				= 0x5d;
-	ENOBUFS				= 0x37;
-	ENODATA				= 0x60;
-	ENODEV				= 0x13;
-	ENOENT				= 0x2;
-	ENOEXEC				= 0x8;
-	ENOLCK				= 0x4d;
-	ENOLINK				= 0x61;
-	ENOMEM				= 0xc;
-	ENOMSG				= 0x5b;
-	ENOPOLICY			= 0x67;
-	ENOPROTOOPT			= 0x2a;
-	ENOSPC				= 0x1c;
-	ENOSR				= 0x62;
-	ENOSTR				= 0x63;
-	ENOSYS				= 0x4e;
-	ENOTBLK				= 0xf;
-	ENOTCONN			= 0x39;
-	ENOTDIR				= 0x14;
-	ENOTEMPTY			= 0x42;
-	ENOTSOCK			= 0x26;
-	ENOTSUP				= 0x2d;
-	ENOTTY				= 0x19;
-	ENXIO				= 0x6;
-	EOPNOTSUPP			= 0x66;
-	EOVERFLOW			= 0x54;
-	EPERM				= 0x1;
-	EPFNOSUPPORT			= 0x2e;
-	EPIPE				= 0x20;
-	EPROCLIM			= 0x43;
-	EPROCUNAVAIL			= 0x4c;
-	EPROGMISMATCH			= 0x4b;
-	EPROGUNAVAIL			= 0x4a;
-	EPROTO				= 0x64;
-	EPROTONOSUPPORT			= 0x2b;
-	EPROTOTYPE			= 0x29;
-	EPWROFF				= 0x52;
-	ERANGE				= 0x22;
-	EREMOTE				= 0x47;
-	EROFS				= 0x1e;
-	ERPCMISMATCH			= 0x49;
-	ESHLIBVERS			= 0x57;
-	ESHUTDOWN			= 0x3a;
-	ESOCKTNOSUPPORT			= 0x2c;
-	ESPIPE				= 0x1d;
-	ESRCH				= 0x3;
-	ESTALE				= 0x46;
-	ETIME				= 0x65;
-	ETIMEDOUT			= 0x3c;
-	ETOOMANYREFS			= 0x3b;
-	ETXTBSY				= 0x1a;
-	EUSERS				= 0x44;
-	EVFILT_AIO			= -0x3;
-	EVFILT_FS			= -0x9;
-	EVFILT_MACHPORT			= -0x8;
-	EVFILT_PROC			= -0x5;
-	EVFILT_READ			= -0x1;
-	EVFILT_SESSION			= -0xb;
-	EVFILT_SIGNAL			= -0x6;
-	EVFILT_SYSCOUNT			= 0xb;
-	EVFILT_THREADMARKER		= 0xb;
-	EVFILT_TIMER			= -0x7;
-	EVFILT_USER			= -0xa;
-	EVFILT_VNODE			= -0x4;
-	EVFILT_WRITE			= -0x2;
-	EV_ADD				= 0x1;
-	EV_CLEAR			= 0x20;
-	EV_DELETE			= 0x2;
-	EV_DISABLE			= 0x8;
-	EV_DISPATCH			= 0x80;
-	EV_ENABLE			= 0x4;
-	EV_EOF				= 0x8000;
-	EV_ERROR			= 0x4000;
-	EV_FLAG0			= 0x1000;
-	EV_FLAG1			= 0x2000;
-	EV_ONESHOT			= 0x10;
-	EV_OOBAND			= 0x2000;
-	EV_POLL				= 0x1000;
-	EV_RECEIPT			= 0x40;
-	EV_SYSFLAGS			= 0xf000;
-	EV_TRIGGER			= 0x100;
-	EWOULDBLOCK			= 0x23;
-	EXDEV				= 0x12;
-	FD_CLOEXEC			= 0x1;
-	FD_SETSIZE			= 0x400;
-	F_ADDFILESIGS			= 0x3d;
-	F_ADDSIGS			= 0x3b;
-	F_ALLOCATEALL			= 0x4;
-	F_ALLOCATECONTIG		= 0x2;
-	F_CHKCLEAN			= 0x29;
-	F_DUPFD				= 0;
-	F_FREEZE_FS			= 0x35;
-	F_FULLFSYNC			= 0x33;
-	F_GETFD				= 0x1;
-	F_GETFL				= 0x3;
-	F_GETLK				= 0x7;
-	F_GETOWN			= 0x5;
-	F_GETPATH			= 0x32;
-	F_GLOBAL_NOCACHE		= 0x37;
-	F_LOG2PHYS			= 0x31;
-	F_MARKDEPENDENCY		= 0x3c;
-	F_NOCACHE			= 0x30;
-	F_PATHPKG_CHECK			= 0x34;
-	F_PEOFPOSMODE			= 0x3;
-	F_PREALLOCATE			= 0x2a;
-	F_RDADVISE			= 0x2c;
-	F_RDAHEAD			= 0x2d;
-	F_RDLCK				= 0x1;
-	F_READBOOTSTRAP			= 0x2e;
-	F_SETFD				= 0x2;
-	F_SETFL				= 0x4;
-	F_SETLK				= 0x8;
-	F_SETLKW			= 0x9;
-	F_SETOWN			= 0x6;
-	F_SETSIZE			= 0x2b;
-	F_THAW_FS			= 0x36;
-	F_UNLCK				= 0x2;
-	F_VOLPOSMODE			= 0x4;
-	F_WRITEBOOTSTRAP		= 0x2f;
-	F_WRLCK				= 0x3;
-	IPPROTO_3PC			= 0x22;
-	IPPROTO_ADFS			= 0x44;
-	IPPROTO_AH			= 0x33;
-	IPPROTO_AHIP			= 0x3d;
-	IPPROTO_APES			= 0x63;
-	IPPROTO_ARGUS			= 0xd;
-	IPPROTO_AX25			= 0x5d;
-	IPPROTO_BHA			= 0x31;
-	IPPROTO_BLT			= 0x1e;
-	IPPROTO_BRSATMON		= 0x4c;
-	IPPROTO_CFTP			= 0x3e;
-	IPPROTO_CHAOS			= 0x10;
-	IPPROTO_CMTP			= 0x26;
-	IPPROTO_CPHB			= 0x49;
-	IPPROTO_CPNX			= 0x48;
-	IPPROTO_DDP			= 0x25;
-	IPPROTO_DGP			= 0x56;
-	IPPROTO_DIVERT			= 0xfe;
-	IPPROTO_DONE			= 0x101;
-	IPPROTO_DSTOPTS			= 0x3c;
-	IPPROTO_EGP			= 0x8;
-	IPPROTO_EMCON			= 0xe;
-	IPPROTO_ENCAP			= 0x62;
-	IPPROTO_EON			= 0x50;
-	IPPROTO_ESP			= 0x32;
-	IPPROTO_ETHERIP			= 0x61;
-	IPPROTO_FRAGMENT		= 0x2c;
-	IPPROTO_GGP			= 0x3;
-	IPPROTO_GMTP			= 0x64;
-	IPPROTO_GRE			= 0x2f;
-	IPPROTO_HELLO			= 0x3f;
-	IPPROTO_HMP			= 0x14;
-	IPPROTO_HOPOPTS			= 0;
-	IPPROTO_ICMP			= 0x1;
-	IPPROTO_ICMPV6			= 0x3a;
-	IPPROTO_IDP			= 0x16;
-	IPPROTO_IDPR			= 0x23;
-	IPPROTO_IDRP			= 0x2d;
-	IPPROTO_IGMP			= 0x2;
-	IPPROTO_IGP			= 0x55;
-	IPPROTO_IGRP			= 0x58;
-	IPPROTO_IL			= 0x28;
-	IPPROTO_INLSP			= 0x34;
-	IPPROTO_INP			= 0x20;
-	IPPROTO_IP			= 0;
-	IPPROTO_IPCOMP			= 0x6c;
-	IPPROTO_IPCV			= 0x47;
-	IPPROTO_IPEIP			= 0x5e;
-	IPPROTO_IPIP			= 0x4;
-	IPPROTO_IPPC			= 0x43;
-	IPPROTO_IPV4			= 0x4;
-	IPPROTO_IPV6			= 0x29;
-	IPPROTO_IRTP			= 0x1c;
-	IPPROTO_KRYPTOLAN		= 0x41;
-	IPPROTO_LARP			= 0x5b;
-	IPPROTO_LEAF1			= 0x19;
-	IPPROTO_LEAF2			= 0x1a;
-	IPPROTO_MAX			= 0x100;
-	IPPROTO_MAXID			= 0x34;
-	IPPROTO_MEAS			= 0x13;
-	IPPROTO_MHRP			= 0x30;
-	IPPROTO_MICP			= 0x5f;
-	IPPROTO_MTP			= 0x5c;
-	IPPROTO_MUX			= 0x12;
-	IPPROTO_ND			= 0x4d;
-	IPPROTO_NHRP			= 0x36;
-	IPPROTO_NONE			= 0x3b;
-	IPPROTO_NSP			= 0x1f;
-	IPPROTO_NVPII			= 0xb;
-	IPPROTO_OSPFIGP			= 0x59;
-	IPPROTO_PGM			= 0x71;
-	IPPROTO_PIGP			= 0x9;
-	IPPROTO_PIM			= 0x67;
-	IPPROTO_PRM			= 0x15;
-	IPPROTO_PUP			= 0xc;
-	IPPROTO_PVP			= 0x4b;
-	IPPROTO_RAW			= 0xff;
-	IPPROTO_RCCMON			= 0xa;
-	IPPROTO_RDP			= 0x1b;
-	IPPROTO_ROUTING			= 0x2b;
-	IPPROTO_RSVP			= 0x2e;
-	IPPROTO_RVD			= 0x42;
-	IPPROTO_SATEXPAK		= 0x40;
-	IPPROTO_SATMON			= 0x45;
-	IPPROTO_SCCSP			= 0x60;
-	IPPROTO_SDRP			= 0x2a;
-	IPPROTO_SEP			= 0x21;
-	IPPROTO_SRPC			= 0x5a;
-	IPPROTO_ST			= 0x7;
-	IPPROTO_SVMTP			= 0x52;
-	IPPROTO_SWIPE			= 0x35;
-	IPPROTO_TCF			= 0x57;
-	IPPROTO_TCP			= 0x6;
-	IPPROTO_TP			= 0x1d;
-	IPPROTO_TPXX			= 0x27;
-	IPPROTO_TRUNK1			= 0x17;
-	IPPROTO_TRUNK2			= 0x18;
-	IPPROTO_TTP			= 0x54;
-	IPPROTO_UDP			= 0x11;
-	IPPROTO_VINES			= 0x53;
-	IPPROTO_VISA			= 0x46;
-	IPPROTO_VMTP			= 0x51;
-	IPPROTO_WBEXPAK			= 0x4f;
-	IPPROTO_WBMON			= 0x4e;
-	IPPROTO_WSN			= 0x4a;
-	IPPROTO_XNET			= 0xf;
-	IPPROTO_XTP			= 0x24;
-	IP_ADD_MEMBERSHIP		= 0xc;
-	IP_BOUND_IF			= 0x19;
-	IP_DEFAULT_MULTICAST_LOOP	= 0x1;
-	IP_DEFAULT_MULTICAST_TTL	= 0x1;
-	IP_DROP_MEMBERSHIP		= 0xd;
-	IP_DUMMYNET_CONFIGURE		= 0x3c;
-	IP_DUMMYNET_DEL			= 0x3d;
-	IP_DUMMYNET_FLUSH		= 0x3e;
-	IP_DUMMYNET_GET			= 0x40;
-	IP_FAITH			= 0x16;
-	IP_FW_ADD			= 0x28;
-	IP_FW_DEL			= 0x29;
-	IP_FW_FLUSH			= 0x2a;
-	IP_FW_GET			= 0x2c;
-	IP_FW_RESETLOG			= 0x2d;
-	IP_FW_ZERO			= 0x2b;
-	IP_HDRINCL			= 0x2;
-	IP_IPSEC_POLICY			= 0x15;
-	IP_MAX_MEMBERSHIPS		= 0x14;
-	IP_MULTICAST_IF			= 0x9;
-	IP_MULTICAST_LOOP		= 0xb;
-	IP_MULTICAST_TTL		= 0xa;
-	IP_MULTICAST_VIF		= 0xe;
-	IP_NAT__XXX			= 0x37;
-	IP_OLD_FW_ADD			= 0x32;
-	IP_OLD_FW_DEL			= 0x33;
-	IP_OLD_FW_FLUSH			= 0x34;
-	IP_OLD_FW_GET			= 0x36;
-	IP_OLD_FW_RESETLOG		= 0x38;
-	IP_OLD_FW_ZERO			= 0x35;
-	IP_OPTIONS			= 0x1;
-	IP_PORTRANGE			= 0x13;
-	IP_PORTRANGE_DEFAULT		= 0;
-	IP_PORTRANGE_HIGH		= 0x1;
-	IP_PORTRANGE_LOW		= 0x2;
-	IP_RECVDSTADDR			= 0x7;
-	IP_RECVIF			= 0x14;
-	IP_RECVOPTS			= 0x5;
-	IP_RECVRETOPTS			= 0x6;
-	IP_RECVTTL			= 0x18;
-	IP_RETOPTS			= 0x8;
-	IP_RSVP_OFF			= 0x10;
-	IP_RSVP_ON			= 0xf;
-	IP_RSVP_VIF_OFF			= 0x12;
-	IP_RSVP_VIF_ON			= 0x11;
-	IP_STRIPHDR			= 0x17;
-	IP_TOS				= 0x3;
-	IP_TRAFFIC_MGT_BACKGROUND	= 0x41;
-	IP_TTL				= 0x4;
-	O_ACCMODE			= 0x3;
-	O_ALERT				= 0x20000000;
-	O_APPEND			= 0x8;
-	O_ASYNC				= 0x40;
-	O_CREAT				= 0x200;
-	O_DIRECTORY			= 0x100000;
-	O_DSYNC				= 0x400000;
-	O_EVTONLY			= 0x8000;
-	O_EXCL				= 0x800;
-	O_EXLOCK			= 0x20;
-	O_FSYNC				= 0x80;
-	O_NDELAY			= 0x4;
-	O_NOCTTY			= 0x20000;
-	O_NOFOLLOW			= 0x100;
-	O_NONBLOCK			= 0x4;
-	O_POPUP				= 0x80000000;
-	O_RDONLY			= 0;
-	O_RDWR				= 0x2;
-	O_SHLOCK			= 0x10;
-	O_SYMLINK			= 0x200000;
-	O_SYNC				= 0x80;
-	O_TRUNC				= 0x400;
-	O_WRONLY			= 0x1;
-	SHUT_RD				= 0;
-	SHUT_RDWR			= 0x2;
-	SHUT_WR				= 0x1;
-	SIGABRT				= 0x6;
-	SIGALRM				= 0xe;
-	SIGBUS				= 0xa;
-	SIGCHLD				= 0x14;
-	SIGCONT				= 0x13;
-	SIGEMT				= 0x7;
-	SIGFPE				= 0x8;
-	SIGHUP				= 0x1;
-	SIGILL				= 0x4;
-	SIGINFO				= 0x1d;
-	SIGINT				= 0x2;
-	SIGIO				= 0x17;
-	SIGIOT				= 0x6;
-	SIGKILL				= 0x9;
-	SIGPIPE				= 0xd;
-	SIGPROF				= 0x1b;
-	SIGQUIT				= 0x3;
-	SIGSEGV				= 0xb;
-	SIGSTOP				= 0x11;
-	SIGSYS				= 0xc;
-	SIGTERM				= 0xf;
-	SIGTRAP				= 0x5;
-	SIGTSTP				= 0x12;
-	SIGTTIN				= 0x15;
-	SIGTTOU				= 0x16;
-	SIGURG				= 0x10;
-	SIGUSR1				= 0x1e;
-	SIGUSR2				= 0x1f;
-	SIGVTALRM			= 0x1a;
-	SIGWINCH			= 0x1c;
-	SIGXCPU				= 0x18;
-	SIGXFSZ				= 0x19;
-	SOCK_DGRAM			= 0x2;
-	SOCK_MAXADDRLEN			= 0xff;
-	SOCK_RAW			= 0x3;
-	SOCK_RDM			= 0x4;
-	SOCK_SEQPACKET			= 0x5;
-	SOCK_STREAM			= 0x1;
-	SOL_SOCKET			= 0xffff;
-	SOMAXCONN			= 0x80;
-	SO_ACCEPTCONN			= 0x2;
-	SO_BROADCAST			= 0x20;
-	SO_DEBUG			= 0x1;
-	SO_DONTROUTE			= 0x10;
-	SO_DONTTRUNC			= 0x2000;
-	SO_ERROR			= 0x1007;
-	SO_KEEPALIVE			= 0x8;
-	SO_LABEL			= 0x1010;
-	SO_LINGER			= 0x80;
-	SO_LINGER_SEC			= 0x1080;
-	SO_NKE				= 0x1021;
-	SO_NOADDRERR			= 0x1023;
-	SO_NOSIGPIPE			= 0x1022;
-	SO_NOTIFYCONFLICT		= 0x1026;
-	SO_NP_EXTENSIONS		= 0x1083;
-	SO_NREAD			= 0x1020;
-	SO_NWRITE			= 0x1024;
-	SO_OOBINLINE			= 0x100;
-	SO_PEERLABEL			= 0x1011;
-	SO_RANDOMPORT			= 0x1082;
-	SO_RCVBUF			= 0x1002;
-	SO_RCVLOWAT			= 0x1004;
-	SO_RCVTIMEO			= 0x1006;
-	SO_RESTRICTIONS			= 0x1081;
-	SO_RESTRICT_DENYIN		= 0x1;
-	SO_RESTRICT_DENYOUT		= 0x2;
-	SO_RESTRICT_DENYSET		= 0x80000000;
-	SO_REUSEADDR			= 0x4;
-	SO_REUSEPORT			= 0x200;
-	SO_REUSESHAREUID		= 0x1025;
-	SO_SNDBUF			= 0x1001;
-	SO_SNDLOWAT			= 0x1003;
-	SO_SNDTIMEO			= 0x1005;
-	SO_TIMESTAMP			= 0x400;
-	SO_TYPE				= 0x1008;
-	SO_UPCALLCLOSEWAIT		= 0x1027;
-	SO_USELOOPBACK			= 0x40;
-	SO_WANTMORE			= 0x4000;
-	SO_WANTOOBFLAG			= 0x8000;
-	S_IEXEC				= 0x40;
-	S_IFBLK				= 0x6000;
-	S_IFCHR				= 0x2000;
-	S_IFDIR				= 0x4000;
-	S_IFIFO				= 0x1000;
-	S_IFLNK				= 0xa000;
-	S_IFMT				= 0xf000;
-	S_IFREG				= 0x8000;
-	S_IFSOCK			= 0xc000;
-	S_IFWHT				= 0xe000;
-	S_IREAD				= 0x100;
-	S_IRGRP				= 0x20;
-	S_IROTH				= 0x4;
-	S_IRUSR				= 0x100;
-	S_IRWXG				= 0x38;
-	S_IRWXO				= 0x7;
-	S_IRWXU				= 0x1c0;
-	S_ISGID				= 0x400;
-	S_ISTXT				= 0x200;
-	S_ISUID				= 0x800;
-	S_ISVTX				= 0x200;
-	S_IWGRP				= 0x10;
-	S_IWOTH				= 0x2;
-	S_IWRITE			= 0x80;
-	S_IWUSR				= 0x80;
-	S_IXGRP				= 0x8;
-	S_IXOTH				= 0x1;
-	S_IXUSR				= 0x40;
-	TCP_CONNECTIONTIMEOUT		= 0x20;
-	TCP_KEEPALIVE			= 0x10;
-	TCP_MAXBURST			= 0x4;
-	TCP_MAXHLEN			= 0x3c;
-	TCP_MAXOLEN			= 0x28;
-	TCP_MAXSEG			= 0x2;
-	TCP_MAXWIN			= 0xffff;
-	TCP_MAX_SACK			= 0x3;
-	TCP_MAX_WINSHIFT		= 0xe;
-	TCP_MINMSS			= 0xd8;
-	TCP_MINMSSOVERLOAD		= 0x3e8;
-	TCP_MSS				= 0x200;
-	TCP_NODELAY			= 0x1;
-	TCP_NOOPT			= 0x8;
-	TCP_NOPUSH			= 0x4;
-	WCONTINUED			= 0x10;
-	WCOREFLAG			= 0x80;
-	WEXITED				= 0x4;
-	WNOHANG				= 0x1;
-	WNOWAIT				= 0x20;
-	WORDSIZE			= 0x40;
-	WSTOPPED			= 0x7f;
-	WUNTRACED			= 0x2;
+	AF_APPLETALK              = 0x10
+	AF_CCITT                  = 0xa
+	AF_CHAOS                  = 0x5
+	AF_CNT                    = 0x15
+	AF_COIP                   = 0x14
+	AF_DATAKIT                = 0x9
+	AF_DECnet                 = 0xc
+	AF_DLI                    = 0xd
+	AF_E164                   = 0x1c
+	AF_ECMA                   = 0x8
+	AF_HYLINK                 = 0xf
+	AF_IEEE80211              = 0x25
+	AF_IMPLINK                = 0x3
+	AF_INET                   = 0x2
+	AF_INET6                  = 0x1e
+	AF_IPX                    = 0x17
+	AF_ISDN                   = 0x1c
+	AF_ISO                    = 0x7
+	AF_LAT                    = 0xe
+	AF_LINK                   = 0x12
+	AF_LOCAL                  = 0x1
+	AF_MAX                    = 0x26
+	AF_NATM                   = 0x1f
+	AF_NDRV                   = 0x1b
+	AF_NETBIOS                = 0x21
+	AF_NS                     = 0x6
+	AF_OSI                    = 0x7
+	AF_PPP                    = 0x22
+	AF_PUP                    = 0x4
+	AF_RESERVED_36            = 0x24
+	AF_ROUTE                  = 0x11
+	AF_SIP                    = 0x18
+	AF_SNA                    = 0xb
+	AF_SYSTEM                 = 0x20
+	AF_UNIX                   = 0x1
+	AF_UNSPEC                 = 0
+	E2BIG                     = 0x7
+	EACCES                    = 0xd
+	EADDRINUSE                = 0x30
+	EADDRNOTAVAIL             = 0x31
+	EAFNOSUPPORT              = 0x2f
+	EAGAIN                    = 0x23
+	EALREADY                  = 0x25
+	EAUTH                     = 0x50
+	EBADARCH                  = 0x56
+	EBADEXEC                  = 0x55
+	EBADF                     = 0x9
+	EBADMACHO                 = 0x58
+	EBADMSG                   = 0x5e
+	EBADRPC                   = 0x48
+	EBUSY                     = 0x10
+	ECANCELED                 = 0x59
+	ECHILD                    = 0xa
+	ECONNABORTED              = 0x35
+	ECONNREFUSED              = 0x3d
+	ECONNRESET                = 0x36
+	EDEADLK                   = 0xb
+	EDESTADDRREQ              = 0x27
+	EDEVERR                   = 0x53
+	EDOM                      = 0x21
+	EDQUOT                    = 0x45
+	EEXIST                    = 0x11
+	EFAULT                    = 0xe
+	EFBIG                     = 0x1b
+	EFTYPE                    = 0x4f
+	EHOSTDOWN                 = 0x40
+	EHOSTUNREACH              = 0x41
+	EIDRM                     = 0x5a
+	EILSEQ                    = 0x5c
+	EINPROGRESS               = 0x24
+	EINTR                     = 0x4
+	EINVAL                    = 0x16
+	EIO                       = 0x5
+	EISCONN                   = 0x38
+	EISDIR                    = 0x15
+	ELAST                     = 0x67
+	ELOOP                     = 0x3e
+	EMFILE                    = 0x18
+	EMLINK                    = 0x1f
+	EMSGSIZE                  = 0x28
+	EMULTIHOP                 = 0x5f
+	ENAMETOOLONG              = 0x3f
+	ENEEDAUTH                 = 0x51
+	ENETDOWN                  = 0x32
+	ENETRESET                 = 0x34
+	ENETUNREACH               = 0x33
+	ENFILE                    = 0x17
+	ENOATTR                   = 0x5d
+	ENOBUFS                   = 0x37
+	ENODATA                   = 0x60
+	ENODEV                    = 0x13
+	ENOENT                    = 0x2
+	ENOEXEC                   = 0x8
+	ENOLCK                    = 0x4d
+	ENOLINK                   = 0x61
+	ENOMEM                    = 0xc
+	ENOMSG                    = 0x5b
+	ENOPOLICY                 = 0x67
+	ENOPROTOOPT               = 0x2a
+	ENOSPC                    = 0x1c
+	ENOSR                     = 0x62
+	ENOSTR                    = 0x63
+	ENOSYS                    = 0x4e
+	ENOTBLK                   = 0xf
+	ENOTCONN                  = 0x39
+	ENOTDIR                   = 0x14
+	ENOTEMPTY                 = 0x42
+	ENOTSOCK                  = 0x26
+	ENOTSUP                   = 0x2d
+	ENOTTY                    = 0x19
+	ENXIO                     = 0x6
+	EOPNOTSUPP                = 0x66
+	EOVERFLOW                 = 0x54
+	EPERM                     = 0x1
+	EPFNOSUPPORT              = 0x2e
+	EPIPE                     = 0x20
+	EPROCLIM                  = 0x43
+	EPROCUNAVAIL              = 0x4c
+	EPROGMISMATCH             = 0x4b
+	EPROGUNAVAIL              = 0x4a
+	EPROTO                    = 0x64
+	EPROTONOSUPPORT           = 0x2b
+	EPROTOTYPE                = 0x29
+	EPWROFF                   = 0x52
+	ERANGE                    = 0x22
+	EREMOTE                   = 0x47
+	EROFS                     = 0x1e
+	ERPCMISMATCH              = 0x49
+	ESHLIBVERS                = 0x57
+	ESHUTDOWN                 = 0x3a
+	ESOCKTNOSUPPORT           = 0x2c
+	ESPIPE                    = 0x1d
+	ESRCH                     = 0x3
+	ESTALE                    = 0x46
+	ETIME                     = 0x65
+	ETIMEDOUT                 = 0x3c
+	ETOOMANYREFS              = 0x3b
+	ETXTBSY                   = 0x1a
+	EUSERS                    = 0x44
+	EVFILT_AIO                = -0x3
+	EVFILT_FS                 = -0x9
+	EVFILT_MACHPORT           = -0x8
+	EVFILT_PROC               = -0x5
+	EVFILT_READ               = -0x1
+	EVFILT_SESSION            = -0xb
+	EVFILT_SIGNAL             = -0x6
+	EVFILT_SYSCOUNT           = 0xb
+	EVFILT_THREADMARKER       = 0xb
+	EVFILT_TIMER              = -0x7
+	EVFILT_USER               = -0xa
+	EVFILT_VNODE              = -0x4
+	EVFILT_WRITE              = -0x2
+	EV_ADD                    = 0x1
+	EV_CLEAR                  = 0x20
+	EV_DELETE                 = 0x2
+	EV_DISABLE                = 0x8
+	EV_DISPATCH               = 0x80
+	EV_ENABLE                 = 0x4
+	EV_EOF                    = 0x8000
+	EV_ERROR                  = 0x4000
+	EV_FLAG0                  = 0x1000
+	EV_FLAG1                  = 0x2000
+	EV_ONESHOT                = 0x10
+	EV_OOBAND                 = 0x2000
+	EV_POLL                   = 0x1000
+	EV_RECEIPT                = 0x40
+	EV_SYSFLAGS               = 0xf000
+	EV_TRIGGER                = 0x100
+	EWOULDBLOCK               = 0x23
+	EXDEV                     = 0x12
+	FD_CLOEXEC                = 0x1
+	FD_SETSIZE                = 0x400
+	F_ADDFILESIGS             = 0x3d
+	F_ADDSIGS                 = 0x3b
+	F_ALLOCATEALL             = 0x4
+	F_ALLOCATECONTIG          = 0x2
+	F_CHKCLEAN                = 0x29
+	F_DUPFD                   = 0
+	F_FREEZE_FS               = 0x35
+	F_FULLFSYNC               = 0x33
+	F_GETFD                   = 0x1
+	F_GETFL                   = 0x3
+	F_GETLK                   = 0x7
+	F_GETOWN                  = 0x5
+	F_GETPATH                 = 0x32
+	F_GLOBAL_NOCACHE          = 0x37
+	F_LOG2PHYS                = 0x31
+	F_MARKDEPENDENCY          = 0x3c
+	F_NOCACHE                 = 0x30
+	F_PATHPKG_CHECK           = 0x34
+	F_PEOFPOSMODE             = 0x3
+	F_PREALLOCATE             = 0x2a
+	F_RDADVISE                = 0x2c
+	F_RDAHEAD                 = 0x2d
+	F_RDLCK                   = 0x1
+	F_READBOOTSTRAP           = 0x2e
+	F_SETFD                   = 0x2
+	F_SETFL                   = 0x4
+	F_SETLK                   = 0x8
+	F_SETLKW                  = 0x9
+	F_SETOWN                  = 0x6
+	F_SETSIZE                 = 0x2b
+	F_THAW_FS                 = 0x36
+	F_UNLCK                   = 0x2
+	F_VOLPOSMODE              = 0x4
+	F_WRITEBOOTSTRAP          = 0x2f
+	F_WRLCK                   = 0x3
+	IPPROTO_3PC               = 0x22
+	IPPROTO_ADFS              = 0x44
+	IPPROTO_AH                = 0x33
+	IPPROTO_AHIP              = 0x3d
+	IPPROTO_APES              = 0x63
+	IPPROTO_ARGUS             = 0xd
+	IPPROTO_AX25              = 0x5d
+	IPPROTO_BHA               = 0x31
+	IPPROTO_BLT               = 0x1e
+	IPPROTO_BRSATMON          = 0x4c
+	IPPROTO_CFTP              = 0x3e
+	IPPROTO_CHAOS             = 0x10
+	IPPROTO_CMTP              = 0x26
+	IPPROTO_CPHB              = 0x49
+	IPPROTO_CPNX              = 0x48
+	IPPROTO_DDP               = 0x25
+	IPPROTO_DGP               = 0x56
+	IPPROTO_DIVERT            = 0xfe
+	IPPROTO_DONE              = 0x101
+	IPPROTO_DSTOPTS           = 0x3c
+	IPPROTO_EGP               = 0x8
+	IPPROTO_EMCON             = 0xe
+	IPPROTO_ENCAP             = 0x62
+	IPPROTO_EON               = 0x50
+	IPPROTO_ESP               = 0x32
+	IPPROTO_ETHERIP           = 0x61
+	IPPROTO_FRAGMENT          = 0x2c
+	IPPROTO_GGP               = 0x3
+	IPPROTO_GMTP              = 0x64
+	IPPROTO_GRE               = 0x2f
+	IPPROTO_HELLO             = 0x3f
+	IPPROTO_HMP               = 0x14
+	IPPROTO_HOPOPTS           = 0
+	IPPROTO_ICMP              = 0x1
+	IPPROTO_ICMPV6            = 0x3a
+	IPPROTO_IDP               = 0x16
+	IPPROTO_IDPR              = 0x23
+	IPPROTO_IDRP              = 0x2d
+	IPPROTO_IGMP              = 0x2
+	IPPROTO_IGP               = 0x55
+	IPPROTO_IGRP              = 0x58
+	IPPROTO_IL                = 0x28
+	IPPROTO_INLSP             = 0x34
+	IPPROTO_INP               = 0x20
+	IPPROTO_IP                = 0
+	IPPROTO_IPCOMP            = 0x6c
+	IPPROTO_IPCV              = 0x47
+	IPPROTO_IPEIP             = 0x5e
+	IPPROTO_IPIP              = 0x4
+	IPPROTO_IPPC              = 0x43
+	IPPROTO_IPV4              = 0x4
+	IPPROTO_IPV6              = 0x29
+	IPPROTO_IRTP              = 0x1c
+	IPPROTO_KRYPTOLAN         = 0x41
+	IPPROTO_LARP              = 0x5b
+	IPPROTO_LEAF1             = 0x19
+	IPPROTO_LEAF2             = 0x1a
+	IPPROTO_MAX               = 0x100
+	IPPROTO_MAXID             = 0x34
+	IPPROTO_MEAS              = 0x13
+	IPPROTO_MHRP              = 0x30
+	IPPROTO_MICP              = 0x5f
+	IPPROTO_MTP               = 0x5c
+	IPPROTO_MUX               = 0x12
+	IPPROTO_ND                = 0x4d
+	IPPROTO_NHRP              = 0x36
+	IPPROTO_NONE              = 0x3b
+	IPPROTO_NSP               = 0x1f
+	IPPROTO_NVPII             = 0xb
+	IPPROTO_OSPFIGP           = 0x59
+	IPPROTO_PGM               = 0x71
+	IPPROTO_PIGP              = 0x9
+	IPPROTO_PIM               = 0x67
+	IPPROTO_PRM               = 0x15
+	IPPROTO_PUP               = 0xc
+	IPPROTO_PVP               = 0x4b
+	IPPROTO_RAW               = 0xff
+	IPPROTO_RCCMON            = 0xa
+	IPPROTO_RDP               = 0x1b
+	IPPROTO_ROUTING           = 0x2b
+	IPPROTO_RSVP              = 0x2e
+	IPPROTO_RVD               = 0x42
+	IPPROTO_SATEXPAK          = 0x40
+	IPPROTO_SATMON            = 0x45
+	IPPROTO_SCCSP             = 0x60
+	IPPROTO_SDRP              = 0x2a
+	IPPROTO_SEP               = 0x21
+	IPPROTO_SRPC              = 0x5a
+	IPPROTO_ST                = 0x7
+	IPPROTO_SVMTP             = 0x52
+	IPPROTO_SWIPE             = 0x35
+	IPPROTO_TCF               = 0x57
+	IPPROTO_TCP               = 0x6
+	IPPROTO_TP                = 0x1d
+	IPPROTO_TPXX              = 0x27
+	IPPROTO_TRUNK1            = 0x17
+	IPPROTO_TRUNK2            = 0x18
+	IPPROTO_TTP               = 0x54
+	IPPROTO_UDP               = 0x11
+	IPPROTO_VINES             = 0x53
+	IPPROTO_VISA              = 0x46
+	IPPROTO_VMTP              = 0x51
+	IPPROTO_WBEXPAK           = 0x4f
+	IPPROTO_WBMON             = 0x4e
+	IPPROTO_WSN               = 0x4a
+	IPPROTO_XNET              = 0xf
+	IPPROTO_XTP               = 0x24
+	IP_ADD_MEMBERSHIP         = 0xc
+	IP_BOUND_IF               = 0x19
+	IP_DEFAULT_MULTICAST_LOOP = 0x1
+	IP_DEFAULT_MULTICAST_TTL  = 0x1
+	IP_DROP_MEMBERSHIP        = 0xd
+	IP_DUMMYNET_CONFIGURE     = 0x3c
+	IP_DUMMYNET_DEL           = 0x3d
+	IP_DUMMYNET_FLUSH         = 0x3e
+	IP_DUMMYNET_GET           = 0x40
+	IP_FAITH                  = 0x16
+	IP_FW_ADD                 = 0x28
+	IP_FW_DEL                 = 0x29
+	IP_FW_FLUSH               = 0x2a
+	IP_FW_GET                 = 0x2c
+	IP_FW_RESETLOG            = 0x2d
+	IP_FW_ZERO                = 0x2b
+	IP_HDRINCL                = 0x2
+	IP_IPSEC_POLICY           = 0x15
+	IP_MAX_MEMBERSHIPS        = 0x14
+	IP_MULTICAST_IF           = 0x9
+	IP_MULTICAST_LOOP         = 0xb
+	IP_MULTICAST_TTL          = 0xa
+	IP_MULTICAST_VIF          = 0xe
+	IP_NAT__XXX               = 0x37
+	IP_OLD_FW_ADD             = 0x32
+	IP_OLD_FW_DEL             = 0x33
+	IP_OLD_FW_FLUSH           = 0x34
+	IP_OLD_FW_GET             = 0x36
+	IP_OLD_FW_RESETLOG        = 0x38
+	IP_OLD_FW_ZERO            = 0x35
+	IP_OPTIONS                = 0x1
+	IP_PORTRANGE              = 0x13
+	IP_PORTRANGE_DEFAULT      = 0
+	IP_PORTRANGE_HIGH         = 0x1
+	IP_PORTRANGE_LOW          = 0x2
+	IP_RECVDSTADDR            = 0x7
+	IP_RECVIF                 = 0x14
+	IP_RECVOPTS               = 0x5
+	IP_RECVRETOPTS            = 0x6
+	IP_RECVTTL                = 0x18
+	IP_RETOPTS                = 0x8
+	IP_RSVP_OFF               = 0x10
+	IP_RSVP_ON                = 0xf
+	IP_RSVP_VIF_OFF           = 0x12
+	IP_RSVP_VIF_ON            = 0x11
+	IP_STRIPHDR               = 0x17
+	IP_TOS                    = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND = 0x41
+	IP_TTL                    = 0x4
+	O_ACCMODE                 = 0x3
+	O_ALERT                   = 0x20000000
+	O_APPEND                  = 0x8
+	O_ASYNC                   = 0x40
+	O_CREAT                   = 0x200
+	O_DIRECTORY               = 0x100000
+	O_DSYNC                   = 0x400000
+	O_EVTONLY                 = 0x8000
+	O_EXCL                    = 0x800
+	O_EXLOCK                  = 0x20
+	O_FSYNC                   = 0x80
+	O_NDELAY                  = 0x4
+	O_NOCTTY                  = 0x20000
+	O_NOFOLLOW                = 0x100
+	O_NONBLOCK                = 0x4
+	O_POPUP                   = 0x80000000
+	O_RDONLY                  = 0
+	O_RDWR                    = 0x2
+	O_SHLOCK                  = 0x10
+	O_SYMLINK                 = 0x200000
+	O_SYNC                    = 0x80
+	O_TRUNC                   = 0x400
+	O_WRONLY                  = 0x1
+	SHUT_RD                   = 0
+	SHUT_RDWR                 = 0x2
+	SHUT_WR                   = 0x1
+	SIGABRT                   = 0x6
+	SIGALRM                   = 0xe
+	SIGBUS                    = 0xa
+	SIGCHLD                   = 0x14
+	SIGCONT                   = 0x13
+	SIGEMT                    = 0x7
+	SIGFPE                    = 0x8
+	SIGHUP                    = 0x1
+	SIGILL                    = 0x4
+	SIGINFO                   = 0x1d
+	SIGINT                    = 0x2
+	SIGIO                     = 0x17
+	SIGIOT                    = 0x6
+	SIGKILL                   = 0x9
+	SIGPIPE                   = 0xd
+	SIGPROF                   = 0x1b
+	SIGQUIT                   = 0x3
+	SIGSEGV                   = 0xb
+	SIGSTOP                   = 0x11
+	SIGSYS                    = 0xc
+	SIGTERM                   = 0xf
+	SIGTRAP                   = 0x5
+	SIGTSTP                   = 0x12
+	SIGTTIN                   = 0x15
+	SIGTTOU                   = 0x16
+	SIGURG                    = 0x10
+	SIGUSR1                   = 0x1e
+	SIGUSR2                   = 0x1f
+	SIGVTALRM                 = 0x1a
+	SIGWINCH                  = 0x1c
+	SIGXCPU                   = 0x18
+	SIGXFSZ                   = 0x19
+	SOCK_DGRAM                = 0x2
+	SOCK_MAXADDRLEN           = 0xff
+	SOCK_RAW                  = 0x3
+	SOCK_RDM                  = 0x4
+	SOCK_SEQPACKET            = 0x5
+	SOCK_STREAM               = 0x1
+	SOL_SOCKET                = 0xffff
+	SOMAXCONN                 = 0x80
+	SO_ACCEPTCONN             = 0x2
+	SO_BROADCAST              = 0x20
+	SO_DEBUG                  = 0x1
+	SO_DONTROUTE              = 0x10
+	SO_DONTTRUNC              = 0x2000
+	SO_ERROR                  = 0x1007
+	SO_KEEPALIVE              = 0x8
+	SO_LABEL                  = 0x1010
+	SO_LINGER                 = 0x80
+	SO_LINGER_SEC             = 0x1080
+	SO_NKE                    = 0x1021
+	SO_NOADDRERR              = 0x1023
+	SO_NOSIGPIPE              = 0x1022
+	SO_NOTIFYCONFLICT         = 0x1026
+	SO_NP_EXTENSIONS          = 0x1083
+	SO_NREAD                  = 0x1020
+	SO_NWRITE                 = 0x1024
+	SO_OOBINLINE              = 0x100
+	SO_PEERLABEL              = 0x1011
+	SO_RANDOMPORT             = 0x1082
+	SO_RCVBUF                 = 0x1002
+	SO_RCVLOWAT               = 0x1004
+	SO_RCVTIMEO               = 0x1006
+	SO_RESTRICTIONS           = 0x1081
+	SO_RESTRICT_DENYIN        = 0x1
+	SO_RESTRICT_DENYOUT       = 0x2
+	SO_RESTRICT_DENYSET       = 0x80000000
+	SO_REUSEADDR              = 0x4
+	SO_REUSEPORT              = 0x200
+	SO_REUSESHAREUID          = 0x1025
+	SO_SNDBUF                 = 0x1001
+	SO_SNDLOWAT               = 0x1003
+	SO_SNDTIMEO               = 0x1005
+	SO_TIMESTAMP              = 0x400
+	SO_TYPE                   = 0x1008
+	SO_UPCALLCLOSEWAIT        = 0x1027
+	SO_USELOOPBACK            = 0x40
+	SO_WANTMORE               = 0x4000
+	SO_WANTOOBFLAG            = 0x8000
+	S_IEXEC                   = 0x40
+	S_IFBLK                   = 0x6000
+	S_IFCHR                   = 0x2000
+	S_IFDIR                   = 0x4000
+	S_IFIFO                   = 0x1000
+	S_IFLNK                   = 0xa000
+	S_IFMT                    = 0xf000
+	S_IFREG                   = 0x8000
+	S_IFSOCK                  = 0xc000
+	S_IFWHT                   = 0xe000
+	S_IREAD                   = 0x100
+	S_IRGRP                   = 0x20
+	S_IROTH                   = 0x4
+	S_IRUSR                   = 0x100
+	S_IRWXG                   = 0x38
+	S_IRWXO                   = 0x7
+	S_IRWXU                   = 0x1c0
+	S_ISGID                   = 0x400
+	S_ISTXT                   = 0x200
+	S_ISUID                   = 0x800
+	S_ISVTX                   = 0x200
+	S_IWGRP                   = 0x10
+	S_IWOTH                   = 0x2
+	S_IWRITE                  = 0x80
+	S_IWUSR                   = 0x80
+	S_IXGRP                   = 0x8
+	S_IXOTH                   = 0x1
+	S_IXUSR                   = 0x40
+	TCP_CONNECTIONTIMEOUT     = 0x20
+	TCP_KEEPALIVE             = 0x10
+	TCP_MAXBURST              = 0x4
+	TCP_MAXHLEN               = 0x3c
+	TCP_MAXOLEN               = 0x28
+	TCP_MAXSEG                = 0x2
+	TCP_MAXWIN                = 0xffff
+	TCP_MAX_SACK              = 0x3
+	TCP_MAX_WINSHIFT          = 0xe
+	TCP_MINMSS                = 0xd8
+	TCP_MINMSSOVERLOAD        = 0x3e8
+	TCP_MSS                   = 0x200
+	TCP_NODELAY               = 0x1
+	TCP_NOOPT                 = 0x8
+	TCP_NOPUSH                = 0x4
+	WCONTINUED                = 0x10
+	WCOREFLAG                 = 0x80
+	WEXITED                   = 0x4
+	WNOHANG                   = 0x1
+	WNOWAIT                   = 0x20
+	WORDSIZE                  = 0x40
+	WSTOPPED                  = 0x7f
+	WUNTRACED                 = 0x2
 )
 
 // Types
diff --git a/src/pkg/syscall/zerrors_freebsd_386.go b/src/pkg/syscall/zerrors_freebsd_386.go
index b198adb95..4c1b828e5 100644
--- a/src/pkg/syscall/zerrors_freebsd_386.go
+++ b/src/pkg/syscall/zerrors_freebsd_386.go
@@ -9,526 +9,526 @@ package syscall
 
 // Constants
 const (
-	AF_APPLETALK			= 0x10;
-	AF_ARP				= 0x23;
-	AF_ATM				= 0x1e;
-	AF_BLUETOOTH			= 0x24;
-	AF_CCITT			= 0xa;
-	AF_CHAOS			= 0x5;
-	AF_CNT				= 0x15;
-	AF_COIP				= 0x14;
-	AF_DATAKIT			= 0x9;
-	AF_DECnet			= 0xc;
-	AF_DLI				= 0xd;
-	AF_E164				= 0x1a;
-	AF_ECMA				= 0x8;
-	AF_HYLINK			= 0xf;
-	AF_IEEE80211			= 0x25;
-	AF_IMPLINK			= 0x3;
-	AF_INET				= 0x2;
-	AF_INET6			= 0x1c;
-	AF_IPX				= 0x17;
-	AF_ISDN				= 0x1a;
-	AF_ISO				= 0x7;
-	AF_LAT				= 0xe;
-	AF_LINK				= 0x12;
-	AF_LOCAL			= 0x1;
-	AF_MAX				= 0x26;
-	AF_NATM				= 0x1d;
-	AF_NETBIOS			= 0x6;
-	AF_NETGRAPH			= 0x20;
-	AF_OSI				= 0x7;
-	AF_PUP				= 0x4;
-	AF_ROUTE			= 0x11;
-	AF_SCLUSTER			= 0x22;
-	AF_SIP				= 0x18;
-	AF_SLOW				= 0x21;
-	AF_SNA				= 0xb;
-	AF_UNIX				= 0x1;
-	AF_UNSPEC			= 0;
-	AF_VENDOR00			= 0x27;
-	AF_VENDOR01			= 0x29;
-	AF_VENDOR02			= 0x2b;
-	AF_VENDOR03			= 0x2d;
-	AF_VENDOR04			= 0x2f;
-	AF_VENDOR05			= 0x31;
-	AF_VENDOR06			= 0x33;
-	AF_VENDOR07			= 0x35;
-	AF_VENDOR08			= 0x37;
-	AF_VENDOR09			= 0x39;
-	AF_VENDOR10			= 0x3b;
-	AF_VENDOR11			= 0x3d;
-	AF_VENDOR12			= 0x3f;
-	AF_VENDOR13			= 0x41;
-	AF_VENDOR14			= 0x43;
-	AF_VENDOR15			= 0x45;
-	AF_VENDOR16			= 0x47;
-	AF_VENDOR17			= 0x49;
-	AF_VENDOR18			= 0x4b;
-	AF_VENDOR19			= 0x4d;
-	AF_VENDOR20			= 0x4f;
-	AF_VENDOR21			= 0x51;
-	AF_VENDOR22			= 0x53;
-	AF_VENDOR23			= 0x55;
-	AF_VENDOR24			= 0x57;
-	AF_VENDOR25			= 0x59;
-	AF_VENDOR26			= 0x5b;
-	AF_VENDOR27			= 0x5d;
-	AF_VENDOR28			= 0x5f;
-	AF_VENDOR29			= 0x61;
-	AF_VENDOR30			= 0x63;
-	AF_VENDOR31			= 0x65;
-	AF_VENDOR32			= 0x67;
-	AF_VENDOR33			= 0x69;
-	AF_VENDOR34			= 0x6b;
-	AF_VENDOR35			= 0x6d;
-	AF_VENDOR36			= 0x6f;
-	AF_VENDOR37			= 0x71;
-	AF_VENDOR38			= 0x73;
-	AF_VENDOR39			= 0x75;
-	AF_VENDOR40			= 0x77;
-	AF_VENDOR41			= 0x79;
-	AF_VENDOR42			= 0x7b;
-	AF_VENDOR43			= 0x7d;
-	AF_VENDOR44			= 0x7f;
-	AF_VENDOR45			= 0x81;
-	AF_VENDOR46			= 0x83;
-	AF_VENDOR47			= 0x85;
-	E2BIG				= 0x7;
-	EACCES				= 0xd;
-	EADDRINUSE			= 0x30;
-	EADDRNOTAVAIL			= 0x31;
-	EAFNOSUPPORT			= 0x2f;
-	EAGAIN				= 0x23;
-	EALREADY			= 0x25;
-	EAUTH				= 0x50;
-	EBADF				= 0x9;
-	EBADMSG				= 0x59;
-	EBADRPC				= 0x48;
-	EBUSY				= 0x10;
-	ECANCELED			= 0x55;
-	ECHILD				= 0xa;
-	ECONNABORTED			= 0x35;
-	ECONNREFUSED			= 0x3d;
-	ECONNRESET			= 0x36;
-	EDEADLK				= 0xb;
-	EDESTADDRREQ			= 0x27;
-	EDOM				= 0x21;
-	EDOOFUS				= 0x58;
-	EDQUOT				= 0x45;
-	EEXIST				= 0x11;
-	EFAULT				= 0xe;
-	EFBIG				= 0x1b;
-	EFTYPE				= 0x4f;
-	EHOSTDOWN			= 0x40;
-	EHOSTUNREACH			= 0x41;
-	EIDRM				= 0x52;
-	EILSEQ				= 0x56;
-	EINPROGRESS			= 0x24;
-	EINTR				= 0x4;
-	EINVAL				= 0x16;
-	EIO				= 0x5;
-	EISCONN				= 0x38;
-	EISDIR				= 0x15;
-	ELAST				= 0x5c;
-	ELOOP				= 0x3e;
-	EMFILE				= 0x18;
-	EMLINK				= 0x1f;
-	EMSGSIZE			= 0x28;
-	EMULTIHOP			= 0x5a;
-	ENAMETOOLONG			= 0x3f;
-	ENEEDAUTH			= 0x51;
-	ENETDOWN			= 0x32;
-	ENETRESET			= 0x34;
-	ENETUNREACH			= 0x33;
-	ENFILE				= 0x17;
-	ENOATTR				= 0x57;
-	ENOBUFS				= 0x37;
-	ENODEV				= 0x13;
-	ENOENT				= 0x2;
-	ENOEXEC				= 0x8;
-	ENOLCK				= 0x4d;
-	ENOLINK				= 0x5b;
-	ENOMEM				= 0xc;
-	ENOMSG				= 0x53;
-	ENOPROTOOPT			= 0x2a;
-	ENOSPC				= 0x1c;
-	ENOSYS				= 0x4e;
-	ENOTBLK				= 0xf;
-	ENOTCONN			= 0x39;
-	ENOTDIR				= 0x14;
-	ENOTEMPTY			= 0x42;
-	ENOTSOCK			= 0x26;
-	ENOTSUP				= 0x2d;
-	ENOTTY				= 0x19;
-	ENXIO				= 0x6;
-	EOPNOTSUPP			= 0x2d;
-	EOVERFLOW			= 0x54;
-	EPERM				= 0x1;
-	EPFNOSUPPORT			= 0x2e;
-	EPIPE				= 0x20;
-	EPROCLIM			= 0x43;
-	EPROCUNAVAIL			= 0x4c;
-	EPROGMISMATCH			= 0x4b;
-	EPROGUNAVAIL			= 0x4a;
-	EPROTO				= 0x5c;
-	EPROTONOSUPPORT			= 0x2b;
-	EPROTOTYPE			= 0x29;
-	ERANGE				= 0x22;
-	EREMOTE				= 0x47;
-	EROFS				= 0x1e;
-	ERPCMISMATCH			= 0x49;
-	ESHUTDOWN			= 0x3a;
-	ESOCKTNOSUPPORT			= 0x2c;
-	ESPIPE				= 0x1d;
-	ESRCH				= 0x3;
-	ESTALE				= 0x46;
-	ETIMEDOUT			= 0x3c;
-	ETOOMANYREFS			= 0x3b;
-	ETXTBSY				= 0x1a;
-	EUSERS				= 0x44;
-	EVFILT_AIO			= -0x3;
-	EVFILT_FS			= -0x9;
-	EVFILT_LIO			= -0xa;
-	EVFILT_NETDEV			= -0x8;
-	EVFILT_PROC			= -0x5;
-	EVFILT_READ			= -0x1;
-	EVFILT_SIGNAL			= -0x6;
-	EVFILT_SYSCOUNT			= 0xa;
-	EVFILT_TIMER			= -0x7;
-	EVFILT_VNODE			= -0x4;
-	EVFILT_WRITE			= -0x2;
-	EV_ADD				= 0x1;
-	EV_CLEAR			= 0x20;
-	EV_DELETE			= 0x2;
-	EV_DISABLE			= 0x8;
-	EV_ENABLE			= 0x4;
-	EV_EOF				= 0x8000;
-	EV_ERROR			= 0x4000;
-	EV_FLAG1			= 0x2000;
-	EV_ONESHOT			= 0x10;
-	EV_SYSFLAGS			= 0xf000;
-	EWOULDBLOCK			= 0x23;
-	EXDEV				= 0x12;
-	FD_CLOEXEC			= 0x1;
-	FD_SETSIZE			= 0x400;
-	F_CANCEL			= 0x5;
-	F_DUP2FD			= 0xa;
-	F_DUPFD				= 0;
-	F_GETFD				= 0x1;
-	F_GETFL				= 0x3;
-	F_GETLK				= 0xb;
-	F_GETOWN			= 0x5;
-	F_OGETLK			= 0x7;
-	F_OSETLK			= 0x8;
-	F_OSETLKW			= 0x9;
-	F_RDLCK				= 0x1;
-	F_SETFD				= 0x2;
-	F_SETFL				= 0x4;
-	F_SETLK				= 0xc;
-	F_SETLKW			= 0xd;
-	F_SETLK_REMOTE			= 0xe;
-	F_SETOWN			= 0x6;
-	F_UNLCK				= 0x2;
-	F_UNLCKSYS			= 0x4;
-	F_WRLCK				= 0x3;
-	IPPROTO_3PC			= 0x22;
-	IPPROTO_ADFS			= 0x44;
-	IPPROTO_AH			= 0x33;
-	IPPROTO_AHIP			= 0x3d;
-	IPPROTO_APES			= 0x63;
-	IPPROTO_ARGUS			= 0xd;
-	IPPROTO_AX25			= 0x5d;
-	IPPROTO_BHA			= 0x31;
-	IPPROTO_BLT			= 0x1e;
-	IPPROTO_BRSATMON		= 0x4c;
-	IPPROTO_CARP			= 0x70;
-	IPPROTO_CFTP			= 0x3e;
-	IPPROTO_CHAOS			= 0x10;
-	IPPROTO_CMTP			= 0x26;
-	IPPROTO_CPHB			= 0x49;
-	IPPROTO_CPNX			= 0x48;
-	IPPROTO_DDP			= 0x25;
-	IPPROTO_DGP			= 0x56;
-	IPPROTO_DIVERT			= 0x102;
-	IPPROTO_DONE			= 0x101;
-	IPPROTO_DSTOPTS			= 0x3c;
-	IPPROTO_EGP			= 0x8;
-	IPPROTO_EMCON			= 0xe;
-	IPPROTO_ENCAP			= 0x62;
-	IPPROTO_EON			= 0x50;
-	IPPROTO_ESP			= 0x32;
-	IPPROTO_ETHERIP			= 0x61;
-	IPPROTO_FRAGMENT		= 0x2c;
-	IPPROTO_GGP			= 0x3;
-	IPPROTO_GMTP			= 0x64;
-	IPPROTO_GRE			= 0x2f;
-	IPPROTO_HELLO			= 0x3f;
-	IPPROTO_HMP			= 0x14;
-	IPPROTO_HOPOPTS			= 0;
-	IPPROTO_ICMP			= 0x1;
-	IPPROTO_ICMPV6			= 0x3a;
-	IPPROTO_IDP			= 0x16;
-	IPPROTO_IDPR			= 0x23;
-	IPPROTO_IDRP			= 0x2d;
-	IPPROTO_IGMP			= 0x2;
-	IPPROTO_IGP			= 0x55;
-	IPPROTO_IGRP			= 0x58;
-	IPPROTO_IL			= 0x28;
-	IPPROTO_INLSP			= 0x34;
-	IPPROTO_INP			= 0x20;
-	IPPROTO_IP			= 0;
-	IPPROTO_IPCOMP			= 0x6c;
-	IPPROTO_IPCV			= 0x47;
-	IPPROTO_IPEIP			= 0x5e;
-	IPPROTO_IPIP			= 0x4;
-	IPPROTO_IPPC			= 0x43;
-	IPPROTO_IPV4			= 0x4;
-	IPPROTO_IPV6			= 0x29;
-	IPPROTO_IRTP			= 0x1c;
-	IPPROTO_KRYPTOLAN		= 0x41;
-	IPPROTO_LARP			= 0x5b;
-	IPPROTO_LEAF1			= 0x19;
-	IPPROTO_LEAF2			= 0x1a;
-	IPPROTO_MAX			= 0x100;
-	IPPROTO_MAXID			= 0x34;
-	IPPROTO_MEAS			= 0x13;
-	IPPROTO_MHRP			= 0x30;
-	IPPROTO_MICP			= 0x5f;
-	IPPROTO_MOBILE			= 0x37;
-	IPPROTO_MTP			= 0x5c;
-	IPPROTO_MUX			= 0x12;
-	IPPROTO_ND			= 0x4d;
-	IPPROTO_NHRP			= 0x36;
-	IPPROTO_NONE			= 0x3b;
-	IPPROTO_NSP			= 0x1f;
-	IPPROTO_NVPII			= 0xb;
-	IPPROTO_OLD_DIVERT		= 0xfe;
-	IPPROTO_OSPFIGP			= 0x59;
-	IPPROTO_PFSYNC			= 0xf0;
-	IPPROTO_PGM			= 0x71;
-	IPPROTO_PIGP			= 0x9;
-	IPPROTO_PIM			= 0x67;
-	IPPROTO_PRM			= 0x15;
-	IPPROTO_PUP			= 0xc;
-	IPPROTO_PVP			= 0x4b;
-	IPPROTO_RAW			= 0xff;
-	IPPROTO_RCCMON			= 0xa;
-	IPPROTO_RDP			= 0x1b;
-	IPPROTO_ROUTING			= 0x2b;
-	IPPROTO_RSVP			= 0x2e;
-	IPPROTO_RVD			= 0x42;
-	IPPROTO_SATEXPAK		= 0x40;
-	IPPROTO_SATMON			= 0x45;
-	IPPROTO_SCCSP			= 0x60;
-	IPPROTO_SCTP			= 0x84;
-	IPPROTO_SDRP			= 0x2a;
-	IPPROTO_SEP			= 0x21;
-	IPPROTO_SKIP			= 0x39;
-	IPPROTO_SPACER			= 0x7fff;
-	IPPROTO_SRPC			= 0x5a;
-	IPPROTO_ST			= 0x7;
-	IPPROTO_SVMTP			= 0x52;
-	IPPROTO_SWIPE			= 0x35;
-	IPPROTO_TCF			= 0x57;
-	IPPROTO_TCP			= 0x6;
-	IPPROTO_TLSP			= 0x38;
-	IPPROTO_TP			= 0x1d;
-	IPPROTO_TPXX			= 0x27;
-	IPPROTO_TRUNK1			= 0x17;
-	IPPROTO_TRUNK2			= 0x18;
-	IPPROTO_TTP			= 0x54;
-	IPPROTO_UDP			= 0x11;
-	IPPROTO_VINES			= 0x53;
-	IPPROTO_VISA			= 0x46;
-	IPPROTO_VMTP			= 0x51;
-	IPPROTO_WBEXPAK			= 0x4f;
-	IPPROTO_WBMON			= 0x4e;
-	IPPROTO_WSN			= 0x4a;
-	IPPROTO_XNET			= 0xf;
-	IPPROTO_XTP			= 0x24;
-	IP_ADD_MEMBERSHIP		= 0xc;
-	IP_ADD_SOURCE_MEMBERSHIP	= 0x46;
-	IP_BINDANY			= 0x18;
-	IP_BLOCK_SOURCE			= 0x48;
-	IP_DEFAULT_MULTICAST_LOOP	= 0x1;
-	IP_DEFAULT_MULTICAST_TTL	= 0x1;
-	IP_DONTFRAG			= 0x43;
-	IP_DROP_MEMBERSHIP		= 0xd;
-	IP_DROP_SOURCE_MEMBERSHIP	= 0x47;
-	IP_DUMMYNET_CONFIGURE		= 0x3c;
-	IP_DUMMYNET_DEL			= 0x3d;
-	IP_DUMMYNET_FLUSH		= 0x3e;
-	IP_DUMMYNET_GET			= 0x40;
-	IP_FAITH			= 0x16;
-	IP_FW_ADD			= 0x32;
-	IP_FW_DEL			= 0x33;
-	IP_FW_FLUSH			= 0x34;
-	IP_FW_GET			= 0x36;
-	IP_FW_NAT_CFG			= 0x38;
-	IP_FW_NAT_DEL			= 0x39;
-	IP_FW_NAT_GET_CONFIG		= 0x3a;
-	IP_FW_NAT_GET_LOG		= 0x3b;
-	IP_FW_RESETLOG			= 0x37;
-	IP_FW_TABLE_ADD			= 0x28;
-	IP_FW_TABLE_DEL			= 0x29;
-	IP_FW_TABLE_FLUSH		= 0x2a;
-	IP_FW_TABLE_GETSIZE		= 0x2b;
-	IP_FW_TABLE_LIST		= 0x2c;
-	IP_FW_ZERO			= 0x35;
-	IP_HDRINCL			= 0x2;
-	IP_IPSEC_POLICY			= 0x15;
-	IP_MAX_GROUP_SRC_FILTER		= 0x200;
-	IP_MAX_MEMBERSHIPS		= 0xfff;
-	IP_MAX_SOCK_MUTE_FILTER		= 0x80;
-	IP_MAX_SOCK_SRC_FILTER		= 0x80;
-	IP_MAX_SOURCE_FILTER		= 0x400;
-	IP_MINTTL			= 0x42;
-	IP_MIN_MEMBERSHIPS		= 0x1f;
-	IP_MSFILTER			= 0x4a;
-	IP_MULTICAST_IF			= 0x9;
-	IP_MULTICAST_LOOP		= 0xb;
-	IP_MULTICAST_TTL		= 0xa;
-	IP_MULTICAST_VIF		= 0xe;
-	IP_ONESBCAST			= 0x17;
-	IP_OPTIONS			= 0x1;
-	IP_PORTRANGE			= 0x13;
-	IP_PORTRANGE_DEFAULT		= 0;
-	IP_PORTRANGE_HIGH		= 0x1;
-	IP_PORTRANGE_LOW		= 0x2;
-	IP_RECVDSTADDR			= 0x7;
-	IP_RECVIF			= 0x14;
-	IP_RECVOPTS			= 0x5;
-	IP_RECVRETOPTS			= 0x6;
-	IP_RECVTTL			= 0x41;
-	IP_RETOPTS			= 0x8;
-	IP_RSVP_OFF			= 0x10;
-	IP_RSVP_ON			= 0xf;
-	IP_RSVP_VIF_OFF			= 0x12;
-	IP_RSVP_VIF_ON			= 0x11;
-	IP_SENDSRCADDR			= 0x7;
-	IP_TOS				= 0x3;
-	IP_TTL				= 0x4;
-	IP_UNBLOCK_SOURCE		= 0x49;
-	O_ACCMODE			= 0x3;
-	O_APPEND			= 0x8;
-	O_ASYNC				= 0x40;
-	O_CREAT				= 0x200;
-	O_DIRECT			= 0x10000;
-	O_DIRECTORY			= 0x20000;
-	O_EXCL				= 0x800;
-	O_EXEC				= 0x40000;
-	O_EXLOCK			= 0x20;
-	O_FSYNC				= 0x80;
-	O_NDELAY			= 0x4;
-	O_NOCTTY			= 0x8000;
-	O_NOFOLLOW			= 0x100;
-	O_NONBLOCK			= 0x4;
-	O_RDONLY			= 0;
-	O_RDWR				= 0x2;
-	O_SHLOCK			= 0x10;
-	O_SYNC				= 0x80;
-	O_TRUNC				= 0x400;
-	O_TTY_INIT			= 0x80000;
-	O_WRONLY			= 0x1;
-	SHUT_RD				= 0;
-	SHUT_RDWR			= 0x2;
-	SHUT_WR				= 0x1;
-	SIGABRT				= 0x6;
-	SIGALRM				= 0xe;
-	SIGBUS				= 0xa;
-	SIGCHLD				= 0x14;
-	SIGCONT				= 0x13;
-	SIGEMT				= 0x7;
-	SIGFPE				= 0x8;
-	SIGHUP				= 0x1;
-	SIGILL				= 0x4;
-	SIGINFO				= 0x1d;
-	SIGINT				= 0x2;
-	SIGIO				= 0x17;
-	SIGIOT				= 0x6;
-	SIGKILL				= 0x9;
-	SIGLWP				= 0x20;
-	SIGPIPE				= 0xd;
-	SIGPROF				= 0x1b;
-	SIGQUIT				= 0x3;
-	SIGSEGV				= 0xb;
-	SIGSTOP				= 0x11;
-	SIGSYS				= 0xc;
-	SIGTERM				= 0xf;
-	SIGTHR				= 0x20;
-	SIGTRAP				= 0x5;
-	SIGTSTP				= 0x12;
-	SIGTTIN				= 0x15;
-	SIGTTOU				= 0x16;
-	SIGURG				= 0x10;
-	SIGUSR1				= 0x1e;
-	SIGUSR2				= 0x1f;
-	SIGVTALRM			= 0x1a;
-	SIGWINCH			= 0x1c;
-	SIGXCPU				= 0x18;
-	SIGXFSZ				= 0x19;
-	SOCK_DGRAM			= 0x2;
-	SOCK_MAXADDRLEN			= 0xff;
-	SOCK_RAW			= 0x3;
-	SOCK_RDM			= 0x4;
-	SOCK_SEQPACKET			= 0x5;
-	SOCK_STREAM			= 0x1;
-	SOL_SOCKET			= 0xffff;
-	SOMAXCONN			= 0x80;
-	SO_ACCEPTCONN			= 0x2;
-	SO_ACCEPTFILTER			= 0x1000;
-	SO_BINTIME			= 0x2000;
-	SO_BROADCAST			= 0x20;
-	SO_DEBUG			= 0x1;
-	SO_DONTROUTE			= 0x10;
-	SO_ERROR			= 0x1007;
-	SO_KEEPALIVE			= 0x8;
-	SO_LABEL			= 0x1009;
-	SO_LINGER			= 0x80;
-	SO_LISTENINCQLEN		= 0x1013;
-	SO_LISTENQLEN			= 0x1012;
-	SO_LISTENQLIMIT			= 0x1011;
-	SO_NOSIGPIPE			= 0x800;
-	SO_NO_DDP			= 0x8000;
-	SO_NO_OFFLOAD			= 0x4000;
-	SO_OOBINLINE			= 0x100;
-	SO_PEERLABEL			= 0x1010;
-	SO_RCVBUF			= 0x1002;
-	SO_RCVLOWAT			= 0x1004;
-	SO_RCVTIMEO			= 0x1006;
-	SO_REUSEADDR			= 0x4;
-	SO_REUSEPORT			= 0x200;
-	SO_SETFIB			= 0x1014;
-	SO_SNDBUF			= 0x1001;
-	SO_SNDLOWAT			= 0x1003;
-	SO_SNDTIMEO			= 0x1005;
-	SO_TIMESTAMP			= 0x400;
-	SO_TYPE				= 0x1008;
-	SO_USELOOPBACK			= 0x40;
-	TCP_CA_NAME_MAX			= 0x10;
-	TCP_CONGESTION			= 0x40;
-	TCP_INFO			= 0x20;
-	TCP_MAXBURST			= 0x4;
-	TCP_MAXHLEN			= 0x3c;
-	TCP_MAXOLEN			= 0x28;
-	TCP_MAXSEG			= 0x2;
-	TCP_MAXWIN			= 0xffff;
-	TCP_MAX_SACK			= 0x4;
-	TCP_MAX_WINSHIFT		= 0xe;
-	TCP_MD5SIG			= 0x10;
-	TCP_MINMSS			= 0xd8;
-	TCP_MSS				= 0x200;
-	TCP_NODELAY			= 0x1;
-	TCP_NOOPT			= 0x8;
-	TCP_NOPUSH			= 0x4;
-	WCONTINUED			= 0x4;
-	WCOREFLAG			= 0x80;
-	WLINUXCLONE			= 0x80000000;
-	WNOHANG				= 0x1;
-	WNOWAIT				= 0x8;
-	WSTOPPED			= 0x2;
-	WUNTRACED			= 0x2;
+	AF_APPLETALK              = 0x10
+	AF_ARP                    = 0x23
+	AF_ATM                    = 0x1e
+	AF_BLUETOOTH              = 0x24
+	AF_CCITT                  = 0xa
+	AF_CHAOS                  = 0x5
+	AF_CNT                    = 0x15
+	AF_COIP                   = 0x14
+	AF_DATAKIT                = 0x9
+	AF_DECnet                 = 0xc
+	AF_DLI                    = 0xd
+	AF_E164                   = 0x1a
+	AF_ECMA                   = 0x8
+	AF_HYLINK                 = 0xf
+	AF_IEEE80211              = 0x25
+	AF_IMPLINK                = 0x3
+	AF_INET                   = 0x2
+	AF_INET6                  = 0x1c
+	AF_IPX                    = 0x17
+	AF_ISDN                   = 0x1a
+	AF_ISO                    = 0x7
+	AF_LAT                    = 0xe
+	AF_LINK                   = 0x12
+	AF_LOCAL                  = 0x1
+	AF_MAX                    = 0x26
+	AF_NATM                   = 0x1d
+	AF_NETBIOS                = 0x6
+	AF_NETGRAPH               = 0x20
+	AF_OSI                    = 0x7
+	AF_PUP                    = 0x4
+	AF_ROUTE                  = 0x11
+	AF_SCLUSTER               = 0x22
+	AF_SIP                    = 0x18
+	AF_SLOW                   = 0x21
+	AF_SNA                    = 0xb
+	AF_UNIX                   = 0x1
+	AF_UNSPEC                 = 0
+	AF_VENDOR00               = 0x27
+	AF_VENDOR01               = 0x29
+	AF_VENDOR02               = 0x2b
+	AF_VENDOR03               = 0x2d
+	AF_VENDOR04               = 0x2f
+	AF_VENDOR05               = 0x31
+	AF_VENDOR06               = 0x33
+	AF_VENDOR07               = 0x35
+	AF_VENDOR08               = 0x37
+	AF_VENDOR09               = 0x39
+	AF_VENDOR10               = 0x3b
+	AF_VENDOR11               = 0x3d
+	AF_VENDOR12               = 0x3f
+	AF_VENDOR13               = 0x41
+	AF_VENDOR14               = 0x43
+	AF_VENDOR15               = 0x45
+	AF_VENDOR16               = 0x47
+	AF_VENDOR17               = 0x49
+	AF_VENDOR18               = 0x4b
+	AF_VENDOR19               = 0x4d
+	AF_VENDOR20               = 0x4f
+	AF_VENDOR21               = 0x51
+	AF_VENDOR22               = 0x53
+	AF_VENDOR23               = 0x55
+	AF_VENDOR24               = 0x57
+	AF_VENDOR25               = 0x59
+	AF_VENDOR26               = 0x5b
+	AF_VENDOR27               = 0x5d
+	AF_VENDOR28               = 0x5f
+	AF_VENDOR29               = 0x61
+	AF_VENDOR30               = 0x63
+	AF_VENDOR31               = 0x65
+	AF_VENDOR32               = 0x67
+	AF_VENDOR33               = 0x69
+	AF_VENDOR34               = 0x6b
+	AF_VENDOR35               = 0x6d
+	AF_VENDOR36               = 0x6f
+	AF_VENDOR37               = 0x71
+	AF_VENDOR38               = 0x73
+	AF_VENDOR39               = 0x75
+	AF_VENDOR40               = 0x77
+	AF_VENDOR41               = 0x79
+	AF_VENDOR42               = 0x7b
+	AF_VENDOR43               = 0x7d
+	AF_VENDOR44               = 0x7f
+	AF_VENDOR45               = 0x81
+	AF_VENDOR46               = 0x83
+	AF_VENDOR47               = 0x85
+	E2BIG                     = 0x7
+	EACCES                    = 0xd
+	EADDRINUSE                = 0x30
+	EADDRNOTAVAIL             = 0x31
+	EAFNOSUPPORT              = 0x2f
+	EAGAIN                    = 0x23
+	EALREADY                  = 0x25
+	EAUTH                     = 0x50
+	EBADF                     = 0x9
+	EBADMSG                   = 0x59
+	EBADRPC                   = 0x48
+	EBUSY                     = 0x10
+	ECANCELED                 = 0x55
+	ECHILD                    = 0xa
+	ECONNABORTED              = 0x35
+	ECONNREFUSED              = 0x3d
+	ECONNRESET                = 0x36
+	EDEADLK                   = 0xb
+	EDESTADDRREQ              = 0x27
+	EDOM                      = 0x21
+	EDOOFUS                   = 0x58
+	EDQUOT                    = 0x45
+	EEXIST                    = 0x11
+	EFAULT                    = 0xe
+	EFBIG                     = 0x1b
+	EFTYPE                    = 0x4f
+	EHOSTDOWN                 = 0x40
+	EHOSTUNREACH              = 0x41
+	EIDRM                     = 0x52
+	EILSEQ                    = 0x56
+	EINPROGRESS               = 0x24
+	EINTR                     = 0x4
+	EINVAL                    = 0x16
+	EIO                       = 0x5
+	EISCONN                   = 0x38
+	EISDIR                    = 0x15
+	ELAST                     = 0x5c
+	ELOOP                     = 0x3e
+	EMFILE                    = 0x18
+	EMLINK                    = 0x1f
+	EMSGSIZE                  = 0x28
+	EMULTIHOP                 = 0x5a
+	ENAMETOOLONG              = 0x3f
+	ENEEDAUTH                 = 0x51
+	ENETDOWN                  = 0x32
+	ENETRESET                 = 0x34
+	ENETUNREACH               = 0x33
+	ENFILE                    = 0x17
+	ENOATTR                   = 0x57
+	ENOBUFS                   = 0x37
+	ENODEV                    = 0x13
+	ENOENT                    = 0x2
+	ENOEXEC                   = 0x8
+	ENOLCK                    = 0x4d
+	ENOLINK                   = 0x5b
+	ENOMEM                    = 0xc
+	ENOMSG                    = 0x53
+	ENOPROTOOPT               = 0x2a
+	ENOSPC                    = 0x1c
+	ENOSYS                    = 0x4e
+	ENOTBLK                   = 0xf
+	ENOTCONN                  = 0x39
+	ENOTDIR                   = 0x14
+	ENOTEMPTY                 = 0x42
+	ENOTSOCK                  = 0x26
+	ENOTSUP                   = 0x2d
+	ENOTTY                    = 0x19
+	ENXIO                     = 0x6
+	EOPNOTSUPP                = 0x2d
+	EOVERFLOW                 = 0x54
+	EPERM                     = 0x1
+	EPFNOSUPPORT              = 0x2e
+	EPIPE                     = 0x20
+	EPROCLIM                  = 0x43
+	EPROCUNAVAIL              = 0x4c
+	EPROGMISMATCH             = 0x4b
+	EPROGUNAVAIL              = 0x4a
+	EPROTO                    = 0x5c
+	EPROTONOSUPPORT           = 0x2b
+	EPROTOTYPE                = 0x29
+	ERANGE                    = 0x22
+	EREMOTE                   = 0x47
+	EROFS                     = 0x1e
+	ERPCMISMATCH              = 0x49
+	ESHUTDOWN                 = 0x3a
+	ESOCKTNOSUPPORT           = 0x2c
+	ESPIPE                    = 0x1d
+	ESRCH                     = 0x3
+	ESTALE                    = 0x46
+	ETIMEDOUT                 = 0x3c
+	ETOOMANYREFS              = 0x3b
+	ETXTBSY                   = 0x1a
+	EUSERS                    = 0x44
+	EVFILT_AIO                = -0x3
+	EVFILT_FS                 = -0x9
+	EVFILT_LIO                = -0xa
+	EVFILT_NETDEV             = -0x8
+	EVFILT_PROC               = -0x5
+	EVFILT_READ               = -0x1
+	EVFILT_SIGNAL             = -0x6
+	EVFILT_SYSCOUNT           = 0xa
+	EVFILT_TIMER              = -0x7
+	EVFILT_VNODE              = -0x4
+	EVFILT_WRITE              = -0x2
+	EV_ADD                    = 0x1
+	EV_CLEAR                  = 0x20
+	EV_DELETE                 = 0x2
+	EV_DISABLE                = 0x8
+	EV_ENABLE                 = 0x4
+	EV_EOF                    = 0x8000
+	EV_ERROR                  = 0x4000
+	EV_FLAG1                  = 0x2000
+	EV_ONESHOT                = 0x10
+	EV_SYSFLAGS               = 0xf000
+	EWOULDBLOCK               = 0x23
+	EXDEV                     = 0x12
+	FD_CLOEXEC                = 0x1
+	FD_SETSIZE                = 0x400
+	F_CANCEL                  = 0x5
+	F_DUP2FD                  = 0xa
+	F_DUPFD                   = 0
+	F_GETFD                   = 0x1
+	F_GETFL                   = 0x3
+	F_GETLK                   = 0xb
+	F_GETOWN                  = 0x5
+	F_OGETLK                  = 0x7
+	F_OSETLK                  = 0x8
+	F_OSETLKW                 = 0x9
+	F_RDLCK                   = 0x1
+	F_SETFD                   = 0x2
+	F_SETFL                   = 0x4
+	F_SETLK                   = 0xc
+	F_SETLKW                  = 0xd
+	F_SETLK_REMOTE            = 0xe
+	F_SETOWN                  = 0x6
+	F_UNLCK                   = 0x2
+	F_UNLCKSYS                = 0x4
+	F_WRLCK                   = 0x3
+	IPPROTO_3PC               = 0x22
+	IPPROTO_ADFS              = 0x44
+	IPPROTO_AH                = 0x33
+	IPPROTO_AHIP              = 0x3d
+	IPPROTO_APES              = 0x63
+	IPPROTO_ARGUS             = 0xd
+	IPPROTO_AX25              = 0x5d
+	IPPROTO_BHA               = 0x31
+	IPPROTO_BLT               = 0x1e
+	IPPROTO_BRSATMON          = 0x4c
+	IPPROTO_CARP              = 0x70
+	IPPROTO_CFTP              = 0x3e
+	IPPROTO_CHAOS             = 0x10
+	IPPROTO_CMTP              = 0x26
+	IPPROTO_CPHB              = 0x49
+	IPPROTO_CPNX              = 0x48
+	IPPROTO_DDP               = 0x25
+	IPPROTO_DGP               = 0x56
+	IPPROTO_DIVERT            = 0x102
+	IPPROTO_DONE              = 0x101
+	IPPROTO_DSTOPTS           = 0x3c
+	IPPROTO_EGP               = 0x8
+	IPPROTO_EMCON             = 0xe
+	IPPROTO_ENCAP             = 0x62
+	IPPROTO_EON               = 0x50
+	IPPROTO_ESP               = 0x32
+	IPPROTO_ETHERIP           = 0x61
+	IPPROTO_FRAGMENT          = 0x2c
+	IPPROTO_GGP               = 0x3
+	IPPROTO_GMTP              = 0x64
+	IPPROTO_GRE               = 0x2f
+	IPPROTO_HELLO             = 0x3f
+	IPPROTO_HMP               = 0x14
+	IPPROTO_HOPOPTS           = 0
+	IPPROTO_ICMP              = 0x1
+	IPPROTO_ICMPV6            = 0x3a
+	IPPROTO_IDP               = 0x16
+	IPPROTO_IDPR              = 0x23
+	IPPROTO_IDRP              = 0x2d
+	IPPROTO_IGMP              = 0x2
+	IPPROTO_IGP               = 0x55
+	IPPROTO_IGRP              = 0x58
+	IPPROTO_IL                = 0x28
+	IPPROTO_INLSP             = 0x34
+	IPPROTO_INP               = 0x20
+	IPPROTO_IP                = 0
+	IPPROTO_IPCOMP            = 0x6c
+	IPPROTO_IPCV              = 0x47
+	IPPROTO_IPEIP             = 0x5e
+	IPPROTO_IPIP              = 0x4
+	IPPROTO_IPPC              = 0x43
+	IPPROTO_IPV4              = 0x4
+	IPPROTO_IPV6              = 0x29
+	IPPROTO_IRTP              = 0x1c
+	IPPROTO_KRYPTOLAN         = 0x41
+	IPPROTO_LARP              = 0x5b
+	IPPROTO_LEAF1             = 0x19
+	IPPROTO_LEAF2             = 0x1a
+	IPPROTO_MAX               = 0x100
+	IPPROTO_MAXID             = 0x34
+	IPPROTO_MEAS              = 0x13
+	IPPROTO_MHRP              = 0x30
+	IPPROTO_MICP              = 0x5f
+	IPPROTO_MOBILE            = 0x37
+	IPPROTO_MTP               = 0x5c
+	IPPROTO_MUX               = 0x12
+	IPPROTO_ND                = 0x4d
+	IPPROTO_NHRP              = 0x36
+	IPPROTO_NONE              = 0x3b
+	IPPROTO_NSP               = 0x1f
+	IPPROTO_NVPII             = 0xb
+	IPPROTO_OLD_DIVERT        = 0xfe
+	IPPROTO_OSPFIGP           = 0x59
+	IPPROTO_PFSYNC            = 0xf0
+	IPPROTO_PGM               = 0x71
+	IPPROTO_PIGP              = 0x9
+	IPPROTO_PIM               = 0x67
+	IPPROTO_PRM               = 0x15
+	IPPROTO_PUP               = 0xc
+	IPPROTO_PVP               = 0x4b
+	IPPROTO_RAW               = 0xff
+	IPPROTO_RCCMON            = 0xa
+	IPPROTO_RDP               = 0x1b
+	IPPROTO_ROUTING           = 0x2b
+	IPPROTO_RSVP              = 0x2e
+	IPPROTO_RVD               = 0x42
+	IPPROTO_SATEXPAK          = 0x40
+	IPPROTO_SATMON            = 0x45
+	IPPROTO_SCCSP             = 0x60
+	IPPROTO_SCTP              = 0x84
+	IPPROTO_SDRP              = 0x2a
+	IPPROTO_SEP               = 0x21
+	IPPROTO_SKIP              = 0x39
+	IPPROTO_SPACER            = 0x7fff
+	IPPROTO_SRPC              = 0x5a
+	IPPROTO_ST                = 0x7
+	IPPROTO_SVMTP             = 0x52
+	IPPROTO_SWIPE             = 0x35
+	IPPROTO_TCF               = 0x57
+	IPPROTO_TCP               = 0x6
+	IPPROTO_TLSP              = 0x38
+	IPPROTO_TP                = 0x1d
+	IPPROTO_TPXX              = 0x27
+	IPPROTO_TRUNK1            = 0x17
+	IPPROTO_TRUNK2            = 0x18
+	IPPROTO_TTP               = 0x54
+	IPPROTO_UDP               = 0x11
+	IPPROTO_VINES             = 0x53
+	IPPROTO_VISA              = 0x46
+	IPPROTO_VMTP              = 0x51
+	IPPROTO_WBEXPAK           = 0x4f
+	IPPROTO_WBMON             = 0x4e
+	IPPROTO_WSN               = 0x4a
+	IPPROTO_XNET              = 0xf
+	IPPROTO_XTP               = 0x24
+	IP_ADD_MEMBERSHIP         = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP  = 0x46
+	IP_BINDANY                = 0x18
+	IP_BLOCK_SOURCE           = 0x48
+	IP_DEFAULT_MULTICAST_LOOP = 0x1
+	IP_DEFAULT_MULTICAST_TTL  = 0x1
+	IP_DONTFRAG               = 0x43
+	IP_DROP_MEMBERSHIP        = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP = 0x47
+	IP_DUMMYNET_CONFIGURE     = 0x3c
+	IP_DUMMYNET_DEL           = 0x3d
+	IP_DUMMYNET_FLUSH         = 0x3e
+	IP_DUMMYNET_GET           = 0x40
+	IP_FAITH                  = 0x16
+	IP_FW_ADD                 = 0x32
+	IP_FW_DEL                 = 0x33
+	IP_FW_FLUSH               = 0x34
+	IP_FW_GET                 = 0x36
+	IP_FW_NAT_CFG             = 0x38
+	IP_FW_NAT_DEL             = 0x39
+	IP_FW_NAT_GET_CONFIG      = 0x3a
+	IP_FW_NAT_GET_LOG         = 0x3b
+	IP_FW_RESETLOG            = 0x37
+	IP_FW_TABLE_ADD           = 0x28
+	IP_FW_TABLE_DEL           = 0x29
+	IP_FW_TABLE_FLUSH         = 0x2a
+	IP_FW_TABLE_GETSIZE       = 0x2b
+	IP_FW_TABLE_LIST          = 0x2c
+	IP_FW_ZERO                = 0x35
+	IP_HDRINCL                = 0x2
+	IP_IPSEC_POLICY           = 0x15
+	IP_MAX_GROUP_SRC_FILTER   = 0x200
+	IP_MAX_MEMBERSHIPS        = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER   = 0x80
+	IP_MAX_SOCK_SRC_FILTER    = 0x80
+	IP_MAX_SOURCE_FILTER      = 0x400
+	IP_MINTTL                 = 0x42
+	IP_MIN_MEMBERSHIPS        = 0x1f
+	IP_MSFILTER               = 0x4a
+	IP_MULTICAST_IF           = 0x9
+	IP_MULTICAST_LOOP         = 0xb
+	IP_MULTICAST_TTL          = 0xa
+	IP_MULTICAST_VIF          = 0xe
+	IP_ONESBCAST              = 0x17
+	IP_OPTIONS                = 0x1
+	IP_PORTRANGE              = 0x13
+	IP_PORTRANGE_DEFAULT      = 0
+	IP_PORTRANGE_HIGH         = 0x1
+	IP_PORTRANGE_LOW          = 0x2
+	IP_RECVDSTADDR            = 0x7
+	IP_RECVIF                 = 0x14
+	IP_RECVOPTS               = 0x5
+	IP_RECVRETOPTS            = 0x6
+	IP_RECVTTL                = 0x41
+	IP_RETOPTS                = 0x8
+	IP_RSVP_OFF               = 0x10
+	IP_RSVP_ON                = 0xf
+	IP_RSVP_VIF_OFF           = 0x12
+	IP_RSVP_VIF_ON            = 0x11
+	IP_SENDSRCADDR            = 0x7
+	IP_TOS                    = 0x3
+	IP_TTL                    = 0x4
+	IP_UNBLOCK_SOURCE         = 0x49
+	O_ACCMODE                 = 0x3
+	O_APPEND                  = 0x8
+	O_ASYNC                   = 0x40
+	O_CREAT                   = 0x200
+	O_DIRECT                  = 0x10000
+	O_DIRECTORY               = 0x20000
+	O_EXCL                    = 0x800
+	O_EXEC                    = 0x40000
+	O_EXLOCK                  = 0x20
+	O_FSYNC                   = 0x80
+	O_NDELAY                  = 0x4
+	O_NOCTTY                  = 0x8000
+	O_NOFOLLOW                = 0x100
+	O_NONBLOCK                = 0x4
+	O_RDONLY                  = 0
+	O_RDWR                    = 0x2
+	O_SHLOCK                  = 0x10
+	O_SYNC                    = 0x80
+	O_TRUNC                   = 0x400
+	O_TTY_INIT                = 0x80000
+	O_WRONLY                  = 0x1
+	SHUT_RD                   = 0
+	SHUT_RDWR                 = 0x2
+	SHUT_WR                   = 0x1
+	SIGABRT                   = 0x6
+	SIGALRM                   = 0xe
+	SIGBUS                    = 0xa
+	SIGCHLD                   = 0x14
+	SIGCONT                   = 0x13
+	SIGEMT                    = 0x7
+	SIGFPE                    = 0x8
+	SIGHUP                    = 0x1
+	SIGILL                    = 0x4
+	SIGINFO                   = 0x1d
+	SIGINT                    = 0x2
+	SIGIO                     = 0x17
+	SIGIOT                    = 0x6
+	SIGKILL                   = 0x9
+	SIGLWP                    = 0x20
+	SIGPIPE                   = 0xd
+	SIGPROF                   = 0x1b
+	SIGQUIT                   = 0x3
+	SIGSEGV                   = 0xb
+	SIGSTOP                   = 0x11
+	SIGSYS                    = 0xc
+	SIGTERM                   = 0xf
+	SIGTHR                    = 0x20
+	SIGTRAP                   = 0x5
+	SIGTSTP                   = 0x12
+	SIGTTIN                   = 0x15
+	SIGTTOU                   = 0x16
+	SIGURG                    = 0x10
+	SIGUSR1                   = 0x1e
+	SIGUSR2                   = 0x1f
+	SIGVTALRM                 = 0x1a
+	SIGWINCH                  = 0x1c
+	SIGXCPU                   = 0x18
+	SIGXFSZ                   = 0x19
+	SOCK_DGRAM                = 0x2
+	SOCK_MAXADDRLEN           = 0xff
+	SOCK_RAW                  = 0x3
+	SOCK_RDM                  = 0x4
+	SOCK_SEQPACKET            = 0x5
+	SOCK_STREAM               = 0x1
+	SOL_SOCKET                = 0xffff
+	SOMAXCONN                 = 0x80
+	SO_ACCEPTCONN             = 0x2
+	SO_ACCEPTFILTER           = 0x1000
+	SO_BINTIME                = 0x2000
+	SO_BROADCAST              = 0x20
+	SO_DEBUG                  = 0x1
+	SO_DONTROUTE              = 0x10
+	SO_ERROR                  = 0x1007
+	SO_KEEPALIVE              = 0x8
+	SO_LABEL                  = 0x1009
+	SO_LINGER                 = 0x80
+	SO_LISTENINCQLEN          = 0x1013
+	SO_LISTENQLEN             = 0x1012
+	SO_LISTENQLIMIT           = 0x1011
+	SO_NOSIGPIPE              = 0x800
+	SO_NO_DDP                 = 0x8000
+	SO_NO_OFFLOAD             = 0x4000
+	SO_OOBINLINE              = 0x100
+	SO_PEERLABEL              = 0x1010
+	SO_RCVBUF                 = 0x1002
+	SO_RCVLOWAT               = 0x1004
+	SO_RCVTIMEO               = 0x1006
+	SO_REUSEADDR              = 0x4
+	SO_REUSEPORT              = 0x200
+	SO_SETFIB                 = 0x1014
+	SO_SNDBUF                 = 0x1001
+	SO_SNDLOWAT               = 0x1003
+	SO_SNDTIMEO               = 0x1005
+	SO_TIMESTAMP              = 0x400
+	SO_TYPE                   = 0x1008
+	SO_USELOOPBACK            = 0x40
+	TCP_CA_NAME_MAX           = 0x10
+	TCP_CONGESTION            = 0x40
+	TCP_INFO                  = 0x20
+	TCP_MAXBURST              = 0x4
+	TCP_MAXHLEN               = 0x3c
+	TCP_MAXOLEN               = 0x28
+	TCP_MAXSEG                = 0x2
+	TCP_MAXWIN                = 0xffff
+	TCP_MAX_SACK              = 0x4
+	TCP_MAX_WINSHIFT          = 0xe
+	TCP_MD5SIG                = 0x10
+	TCP_MINMSS                = 0xd8
+	TCP_MSS                   = 0x200
+	TCP_NODELAY               = 0x1
+	TCP_NOOPT                 = 0x8
+	TCP_NOPUSH                = 0x4
+	WCONTINUED                = 0x4
+	WCOREFLAG                 = 0x80
+	WLINUXCLONE               = 0x80000000
+	WNOHANG                   = 0x1
+	WNOWAIT                   = 0x8
+	WSTOPPED                  = 0x2
+	WUNTRACED                 = 0x2
 )
 
 // Types
diff --git a/src/pkg/syscall/zerrors_freebsd_amd64.go b/src/pkg/syscall/zerrors_freebsd_amd64.go
index b198adb95..4c1b828e5 100644
--- a/src/pkg/syscall/zerrors_freebsd_amd64.go
+++ b/src/pkg/syscall/zerrors_freebsd_amd64.go
@@ -9,526 +9,526 @@ package syscall
 
 // Constants
 const (
-	AF_APPLETALK			= 0x10;
-	AF_ARP				= 0x23;
-	AF_ATM				= 0x1e;
-	AF_BLUETOOTH			= 0x24;
-	AF_CCITT			= 0xa;
-	AF_CHAOS			= 0x5;
-	AF_CNT				= 0x15;
-	AF_COIP				= 0x14;
-	AF_DATAKIT			= 0x9;
-	AF_DECnet			= 0xc;
-	AF_DLI				= 0xd;
-	AF_E164				= 0x1a;
-	AF_ECMA				= 0x8;
-	AF_HYLINK			= 0xf;
-	AF_IEEE80211			= 0x25;
-	AF_IMPLINK			= 0x3;
-	AF_INET				= 0x2;
-	AF_INET6			= 0x1c;
-	AF_IPX				= 0x17;
-	AF_ISDN				= 0x1a;
-	AF_ISO				= 0x7;
-	AF_LAT				= 0xe;
-	AF_LINK				= 0x12;
-	AF_LOCAL			= 0x1;
-	AF_MAX				= 0x26;
-	AF_NATM				= 0x1d;
-	AF_NETBIOS			= 0x6;
-	AF_NETGRAPH			= 0x20;
-	AF_OSI				= 0x7;
-	AF_PUP				= 0x4;
-	AF_ROUTE			= 0x11;
-	AF_SCLUSTER			= 0x22;
-	AF_SIP				= 0x18;
-	AF_SLOW				= 0x21;
-	AF_SNA				= 0xb;
-	AF_UNIX				= 0x1;
-	AF_UNSPEC			= 0;
-	AF_VENDOR00			= 0x27;
-	AF_VENDOR01			= 0x29;
-	AF_VENDOR02			= 0x2b;
-	AF_VENDOR03			= 0x2d;
-	AF_VENDOR04			= 0x2f;
-	AF_VENDOR05			= 0x31;
-	AF_VENDOR06			= 0x33;
-	AF_VENDOR07			= 0x35;
-	AF_VENDOR08			= 0x37;
-	AF_VENDOR09			= 0x39;
-	AF_VENDOR10			= 0x3b;
-	AF_VENDOR11			= 0x3d;
-	AF_VENDOR12			= 0x3f;
-	AF_VENDOR13			= 0x41;
-	AF_VENDOR14			= 0x43;
-	AF_VENDOR15			= 0x45;
-	AF_VENDOR16			= 0x47;
-	AF_VENDOR17			= 0x49;
-	AF_VENDOR18			= 0x4b;
-	AF_VENDOR19			= 0x4d;
-	AF_VENDOR20			= 0x4f;
-	AF_VENDOR21			= 0x51;
-	AF_VENDOR22			= 0x53;
-	AF_VENDOR23			= 0x55;
-	AF_VENDOR24			= 0x57;
-	AF_VENDOR25			= 0x59;
-	AF_VENDOR26			= 0x5b;
-	AF_VENDOR27			= 0x5d;
-	AF_VENDOR28			= 0x5f;
-	AF_VENDOR29			= 0x61;
-	AF_VENDOR30			= 0x63;
-	AF_VENDOR31			= 0x65;
-	AF_VENDOR32			= 0x67;
-	AF_VENDOR33			= 0x69;
-	AF_VENDOR34			= 0x6b;
-	AF_VENDOR35			= 0x6d;
-	AF_VENDOR36			= 0x6f;
-	AF_VENDOR37			= 0x71;
-	AF_VENDOR38			= 0x73;
-	AF_VENDOR39			= 0x75;
-	AF_VENDOR40			= 0x77;
-	AF_VENDOR41			= 0x79;
-	AF_VENDOR42			= 0x7b;
-	AF_VENDOR43			= 0x7d;
-	AF_VENDOR44			= 0x7f;
-	AF_VENDOR45			= 0x81;
-	AF_VENDOR46			= 0x83;
-	AF_VENDOR47			= 0x85;
-	E2BIG				= 0x7;
-	EACCES				= 0xd;
-	EADDRINUSE			= 0x30;
-	EADDRNOTAVAIL			= 0x31;
-	EAFNOSUPPORT			= 0x2f;
-	EAGAIN				= 0x23;
-	EALREADY			= 0x25;
-	EAUTH				= 0x50;
-	EBADF				= 0x9;
-	EBADMSG				= 0x59;
-	EBADRPC				= 0x48;
-	EBUSY				= 0x10;
-	ECANCELED			= 0x55;
-	ECHILD				= 0xa;
-	ECONNABORTED			= 0x35;
-	ECONNREFUSED			= 0x3d;
-	ECONNRESET			= 0x36;
-	EDEADLK				= 0xb;
-	EDESTADDRREQ			= 0x27;
-	EDOM				= 0x21;
-	EDOOFUS				= 0x58;
-	EDQUOT				= 0x45;
-	EEXIST				= 0x11;
-	EFAULT				= 0xe;
-	EFBIG				= 0x1b;
-	EFTYPE				= 0x4f;
-	EHOSTDOWN			= 0x40;
-	EHOSTUNREACH			= 0x41;
-	EIDRM				= 0x52;
-	EILSEQ				= 0x56;
-	EINPROGRESS			= 0x24;
-	EINTR				= 0x4;
-	EINVAL				= 0x16;
-	EIO				= 0x5;
-	EISCONN				= 0x38;
-	EISDIR				= 0x15;
-	ELAST				= 0x5c;
-	ELOOP				= 0x3e;
-	EMFILE				= 0x18;
-	EMLINK				= 0x1f;
-	EMSGSIZE			= 0x28;
-	EMULTIHOP			= 0x5a;
-	ENAMETOOLONG			= 0x3f;
-	ENEEDAUTH			= 0x51;
-	ENETDOWN			= 0x32;
-	ENETRESET			= 0x34;
-	ENETUNREACH			= 0x33;
-	ENFILE				= 0x17;
-	ENOATTR				= 0x57;
-	ENOBUFS				= 0x37;
-	ENODEV				= 0x13;
-	ENOENT				= 0x2;
-	ENOEXEC				= 0x8;
-	ENOLCK				= 0x4d;
-	ENOLINK				= 0x5b;
-	ENOMEM				= 0xc;
-	ENOMSG				= 0x53;
-	ENOPROTOOPT			= 0x2a;
-	ENOSPC				= 0x1c;
-	ENOSYS				= 0x4e;
-	ENOTBLK				= 0xf;
-	ENOTCONN			= 0x39;
-	ENOTDIR				= 0x14;
-	ENOTEMPTY			= 0x42;
-	ENOTSOCK			= 0x26;
-	ENOTSUP				= 0x2d;
-	ENOTTY				= 0x19;
-	ENXIO				= 0x6;
-	EOPNOTSUPP			= 0x2d;
-	EOVERFLOW			= 0x54;
-	EPERM				= 0x1;
-	EPFNOSUPPORT			= 0x2e;
-	EPIPE				= 0x20;
-	EPROCLIM			= 0x43;
-	EPROCUNAVAIL			= 0x4c;
-	EPROGMISMATCH			= 0x4b;
-	EPROGUNAVAIL			= 0x4a;
-	EPROTO				= 0x5c;
-	EPROTONOSUPPORT			= 0x2b;
-	EPROTOTYPE			= 0x29;
-	ERANGE				= 0x22;
-	EREMOTE				= 0x47;
-	EROFS				= 0x1e;
-	ERPCMISMATCH			= 0x49;
-	ESHUTDOWN			= 0x3a;
-	ESOCKTNOSUPPORT			= 0x2c;
-	ESPIPE				= 0x1d;
-	ESRCH				= 0x3;
-	ESTALE				= 0x46;
-	ETIMEDOUT			= 0x3c;
-	ETOOMANYREFS			= 0x3b;
-	ETXTBSY				= 0x1a;
-	EUSERS				= 0x44;
-	EVFILT_AIO			= -0x3;
-	EVFILT_FS			= -0x9;
-	EVFILT_LIO			= -0xa;
-	EVFILT_NETDEV			= -0x8;
-	EVFILT_PROC			= -0x5;
-	EVFILT_READ			= -0x1;
-	EVFILT_SIGNAL			= -0x6;
-	EVFILT_SYSCOUNT			= 0xa;
-	EVFILT_TIMER			= -0x7;
-	EVFILT_VNODE			= -0x4;
-	EVFILT_WRITE			= -0x2;
-	EV_ADD				= 0x1;
-	EV_CLEAR			= 0x20;
-	EV_DELETE			= 0x2;
-	EV_DISABLE			= 0x8;
-	EV_ENABLE			= 0x4;
-	EV_EOF				= 0x8000;
-	EV_ERROR			= 0x4000;
-	EV_FLAG1			= 0x2000;
-	EV_ONESHOT			= 0x10;
-	EV_SYSFLAGS			= 0xf000;
-	EWOULDBLOCK			= 0x23;
-	EXDEV				= 0x12;
-	FD_CLOEXEC			= 0x1;
-	FD_SETSIZE			= 0x400;
-	F_CANCEL			= 0x5;
-	F_DUP2FD			= 0xa;
-	F_DUPFD				= 0;
-	F_GETFD				= 0x1;
-	F_GETFL				= 0x3;
-	F_GETLK				= 0xb;
-	F_GETOWN			= 0x5;
-	F_OGETLK			= 0x7;
-	F_OSETLK			= 0x8;
-	F_OSETLKW			= 0x9;
-	F_RDLCK				= 0x1;
-	F_SETFD				= 0x2;
-	F_SETFL				= 0x4;
-	F_SETLK				= 0xc;
-	F_SETLKW			= 0xd;
-	F_SETLK_REMOTE			= 0xe;
-	F_SETOWN			= 0x6;
-	F_UNLCK				= 0x2;
-	F_UNLCKSYS			= 0x4;
-	F_WRLCK				= 0x3;
-	IPPROTO_3PC			= 0x22;
-	IPPROTO_ADFS			= 0x44;
-	IPPROTO_AH			= 0x33;
-	IPPROTO_AHIP			= 0x3d;
-	IPPROTO_APES			= 0x63;
-	IPPROTO_ARGUS			= 0xd;
-	IPPROTO_AX25			= 0x5d;
-	IPPROTO_BHA			= 0x31;
-	IPPROTO_BLT			= 0x1e;
-	IPPROTO_BRSATMON		= 0x4c;
-	IPPROTO_CARP			= 0x70;
-	IPPROTO_CFTP			= 0x3e;
-	IPPROTO_CHAOS			= 0x10;
-	IPPROTO_CMTP			= 0x26;
-	IPPROTO_CPHB			= 0x49;
-	IPPROTO_CPNX			= 0x48;
-	IPPROTO_DDP			= 0x25;
-	IPPROTO_DGP			= 0x56;
-	IPPROTO_DIVERT			= 0x102;
-	IPPROTO_DONE			= 0x101;
-	IPPROTO_DSTOPTS			= 0x3c;
-	IPPROTO_EGP			= 0x8;
-	IPPROTO_EMCON			= 0xe;
-	IPPROTO_ENCAP			= 0x62;
-	IPPROTO_EON			= 0x50;
-	IPPROTO_ESP			= 0x32;
-	IPPROTO_ETHERIP			= 0x61;
-	IPPROTO_FRAGMENT		= 0x2c;
-	IPPROTO_GGP			= 0x3;
-	IPPROTO_GMTP			= 0x64;
-	IPPROTO_GRE			= 0x2f;
-	IPPROTO_HELLO			= 0x3f;
-	IPPROTO_HMP			= 0x14;
-	IPPROTO_HOPOPTS			= 0;
-	IPPROTO_ICMP			= 0x1;
-	IPPROTO_ICMPV6			= 0x3a;
-	IPPROTO_IDP			= 0x16;
-	IPPROTO_IDPR			= 0x23;
-	IPPROTO_IDRP			= 0x2d;
-	IPPROTO_IGMP			= 0x2;
-	IPPROTO_IGP			= 0x55;
-	IPPROTO_IGRP			= 0x58;
-	IPPROTO_IL			= 0x28;
-	IPPROTO_INLSP			= 0x34;
-	IPPROTO_INP			= 0x20;
-	IPPROTO_IP			= 0;
-	IPPROTO_IPCOMP			= 0x6c;
-	IPPROTO_IPCV			= 0x47;
-	IPPROTO_IPEIP			= 0x5e;
-	IPPROTO_IPIP			= 0x4;
-	IPPROTO_IPPC			= 0x43;
-	IPPROTO_IPV4			= 0x4;
-	IPPROTO_IPV6			= 0x29;
-	IPPROTO_IRTP			= 0x1c;
-	IPPROTO_KRYPTOLAN		= 0x41;
-	IPPROTO_LARP			= 0x5b;
-	IPPROTO_LEAF1			= 0x19;
-	IPPROTO_LEAF2			= 0x1a;
-	IPPROTO_MAX			= 0x100;
-	IPPROTO_MAXID			= 0x34;
-	IPPROTO_MEAS			= 0x13;
-	IPPROTO_MHRP			= 0x30;
-	IPPROTO_MICP			= 0x5f;
-	IPPROTO_MOBILE			= 0x37;
-	IPPROTO_MTP			= 0x5c;
-	IPPROTO_MUX			= 0x12;
-	IPPROTO_ND			= 0x4d;
-	IPPROTO_NHRP			= 0x36;
-	IPPROTO_NONE			= 0x3b;
-	IPPROTO_NSP			= 0x1f;
-	IPPROTO_NVPII			= 0xb;
-	IPPROTO_OLD_DIVERT		= 0xfe;
-	IPPROTO_OSPFIGP			= 0x59;
-	IPPROTO_PFSYNC			= 0xf0;
-	IPPROTO_PGM			= 0x71;
-	IPPROTO_PIGP			= 0x9;
-	IPPROTO_PIM			= 0x67;
-	IPPROTO_PRM			= 0x15;
-	IPPROTO_PUP			= 0xc;
-	IPPROTO_PVP			= 0x4b;
-	IPPROTO_RAW			= 0xff;
-	IPPROTO_RCCMON			= 0xa;
-	IPPROTO_RDP			= 0x1b;
-	IPPROTO_ROUTING			= 0x2b;
-	IPPROTO_RSVP			= 0x2e;
-	IPPROTO_RVD			= 0x42;
-	IPPROTO_SATEXPAK		= 0x40;
-	IPPROTO_SATMON			= 0x45;
-	IPPROTO_SCCSP			= 0x60;
-	IPPROTO_SCTP			= 0x84;
-	IPPROTO_SDRP			= 0x2a;
-	IPPROTO_SEP			= 0x21;
-	IPPROTO_SKIP			= 0x39;
-	IPPROTO_SPACER			= 0x7fff;
-	IPPROTO_SRPC			= 0x5a;
-	IPPROTO_ST			= 0x7;
-	IPPROTO_SVMTP			= 0x52;
-	IPPROTO_SWIPE			= 0x35;
-	IPPROTO_TCF			= 0x57;
-	IPPROTO_TCP			= 0x6;
-	IPPROTO_TLSP			= 0x38;
-	IPPROTO_TP			= 0x1d;
-	IPPROTO_TPXX			= 0x27;
-	IPPROTO_TRUNK1			= 0x17;
-	IPPROTO_TRUNK2			= 0x18;
-	IPPROTO_TTP			= 0x54;
-	IPPROTO_UDP			= 0x11;
-	IPPROTO_VINES			= 0x53;
-	IPPROTO_VISA			= 0x46;
-	IPPROTO_VMTP			= 0x51;
-	IPPROTO_WBEXPAK			= 0x4f;
-	IPPROTO_WBMON			= 0x4e;
-	IPPROTO_WSN			= 0x4a;
-	IPPROTO_XNET			= 0xf;
-	IPPROTO_XTP			= 0x24;
-	IP_ADD_MEMBERSHIP		= 0xc;
-	IP_ADD_SOURCE_MEMBERSHIP	= 0x46;
-	IP_BINDANY			= 0x18;
-	IP_BLOCK_SOURCE			= 0x48;
-	IP_DEFAULT_MULTICAST_LOOP	= 0x1;
-	IP_DEFAULT_MULTICAST_TTL	= 0x1;
-	IP_DONTFRAG			= 0x43;
-	IP_DROP_MEMBERSHIP		= 0xd;
-	IP_DROP_SOURCE_MEMBERSHIP	= 0x47;
-	IP_DUMMYNET_CONFIGURE		= 0x3c;
-	IP_DUMMYNET_DEL			= 0x3d;
-	IP_DUMMYNET_FLUSH		= 0x3e;
-	IP_DUMMYNET_GET			= 0x40;
-	IP_FAITH			= 0x16;
-	IP_FW_ADD			= 0x32;
-	IP_FW_DEL			= 0x33;
-	IP_FW_FLUSH			= 0x34;
-	IP_FW_GET			= 0x36;
-	IP_FW_NAT_CFG			= 0x38;
-	IP_FW_NAT_DEL			= 0x39;
-	IP_FW_NAT_GET_CONFIG		= 0x3a;
-	IP_FW_NAT_GET_LOG		= 0x3b;
-	IP_FW_RESETLOG			= 0x37;
-	IP_FW_TABLE_ADD			= 0x28;
-	IP_FW_TABLE_DEL			= 0x29;
-	IP_FW_TABLE_FLUSH		= 0x2a;
-	IP_FW_TABLE_GETSIZE		= 0x2b;
-	IP_FW_TABLE_LIST		= 0x2c;
-	IP_FW_ZERO			= 0x35;
-	IP_HDRINCL			= 0x2;
-	IP_IPSEC_POLICY			= 0x15;
-	IP_MAX_GROUP_SRC_FILTER		= 0x200;
-	IP_MAX_MEMBERSHIPS		= 0xfff;
-	IP_MAX_SOCK_MUTE_FILTER		= 0x80;
-	IP_MAX_SOCK_SRC_FILTER		= 0x80;
-	IP_MAX_SOURCE_FILTER		= 0x400;
-	IP_MINTTL			= 0x42;
-	IP_MIN_MEMBERSHIPS		= 0x1f;
-	IP_MSFILTER			= 0x4a;
-	IP_MULTICAST_IF			= 0x9;
-	IP_MULTICAST_LOOP		= 0xb;
-	IP_MULTICAST_TTL		= 0xa;
-	IP_MULTICAST_VIF		= 0xe;
-	IP_ONESBCAST			= 0x17;
-	IP_OPTIONS			= 0x1;
-	IP_PORTRANGE			= 0x13;
-	IP_PORTRANGE_DEFAULT		= 0;
-	IP_PORTRANGE_HIGH		= 0x1;
-	IP_PORTRANGE_LOW		= 0x2;
-	IP_RECVDSTADDR			= 0x7;
-	IP_RECVIF			= 0x14;
-	IP_RECVOPTS			= 0x5;
-	IP_RECVRETOPTS			= 0x6;
-	IP_RECVTTL			= 0x41;
-	IP_RETOPTS			= 0x8;
-	IP_RSVP_OFF			= 0x10;
-	IP_RSVP_ON			= 0xf;
-	IP_RSVP_VIF_OFF			= 0x12;
-	IP_RSVP_VIF_ON			= 0x11;
-	IP_SENDSRCADDR			= 0x7;
-	IP_TOS				= 0x3;
-	IP_TTL				= 0x4;
-	IP_UNBLOCK_SOURCE		= 0x49;
-	O_ACCMODE			= 0x3;
-	O_APPEND			= 0x8;
-	O_ASYNC				= 0x40;
-	O_CREAT				= 0x200;
-	O_DIRECT			= 0x10000;
-	O_DIRECTORY			= 0x20000;
-	O_EXCL				= 0x800;
-	O_EXEC				= 0x40000;
-	O_EXLOCK			= 0x20;
-	O_FSYNC				= 0x80;
-	O_NDELAY			= 0x4;
-	O_NOCTTY			= 0x8000;
-	O_NOFOLLOW			= 0x100;
-	O_NONBLOCK			= 0x4;
-	O_RDONLY			= 0;
-	O_RDWR				= 0x2;
-	O_SHLOCK			= 0x10;
-	O_SYNC				= 0x80;
-	O_TRUNC				= 0x400;
-	O_TTY_INIT			= 0x80000;
-	O_WRONLY			= 0x1;
-	SHUT_RD				= 0;
-	SHUT_RDWR			= 0x2;
-	SHUT_WR				= 0x1;
-	SIGABRT				= 0x6;
-	SIGALRM				= 0xe;
-	SIGBUS				= 0xa;
-	SIGCHLD				= 0x14;
-	SIGCONT				= 0x13;
-	SIGEMT				= 0x7;
-	SIGFPE				= 0x8;
-	SIGHUP				= 0x1;
-	SIGILL				= 0x4;
-	SIGINFO				= 0x1d;
-	SIGINT				= 0x2;
-	SIGIO				= 0x17;
-	SIGIOT				= 0x6;
-	SIGKILL				= 0x9;
-	SIGLWP				= 0x20;
-	SIGPIPE				= 0xd;
-	SIGPROF				= 0x1b;
-	SIGQUIT				= 0x3;
-	SIGSEGV				= 0xb;
-	SIGSTOP				= 0x11;
-	SIGSYS				= 0xc;
-	SIGTERM				= 0xf;
-	SIGTHR				= 0x20;
-	SIGTRAP				= 0x5;
-	SIGTSTP				= 0x12;
-	SIGTTIN				= 0x15;
-	SIGTTOU				= 0x16;
-	SIGURG				= 0x10;
-	SIGUSR1				= 0x1e;
-	SIGUSR2				= 0x1f;
-	SIGVTALRM			= 0x1a;
-	SIGWINCH			= 0x1c;
-	SIGXCPU				= 0x18;
-	SIGXFSZ				= 0x19;
-	SOCK_DGRAM			= 0x2;
-	SOCK_MAXADDRLEN			= 0xff;
-	SOCK_RAW			= 0x3;
-	SOCK_RDM			= 0x4;
-	SOCK_SEQPACKET			= 0x5;
-	SOCK_STREAM			= 0x1;
-	SOL_SOCKET			= 0xffff;
-	SOMAXCONN			= 0x80;
-	SO_ACCEPTCONN			= 0x2;
-	SO_ACCEPTFILTER			= 0x1000;
-	SO_BINTIME			= 0x2000;
-	SO_BROADCAST			= 0x20;
-	SO_DEBUG			= 0x1;
-	SO_DONTROUTE			= 0x10;
-	SO_ERROR			= 0x1007;
-	SO_KEEPALIVE			= 0x8;
-	SO_LABEL			= 0x1009;
-	SO_LINGER			= 0x80;
-	SO_LISTENINCQLEN		= 0x1013;
-	SO_LISTENQLEN			= 0x1012;
-	SO_LISTENQLIMIT			= 0x1011;
-	SO_NOSIGPIPE			= 0x800;
-	SO_NO_DDP			= 0x8000;
-	SO_NO_OFFLOAD			= 0x4000;
-	SO_OOBINLINE			= 0x100;
-	SO_PEERLABEL			= 0x1010;
-	SO_RCVBUF			= 0x1002;
-	SO_RCVLOWAT			= 0x1004;
-	SO_RCVTIMEO			= 0x1006;
-	SO_REUSEADDR			= 0x4;
-	SO_REUSEPORT			= 0x200;
-	SO_SETFIB			= 0x1014;
-	SO_SNDBUF			= 0x1001;
-	SO_SNDLOWAT			= 0x1003;
-	SO_SNDTIMEO			= 0x1005;
-	SO_TIMESTAMP			= 0x400;
-	SO_TYPE				= 0x1008;
-	SO_USELOOPBACK			= 0x40;
-	TCP_CA_NAME_MAX			= 0x10;
-	TCP_CONGESTION			= 0x40;
-	TCP_INFO			= 0x20;
-	TCP_MAXBURST			= 0x4;
-	TCP_MAXHLEN			= 0x3c;
-	TCP_MAXOLEN			= 0x28;
-	TCP_MAXSEG			= 0x2;
-	TCP_MAXWIN			= 0xffff;
-	TCP_MAX_SACK			= 0x4;
-	TCP_MAX_WINSHIFT		= 0xe;
-	TCP_MD5SIG			= 0x10;
-	TCP_MINMSS			= 0xd8;
-	TCP_MSS				= 0x200;
-	TCP_NODELAY			= 0x1;
-	TCP_NOOPT			= 0x8;
-	TCP_NOPUSH			= 0x4;
-	WCONTINUED			= 0x4;
-	WCOREFLAG			= 0x80;
-	WLINUXCLONE			= 0x80000000;
-	WNOHANG				= 0x1;
-	WNOWAIT				= 0x8;
-	WSTOPPED			= 0x2;
-	WUNTRACED			= 0x2;
+	AF_APPLETALK              = 0x10
+	AF_ARP                    = 0x23
+	AF_ATM                    = 0x1e
+	AF_BLUETOOTH              = 0x24
+	AF_CCITT                  = 0xa
+	AF_CHAOS                  = 0x5
+	AF_CNT                    = 0x15
+	AF_COIP                   = 0x14
+	AF_DATAKIT                = 0x9
+	AF_DECnet                 = 0xc
+	AF_DLI                    = 0xd
+	AF_E164                   = 0x1a
+	AF_ECMA                   = 0x8
+	AF_HYLINK                 = 0xf
+	AF_IEEE80211              = 0x25
+	AF_IMPLINK                = 0x3
+	AF_INET                   = 0x2
+	AF_INET6                  = 0x1c
+	AF_IPX                    = 0x17
+	AF_ISDN                   = 0x1a
+	AF_ISO                    = 0x7
+	AF_LAT                    = 0xe
+	AF_LINK                   = 0x12
+	AF_LOCAL                  = 0x1
+	AF_MAX                    = 0x26
+	AF_NATM                   = 0x1d
+	AF_NETBIOS                = 0x6
+	AF_NETGRAPH               = 0x20
+	AF_OSI                    = 0x7
+	AF_PUP                    = 0x4
+	AF_ROUTE                  = 0x11
+	AF_SCLUSTER               = 0x22
+	AF_SIP                    = 0x18
+	AF_SLOW                   = 0x21
+	AF_SNA                    = 0xb
+	AF_UNIX                   = 0x1
+	AF_UNSPEC                 = 0
+	AF_VENDOR00               = 0x27
+	AF_VENDOR01               = 0x29
+	AF_VENDOR02               = 0x2b
+	AF_VENDOR03               = 0x2d
+	AF_VENDOR04               = 0x2f
+	AF_VENDOR05               = 0x31
+	AF_VENDOR06               = 0x33
+	AF_VENDOR07               = 0x35
+	AF_VENDOR08               = 0x37
+	AF_VENDOR09               = 0x39
+	AF_VENDOR10               = 0x3b
+	AF_VENDOR11               = 0x3d
+	AF_VENDOR12               = 0x3f
+	AF_VENDOR13               = 0x41
+	AF_VENDOR14               = 0x43
+	AF_VENDOR15               = 0x45
+	AF_VENDOR16               = 0x47
+	AF_VENDOR17               = 0x49
+	AF_VENDOR18               = 0x4b
+	AF_VENDOR19               = 0x4d
+	AF_VENDOR20               = 0x4f
+	AF_VENDOR21               = 0x51
+	AF_VENDOR22               = 0x53
+	AF_VENDOR23               = 0x55
+	AF_VENDOR24               = 0x57
+	AF_VENDOR25               = 0x59
+	AF_VENDOR26               = 0x5b
+	AF_VENDOR27               = 0x5d
+	AF_VENDOR28               = 0x5f
+	AF_VENDOR29               = 0x61
+	AF_VENDOR30               = 0x63
+	AF_VENDOR31               = 0x65
+	AF_VENDOR32               = 0x67
+	AF_VENDOR33               = 0x69
+	AF_VENDOR34               = 0x6b
+	AF_VENDOR35               = 0x6d
+	AF_VENDOR36               = 0x6f
+	AF_VENDOR37               = 0x71
+	AF_VENDOR38               = 0x73
+	AF_VENDOR39               = 0x75
+	AF_VENDOR40               = 0x77
+	AF_VENDOR41               = 0x79
+	AF_VENDOR42               = 0x7b
+	AF_VENDOR43               = 0x7d
+	AF_VENDOR44               = 0x7f
+	AF_VENDOR45               = 0x81
+	AF_VENDOR46               = 0x83
+	AF_VENDOR47               = 0x85
+	E2BIG                     = 0x7
+	EACCES                    = 0xd
+	EADDRINUSE                = 0x30
+	EADDRNOTAVAIL             = 0x31
+	EAFNOSUPPORT              = 0x2f
+	EAGAIN                    = 0x23
+	EALREADY                  = 0x25
+	EAUTH                     = 0x50
+	EBADF                     = 0x9
+	EBADMSG                   = 0x59
+	EBADRPC                   = 0x48
+	EBUSY                     = 0x10
+	ECANCELED                 = 0x55
+	ECHILD                    = 0xa
+	ECONNABORTED              = 0x35
+	ECONNREFUSED              = 0x3d
+	ECONNRESET                = 0x36
+	EDEADLK                   = 0xb
+	EDESTADDRREQ              = 0x27
+	EDOM                      = 0x21
+	EDOOFUS                   = 0x58
+	EDQUOT                    = 0x45
+	EEXIST                    = 0x11
+	EFAULT                    = 0xe
+	EFBIG                     = 0x1b
+	EFTYPE                    = 0x4f
+	EHOSTDOWN                 = 0x40
+	EHOSTUNREACH              = 0x41
+	EIDRM                     = 0x52
+	EILSEQ                    = 0x56
+	EINPROGRESS               = 0x24
+	EINTR                     = 0x4
+	EINVAL                    = 0x16
+	EIO                       = 0x5
+	EISCONN                   = 0x38
+	EISDIR                    = 0x15
+	ELAST                     = 0x5c
+	ELOOP                     = 0x3e
+	EMFILE                    = 0x18
+	EMLINK                    = 0x1f
+	EMSGSIZE                  = 0x28
+	EMULTIHOP                 = 0x5a
+	ENAMETOOLONG              = 0x3f
+	ENEEDAUTH                 = 0x51
+	ENETDOWN                  = 0x32
+	ENETRESET                 = 0x34
+	ENETUNREACH               = 0x33
+	ENFILE                    = 0x17
+	ENOATTR                   = 0x57
+	ENOBUFS                   = 0x37
+	ENODEV                    = 0x13
+	ENOENT                    = 0x2
+	ENOEXEC                   = 0x8
+	ENOLCK                    = 0x4d
+	ENOLINK                   = 0x5b
+	ENOMEM                    = 0xc
+	ENOMSG                    = 0x53
+	ENOPROTOOPT               = 0x2a
+	ENOSPC                    = 0x1c
+	ENOSYS                    = 0x4e
+	ENOTBLK                   = 0xf
+	ENOTCONN                  = 0x39
+	ENOTDIR                   = 0x14
+	ENOTEMPTY                 = 0x42
+	ENOTSOCK                  = 0x26
+	ENOTSUP                   = 0x2d
+	ENOTTY                    = 0x19
+	ENXIO                     = 0x6
+	EOPNOTSUPP                = 0x2d
+	EOVERFLOW                 = 0x54
+	EPERM                     = 0x1
+	EPFNOSUPPORT              = 0x2e
+	EPIPE                     = 0x20
+	EPROCLIM                  = 0x43
+	EPROCUNAVAIL              = 0x4c
+	EPROGMISMATCH             = 0x4b
+	EPROGUNAVAIL              = 0x4a
+	EPROTO                    = 0x5c
+	EPROTONOSUPPORT           = 0x2b
+	EPROTOTYPE                = 0x29
+	ERANGE                    = 0x22
+	EREMOTE                   = 0x47
+	EROFS                     = 0x1e
+	ERPCMISMATCH              = 0x49
+	ESHUTDOWN                 = 0x3a
+	ESOCKTNOSUPPORT           = 0x2c
+	ESPIPE                    = 0x1d
+	ESRCH                     = 0x3
+	ESTALE                    = 0x46
+	ETIMEDOUT                 = 0x3c
+	ETOOMANYREFS              = 0x3b
+	ETXTBSY                   = 0x1a
+	EUSERS                    = 0x44
+	EVFILT_AIO                = -0x3
+	EVFILT_FS                 = -0x9
+	EVFILT_LIO                = -0xa
+	EVFILT_NETDEV             = -0x8
+	EVFILT_PROC               = -0x5
+	EVFILT_READ               = -0x1
+	EVFILT_SIGNAL             = -0x6
+	EVFILT_SYSCOUNT           = 0xa
+	EVFILT_TIMER              = -0x7
+	EVFILT_VNODE              = -0x4
+	EVFILT_WRITE              = -0x2
+	EV_ADD                    = 0x1
+	EV_CLEAR                  = 0x20
+	EV_DELETE                 = 0x2
+	EV_DISABLE                = 0x8
+	EV_ENABLE                 = 0x4
+	EV_EOF                    = 0x8000
+	EV_ERROR                  = 0x4000
+	EV_FLAG1                  = 0x2000
+	EV_ONESHOT                = 0x10
+	EV_SYSFLAGS               = 0xf000
+	EWOULDBLOCK               = 0x23
+	EXDEV                     = 0x12
+	FD_CLOEXEC                = 0x1
+	FD_SETSIZE                = 0x400
+	F_CANCEL                  = 0x5
+	F_DUP2FD                  = 0xa
+	F_DUPFD                   = 0
+	F_GETFD                   = 0x1
+	F_GETFL                   = 0x3
+	F_GETLK                   = 0xb
+	F_GETOWN                  = 0x5
+	F_OGETLK                  = 0x7
+	F_OSETLK                  = 0x8
+	F_OSETLKW                 = 0x9
+	F_RDLCK                   = 0x1
+	F_SETFD                   = 0x2
+	F_SETFL                   = 0x4
+	F_SETLK                   = 0xc
+	F_SETLKW                  = 0xd
+	F_SETLK_REMOTE            = 0xe
+	F_SETOWN                  = 0x6
+	F_UNLCK                   = 0x2
+	F_UNLCKSYS                = 0x4
+	F_WRLCK                   = 0x3
+	IPPROTO_3PC               = 0x22
+	IPPROTO_ADFS              = 0x44
+	IPPROTO_AH                = 0x33
+	IPPROTO_AHIP              = 0x3d
+	IPPROTO_APES              = 0x63
+	IPPROTO_ARGUS             = 0xd
+	IPPROTO_AX25              = 0x5d
+	IPPROTO_BHA               = 0x31
+	IPPROTO_BLT               = 0x1e
+	IPPROTO_BRSATMON          = 0x4c
+	IPPROTO_CARP              = 0x70
+	IPPROTO_CFTP              = 0x3e
+	IPPROTO_CHAOS             = 0x10
+	IPPROTO_CMTP              = 0x26
+	IPPROTO_CPHB              = 0x49
+	IPPROTO_CPNX              = 0x48
+	IPPROTO_DDP               = 0x25
+	IPPROTO_DGP               = 0x56
+	IPPROTO_DIVERT            = 0x102
+	IPPROTO_DONE              = 0x101
+	IPPROTO_DSTOPTS           = 0x3c
+	IPPROTO_EGP               = 0x8
+	IPPROTO_EMCON             = 0xe
+	IPPROTO_ENCAP             = 0x62
+	IPPROTO_EON               = 0x50
+	IPPROTO_ESP               = 0x32
+	IPPROTO_ETHERIP           = 0x61
+	IPPROTO_FRAGMENT          = 0x2c
+	IPPROTO_GGP               = 0x3
+	IPPROTO_GMTP              = 0x64
+	IPPROTO_GRE               = 0x2f
+	IPPROTO_HELLO             = 0x3f
+	IPPROTO_HMP               = 0x14
+	IPPROTO_HOPOPTS           = 0
+	IPPROTO_ICMP              = 0x1
+	IPPROTO_ICMPV6            = 0x3a
+	IPPROTO_IDP               = 0x16
+	IPPROTO_IDPR              = 0x23
+	IPPROTO_IDRP              = 0x2d
+	IPPROTO_IGMP              = 0x2
+	IPPROTO_IGP               = 0x55
+	IPPROTO_IGRP              = 0x58
+	IPPROTO_IL                = 0x28
+	IPPROTO_INLSP             = 0x34
+	IPPROTO_INP               = 0x20
+	IPPROTO_IP                = 0
+	IPPROTO_IPCOMP            = 0x6c
+	IPPROTO_IPCV              = 0x47
+	IPPROTO_IPEIP             = 0x5e
+	IPPROTO_IPIP              = 0x4
+	IPPROTO_IPPC              = 0x43
+	IPPROTO_IPV4              = 0x4
+	IPPROTO_IPV6              = 0x29
+	IPPROTO_IRTP              = 0x1c
+	IPPROTO_KRYPTOLAN         = 0x41
+	IPPROTO_LARP              = 0x5b
+	IPPROTO_LEAF1             = 0x19
+	IPPROTO_LEAF2             = 0x1a
+	IPPROTO_MAX               = 0x100
+	IPPROTO_MAXID             = 0x34
+	IPPROTO_MEAS              = 0x13
+	IPPROTO_MHRP              = 0x30
+	IPPROTO_MICP              = 0x5f
+	IPPROTO_MOBILE            = 0x37
+	IPPROTO_MTP               = 0x5c
+	IPPROTO_MUX               = 0x12
+	IPPROTO_ND                = 0x4d
+	IPPROTO_NHRP              = 0x36
+	IPPROTO_NONE              = 0x3b
+	IPPROTO_NSP               = 0x1f
+	IPPROTO_NVPII             = 0xb
+	IPPROTO_OLD_DIVERT        = 0xfe
+	IPPROTO_OSPFIGP           = 0x59
+	IPPROTO_PFSYNC            = 0xf0
+	IPPROTO_PGM               = 0x71
+	IPPROTO_PIGP              = 0x9
+	IPPROTO_PIM               = 0x67
+	IPPROTO_PRM               = 0x15
+	IPPROTO_PUP               = 0xc
+	IPPROTO_PVP               = 0x4b
+	IPPROTO_RAW               = 0xff
+	IPPROTO_RCCMON            = 0xa
+	IPPROTO_RDP               = 0x1b
+	IPPROTO_ROUTING           = 0x2b
+	IPPROTO_RSVP              = 0x2e
+	IPPROTO_RVD               = 0x42
+	IPPROTO_SATEXPAK          = 0x40
+	IPPROTO_SATMON            = 0x45
+	IPPROTO_SCCSP             = 0x60
+	IPPROTO_SCTP              = 0x84
+	IPPROTO_SDRP              = 0x2a
+	IPPROTO_SEP               = 0x21
+	IPPROTO_SKIP              = 0x39
+	IPPROTO_SPACER            = 0x7fff
+	IPPROTO_SRPC              = 0x5a
+	IPPROTO_ST                = 0x7
+	IPPROTO_SVMTP             = 0x52
+	IPPROTO_SWIPE             = 0x35
+	IPPROTO_TCF               = 0x57
+	IPPROTO_TCP               = 0x6
+	IPPROTO_TLSP              = 0x38
+	IPPROTO_TP                = 0x1d
+	IPPROTO_TPXX              = 0x27
+	IPPROTO_TRUNK1            = 0x17
+	IPPROTO_TRUNK2            = 0x18
+	IPPROTO_TTP               = 0x54
+	IPPROTO_UDP               = 0x11
+	IPPROTO_VINES             = 0x53
+	IPPROTO_VISA              = 0x46
+	IPPROTO_VMTP              = 0x51
+	IPPROTO_WBEXPAK           = 0x4f
+	IPPROTO_WBMON             = 0x4e
+	IPPROTO_WSN               = 0x4a
+	IPPROTO_XNET              = 0xf
+	IPPROTO_XTP               = 0x24
+	IP_ADD_MEMBERSHIP         = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP  = 0x46
+	IP_BINDANY                = 0x18
+	IP_BLOCK_SOURCE           = 0x48
+	IP_DEFAULT_MULTICAST_LOOP = 0x1
+	IP_DEFAULT_MULTICAST_TTL  = 0x1
+	IP_DONTFRAG               = 0x43
+	IP_DROP_MEMBERSHIP        = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP = 0x47
+	IP_DUMMYNET_CONFIGURE     = 0x3c
+	IP_DUMMYNET_DEL           = 0x3d
+	IP_DUMMYNET_FLUSH         = 0x3e
+	IP_DUMMYNET_GET           = 0x40
+	IP_FAITH                  = 0x16
+	IP_FW_ADD                 = 0x32
+	IP_FW_DEL                 = 0x33
+	IP_FW_FLUSH               = 0x34
+	IP_FW_GET                 = 0x36
+	IP_FW_NAT_CFG             = 0x38
+	IP_FW_NAT_DEL             = 0x39
+	IP_FW_NAT_GET_CONFIG      = 0x3a
+	IP_FW_NAT_GET_LOG         = 0x3b
+	IP_FW_RESETLOG            = 0x37
+	IP_FW_TABLE_ADD           = 0x28
+	IP_FW_TABLE_DEL           = 0x29
+	IP_FW_TABLE_FLUSH         = 0x2a
+	IP_FW_TABLE_GETSIZE       = 0x2b
+	IP_FW_TABLE_LIST          = 0x2c
+	IP_FW_ZERO                = 0x35
+	IP_HDRINCL                = 0x2
+	IP_IPSEC_POLICY           = 0x15
+	IP_MAX_GROUP_SRC_FILTER   = 0x200
+	IP_MAX_MEMBERSHIPS        = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER   = 0x80
+	IP_MAX_SOCK_SRC_FILTER    = 0x80
+	IP_MAX_SOURCE_FILTER      = 0x400
+	IP_MINTTL                 = 0x42
+	IP_MIN_MEMBERSHIPS        = 0x1f
+	IP_MSFILTER               = 0x4a
+	IP_MULTICAST_IF           = 0x9
+	IP_MULTICAST_LOOP         = 0xb
+	IP_MULTICAST_TTL          = 0xa
+	IP_MULTICAST_VIF          = 0xe
+	IP_ONESBCAST              = 0x17
+	IP_OPTIONS                = 0x1
+	IP_PORTRANGE              = 0x13
+	IP_PORTRANGE_DEFAULT      = 0
+	IP_PORTRANGE_HIGH         = 0x1
+	IP_PORTRANGE_LOW          = 0x2
+	IP_RECVDSTADDR            = 0x7
+	IP_RECVIF                 = 0x14
+	IP_RECVOPTS               = 0x5
+	IP_RECVRETOPTS            = 0x6
+	IP_RECVTTL                = 0x41
+	IP_RETOPTS                = 0x8
+	IP_RSVP_OFF               = 0x10
+	IP_RSVP_ON                = 0xf
+	IP_RSVP_VIF_OFF           = 0x12
+	IP_RSVP_VIF_ON            = 0x11
+	IP_SENDSRCADDR            = 0x7
+	IP_TOS                    = 0x3
+	IP_TTL                    = 0x4
+	IP_UNBLOCK_SOURCE         = 0x49
+	O_ACCMODE                 = 0x3
+	O_APPEND                  = 0x8
+	O_ASYNC                   = 0x40
+	O_CREAT                   = 0x200
+	O_DIRECT                  = 0x10000
+	O_DIRECTORY               = 0x20000
+	O_EXCL                    = 0x800
+	O_EXEC                    = 0x40000
+	O_EXLOCK                  = 0x20
+	O_FSYNC                   = 0x80
+	O_NDELAY                  = 0x4
+	O_NOCTTY                  = 0x8000
+	O_NOFOLLOW                = 0x100
+	O_NONBLOCK                = 0x4
+	O_RDONLY                  = 0
+	O_RDWR                    = 0x2
+	O_SHLOCK                  = 0x10
+	O_SYNC                    = 0x80
+	O_TRUNC                   = 0x400
+	O_TTY_INIT                = 0x80000
+	O_WRONLY                  = 0x1
+	SHUT_RD                   = 0
+	SHUT_RDWR                 = 0x2
+	SHUT_WR                   = 0x1
+	SIGABRT                   = 0x6
+	SIGALRM                   = 0xe
+	SIGBUS                    = 0xa
+	SIGCHLD                   = 0x14
+	SIGCONT                   = 0x13
+	SIGEMT                    = 0x7
+	SIGFPE                    = 0x8
+	SIGHUP                    = 0x1
+	SIGILL                    = 0x4
+	SIGINFO                   = 0x1d
+	SIGINT                    = 0x2
+	SIGIO                     = 0x17
+	SIGIOT                    = 0x6
+	SIGKILL                   = 0x9
+	SIGLWP                    = 0x20
+	SIGPIPE                   = 0xd
+	SIGPROF                   = 0x1b
+	SIGQUIT                   = 0x3
+	SIGSEGV                   = 0xb
+	SIGSTOP                   = 0x11
+	SIGSYS                    = 0xc
+	SIGTERM                   = 0xf
+	SIGTHR                    = 0x20
+	SIGTRAP                   = 0x5
+	SIGTSTP                   = 0x12
+	SIGTTIN                   = 0x15
+	SIGTTOU                   = 0x16
+	SIGURG                    = 0x10
+	SIGUSR1                   = 0x1e
+	SIGUSR2                   = 0x1f
+	SIGVTALRM                 = 0x1a
+	SIGWINCH                  = 0x1c
+	SIGXCPU                   = 0x18
+	SIGXFSZ                   = 0x19
+	SOCK_DGRAM                = 0x2
+	SOCK_MAXADDRLEN           = 0xff
+	SOCK_RAW                  = 0x3
+	SOCK_RDM                  = 0x4
+	SOCK_SEQPACKET            = 0x5
+	SOCK_STREAM               = 0x1
+	SOL_SOCKET                = 0xffff
+	SOMAXCONN                 = 0x80
+	SO_ACCEPTCONN             = 0x2
+	SO_ACCEPTFILTER           = 0x1000
+	SO_BINTIME                = 0x2000
+	SO_BROADCAST              = 0x20
+	SO_DEBUG                  = 0x1
+	SO_DONTROUTE              = 0x10
+	SO_ERROR                  = 0x1007
+	SO_KEEPALIVE              = 0x8
+	SO_LABEL                  = 0x1009
+	SO_LINGER                 = 0x80
+	SO_LISTENINCQLEN          = 0x1013
+	SO_LISTENQLEN             = 0x1012
+	SO_LISTENQLIMIT           = 0x1011
+	SO_NOSIGPIPE              = 0x800
+	SO_NO_DDP                 = 0x8000
+	SO_NO_OFFLOAD             = 0x4000
+	SO_OOBINLINE              = 0x100
+	SO_PEERLABEL              = 0x1010
+	SO_RCVBUF                 = 0x1002
+	SO_RCVLOWAT               = 0x1004
+	SO_RCVTIMEO               = 0x1006
+	SO_REUSEADDR              = 0x4
+	SO_REUSEPORT              = 0x200
+	SO_SETFIB                 = 0x1014
+	SO_SNDBUF                 = 0x1001
+	SO_SNDLOWAT               = 0x1003
+	SO_SNDTIMEO               = 0x1005
+	SO_TIMESTAMP              = 0x400
+	SO_TYPE                   = 0x1008
+	SO_USELOOPBACK            = 0x40
+	TCP_CA_NAME_MAX           = 0x10
+	TCP_CONGESTION            = 0x40
+	TCP_INFO                  = 0x20
+	TCP_MAXBURST              = 0x4
+	TCP_MAXHLEN               = 0x3c
+	TCP_MAXOLEN               = 0x28
+	TCP_MAXSEG                = 0x2
+	TCP_MAXWIN                = 0xffff
+	TCP_MAX_SACK              = 0x4
+	TCP_MAX_WINSHIFT          = 0xe
+	TCP_MD5SIG                = 0x10
+	TCP_MINMSS                = 0xd8
+	TCP_MSS                   = 0x200
+	TCP_NODELAY               = 0x1
+	TCP_NOOPT                 = 0x8
+	TCP_NOPUSH                = 0x4
+	WCONTINUED                = 0x4
+	WCOREFLAG                 = 0x80
+	WLINUXCLONE               = 0x80000000
+	WNOHANG                   = 0x1
+	WNOWAIT                   = 0x8
+	WSTOPPED                  = 0x2
+	WUNTRACED                 = 0x2
 )
 
 // Types
diff --git a/src/pkg/syscall/zerrors_linux_386.go b/src/pkg/syscall/zerrors_linux_386.go
index bca74b340..ba744a70c 100644
--- a/src/pkg/syscall/zerrors_linux_386.go
+++ b/src/pkg/syscall/zerrors_linux_386.go
@@ -9,516 +9,516 @@ package syscall
 
 // Constants
 const (
-	AF_APPLETALK				= 0x5;
-	AF_ASH					= 0x12;
-	AF_ATMPVC				= 0x8;
-	AF_ATMSVC				= 0x14;
-	AF_AX25					= 0x3;
-	AF_BLUETOOTH				= 0x1f;
-	AF_BRIDGE				= 0x7;
-	AF_CAN					= 0x1d;
-	AF_DECnet				= 0xc;
-	AF_ECONET				= 0x13;
-	AF_FILE					= 0x1;
-	AF_IEEE802154				= 0x24;
-	AF_INET					= 0x2;
-	AF_INET6				= 0xa;
-	AF_IPX					= 0x4;
-	AF_IRDA					= 0x17;
-	AF_ISDN					= 0x22;
-	AF_IUCV					= 0x20;
-	AF_KEY					= 0xf;
-	AF_LLC					= 0x1a;
-	AF_LOCAL				= 0x1;
-	AF_MAX					= 0x25;
-	AF_NETBEUI				= 0xd;
-	AF_NETLINK				= 0x10;
-	AF_NETROM				= 0x6;
-	AF_PACKET				= 0x11;
-	AF_PHONET				= 0x23;
-	AF_PPPOX				= 0x18;
-	AF_RDS					= 0x15;
-	AF_ROSE					= 0xb;
-	AF_ROUTE				= 0x10;
-	AF_RXRPC				= 0x21;
-	AF_SECURITY				= 0xe;
-	AF_SNA					= 0x16;
-	AF_TIPC					= 0x1e;
-	AF_UNIX					= 0x1;
-	AF_UNSPEC				= 0;
-	AF_WANPIPE				= 0x19;
-	AF_X25					= 0x9;
-	E2BIG					= 0x7;
-	EACCES					= 0xd;
-	EADDRINUSE				= 0x62;
-	EADDRNOTAVAIL				= 0x63;
-	EADV					= 0x44;
-	EAFNOSUPPORT				= 0x61;
-	EAGAIN					= 0xb;
-	EALREADY				= 0x72;
-	EBADE					= 0x34;
-	EBADF					= 0x9;
-	EBADFD					= 0x4d;
-	EBADMSG					= 0x4a;
-	EBADR					= 0x35;
-	EBADRQC					= 0x38;
-	EBADSLT					= 0x39;
-	EBFONT					= 0x3b;
-	EBUSY					= 0x10;
-	ECANCELED				= 0x7d;
-	ECHILD					= 0xa;
-	ECHRNG					= 0x2c;
-	ECOMM					= 0x46;
-	ECONNABORTED				= 0x67;
-	ECONNREFUSED				= 0x6f;
-	ECONNRESET				= 0x68;
-	EDEADLK					= 0x23;
-	EDEADLOCK				= 0x23;
-	EDESTADDRREQ				= 0x59;
-	EDOM					= 0x21;
-	EDOTDOT					= 0x49;
-	EDQUOT					= 0x7a;
-	EEXIST					= 0x11;
-	EFAULT					= 0xe;
-	EFBIG					= 0x1b;
-	EHOSTDOWN				= 0x70;
-	EHOSTUNREACH				= 0x71;
-	EIDRM					= 0x2b;
-	EILSEQ					= 0x54;
-	EINPROGRESS				= 0x73;
-	EINTR					= 0x4;
-	EINVAL					= 0x16;
-	EIO					= 0x5;
-	EISCONN					= 0x6a;
-	EISDIR					= 0x15;
-	EISNAM					= 0x78;
-	EKEYEXPIRED				= 0x7f;
-	EKEYREJECTED				= 0x81;
-	EKEYREVOKED				= 0x80;
-	EL2HLT					= 0x33;
-	EL2NSYNC				= 0x2d;
-	EL3HLT					= 0x2e;
-	EL3RST					= 0x2f;
-	ELIBACC					= 0x4f;
-	ELIBBAD					= 0x50;
-	ELIBEXEC				= 0x53;
-	ELIBMAX					= 0x52;
-	ELIBSCN					= 0x51;
-	ELNRNG					= 0x30;
-	ELOOP					= 0x28;
-	EMEDIUMTYPE				= 0x7c;
-	EMFILE					= 0x18;
-	EMLINK					= 0x1f;
-	EMSGSIZE				= 0x5a;
-	EMULTIHOP				= 0x48;
-	ENAMETOOLONG				= 0x24;
-	ENAVAIL					= 0x77;
-	ENETDOWN				= 0x64;
-	ENETRESET				= 0x66;
-	ENETUNREACH				= 0x65;
-	ENFILE					= 0x17;
-	ENOANO					= 0x37;
-	ENOBUFS					= 0x69;
-	ENOCSI					= 0x32;
-	ENODATA					= 0x3d;
-	ENODEV					= 0x13;
-	ENOENT					= 0x2;
-	ENOEXEC					= 0x8;
-	ENOKEY					= 0x7e;
-	ENOLCK					= 0x25;
-	ENOLINK					= 0x43;
-	ENOMEDIUM				= 0x7b;
-	ENOMEM					= 0xc;
-	ENOMSG					= 0x2a;
-	ENONET					= 0x40;
-	ENOPKG					= 0x41;
-	ENOPROTOOPT				= 0x5c;
-	ENOSPC					= 0x1c;
-	ENOSR					= 0x3f;
-	ENOSTR					= 0x3c;
-	ENOSYS					= 0x26;
-	ENOTBLK					= 0xf;
-	ENOTCONN				= 0x6b;
-	ENOTDIR					= 0x14;
-	ENOTEMPTY				= 0x27;
-	ENOTNAM					= 0x76;
-	ENOTRECOVERABLE				= 0x83;
-	ENOTSOCK				= 0x58;
-	ENOTSUP					= 0x5f;
-	ENOTTY					= 0x19;
-	ENOTUNIQ				= 0x4c;
-	ENXIO					= 0x6;
-	EOPNOTSUPP				= 0x5f;
-	EOVERFLOW				= 0x4b;
-	EOWNERDEAD				= 0x82;
-	EPERM					= 0x1;
-	EPFNOSUPPORT				= 0x60;
-	EPIPE					= 0x20;
-	EPOLLERR				= 0x8;
-	EPOLLET					= -0x80000000;
-	EPOLLHUP				= 0x10;
-	EPOLLIN					= 0x1;
-	EPOLLMSG				= 0x400;
-	EPOLLONESHOT				= 0x40000000;
-	EPOLLOUT				= 0x4;
-	EPOLLPRI				= 0x2;
-	EPOLLRDBAND				= 0x80;
-	EPOLLRDHUP				= 0x2000;
-	EPOLLRDNORM				= 0x40;
-	EPOLLWRBAND				= 0x200;
-	EPOLLWRNORM				= 0x100;
-	EPOLL_CLOEXEC				= 0x80000;
-	EPOLL_CTL_ADD				= 0x1;
-	EPOLL_CTL_DEL				= 0x2;
-	EPOLL_CTL_MOD				= 0x3;
-	EPOLL_NONBLOCK				= 0x800;
-	EPROTO					= 0x47;
-	EPROTONOSUPPORT				= 0x5d;
-	EPROTOTYPE				= 0x5b;
-	ERANGE					= 0x22;
-	EREMCHG					= 0x4e;
-	EREMOTE					= 0x42;
-	EREMOTEIO				= 0x79;
-	ERESTART				= 0x55;
-	ERFKILL					= 0x84;
-	EROFS					= 0x1e;
-	ESHUTDOWN				= 0x6c;
-	ESOCKTNOSUPPORT				= 0x5e;
-	ESPIPE					= 0x1d;
-	ESRCH					= 0x3;
-	ESRMNT					= 0x45;
-	ESTALE					= 0x74;
-	ESTRPIPE				= 0x56;
-	ETIME					= 0x3e;
-	ETIMEDOUT				= 0x6e;
-	ETOOMANYREFS				= 0x6d;
-	ETXTBSY					= 0x1a;
-	EUCLEAN					= 0x75;
-	EUNATCH					= 0x31;
-	EUSERS					= 0x57;
-	EWOULDBLOCK				= 0xb;
-	EXDEV					= 0x12;
-	EXFULL					= 0x36;
-	FD_CLOEXEC				= 0x1;
-	FD_SETSIZE				= 0x400;
-	F_DUPFD					= 0;
-	F_DUPFD_CLOEXEC				= 0x406;
-	F_EXLCK					= 0x4;
-	F_GETFD					= 0x1;
-	F_GETFL					= 0x3;
-	F_GETLEASE				= 0x401;
-	F_GETLK					= 0x5;
-	F_GETLK64				= 0x5;
-	F_GETOWN				= 0x9;
-	F_GETSIG				= 0xb;
-	F_LOCK					= 0x1;
-	F_NOTIFY				= 0x402;
-	F_OK					= 0;
-	F_RDLCK					= 0;
-	F_SETFD					= 0x2;
-	F_SETFL					= 0x4;
-	F_SETLEASE				= 0x400;
-	F_SETLK					= 0x6;
-	F_SETLK64				= 0x6;
-	F_SETLKW				= 0x7;
-	F_SETLKW64				= 0x7;
-	F_SETOWN				= 0x8;
-	F_SETSIG				= 0xa;
-	F_SHLCK					= 0x8;
-	F_TEST					= 0x3;
-	F_TLOCK					= 0x2;
-	F_ULOCK					= 0;
-	F_UNLCK					= 0x2;
-	F_WRLCK					= 0x1;
-	IPPROTO_AH				= 0x33;
-	IPPROTO_COMP				= 0x6c;
-	IPPROTO_DCCP				= 0x21;
-	IPPROTO_DSTOPTS				= 0x3c;
-	IPPROTO_EGP				= 0x8;
-	IPPROTO_ENCAP				= 0x62;
-	IPPROTO_ESP				= 0x32;
-	IPPROTO_FRAGMENT			= 0x2c;
-	IPPROTO_GRE				= 0x2f;
-	IPPROTO_HOPOPTS				= 0;
-	IPPROTO_ICMP				= 0x1;
-	IPPROTO_ICMPV6				= 0x3a;
-	IPPROTO_IDP				= 0x16;
-	IPPROTO_IGMP				= 0x2;
-	IPPROTO_IP				= 0;
-	IPPROTO_IPIP				= 0x4;
-	IPPROTO_IPV6				= 0x29;
-	IPPROTO_MTP				= 0x5c;
-	IPPROTO_NONE				= 0x3b;
-	IPPROTO_PIM				= 0x67;
-	IPPROTO_PUP				= 0xc;
-	IPPROTO_RAW				= 0xff;
-	IPPROTO_ROUTING				= 0x2b;
-	IPPROTO_RSVP				= 0x2e;
-	IPPROTO_SCTP				= 0x84;
-	IPPROTO_TCP				= 0x6;
-	IPPROTO_TP				= 0x1d;
-	IPPROTO_UDP				= 0x11;
-	IPPROTO_UDPLITE				= 0x88;
-	IP_ADD_MEMBERSHIP			= 0x23;
-	IP_ADD_SOURCE_MEMBERSHIP		= 0x27;
-	IP_BLOCK_SOURCE				= 0x26;
-	IP_DEFAULT_MULTICAST_LOOP		= 0x1;
-	IP_DEFAULT_MULTICAST_TTL		= 0x1;
-	IP_DROP_MEMBERSHIP			= 0x24;
-	IP_DROP_SOURCE_MEMBERSHIP		= 0x28;
-	IP_HDRINCL				= 0x3;
-	IP_MAX_MEMBERSHIPS			= 0x14;
-	IP_MSFILTER				= 0x29;
-	IP_MTU_DISCOVER				= 0xa;
-	IP_MULTICAST_IF				= 0x20;
-	IP_MULTICAST_LOOP			= 0x22;
-	IP_MULTICAST_TTL			= 0x21;
-	IP_OPTIONS				= 0x4;
-	IP_PKTINFO				= 0x8;
-	IP_PKTOPTIONS				= 0x9;
-	IP_PMTUDISC				= 0xa;
-	IP_PMTUDISC_DO				= 0x2;
-	IP_PMTUDISC_DONT			= 0;
-	IP_PMTUDISC_PROBE			= 0x3;
-	IP_PMTUDISC_WANT			= 0x1;
-	IP_RECVERR				= 0xb;
-	IP_RECVOPTS				= 0x6;
-	IP_RECVRETOPTS				= 0x7;
-	IP_RECVTOS				= 0xd;
-	IP_RECVTTL				= 0xc;
-	IP_RETOPTS				= 0x7;
-	IP_ROUTER_ALERT				= 0x5;
-	IP_TOS					= 0x1;
-	IP_TTL					= 0x2;
-	IP_UNBLOCK_SOURCE			= 0x25;
-	NAME_MAX				= 0xff;
-	O_ACCMODE				= 0x3;
-	O_APPEND				= 0x400;
-	O_ASYNC					= 0x2000;
-	O_CLOEXEC				= 0x80000;
-	O_CREAT					= 0x40;
-	O_DIRECT				= 0x4000;
-	O_DIRECTORY				= 0x10000;
-	O_DSYNC					= 0x1000;
-	O_EXCL					= 0x80;
-	O_FSYNC					= 0x1000;
-	O_LARGEFILE				= 0;
-	O_NDELAY				= 0x800;
-	O_NOATIME				= 0x40000;
-	O_NOCTTY				= 0x100;
-	O_NOFOLLOW				= 0x20000;
-	O_NONBLOCK				= 0x800;
-	O_RDONLY				= 0;
-	O_RDWR					= 0x2;
-	O_RSYNC					= 0x1000;
-	O_SYNC					= 0x1000;
-	O_TRUNC					= 0x200;
-	O_WRONLY				= 0x1;
-	PTRACE_ARCH_PRCTL			= 0x1e;
-	PTRACE_ATTACH				= 0x10;
-	PTRACE_BTS_CLEAR			= 0x2c;
-	PTRACE_BTS_CONFIG			= 0x28;
-	PTRACE_BTS_DRAIN			= 0x2d;
-	PTRACE_BTS_GET				= 0x2b;
-	PTRACE_BTS_O_ALLOC			= 0x8;
-	PTRACE_BTS_O_SCHED			= 0x2;
-	PTRACE_BTS_O_SIGNAL			= 0x4;
-	PTRACE_BTS_O_TRACE			= 0x1;
-	PTRACE_BTS_SIZE				= 0x2a;
-	PTRACE_BTS_STATUS			= 0x29;
-	PTRACE_CONT				= 0x7;
-	PTRACE_DETACH				= 0x11;
-	PTRACE_EVENT_CLONE			= 0x3;
-	PTRACE_EVENT_EXEC			= 0x4;
-	PTRACE_EVENT_EXIT			= 0x6;
-	PTRACE_EVENT_FORK			= 0x1;
-	PTRACE_EVENT_VFORK			= 0x2;
-	PTRACE_EVENT_VFORK_DONE			= 0x5;
-	PTRACE_GETEVENTMSG			= 0x4201;
-	PTRACE_GETFPREGS			= 0xe;
-	PTRACE_GETFPXREGS			= 0x12;
-	PTRACE_GETREGS				= 0xc;
-	PTRACE_GETSIGINFO			= 0x4202;
-	PTRACE_GET_THREAD_AREA			= 0x19;
-	PTRACE_KILL				= 0x8;
-	PTRACE_OLDSETOPTIONS			= 0x15;
-	PTRACE_O_MASK				= 0x7f;
-	PTRACE_O_TRACECLONE			= 0x8;
-	PTRACE_O_TRACEEXEC			= 0x10;
-	PTRACE_O_TRACEEXIT			= 0x40;
-	PTRACE_O_TRACEFORK			= 0x2;
-	PTRACE_O_TRACESYSGOOD			= 0x1;
-	PTRACE_O_TRACEVFORK			= 0x4;
-	PTRACE_O_TRACEVFORKDONE			= 0x20;
-	PTRACE_PEEKDATA				= 0x2;
-	PTRACE_PEEKTEXT				= 0x1;
-	PTRACE_PEEKUSR				= 0x3;
-	PTRACE_POKEDATA				= 0x5;
-	PTRACE_POKETEXT				= 0x4;
-	PTRACE_POKEUSR				= 0x6;
-	PTRACE_SETFPREGS			= 0xf;
-	PTRACE_SETFPXREGS			= 0x13;
-	PTRACE_SETOPTIONS			= 0x4200;
-	PTRACE_SETREGS				= 0xd;
-	PTRACE_SETSIGINFO			= 0x4203;
-	PTRACE_SET_THREAD_AREA			= 0x1a;
-	PTRACE_SINGLEBLOCK			= 0x21;
-	PTRACE_SINGLESTEP			= 0x9;
-	PTRACE_SYSCALL				= 0x18;
-	PTRACE_SYSEMU				= 0x1f;
-	PTRACE_SYSEMU_SINGLESTEP		= 0x20;
-	PTRACE_TRACEME				= 0;
-	SHUT_RD					= 0;
-	SHUT_RDWR				= 0x2;
-	SHUT_WR					= 0x1;
-	SIGABRT					= 0x6;
-	SIGALRM					= 0xe;
-	SIGBUS					= 0x7;
-	SIGCHLD					= 0x11;
-	SIGCLD					= 0x11;
-	SIGCONT					= 0x12;
-	SIGFPE					= 0x8;
-	SIGHUP					= 0x1;
-	SIGILL					= 0x4;
-	SIGINT					= 0x2;
-	SIGIO					= 0x1d;
-	SIGIOT					= 0x6;
-	SIGKILL					= 0x9;
-	SIGPIPE					= 0xd;
-	SIGPOLL					= 0x1d;
-	SIGPROF					= 0x1b;
-	SIGPWR					= 0x1e;
-	SIGQUIT					= 0x3;
-	SIGSEGV					= 0xb;
-	SIGSTKFLT				= 0x10;
-	SIGSTOP					= 0x13;
-	SIGSYS					= 0x1f;
-	SIGTERM					= 0xf;
-	SIGTRAP					= 0x5;
-	SIGTSTP					= 0x14;
-	SIGTTIN					= 0x15;
-	SIGTTOU					= 0x16;
-	SIGUNUSED				= 0x1f;
-	SIGURG					= 0x17;
-	SIGUSR1					= 0xa;
-	SIGUSR2					= 0xc;
-	SIGVTALRM				= 0x1a;
-	SIGWINCH				= 0x1c;
-	SIGXCPU					= 0x18;
-	SIGXFSZ					= 0x19;
-	SOCK_CLOEXEC				= 0x80000;
-	SOCK_DCCP				= 0x6;
-	SOCK_DGRAM				= 0x2;
-	SOCK_NONBLOCK				= 0x800;
-	SOCK_PACKET				= 0xa;
-	SOCK_RAW				= 0x3;
-	SOCK_RDM				= 0x4;
-	SOCK_SEQPACKET				= 0x5;
-	SOCK_STREAM				= 0x1;
-	SOL_AAL					= 0x109;
-	SOL_ATM					= 0x108;
-	SOL_DECNET				= 0x105;
-	SOL_ICMPV6				= 0x3a;
-	SOL_IP					= 0;
-	SOL_IPV6				= 0x29;
-	SOL_IRDA				= 0x10a;
-	SOL_PACKET				= 0x107;
-	SOL_RAW					= 0xff;
-	SOL_SOCKET				= 0x1;
-	SOL_TCP					= 0x6;
-	SOL_X25					= 0x106;
-	SOMAXCONN				= 0x80;
-	SO_ACCEPTCONN				= 0x1e;
-	SO_ATTACH_FILTER			= 0x1a;
-	SO_BINDTODEVICE				= 0x19;
-	SO_BROADCAST				= 0x6;
-	SO_BSDCOMPAT				= 0xe;
-	SO_DEBUG				= 0x1;
-	SO_DETACH_FILTER			= 0x1b;
-	SO_DONTROUTE				= 0x5;
-	SO_ERROR				= 0x4;
-	SO_KEEPALIVE				= 0x9;
-	SO_LINGER				= 0xd;
-	SO_MARK					= 0x24;
-	SO_NO_CHECK				= 0xb;
-	SO_OOBINLINE				= 0xa;
-	SO_PASSCRED				= 0x10;
-	SO_PASSSEC				= 0x22;
-	SO_PEERCRED				= 0x11;
-	SO_PEERNAME				= 0x1c;
-	SO_PEERSEC				= 0x1f;
-	SO_PRIORITY				= 0xc;
-	SO_RCVBUF				= 0x8;
-	SO_RCVBUFFORCE				= 0x21;
-	SO_RCVLOWAT				= 0x12;
-	SO_RCVTIMEO				= 0x14;
-	SO_REUSEADDR				= 0x2;
-	SO_SECURITY_AUTHENTICATION		= 0x16;
-	SO_SECURITY_ENCRYPTION_NETWORK		= 0x18;
-	SO_SECURITY_ENCRYPTION_TRANSPORT	= 0x17;
-	SO_SNDBUF				= 0x7;
-	SO_SNDBUFFORCE				= 0x20;
-	SO_SNDLOWAT				= 0x13;
-	SO_SNDTIMEO				= 0x15;
-	SO_TIMESTAMP				= 0x1d;
-	SO_TIMESTAMPING				= 0x25;
-	SO_TIMESTAMPNS				= 0x23;
-	SO_TYPE					= 0x3;
-	S_BLKSIZE				= 0x200;
-	S_IEXEC					= 0x40;
-	S_IFBLK					= 0x6000;
-	S_IFCHR					= 0x2000;
-	S_IFDIR					= 0x4000;
-	S_IFIFO					= 0x1000;
-	S_IFLNK					= 0xa000;
-	S_IFMT					= 0xf000;
-	S_IFREG					= 0x8000;
-	S_IFSOCK				= 0xc000;
-	S_IREAD					= 0x100;
-	S_IRGRP					= 0x20;
-	S_IROTH					= 0x4;
-	S_IRUSR					= 0x100;
-	S_IRWXG					= 0x38;
-	S_IRWXO					= 0x7;
-	S_IRWXU					= 0x1c0;
-	S_ISGID					= 0x400;
-	S_ISUID					= 0x800;
-	S_ISVTX					= 0x200;
-	S_IWGRP					= 0x10;
-	S_IWOTH					= 0x2;
-	S_IWRITE				= 0x80;
-	S_IWUSR					= 0x80;
-	S_IXGRP					= 0x8;
-	S_IXOTH					= 0x1;
-	S_IXUSR					= 0x40;
-	TCP_CONGESTION				= 0xd;
-	TCP_CORK				= 0x3;
-	TCP_DEFER_ACCEPT			= 0x9;
-	TCP_INFO				= 0xb;
-	TCP_KEEPCNT				= 0x6;
-	TCP_KEEPIDLE				= 0x4;
-	TCP_KEEPINTVL				= 0x5;
-	TCP_LINGER2				= 0x8;
-	TCP_MAXSEG				= 0x2;
-	TCP_MAXWIN				= 0xffff;
-	TCP_MAX_WINSHIFT			= 0xe;
-	TCP_MD5SIG				= 0xe;
-	TCP_MD5SIG_MAXKEYLEN			= 0x50;
-	TCP_MSS					= 0x200;
-	TCP_NODELAY				= 0x1;
-	TCP_QUICKACK				= 0xc;
-	TCP_SYNCNT				= 0x7;
-	TCP_WINDOW_CLAMP			= 0xa;
-	WALL					= 0x40000000;
-	WCLONE					= 0x80000000;
-	WCONTINUED				= 0x8;
-	WEXITED					= 0x4;
-	WNOHANG					= 0x1;
-	WNOTHREAD				= 0x20000000;
-	WNOWAIT					= 0x1000000;
-	WORDSIZE				= 0x40;
-	WSTOPPED				= 0x2;
-	WUNTRACED				= 0x2;
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x25
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	E2BIG                            = 0x7
+	EACCES                           = 0xd
+	EADDRINUSE                       = 0x62
+	EADDRNOTAVAIL                    = 0x63
+	EADV                             = 0x44
+	EAFNOSUPPORT                     = 0x61
+	EAGAIN                           = 0xb
+	EALREADY                         = 0x72
+	EBADE                            = 0x34
+	EBADF                            = 0x9
+	EBADFD                           = 0x4d
+	EBADMSG                          = 0x4a
+	EBADR                            = 0x35
+	EBADRQC                          = 0x38
+	EBADSLT                          = 0x39
+	EBFONT                           = 0x3b
+	EBUSY                            = 0x10
+	ECANCELED                        = 0x7d
+	ECHILD                           = 0xa
+	ECHRNG                           = 0x2c
+	ECOMM                            = 0x46
+	ECONNABORTED                     = 0x67
+	ECONNREFUSED                     = 0x6f
+	ECONNRESET                       = 0x68
+	EDEADLK                          = 0x23
+	EDEADLOCK                        = 0x23
+	EDESTADDRREQ                     = 0x59
+	EDOM                             = 0x21
+	EDOTDOT                          = 0x49
+	EDQUOT                           = 0x7a
+	EEXIST                           = 0x11
+	EFAULT                           = 0xe
+	EFBIG                            = 0x1b
+	EHOSTDOWN                        = 0x70
+	EHOSTUNREACH                     = 0x71
+	EIDRM                            = 0x2b
+	EILSEQ                           = 0x54
+	EINPROGRESS                      = 0x73
+	EINTR                            = 0x4
+	EINVAL                           = 0x16
+	EIO                              = 0x5
+	EISCONN                          = 0x6a
+	EISDIR                           = 0x15
+	EISNAM                           = 0x78
+	EKEYEXPIRED                      = 0x7f
+	EKEYREJECTED                     = 0x81
+	EKEYREVOKED                      = 0x80
+	EL2HLT                           = 0x33
+	EL2NSYNC                         = 0x2d
+	EL3HLT                           = 0x2e
+	EL3RST                           = 0x2f
+	ELIBACC                          = 0x4f
+	ELIBBAD                          = 0x50
+	ELIBEXEC                         = 0x53
+	ELIBMAX                          = 0x52
+	ELIBSCN                          = 0x51
+	ELNRNG                           = 0x30
+	ELOOP                            = 0x28
+	EMEDIUMTYPE                      = 0x7c
+	EMFILE                           = 0x18
+	EMLINK                           = 0x1f
+	EMSGSIZE                         = 0x5a
+	EMULTIHOP                        = 0x48
+	ENAMETOOLONG                     = 0x24
+	ENAVAIL                          = 0x77
+	ENETDOWN                         = 0x64
+	ENETRESET                        = 0x66
+	ENETUNREACH                      = 0x65
+	ENFILE                           = 0x17
+	ENOANO                           = 0x37
+	ENOBUFS                          = 0x69
+	ENOCSI                           = 0x32
+	ENODATA                          = 0x3d
+	ENODEV                           = 0x13
+	ENOENT                           = 0x2
+	ENOEXEC                          = 0x8
+	ENOKEY                           = 0x7e
+	ENOLCK                           = 0x25
+	ENOLINK                          = 0x43
+	ENOMEDIUM                        = 0x7b
+	ENOMEM                           = 0xc
+	ENOMSG                           = 0x2a
+	ENONET                           = 0x40
+	ENOPKG                           = 0x41
+	ENOPROTOOPT                      = 0x5c
+	ENOSPC                           = 0x1c
+	ENOSR                            = 0x3f
+	ENOSTR                           = 0x3c
+	ENOSYS                           = 0x26
+	ENOTBLK                          = 0xf
+	ENOTCONN                         = 0x6b
+	ENOTDIR                          = 0x14
+	ENOTEMPTY                        = 0x27
+	ENOTNAM                          = 0x76
+	ENOTRECOVERABLE                  = 0x83
+	ENOTSOCK                         = 0x58
+	ENOTSUP                          = 0x5f
+	ENOTTY                           = 0x19
+	ENOTUNIQ                         = 0x4c
+	ENXIO                            = 0x6
+	EOPNOTSUPP                       = 0x5f
+	EOVERFLOW                        = 0x4b
+	EOWNERDEAD                       = 0x82
+	EPERM                            = 0x1
+	EPFNOSUPPORT                     = 0x60
+	EPIPE                            = 0x20
+	EPOLLERR                         = 0x8
+	EPOLLET                          = -0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	EPOLL_NONBLOCK                   = 0x800
+	EPROTO                           = 0x47
+	EPROTONOSUPPORT                  = 0x5d
+	EPROTOTYPE                       = 0x5b
+	ERANGE                           = 0x22
+	EREMCHG                          = 0x4e
+	EREMOTE                          = 0x42
+	EREMOTEIO                        = 0x79
+	ERESTART                         = 0x55
+	ERFKILL                          = 0x84
+	EROFS                            = 0x1e
+	ESHUTDOWN                        = 0x6c
+	ESOCKTNOSUPPORT                  = 0x5e
+	ESPIPE                           = 0x1d
+	ESRCH                            = 0x3
+	ESRMNT                           = 0x45
+	ESTALE                           = 0x74
+	ESTRPIPE                         = 0x56
+	ETIME                            = 0x3e
+	ETIMEDOUT                        = 0x6e
+	ETOOMANYREFS                     = 0x6d
+	ETXTBSY                          = 0x1a
+	EUCLEAN                          = 0x75
+	EUNATCH                          = 0x31
+	EUSERS                           = 0x57
+	EWOULDBLOCK                      = 0xb
+	EXDEV                            = 0x12
+	EXFULL                           = 0x36
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	F_DUPFD                          = 0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0x5
+	F_GETOWN                         = 0x9
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0
+	F_RDLCK                          = 0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x8
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	IPPROTO_AH                       = 0x33
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_HDRINCL                       = 0x3
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MSFILTER                      = 0x29
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OPTIONS                       = 0x4
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	NAME_MAX                         = 0xff
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x4000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x1000
+	O_LARGEFILE                      = 0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x800
+	O_RDONLY                         = 0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x1000
+	O_SYNC                           = 0x1000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PTRACE_ARCH_PRCTL                = 0x1e
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_BTS_CLEAR                 = 0x2c
+	PTRACE_BTS_CONFIG                = 0x28
+	PTRACE_BTS_DRAIN                 = 0x2d
+	PTRACE_BTS_GET                   = 0x2b
+	PTRACE_BTS_O_ALLOC               = 0x8
+	PTRACE_BTS_O_SCHED               = 0x2
+	PTRACE_BTS_O_SIGNAL              = 0x4
+	PTRACE_BTS_O_TRACE               = 0x1
+	PTRACE_BTS_SIZE                  = 0x2a
+	PTRACE_BTS_STATUS                = 0x29
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETFPXREGS                = 0x12
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_KILL                      = 0x8
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_MASK                    = 0x7f
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETFPXREGS                = 0x13
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x21
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_SYSEMU                    = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP         = 0x20
+	PTRACE_TRACEME                   = 0
+	SHUT_RD                          = 0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIGABRT                          = 0x6
+	SIGALRM                          = 0xe
+	SIGBUS                           = 0x7
+	SIGCHLD                          = 0x11
+	SIGCLD                           = 0x11
+	SIGCONT                          = 0x12
+	SIGFPE                           = 0x8
+	SIGHUP                           = 0x1
+	SIGILL                           = 0x4
+	SIGINT                           = 0x2
+	SIGIO                            = 0x1d
+	SIGIOT                           = 0x6
+	SIGKILL                          = 0x9
+	SIGPIPE                          = 0xd
+	SIGPOLL                          = 0x1d
+	SIGPROF                          = 0x1b
+	SIGPWR                           = 0x1e
+	SIGQUIT                          = 0x3
+	SIGSEGV                          = 0xb
+	SIGSTKFLT                        = 0x10
+	SIGSTOP                          = 0x13
+	SIGSYS                           = 0x1f
+	SIGTERM                          = 0xf
+	SIGTRAP                          = 0x5
+	SIGTSTP                          = 0x14
+	SIGTTIN                          = 0x15
+	SIGTTOU                          = 0x16
+	SIGUNUSED                        = 0x1f
+	SIGURG                           = 0x17
+	SIGUSR1                          = 0xa
+	SIGUSR2                          = 0xc
+	SIGVTALRM                        = 0x1a
+	SIGWINCH                         = 0x1c
+	SIGXCPU                          = 0x18
+	SIGXFSZ                          = 0x19
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_MARK                          = 0x24
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TCP_CONGESTION                   = 0xd
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_NODELAY                      = 0x1
+	TCP_QUICKACK                     = 0xc
+	TCP_SYNCNT                       = 0x7
+	TCP_WINDOW_CLAMP                 = 0xa
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
 )
 
 // Types
diff --git a/src/pkg/syscall/zerrors_linux_amd64.go b/src/pkg/syscall/zerrors_linux_amd64.go
index bca74b340..ba744a70c 100644
--- a/src/pkg/syscall/zerrors_linux_amd64.go
+++ b/src/pkg/syscall/zerrors_linux_amd64.go
@@ -9,516 +9,516 @@ package syscall
 
 // Constants
 const (
-	AF_APPLETALK				= 0x5;
-	AF_ASH					= 0x12;
-	AF_ATMPVC				= 0x8;
-	AF_ATMSVC				= 0x14;
-	AF_AX25					= 0x3;
-	AF_BLUETOOTH				= 0x1f;
-	AF_BRIDGE				= 0x7;
-	AF_CAN					= 0x1d;
-	AF_DECnet				= 0xc;
-	AF_ECONET				= 0x13;
-	AF_FILE					= 0x1;
-	AF_IEEE802154				= 0x24;
-	AF_INET					= 0x2;
-	AF_INET6				= 0xa;
-	AF_IPX					= 0x4;
-	AF_IRDA					= 0x17;
-	AF_ISDN					= 0x22;
-	AF_IUCV					= 0x20;
-	AF_KEY					= 0xf;
-	AF_LLC					= 0x1a;
-	AF_LOCAL				= 0x1;
-	AF_MAX					= 0x25;
-	AF_NETBEUI				= 0xd;
-	AF_NETLINK				= 0x10;
-	AF_NETROM				= 0x6;
-	AF_PACKET				= 0x11;
-	AF_PHONET				= 0x23;
-	AF_PPPOX				= 0x18;
-	AF_RDS					= 0x15;
-	AF_ROSE					= 0xb;
-	AF_ROUTE				= 0x10;
-	AF_RXRPC				= 0x21;
-	AF_SECURITY				= 0xe;
-	AF_SNA					= 0x16;
-	AF_TIPC					= 0x1e;
-	AF_UNIX					= 0x1;
-	AF_UNSPEC				= 0;
-	AF_WANPIPE				= 0x19;
-	AF_X25					= 0x9;
-	E2BIG					= 0x7;
-	EACCES					= 0xd;
-	EADDRINUSE				= 0x62;
-	EADDRNOTAVAIL				= 0x63;
-	EADV					= 0x44;
-	EAFNOSUPPORT				= 0x61;
-	EAGAIN					= 0xb;
-	EALREADY				= 0x72;
-	EBADE					= 0x34;
-	EBADF					= 0x9;
-	EBADFD					= 0x4d;
-	EBADMSG					= 0x4a;
-	EBADR					= 0x35;
-	EBADRQC					= 0x38;
-	EBADSLT					= 0x39;
-	EBFONT					= 0x3b;
-	EBUSY					= 0x10;
-	ECANCELED				= 0x7d;
-	ECHILD					= 0xa;
-	ECHRNG					= 0x2c;
-	ECOMM					= 0x46;
-	ECONNABORTED				= 0x67;
-	ECONNREFUSED				= 0x6f;
-	ECONNRESET				= 0x68;
-	EDEADLK					= 0x23;
-	EDEADLOCK				= 0x23;
-	EDESTADDRREQ				= 0x59;
-	EDOM					= 0x21;
-	EDOTDOT					= 0x49;
-	EDQUOT					= 0x7a;
-	EEXIST					= 0x11;
-	EFAULT					= 0xe;
-	EFBIG					= 0x1b;
-	EHOSTDOWN				= 0x70;
-	EHOSTUNREACH				= 0x71;
-	EIDRM					= 0x2b;
-	EILSEQ					= 0x54;
-	EINPROGRESS				= 0x73;
-	EINTR					= 0x4;
-	EINVAL					= 0x16;
-	EIO					= 0x5;
-	EISCONN					= 0x6a;
-	EISDIR					= 0x15;
-	EISNAM					= 0x78;
-	EKEYEXPIRED				= 0x7f;
-	EKEYREJECTED				= 0x81;
-	EKEYREVOKED				= 0x80;
-	EL2HLT					= 0x33;
-	EL2NSYNC				= 0x2d;
-	EL3HLT					= 0x2e;
-	EL3RST					= 0x2f;
-	ELIBACC					= 0x4f;
-	ELIBBAD					= 0x50;
-	ELIBEXEC				= 0x53;
-	ELIBMAX					= 0x52;
-	ELIBSCN					= 0x51;
-	ELNRNG					= 0x30;
-	ELOOP					= 0x28;
-	EMEDIUMTYPE				= 0x7c;
-	EMFILE					= 0x18;
-	EMLINK					= 0x1f;
-	EMSGSIZE				= 0x5a;
-	EMULTIHOP				= 0x48;
-	ENAMETOOLONG				= 0x24;
-	ENAVAIL					= 0x77;
-	ENETDOWN				= 0x64;
-	ENETRESET				= 0x66;
-	ENETUNREACH				= 0x65;
-	ENFILE					= 0x17;
-	ENOANO					= 0x37;
-	ENOBUFS					= 0x69;
-	ENOCSI					= 0x32;
-	ENODATA					= 0x3d;
-	ENODEV					= 0x13;
-	ENOENT					= 0x2;
-	ENOEXEC					= 0x8;
-	ENOKEY					= 0x7e;
-	ENOLCK					= 0x25;
-	ENOLINK					= 0x43;
-	ENOMEDIUM				= 0x7b;
-	ENOMEM					= 0xc;
-	ENOMSG					= 0x2a;
-	ENONET					= 0x40;
-	ENOPKG					= 0x41;
-	ENOPROTOOPT				= 0x5c;
-	ENOSPC					= 0x1c;
-	ENOSR					= 0x3f;
-	ENOSTR					= 0x3c;
-	ENOSYS					= 0x26;
-	ENOTBLK					= 0xf;
-	ENOTCONN				= 0x6b;
-	ENOTDIR					= 0x14;
-	ENOTEMPTY				= 0x27;
-	ENOTNAM					= 0x76;
-	ENOTRECOVERABLE				= 0x83;
-	ENOTSOCK				= 0x58;
-	ENOTSUP					= 0x5f;
-	ENOTTY					= 0x19;
-	ENOTUNIQ				= 0x4c;
-	ENXIO					= 0x6;
-	EOPNOTSUPP				= 0x5f;
-	EOVERFLOW				= 0x4b;
-	EOWNERDEAD				= 0x82;
-	EPERM					= 0x1;
-	EPFNOSUPPORT				= 0x60;
-	EPIPE					= 0x20;
-	EPOLLERR				= 0x8;
-	EPOLLET					= -0x80000000;
-	EPOLLHUP				= 0x10;
-	EPOLLIN					= 0x1;
-	EPOLLMSG				= 0x400;
-	EPOLLONESHOT				= 0x40000000;
-	EPOLLOUT				= 0x4;
-	EPOLLPRI				= 0x2;
-	EPOLLRDBAND				= 0x80;
-	EPOLLRDHUP				= 0x2000;
-	EPOLLRDNORM				= 0x40;
-	EPOLLWRBAND				= 0x200;
-	EPOLLWRNORM				= 0x100;
-	EPOLL_CLOEXEC				= 0x80000;
-	EPOLL_CTL_ADD				= 0x1;
-	EPOLL_CTL_DEL				= 0x2;
-	EPOLL_CTL_MOD				= 0x3;
-	EPOLL_NONBLOCK				= 0x800;
-	EPROTO					= 0x47;
-	EPROTONOSUPPORT				= 0x5d;
-	EPROTOTYPE				= 0x5b;
-	ERANGE					= 0x22;
-	EREMCHG					= 0x4e;
-	EREMOTE					= 0x42;
-	EREMOTEIO				= 0x79;
-	ERESTART				= 0x55;
-	ERFKILL					= 0x84;
-	EROFS					= 0x1e;
-	ESHUTDOWN				= 0x6c;
-	ESOCKTNOSUPPORT				= 0x5e;
-	ESPIPE					= 0x1d;
-	ESRCH					= 0x3;
-	ESRMNT					= 0x45;
-	ESTALE					= 0x74;
-	ESTRPIPE				= 0x56;
-	ETIME					= 0x3e;
-	ETIMEDOUT				= 0x6e;
-	ETOOMANYREFS				= 0x6d;
-	ETXTBSY					= 0x1a;
-	EUCLEAN					= 0x75;
-	EUNATCH					= 0x31;
-	EUSERS					= 0x57;
-	EWOULDBLOCK				= 0xb;
-	EXDEV					= 0x12;
-	EXFULL					= 0x36;
-	FD_CLOEXEC				= 0x1;
-	FD_SETSIZE				= 0x400;
-	F_DUPFD					= 0;
-	F_DUPFD_CLOEXEC				= 0x406;
-	F_EXLCK					= 0x4;
-	F_GETFD					= 0x1;
-	F_GETFL					= 0x3;
-	F_GETLEASE				= 0x401;
-	F_GETLK					= 0x5;
-	F_GETLK64				= 0x5;
-	F_GETOWN				= 0x9;
-	F_GETSIG				= 0xb;
-	F_LOCK					= 0x1;
-	F_NOTIFY				= 0x402;
-	F_OK					= 0;
-	F_RDLCK					= 0;
-	F_SETFD					= 0x2;
-	F_SETFL					= 0x4;
-	F_SETLEASE				= 0x400;
-	F_SETLK					= 0x6;
-	F_SETLK64				= 0x6;
-	F_SETLKW				= 0x7;
-	F_SETLKW64				= 0x7;
-	F_SETOWN				= 0x8;
-	F_SETSIG				= 0xa;
-	F_SHLCK					= 0x8;
-	F_TEST					= 0x3;
-	F_TLOCK					= 0x2;
-	F_ULOCK					= 0;
-	F_UNLCK					= 0x2;
-	F_WRLCK					= 0x1;
-	IPPROTO_AH				= 0x33;
-	IPPROTO_COMP				= 0x6c;
-	IPPROTO_DCCP				= 0x21;
-	IPPROTO_DSTOPTS				= 0x3c;
-	IPPROTO_EGP				= 0x8;
-	IPPROTO_ENCAP				= 0x62;
-	IPPROTO_ESP				= 0x32;
-	IPPROTO_FRAGMENT			= 0x2c;
-	IPPROTO_GRE				= 0x2f;
-	IPPROTO_HOPOPTS				= 0;
-	IPPROTO_ICMP				= 0x1;
-	IPPROTO_ICMPV6				= 0x3a;
-	IPPROTO_IDP				= 0x16;
-	IPPROTO_IGMP				= 0x2;
-	IPPROTO_IP				= 0;
-	IPPROTO_IPIP				= 0x4;
-	IPPROTO_IPV6				= 0x29;
-	IPPROTO_MTP				= 0x5c;
-	IPPROTO_NONE				= 0x3b;
-	IPPROTO_PIM				= 0x67;
-	IPPROTO_PUP				= 0xc;
-	IPPROTO_RAW				= 0xff;
-	IPPROTO_ROUTING				= 0x2b;
-	IPPROTO_RSVP				= 0x2e;
-	IPPROTO_SCTP				= 0x84;
-	IPPROTO_TCP				= 0x6;
-	IPPROTO_TP				= 0x1d;
-	IPPROTO_UDP				= 0x11;
-	IPPROTO_UDPLITE				= 0x88;
-	IP_ADD_MEMBERSHIP			= 0x23;
-	IP_ADD_SOURCE_MEMBERSHIP		= 0x27;
-	IP_BLOCK_SOURCE				= 0x26;
-	IP_DEFAULT_MULTICAST_LOOP		= 0x1;
-	IP_DEFAULT_MULTICAST_TTL		= 0x1;
-	IP_DROP_MEMBERSHIP			= 0x24;
-	IP_DROP_SOURCE_MEMBERSHIP		= 0x28;
-	IP_HDRINCL				= 0x3;
-	IP_MAX_MEMBERSHIPS			= 0x14;
-	IP_MSFILTER				= 0x29;
-	IP_MTU_DISCOVER				= 0xa;
-	IP_MULTICAST_IF				= 0x20;
-	IP_MULTICAST_LOOP			= 0x22;
-	IP_MULTICAST_TTL			= 0x21;
-	IP_OPTIONS				= 0x4;
-	IP_PKTINFO				= 0x8;
-	IP_PKTOPTIONS				= 0x9;
-	IP_PMTUDISC				= 0xa;
-	IP_PMTUDISC_DO				= 0x2;
-	IP_PMTUDISC_DONT			= 0;
-	IP_PMTUDISC_PROBE			= 0x3;
-	IP_PMTUDISC_WANT			= 0x1;
-	IP_RECVERR				= 0xb;
-	IP_RECVOPTS				= 0x6;
-	IP_RECVRETOPTS				= 0x7;
-	IP_RECVTOS				= 0xd;
-	IP_RECVTTL				= 0xc;
-	IP_RETOPTS				= 0x7;
-	IP_ROUTER_ALERT				= 0x5;
-	IP_TOS					= 0x1;
-	IP_TTL					= 0x2;
-	IP_UNBLOCK_SOURCE			= 0x25;
-	NAME_MAX				= 0xff;
-	O_ACCMODE				= 0x3;
-	O_APPEND				= 0x400;
-	O_ASYNC					= 0x2000;
-	O_CLOEXEC				= 0x80000;
-	O_CREAT					= 0x40;
-	O_DIRECT				= 0x4000;
-	O_DIRECTORY				= 0x10000;
-	O_DSYNC					= 0x1000;
-	O_EXCL					= 0x80;
-	O_FSYNC					= 0x1000;
-	O_LARGEFILE				= 0;
-	O_NDELAY				= 0x800;
-	O_NOATIME				= 0x40000;
-	O_NOCTTY				= 0x100;
-	O_NOFOLLOW				= 0x20000;
-	O_NONBLOCK				= 0x800;
-	O_RDONLY				= 0;
-	O_RDWR					= 0x2;
-	O_RSYNC					= 0x1000;
-	O_SYNC					= 0x1000;
-	O_TRUNC					= 0x200;
-	O_WRONLY				= 0x1;
-	PTRACE_ARCH_PRCTL			= 0x1e;
-	PTRACE_ATTACH				= 0x10;
-	PTRACE_BTS_CLEAR			= 0x2c;
-	PTRACE_BTS_CONFIG			= 0x28;
-	PTRACE_BTS_DRAIN			= 0x2d;
-	PTRACE_BTS_GET				= 0x2b;
-	PTRACE_BTS_O_ALLOC			= 0x8;
-	PTRACE_BTS_O_SCHED			= 0x2;
-	PTRACE_BTS_O_SIGNAL			= 0x4;
-	PTRACE_BTS_O_TRACE			= 0x1;
-	PTRACE_BTS_SIZE				= 0x2a;
-	PTRACE_BTS_STATUS			= 0x29;
-	PTRACE_CONT				= 0x7;
-	PTRACE_DETACH				= 0x11;
-	PTRACE_EVENT_CLONE			= 0x3;
-	PTRACE_EVENT_EXEC			= 0x4;
-	PTRACE_EVENT_EXIT			= 0x6;
-	PTRACE_EVENT_FORK			= 0x1;
-	PTRACE_EVENT_VFORK			= 0x2;
-	PTRACE_EVENT_VFORK_DONE			= 0x5;
-	PTRACE_GETEVENTMSG			= 0x4201;
-	PTRACE_GETFPREGS			= 0xe;
-	PTRACE_GETFPXREGS			= 0x12;
-	PTRACE_GETREGS				= 0xc;
-	PTRACE_GETSIGINFO			= 0x4202;
-	PTRACE_GET_THREAD_AREA			= 0x19;
-	PTRACE_KILL				= 0x8;
-	PTRACE_OLDSETOPTIONS			= 0x15;
-	PTRACE_O_MASK				= 0x7f;
-	PTRACE_O_TRACECLONE			= 0x8;
-	PTRACE_O_TRACEEXEC			= 0x10;
-	PTRACE_O_TRACEEXIT			= 0x40;
-	PTRACE_O_TRACEFORK			= 0x2;
-	PTRACE_O_TRACESYSGOOD			= 0x1;
-	PTRACE_O_TRACEVFORK			= 0x4;
-	PTRACE_O_TRACEVFORKDONE			= 0x20;
-	PTRACE_PEEKDATA				= 0x2;
-	PTRACE_PEEKTEXT				= 0x1;
-	PTRACE_PEEKUSR				= 0x3;
-	PTRACE_POKEDATA				= 0x5;
-	PTRACE_POKETEXT				= 0x4;
-	PTRACE_POKEUSR				= 0x6;
-	PTRACE_SETFPREGS			= 0xf;
-	PTRACE_SETFPXREGS			= 0x13;
-	PTRACE_SETOPTIONS			= 0x4200;
-	PTRACE_SETREGS				= 0xd;
-	PTRACE_SETSIGINFO			= 0x4203;
-	PTRACE_SET_THREAD_AREA			= 0x1a;
-	PTRACE_SINGLEBLOCK			= 0x21;
-	PTRACE_SINGLESTEP			= 0x9;
-	PTRACE_SYSCALL				= 0x18;
-	PTRACE_SYSEMU				= 0x1f;
-	PTRACE_SYSEMU_SINGLESTEP		= 0x20;
-	PTRACE_TRACEME				= 0;
-	SHUT_RD					= 0;
-	SHUT_RDWR				= 0x2;
-	SHUT_WR					= 0x1;
-	SIGABRT					= 0x6;
-	SIGALRM					= 0xe;
-	SIGBUS					= 0x7;
-	SIGCHLD					= 0x11;
-	SIGCLD					= 0x11;
-	SIGCONT					= 0x12;
-	SIGFPE					= 0x8;
-	SIGHUP					= 0x1;
-	SIGILL					= 0x4;
-	SIGINT					= 0x2;
-	SIGIO					= 0x1d;
-	SIGIOT					= 0x6;
-	SIGKILL					= 0x9;
-	SIGPIPE					= 0xd;
-	SIGPOLL					= 0x1d;
-	SIGPROF					= 0x1b;
-	SIGPWR					= 0x1e;
-	SIGQUIT					= 0x3;
-	SIGSEGV					= 0xb;
-	SIGSTKFLT				= 0x10;
-	SIGSTOP					= 0x13;
-	SIGSYS					= 0x1f;
-	SIGTERM					= 0xf;
-	SIGTRAP					= 0x5;
-	SIGTSTP					= 0x14;
-	SIGTTIN					= 0x15;
-	SIGTTOU					= 0x16;
-	SIGUNUSED				= 0x1f;
-	SIGURG					= 0x17;
-	SIGUSR1					= 0xa;
-	SIGUSR2					= 0xc;
-	SIGVTALRM				= 0x1a;
-	SIGWINCH				= 0x1c;
-	SIGXCPU					= 0x18;
-	SIGXFSZ					= 0x19;
-	SOCK_CLOEXEC				= 0x80000;
-	SOCK_DCCP				= 0x6;
-	SOCK_DGRAM				= 0x2;
-	SOCK_NONBLOCK				= 0x800;
-	SOCK_PACKET				= 0xa;
-	SOCK_RAW				= 0x3;
-	SOCK_RDM				= 0x4;
-	SOCK_SEQPACKET				= 0x5;
-	SOCK_STREAM				= 0x1;
-	SOL_AAL					= 0x109;
-	SOL_ATM					= 0x108;
-	SOL_DECNET				= 0x105;
-	SOL_ICMPV6				= 0x3a;
-	SOL_IP					= 0;
-	SOL_IPV6				= 0x29;
-	SOL_IRDA				= 0x10a;
-	SOL_PACKET				= 0x107;
-	SOL_RAW					= 0xff;
-	SOL_SOCKET				= 0x1;
-	SOL_TCP					= 0x6;
-	SOL_X25					= 0x106;
-	SOMAXCONN				= 0x80;
-	SO_ACCEPTCONN				= 0x1e;
-	SO_ATTACH_FILTER			= 0x1a;
-	SO_BINDTODEVICE				= 0x19;
-	SO_BROADCAST				= 0x6;
-	SO_BSDCOMPAT				= 0xe;
-	SO_DEBUG				= 0x1;
-	SO_DETACH_FILTER			= 0x1b;
-	SO_DONTROUTE				= 0x5;
-	SO_ERROR				= 0x4;
-	SO_KEEPALIVE				= 0x9;
-	SO_LINGER				= 0xd;
-	SO_MARK					= 0x24;
-	SO_NO_CHECK				= 0xb;
-	SO_OOBINLINE				= 0xa;
-	SO_PASSCRED				= 0x10;
-	SO_PASSSEC				= 0x22;
-	SO_PEERCRED				= 0x11;
-	SO_PEERNAME				= 0x1c;
-	SO_PEERSEC				= 0x1f;
-	SO_PRIORITY				= 0xc;
-	SO_RCVBUF				= 0x8;
-	SO_RCVBUFFORCE				= 0x21;
-	SO_RCVLOWAT				= 0x12;
-	SO_RCVTIMEO				= 0x14;
-	SO_REUSEADDR				= 0x2;
-	SO_SECURITY_AUTHENTICATION		= 0x16;
-	SO_SECURITY_ENCRYPTION_NETWORK		= 0x18;
-	SO_SECURITY_ENCRYPTION_TRANSPORT	= 0x17;
-	SO_SNDBUF				= 0x7;
-	SO_SNDBUFFORCE				= 0x20;
-	SO_SNDLOWAT				= 0x13;
-	SO_SNDTIMEO				= 0x15;
-	SO_TIMESTAMP				= 0x1d;
-	SO_TIMESTAMPING				= 0x25;
-	SO_TIMESTAMPNS				= 0x23;
-	SO_TYPE					= 0x3;
-	S_BLKSIZE				= 0x200;
-	S_IEXEC					= 0x40;
-	S_IFBLK					= 0x6000;
-	S_IFCHR					= 0x2000;
-	S_IFDIR					= 0x4000;
-	S_IFIFO					= 0x1000;
-	S_IFLNK					= 0xa000;
-	S_IFMT					= 0xf000;
-	S_IFREG					= 0x8000;
-	S_IFSOCK				= 0xc000;
-	S_IREAD					= 0x100;
-	S_IRGRP					= 0x20;
-	S_IROTH					= 0x4;
-	S_IRUSR					= 0x100;
-	S_IRWXG					= 0x38;
-	S_IRWXO					= 0x7;
-	S_IRWXU					= 0x1c0;
-	S_ISGID					= 0x400;
-	S_ISUID					= 0x800;
-	S_ISVTX					= 0x200;
-	S_IWGRP					= 0x10;
-	S_IWOTH					= 0x2;
-	S_IWRITE				= 0x80;
-	S_IWUSR					= 0x80;
-	S_IXGRP					= 0x8;
-	S_IXOTH					= 0x1;
-	S_IXUSR					= 0x40;
-	TCP_CONGESTION				= 0xd;
-	TCP_CORK				= 0x3;
-	TCP_DEFER_ACCEPT			= 0x9;
-	TCP_INFO				= 0xb;
-	TCP_KEEPCNT				= 0x6;
-	TCP_KEEPIDLE				= 0x4;
-	TCP_KEEPINTVL				= 0x5;
-	TCP_LINGER2				= 0x8;
-	TCP_MAXSEG				= 0x2;
-	TCP_MAXWIN				= 0xffff;
-	TCP_MAX_WINSHIFT			= 0xe;
-	TCP_MD5SIG				= 0xe;
-	TCP_MD5SIG_MAXKEYLEN			= 0x50;
-	TCP_MSS					= 0x200;
-	TCP_NODELAY				= 0x1;
-	TCP_QUICKACK				= 0xc;
-	TCP_SYNCNT				= 0x7;
-	TCP_WINDOW_CLAMP			= 0xa;
-	WALL					= 0x40000000;
-	WCLONE					= 0x80000000;
-	WCONTINUED				= 0x8;
-	WEXITED					= 0x4;
-	WNOHANG					= 0x1;
-	WNOTHREAD				= 0x20000000;
-	WNOWAIT					= 0x1000000;
-	WORDSIZE				= 0x40;
-	WSTOPPED				= 0x2;
-	WUNTRACED				= 0x2;
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x25
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	E2BIG                            = 0x7
+	EACCES                           = 0xd
+	EADDRINUSE                       = 0x62
+	EADDRNOTAVAIL                    = 0x63
+	EADV                             = 0x44
+	EAFNOSUPPORT                     = 0x61
+	EAGAIN                           = 0xb
+	EALREADY                         = 0x72
+	EBADE                            = 0x34
+	EBADF                            = 0x9
+	EBADFD                           = 0x4d
+	EBADMSG                          = 0x4a
+	EBADR                            = 0x35
+	EBADRQC                          = 0x38
+	EBADSLT                          = 0x39
+	EBFONT                           = 0x3b
+	EBUSY                            = 0x10
+	ECANCELED                        = 0x7d
+	ECHILD                           = 0xa
+	ECHRNG                           = 0x2c
+	ECOMM                            = 0x46
+	ECONNABORTED                     = 0x67
+	ECONNREFUSED                     = 0x6f
+	ECONNRESET                       = 0x68
+	EDEADLK                          = 0x23
+	EDEADLOCK                        = 0x23
+	EDESTADDRREQ                     = 0x59
+	EDOM                             = 0x21
+	EDOTDOT                          = 0x49
+	EDQUOT                           = 0x7a
+	EEXIST                           = 0x11
+	EFAULT                           = 0xe
+	EFBIG                            = 0x1b
+	EHOSTDOWN                        = 0x70
+	EHOSTUNREACH                     = 0x71
+	EIDRM                            = 0x2b
+	EILSEQ                           = 0x54
+	EINPROGRESS                      = 0x73
+	EINTR                            = 0x4
+	EINVAL                           = 0x16
+	EIO                              = 0x5
+	EISCONN                          = 0x6a
+	EISDIR                           = 0x15
+	EISNAM                           = 0x78
+	EKEYEXPIRED                      = 0x7f
+	EKEYREJECTED                     = 0x81
+	EKEYREVOKED                      = 0x80
+	EL2HLT                           = 0x33
+	EL2NSYNC                         = 0x2d
+	EL3HLT                           = 0x2e
+	EL3RST                           = 0x2f
+	ELIBACC                          = 0x4f
+	ELIBBAD                          = 0x50
+	ELIBEXEC                         = 0x53
+	ELIBMAX                          = 0x52
+	ELIBSCN                          = 0x51
+	ELNRNG                           = 0x30
+	ELOOP                            = 0x28
+	EMEDIUMTYPE                      = 0x7c
+	EMFILE                           = 0x18
+	EMLINK                           = 0x1f
+	EMSGSIZE                         = 0x5a
+	EMULTIHOP                        = 0x48
+	ENAMETOOLONG                     = 0x24
+	ENAVAIL                          = 0x77
+	ENETDOWN                         = 0x64
+	ENETRESET                        = 0x66
+	ENETUNREACH                      = 0x65
+	ENFILE                           = 0x17
+	ENOANO                           = 0x37
+	ENOBUFS                          = 0x69
+	ENOCSI                           = 0x32
+	ENODATA                          = 0x3d
+	ENODEV                           = 0x13
+	ENOENT                           = 0x2
+	ENOEXEC                          = 0x8
+	ENOKEY                           = 0x7e
+	ENOLCK                           = 0x25
+	ENOLINK                          = 0x43
+	ENOMEDIUM                        = 0x7b
+	ENOMEM                           = 0xc
+	ENOMSG                           = 0x2a
+	ENONET                           = 0x40
+	ENOPKG                           = 0x41
+	ENOPROTOOPT                      = 0x5c
+	ENOSPC                           = 0x1c
+	ENOSR                            = 0x3f
+	ENOSTR                           = 0x3c
+	ENOSYS                           = 0x26
+	ENOTBLK                          = 0xf
+	ENOTCONN                         = 0x6b
+	ENOTDIR                          = 0x14
+	ENOTEMPTY                        = 0x27
+	ENOTNAM                          = 0x76
+	ENOTRECOVERABLE                  = 0x83
+	ENOTSOCK                         = 0x58
+	ENOTSUP                          = 0x5f
+	ENOTTY                           = 0x19
+	ENOTUNIQ                         = 0x4c
+	ENXIO                            = 0x6
+	EOPNOTSUPP                       = 0x5f
+	EOVERFLOW                        = 0x4b
+	EOWNERDEAD                       = 0x82
+	EPERM                            = 0x1
+	EPFNOSUPPORT                     = 0x60
+	EPIPE                            = 0x20
+	EPOLLERR                         = 0x8
+	EPOLLET                          = -0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	EPOLL_NONBLOCK                   = 0x800
+	EPROTO                           = 0x47
+	EPROTONOSUPPORT                  = 0x5d
+	EPROTOTYPE                       = 0x5b
+	ERANGE                           = 0x22
+	EREMCHG                          = 0x4e
+	EREMOTE                          = 0x42
+	EREMOTEIO                        = 0x79
+	ERESTART                         = 0x55
+	ERFKILL                          = 0x84
+	EROFS                            = 0x1e
+	ESHUTDOWN                        = 0x6c
+	ESOCKTNOSUPPORT                  = 0x5e
+	ESPIPE                           = 0x1d
+	ESRCH                            = 0x3
+	ESRMNT                           = 0x45
+	ESTALE                           = 0x74
+	ESTRPIPE                         = 0x56
+	ETIME                            = 0x3e
+	ETIMEDOUT                        = 0x6e
+	ETOOMANYREFS                     = 0x6d
+	ETXTBSY                          = 0x1a
+	EUCLEAN                          = 0x75
+	EUNATCH                          = 0x31
+	EUSERS                           = 0x57
+	EWOULDBLOCK                      = 0xb
+	EXDEV                            = 0x12
+	EXFULL                           = 0x36
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	F_DUPFD                          = 0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0x5
+	F_GETOWN                         = 0x9
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0
+	F_RDLCK                          = 0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x8
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	IPPROTO_AH                       = 0x33
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_HDRINCL                       = 0x3
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MSFILTER                      = 0x29
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OPTIONS                       = 0x4
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	NAME_MAX                         = 0xff
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x4000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x1000
+	O_LARGEFILE                      = 0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x800
+	O_RDONLY                         = 0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x1000
+	O_SYNC                           = 0x1000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PTRACE_ARCH_PRCTL                = 0x1e
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_BTS_CLEAR                 = 0x2c
+	PTRACE_BTS_CONFIG                = 0x28
+	PTRACE_BTS_DRAIN                 = 0x2d
+	PTRACE_BTS_GET                   = 0x2b
+	PTRACE_BTS_O_ALLOC               = 0x8
+	PTRACE_BTS_O_SCHED               = 0x2
+	PTRACE_BTS_O_SIGNAL              = 0x4
+	PTRACE_BTS_O_TRACE               = 0x1
+	PTRACE_BTS_SIZE                  = 0x2a
+	PTRACE_BTS_STATUS                = 0x29
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETFPXREGS                = 0x12
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_KILL                      = 0x8
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_MASK                    = 0x7f
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETFPXREGS                = 0x13
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x21
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_SYSEMU                    = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP         = 0x20
+	PTRACE_TRACEME                   = 0
+	SHUT_RD                          = 0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIGABRT                          = 0x6
+	SIGALRM                          = 0xe
+	SIGBUS                           = 0x7
+	SIGCHLD                          = 0x11
+	SIGCLD                           = 0x11
+	SIGCONT                          = 0x12
+	SIGFPE                           = 0x8
+	SIGHUP                           = 0x1
+	SIGILL                           = 0x4
+	SIGINT                           = 0x2
+	SIGIO                            = 0x1d
+	SIGIOT                           = 0x6
+	SIGKILL                          = 0x9
+	SIGPIPE                          = 0xd
+	SIGPOLL                          = 0x1d
+	SIGPROF                          = 0x1b
+	SIGPWR                           = 0x1e
+	SIGQUIT                          = 0x3
+	SIGSEGV                          = 0xb
+	SIGSTKFLT                        = 0x10
+	SIGSTOP                          = 0x13
+	SIGSYS                           = 0x1f
+	SIGTERM                          = 0xf
+	SIGTRAP                          = 0x5
+	SIGTSTP                          = 0x14
+	SIGTTIN                          = 0x15
+	SIGTTOU                          = 0x16
+	SIGUNUSED                        = 0x1f
+	SIGURG                           = 0x17
+	SIGUSR1                          = 0xa
+	SIGUSR2                          = 0xc
+	SIGVTALRM                        = 0x1a
+	SIGWINCH                         = 0x1c
+	SIGXCPU                          = 0x18
+	SIGXFSZ                          = 0x19
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_MARK                          = 0x24
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TCP_CONGESTION                   = 0xd
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_NODELAY                      = 0x1
+	TCP_QUICKACK                     = 0xc
+	TCP_SYNCNT                       = 0x7
+	TCP_WINDOW_CLAMP                 = 0xa
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
 )
 
 // Types
diff --git a/src/pkg/syscall/zerrors_linux_arm.go b/src/pkg/syscall/zerrors_linux_arm.go
index 1d7ff4498..19d676074 100644
--- a/src/pkg/syscall/zerrors_linux_arm.go
+++ b/src/pkg/syscall/zerrors_linux_arm.go
@@ -9,177 +9,177 @@ package syscall
 
 // Constants
 const (
-	EMULTIHOP	= 0x48;
-	EUNATCH		= 0x31;
-	EAFNOSUPPORT	= 0x61;
-	EREMCHG		= 0x4e;
-	EACCES		= 0xd;
-	EL3RST		= 0x2f;
-	EDESTADDRREQ	= 0x59;
-	EILSEQ		= 0x54;
-	ESPIPE		= 0x1d;
-	EMLINK		= 0x1f;
-	EOWNERDEAD	= 0x82;
-	ENOTTY		= 0x19;
-	EBADE		= 0x34;
-	EBADF		= 0x9;
-	EBADR		= 0x35;
-	EADV		= 0x44;
-	ERANGE		= 0x22;
-	ECANCELED	= 0x7d;
-	ETXTBSY		= 0x1a;
-	ENOMEM		= 0xc;
-	EINPROGRESS	= 0x73;
-	ENOTEMPTY	= 0x27;
-	ENOTBLK		= 0xf;
-	EPROTOTYPE	= 0x5b;
-	ERESTART	= 0x55;
-	EISNAM		= 0x78;
-	ENOMSG		= 0x2a;
-	EALREADY	= 0x72;
-	ETIMEDOUT	= 0x6e;
-	ENODATA		= 0x3d;
-	EINTR		= 0x4;
-	ENOLINK		= 0x43;
-	EPERM		= 0x1;
-	ELOOP		= 0x28;
-	ENETDOWN	= 0x64;
-	ESTALE		= 0x74;
-	ENOTSOCK	= 0x58;
-	ENOSR		= 0x3f;
-	ECHILD		= 0xa;
-	ELNRNG		= 0x30;
-	EPIPE		= 0x20;
-	EBADMSG		= 0x4a;
-	EBFONT		= 0x3b;
-	EREMOTE		= 0x42;
-	ETOOMANYREFS	= 0x6d;
-	EPFNOSUPPORT	= 0x60;
-	ENONET		= 0x40;
-	EXFULL		= 0x36;
-	EBADSLT		= 0x39;
-	ENOTNAM		= 0x76;
-	ENOCSI		= 0x32;
-	EADDRINUSE	= 0x62;
-	ENETRESET	= 0x66;
-	EISDIR		= 0x15;
-	EIDRM		= 0x2b;
-	ECOMM		= 0x46;
-	EBADFD		= 0x4d;
-	EL2HLT		= 0x33;
-	ENOKEY		= 0x7e;
-	EINVAL		= 0x16;
-	ESHUTDOWN	= 0x6c;
-	EKEYREJECTED	= 0x81;
-	ELIBSCN		= 0x51;
-	ENAVAIL		= 0x77;
-	EOVERFLOW	= 0x4b;
-	EUCLEAN		= 0x75;
-	ENOMEDIUM	= 0x7b;
-	EBUSY		= 0x10;
-	EPROTO		= 0x47;
-	ENODEV		= 0x13;
-	EKEYEXPIRED	= 0x7f;
-	EROFS		= 0x1e;
-	ELIBACC		= 0x4f;
-	E2BIG		= 0x7;
-	EDEADLK		= 0x23;
-	ENOTDIR		= 0x14;
-	ECONNRESET	= 0x68;
-	ENXIO		= 0x6;
-	EBADRQC		= 0x38;
-	ENAMETOOLONG	= 0x24;
-	ESOCKTNOSUPPORT	= 0x5e;
-	ELIBEXEC	= 0x53;
-	EDOTDOT		= 0x49;
-	EADDRNOTAVAIL	= 0x63;
-	ETIME		= 0x3e;
-	EPROTONOSUPPORT	= 0x5d;
-	ENOTRECOVERABLE	= 0x83;
-	EIO		= 0x5;
-	ENETUNREACH	= 0x65;
-	EXDEV		= 0x12;
-	EDQUOT		= 0x7a;
-	EREMOTEIO	= 0x79;
-	ENOSPC		= 0x1c;
-	ENOEXEC		= 0x8;
-	EMSGSIZE	= 0x5a;
-	EDOM		= 0x21;
-	ENOSTR		= 0x3c;
-	EFBIG		= 0x1b;
-	ESRCH		= 0x3;
-	ECHRNG		= 0x2c;
-	EHOSTDOWN	= 0x70;
-	ENOLCK		= 0x25;
-	ENFILE		= 0x17;
-	ENOSYS		= 0x26;
-	ENOTCONN	= 0x6b;
-	ENOTSUP		= 0x5f;
-	ESRMNT		= 0x45;
-	EDEADLOCK	= 0x23;
-	ECONNABORTED	= 0x67;
-	ENOANO		= 0x37;
-	EISCONN		= 0x6a;
-	EUSERS		= 0x57;
-	ENOPROTOOPT	= 0x5c;
-	EMFILE		= 0x18;
-	ENOBUFS		= 0x69;
-	EL3HLT		= 0x2e;
-	EFAULT		= 0xe;
-	EWOULDBLOCK	= 0xb;
-	ELIBBAD		= 0x50;
-	ESTRPIPE	= 0x56;
-	ECONNREFUSED	= 0x6f;
-	EAGAIN		= 0xb;
-	ELIBMAX		= 0x52;
-	EEXIST		= 0x11;
-	EL2NSYNC	= 0x2d;
-	ENOENT		= 0x2;
-	ENOPKG		= 0x41;
-	EKEYREVOKED	= 0x80;
-	EHOSTUNREACH	= 0x71;
-	ENOTUNIQ	= 0x4c;
-	EOPNOTSUPP	= 0x5f;
-	EMEDIUMTYPE	= 0x7c;
-	SIGBUS		= 0x7;
-	SIGTTIN		= 0x15;
-	SIGPROF		= 0x1b;
-	SIGFPE		= 0x8;
-	SIGHUP		= 0x1;
-	SIGTTOU		= 0x16;
-	SIGSTKFLT	= 0x10;
-	SIGUSR1		= 0xa;
-	SIGURG		= 0x17;
-	SIGIO		= 0x1d;
-	SIGQUIT		= 0x3;
-	SIGCLD		= 0x11;
-	SHUT_RD		= 0;
-	SHUT_RDWR	= 0x2;
-	SHUT_WR		= 0x1;
-	SIGABRT		= 0x6;
-	SIGTRAP		= 0x5;
-	SIGVTALRM	= 0x1a;
-	SIGPOLL		= 0x1d;
-	SIGSEGV		= 0xb;
-	SIGCONT		= 0x12;
-	SIGPIPE		= 0xd;
-	SIGWINCH	= 0x1c;
-	SIGXFSZ		= 0x19;
-	SIGCHLD		= 0x11;
-	SIGSYS		= 0x1f;
-	SIGSTOP		= 0x13;
-	SIGALRM		= 0xe;
-	SIGUSR2		= 0xc;
-	SIGTSTP		= 0x14;
-	SIGKILL		= 0x9;
-	SIGXCPU		= 0x18;
-	SIGUNUSED	= 0x1f;
-	SIGPWR		= 0x1e;
-	SIGILL		= 0x4;
-	SIGINT		= 0x2;
-	SIGIOT		= 0x6;
-	SIGTERM		= 0xf;
-	O_EXCL		= 0x80;
+	EMULTIHOP       = 0x48
+	EUNATCH         = 0x31
+	EAFNOSUPPORT    = 0x61
+	EREMCHG         = 0x4e
+	EACCES          = 0xd
+	EL3RST          = 0x2f
+	EDESTADDRREQ    = 0x59
+	EILSEQ          = 0x54
+	ESPIPE          = 0x1d
+	EMLINK          = 0x1f
+	EOWNERDEAD      = 0x82
+	ENOTTY          = 0x19
+	EBADE           = 0x34
+	EBADF           = 0x9
+	EBADR           = 0x35
+	EADV            = 0x44
+	ERANGE          = 0x22
+	ECANCELED       = 0x7d
+	ETXTBSY         = 0x1a
+	ENOMEM          = 0xc
+	EINPROGRESS     = 0x73
+	ENOTEMPTY       = 0x27
+	ENOTBLK         = 0xf
+	EPROTOTYPE      = 0x5b
+	ERESTART        = 0x55
+	EISNAM          = 0x78
+	ENOMSG          = 0x2a
+	EALREADY        = 0x72
+	ETIMEDOUT       = 0x6e
+	ENODATA         = 0x3d
+	EINTR           = 0x4
+	ENOLINK         = 0x43
+	EPERM           = 0x1
+	ELOOP           = 0x28
+	ENETDOWN        = 0x64
+	ESTALE          = 0x74
+	ENOTSOCK        = 0x58
+	ENOSR           = 0x3f
+	ECHILD          = 0xa
+	ELNRNG          = 0x30
+	EPIPE           = 0x20
+	EBADMSG         = 0x4a
+	EBFONT          = 0x3b
+	EREMOTE         = 0x42
+	ETOOMANYREFS    = 0x6d
+	EPFNOSUPPORT    = 0x60
+	ENONET          = 0x40
+	EXFULL          = 0x36
+	EBADSLT         = 0x39
+	ENOTNAM         = 0x76
+	ENOCSI          = 0x32
+	EADDRINUSE      = 0x62
+	ENETRESET       = 0x66
+	EISDIR          = 0x15
+	EIDRM           = 0x2b
+	ECOMM           = 0x46
+	EBADFD          = 0x4d
+	EL2HLT          = 0x33
+	ENOKEY          = 0x7e
+	EINVAL          = 0x16
+	ESHUTDOWN       = 0x6c
+	EKEYREJECTED    = 0x81
+	ELIBSCN         = 0x51
+	ENAVAIL         = 0x77
+	EOVERFLOW       = 0x4b
+	EUCLEAN         = 0x75
+	ENOMEDIUM       = 0x7b
+	EBUSY           = 0x10
+	EPROTO          = 0x47
+	ENODEV          = 0x13
+	EKEYEXPIRED     = 0x7f
+	EROFS           = 0x1e
+	ELIBACC         = 0x4f
+	E2BIG           = 0x7
+	EDEADLK         = 0x23
+	ENOTDIR         = 0x14
+	ECONNRESET      = 0x68
+	ENXIO           = 0x6
+	EBADRQC         = 0x38
+	ENAMETOOLONG    = 0x24
+	ESOCKTNOSUPPORT = 0x5e
+	ELIBEXEC        = 0x53
+	EDOTDOT         = 0x49
+	EADDRNOTAVAIL   = 0x63
+	ETIME           = 0x3e
+	EPROTONOSUPPORT = 0x5d
+	ENOTRECOVERABLE = 0x83
+	EIO             = 0x5
+	ENETUNREACH     = 0x65
+	EXDEV           = 0x12
+	EDQUOT          = 0x7a
+	EREMOTEIO       = 0x79
+	ENOSPC          = 0x1c
+	ENOEXEC         = 0x8
+	EMSGSIZE        = 0x5a
+	EDOM            = 0x21
+	ENOSTR          = 0x3c
+	EFBIG           = 0x1b
+	ESRCH           = 0x3
+	ECHRNG          = 0x2c
+	EHOSTDOWN       = 0x70
+	ENOLCK          = 0x25
+	ENFILE          = 0x17
+	ENOSYS          = 0x26
+	ENOTCONN        = 0x6b
+	ENOTSUP         = 0x5f
+	ESRMNT          = 0x45
+	EDEADLOCK       = 0x23
+	ECONNABORTED    = 0x67
+	ENOANO          = 0x37
+	EISCONN         = 0x6a
+	EUSERS          = 0x57
+	ENOPROTOOPT     = 0x5c
+	EMFILE          = 0x18
+	ENOBUFS         = 0x69
+	EL3HLT          = 0x2e
+	EFAULT          = 0xe
+	EWOULDBLOCK     = 0xb
+	ELIBBAD         = 0x50
+	ESTRPIPE        = 0x56
+	ECONNREFUSED    = 0x6f
+	EAGAIN          = 0xb
+	ELIBMAX         = 0x52
+	EEXIST          = 0x11
+	EL2NSYNC        = 0x2d
+	ENOENT          = 0x2
+	ENOPKG          = 0x41
+	EKEYREVOKED     = 0x80
+	EHOSTUNREACH    = 0x71
+	ENOTUNIQ        = 0x4c
+	EOPNOTSUPP      = 0x5f
+	EMEDIUMTYPE     = 0x7c
+	SIGBUS          = 0x7
+	SIGTTIN         = 0x15
+	SIGPROF         = 0x1b
+	SIGFPE          = 0x8
+	SIGHUP          = 0x1
+	SIGTTOU         = 0x16
+	SIGSTKFLT       = 0x10
+	SIGUSR1         = 0xa
+	SIGURG          = 0x17
+	SIGIO           = 0x1d
+	SIGQUIT         = 0x3
+	SIGCLD          = 0x11
+	SHUT_RD         = 0
+	SHUT_RDWR       = 0x2
+	SHUT_WR         = 0x1
+	SIGABRT         = 0x6
+	SIGTRAP         = 0x5
+	SIGVTALRM       = 0x1a
+	SIGPOLL         = 0x1d
+	SIGSEGV         = 0xb
+	SIGCONT         = 0x12
+	SIGPIPE         = 0xd
+	SIGWINCH        = 0x1c
+	SIGXFSZ         = 0x19
+	SIGCHLD         = 0x11
+	SIGSYS          = 0x1f
+	SIGSTOP         = 0x13
+	SIGALRM         = 0xe
+	SIGUSR2         = 0xc
+	SIGTSTP         = 0x14
+	SIGKILL         = 0x9
+	SIGXCPU         = 0x18
+	SIGUNUSED       = 0x1f
+	SIGPWR          = 0x1e
+	SIGILL          = 0x4
+	SIGINT          = 0x2
+	SIGIOT          = 0x6
+	SIGTERM         = 0xf
+	O_EXCL          = 0x80
 )
 
 // Types
diff --git a/src/pkg/syscall/zerrors_nacl_386.go b/src/pkg/syscall/zerrors_nacl_386.go
index c80557e49..2c1dff8cf 100644
--- a/src/pkg/syscall/zerrors_nacl_386.go
+++ b/src/pkg/syscall/zerrors_nacl_386.go
@@ -4,126 +4,126 @@
 package syscall
 
 const (
-	EPERM		= 1;
-	ENOENT		= 2;
-	ESRCH		= 3;
-	EINTR		= 4;
-	EIO		= 5;
-	ENXIO		= 6;
-	E2BIG		= 7;
-	ENOEXEC		= 8;
-	EBADF		= 9;
-	ECHILD		= 10;
-	EAGAIN		= 11;
-	ENOMEM		= 12;
-	EACCES		= 13;
-	EFAULT		= 14;
-	EBUSY		= 16;
-	EEXIST		= 17;
-	EXDEV		= 18;
-	ENODEV		= 19;
-	ENOTDIR		= 20;
-	EISDIR		= 21;
-	EINVAL		= 22;
-	ENFILE		= 23;
-	EMFILE		= 24;
-	ENOTTY		= 25;
-	EFBIG		= 27;
-	ENOSPC		= 28;
-	ESPIPE		= 29;
-	EROFS		= 30;
-	EMLINK		= 31;
-	EPIPE		= 32;
-	ENAMETOOLONG	= 36;
-	ENOSYS		= 38;
-	EDQUOT		= 122;
-	EDOM		= 33;
-	ERANGE		= 34;
-	ENOMSG		= 35;
-	ECHRNG		= 37;
-	EL3HLT		= 39;
-	EL3RST		= 40;
-	ELNRNG		= 41;
-	EUNATCH		= 42;
-	ENOCSI		= 43;
-	EL2HLT		= 44;
-	EDEADLK		= 45;
-	ENOLCK		= 46;
-	EBADE		= 50;
-	EBADR		= 51;
-	EXFULL		= 52;
-	ENOANO		= 53;
-	EBADRQC		= 54;
-	EBADSLT		= 55;
-	EBFONT		= 57;
-	ENOSTR		= 60;
-	ENODATA		= 61;
-	ETIME		= 62;
-	ENOSR		= 63;
-	ENONET		= 64;
-	ENOPKG		= 65;
-	EREMOTE		= 66;
-	ENOLINK		= 67;
-	EADV		= 68;
-	ESRMNT		= 69;
-	ECOMM		= 70;
-	EPROTO		= 71;
-	EMULTIHOP	= 74;
-	ELBIN		= 75;
-	EDOTDOT		= 76;
-	EBADMSG		= 77;
-	EFTYPE		= 79;
-	ENOTUNIQ	= 80;
-	EBADFD		= 81;
-	EREMCHG		= 82;
-	ELIBACC		= 83;
-	ELIBBAD		= 84;
-	ELIBSCN		= 85;
-	ELIBMAX		= 86;
-	ELIBEXEC	= 87;
-	ENMFILE		= 89;
-	ENOTEMPTY	= 90;
-	ELOOP		= 92;
-	EOPNOTSUPP	= 95;
-	EPFNOSUPPORT	= 96;
-	ECONNRESET	= 104;
-	ENOBUFS		= 105;
-	EAFNOSUPPORT	= 106;
-	EPROTOTYPE	= 107;
-	ENOTSOCK	= 108;
-	ENOPROTOOPT	= 109;
-	ESHUTDOWN	= 110;
-	ECONNREFUSED	= 111;
-	EADDRINUSE	= 112;
-	ECONNABORTED	= 113;
-	ENETUNREACH	= 114;
-	ENETDOWN	= 115;
-	ETIMEDOUT	= 116;
-	EHOSTDOWN	= 117;
-	EHOSTUNREACH	= 118;
-	EINPROGRESS	= 119;
-	EALREADY	= 120;
-	EDESTADDRREQ	= 121;
-	EPROTONOSUPPORT	= 123;
-	ESOCKTNOSUPPORT	= 124;
-	EADDRNOTAVAIL	= 125;
-	ENETRESET	= 126;
-	EISCONN		= 127;
-	ENOTCONN	= 128;
-	ETOOMANYREFS	= 129;
-	EPROCLIM	= 130;
-	EUSERS		= 131;
-	ESTALE		= 133;
-	ENOMEDIUM	= 135;
-	ENOSHARE	= 136;
-	ECASECLASH	= 137;
-	EILSEQ		= 138;
-	EOVERFLOW	= 139;
-	ECANCELED	= 140;
-	EL2NSYNC	= 88;
-	EIDRM		= 91;
-	EMSGSIZE	= 132;
-	ENACL		= 99;	/* otherwise unused */
+	EPERM           = 1
+	ENOENT          = 2
+	ESRCH           = 3
+	EINTR           = 4
+	EIO             = 5
+	ENXIO           = 6
+	E2BIG           = 7
+	ENOEXEC         = 8
+	EBADF           = 9
+	ECHILD          = 10
+	EAGAIN          = 11
+	ENOMEM          = 12
+	EACCES          = 13
+	EFAULT          = 14
+	EBUSY           = 16
+	EEXIST          = 17
+	EXDEV           = 18
+	ENODEV          = 19
+	ENOTDIR         = 20
+	EISDIR          = 21
+	EINVAL          = 22
+	ENFILE          = 23
+	EMFILE          = 24
+	ENOTTY          = 25
+	EFBIG           = 27
+	ENOSPC          = 28
+	ESPIPE          = 29
+	EROFS           = 30
+	EMLINK          = 31
+	EPIPE           = 32
+	ENAMETOOLONG    = 36
+	ENOSYS          = 38
+	EDQUOT          = 122
+	EDOM            = 33
+	ERANGE          = 34
+	ENOMSG          = 35
+	ECHRNG          = 37
+	EL3HLT          = 39
+	EL3RST          = 40
+	ELNRNG          = 41
+	EUNATCH         = 42
+	ENOCSI          = 43
+	EL2HLT          = 44
+	EDEADLK         = 45
+	ENOLCK          = 46
+	EBADE           = 50
+	EBADR           = 51
+	EXFULL          = 52
+	ENOANO          = 53
+	EBADRQC         = 54
+	EBADSLT         = 55
+	EBFONT          = 57
+	ENOSTR          = 60
+	ENODATA         = 61
+	ETIME           = 62
+	ENOSR           = 63
+	ENONET          = 64
+	ENOPKG          = 65
+	EREMOTE         = 66
+	ENOLINK         = 67
+	EADV            = 68
+	ESRMNT          = 69
+	ECOMM           = 70
+	EPROTO          = 71
+	EMULTIHOP       = 74
+	ELBIN           = 75
+	EDOTDOT         = 76
+	EBADMSG         = 77
+	EFTYPE          = 79
+	ENOTUNIQ        = 80
+	EBADFD          = 81
+	EREMCHG         = 82
+	ELIBACC         = 83
+	ELIBBAD         = 84
+	ELIBSCN         = 85
+	ELIBMAX         = 86
+	ELIBEXEC        = 87
+	ENMFILE         = 89
+	ENOTEMPTY       = 90
+	ELOOP           = 92
+	EOPNOTSUPP      = 95
+	EPFNOSUPPORT    = 96
+	ECONNRESET      = 104
+	ENOBUFS         = 105
+	EAFNOSUPPORT    = 106
+	EPROTOTYPE      = 107
+	ENOTSOCK        = 108
+	ENOPROTOOPT     = 109
+	ESHUTDOWN       = 110
+	ECONNREFUSED    = 111
+	EADDRINUSE      = 112
+	ECONNABORTED    = 113
+	ENETUNREACH     = 114
+	ENETDOWN        = 115
+	ETIMEDOUT       = 116
+	EHOSTDOWN       = 117
+	EHOSTUNREACH    = 118
+	EINPROGRESS     = 119
+	EALREADY        = 120
+	EDESTADDRREQ    = 121
+	EPROTONOSUPPORT = 123
+	ESOCKTNOSUPPORT = 124
+	EADDRNOTAVAIL   = 125
+	ENETRESET       = 126
+	EISCONN         = 127
+	ENOTCONN        = 128
+	ETOOMANYREFS    = 129
+	EPROCLIM        = 130
+	EUSERS          = 131
+	ESTALE          = 133
+	ENOMEDIUM       = 135
+	ENOSHARE        = 136
+	ECASECLASH      = 137
+	EILSEQ          = 138
+	EOVERFLOW       = 139
+	ECANCELED       = 140
+	EL2NSYNC        = 88
+	EIDRM           = 91
+	EMSGSIZE        = 132
+	ENACL           = 99 /* otherwise unused */
 )
 
 
diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go
index f4c33edc9..303919ce4 100644
--- a/src/pkg/syscall/zsyscall_darwin_386.go
+++ b/src/pkg/syscall/zsyscall_darwin_386.go
@@ -6,676 +6,676 @@ package syscall
 import "unsafe"
 
 func getgroups(ngid int, gid *_Gid_t) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setgroups(ngid int, gid *_Gid_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	errno = int(e1)
+	return
 }
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0);
-	wpid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func pipe() (r int, w int, errno int) {
-	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0);
-	r = int(r0);
-	w = int(r1);
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	errno = int(e1)
+	return
 }
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func bind(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func connect(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func socket(domain int, typ int, proto int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setsockopt(s int, level int, name int, val uintptr, vallen int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	errno = int(e1)
+	return
 }
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func Shutdown(s int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func kevent(kq int, change uintptr, nchange int, event uintptr, nevent int, timeout *Timespec) (n int, errno int) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (errno int) {
-	var _p0 *_C_int;
+	var _p0 *_C_int
 	if len(mib) > 0 {
 		_p0 = &mib[0]
 	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	errno = int(e1)
+	return
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg));
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Access(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	errno = int(e1)
+	return
 }
 
 func Chdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Chflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Chown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Chroot(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Dup(fd int) (nfd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0);
-	nfd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup2(from int, to int) (errno int) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	errno = int(e1)
+	return
 }
 
 func Exchangedata(path1 string, path2 string, options int) (errno int) {
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(StringBytePtr(path1))), uintptr(unsafe.Pointer(StringBytePtr(path2))), uintptr(options));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(StringBytePtr(path1))), uintptr(unsafe.Pointer(StringBytePtr(path2))), uintptr(options))
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
 }
 
 func Fchdir(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmod(fd int, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchown(fd int, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Flock(fd int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func Fpathconf(fd int, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fstatfs(fd int, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fsync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ftruncate(fd int, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0);
-	size = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0);
-	egid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
 }
 
 func Geteuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Getfsstat(buf []Statfs_t, flags int) (n int, errno int) {
-	var _p0 *Statfs_t;
+	var _p0 *Statfs_t
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0);
-	gid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
 }
 
 func Getpgid(pid int) (pgid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0);
-	pgid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0);
-	pgrp = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0);
-	ppid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
 }
 
 func Getpriority(which int, who int) (prio int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0);
-	prio = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getrusage(who int, rusage *Rusage) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getsid(pid int) (sid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0);
-	sid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0);
-	tainted = bool(r0 != 0);
-	return;
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
 }
 
 func Kill(pid int, signum int, posix int) (errno int) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	errno = int(e1)
+	return
 }
 
 func Kqueue() (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Lchown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Link(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Listen(s int, backlog int) (errno int) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	errno = int(e1)
+	return
 }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdir(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkfifo(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mknod(path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev))
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pathconf(path string, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pread(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Rename(from string, to string) (errno int) {
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0)
+	errno = int(e1)
+	return
 }
 
 func Revoke(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Rmdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0);
-	newoffset = int64(int64(r1)<<32 | int64(r0));
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	errno = int(e1)
+	return
 }
 
 func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (errno int) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setegid(egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seteuid(euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setlogin(name string) (errno int) {
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setpgid(pid int, pgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setpriority(which int, who int, prio int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	errno = int(e1)
+	return
 }
 
 func Setprivexec(flag int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setregid(rgid int, egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setreuid(ruid int, euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setsid() (pid int, errno int) {
-	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0);
-	pid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Settimeofday(tp *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Statfs(path string, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Symlink(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Sync() (errno int) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Truncate(path string, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Undelete(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlink(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unmount(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func write(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func gettimeofday(tp *Timeval) (sec int32, usec int32, errno int) {
-	r0, r1, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0);
-	sec = int32(r0);
-	usec = int32(r1);
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int32(r0)
+	usec = int32(r1)
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go
index 998f00831..6e25cf381 100644
--- a/src/pkg/syscall/zsyscall_darwin_amd64.go
+++ b/src/pkg/syscall/zsyscall_darwin_amd64.go
@@ -6,676 +6,676 @@ package syscall
 import "unsafe"
 
 func getgroups(ngid int, gid *_Gid_t) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setgroups(ngid int, gid *_Gid_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	errno = int(e1)
+	return
 }
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0);
-	wpid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func pipe() (r int, w int, errno int) {
-	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0);
-	r = int(r0);
-	w = int(r1);
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	errno = int(e1)
+	return
 }
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func bind(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func connect(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func socket(domain int, typ int, proto int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setsockopt(s int, level int, name int, val uintptr, vallen int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	errno = int(e1)
+	return
 }
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func Shutdown(s int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func kevent(kq int, change uintptr, nchange int, event uintptr, nevent int, timeout *Timespec) (n int, errno int) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (errno int) {
-	var _p0 *_C_int;
+	var _p0 *_C_int
 	if len(mib) > 0 {
 		_p0 = &mib[0]
 	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	errno = int(e1)
+	return
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg));
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Access(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	errno = int(e1)
+	return
 }
 
 func Chdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Chflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Chown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Chroot(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Dup(fd int) (nfd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0);
-	nfd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup2(from int, to int) (errno int) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	errno = int(e1)
+	return
 }
 
 func Exchangedata(path1 string, path2 string, options int) (errno int) {
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(StringBytePtr(path1))), uintptr(unsafe.Pointer(StringBytePtr(path2))), uintptr(options));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(StringBytePtr(path1))), uintptr(unsafe.Pointer(StringBytePtr(path2))), uintptr(options))
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
 }
 
 func Fchdir(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmod(fd int, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchown(fd int, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Flock(fd int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func Fpathconf(fd int, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fstatfs(fd int, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fsync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ftruncate(fd int, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	errno = int(e1)
+	return
 }
 
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0);
-	size = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0);
-	egid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
 }
 
 func Geteuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Getfsstat(buf []Statfs_t, flags int) (n int, errno int) {
-	var _p0 *Statfs_t;
+	var _p0 *Statfs_t
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0);
-	gid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
 }
 
 func Getpgid(pid int) (pgid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0);
-	pgid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0);
-	pgrp = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0);
-	ppid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
 }
 
 func Getpriority(which int, who int) (prio int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0);
-	prio = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getrusage(who int, rusage *Rusage) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getsid(pid int) (sid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0);
-	sid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0);
-	tainted = bool(r0 != 0);
-	return;
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
 }
 
 func Kill(pid int, signum int, posix int) (errno int) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	errno = int(e1)
+	return
 }
 
 func Kqueue() (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Lchown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Link(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Listen(s int, backlog int) (errno int) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	errno = int(e1)
+	return
 }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdir(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkfifo(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mknod(path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev))
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pathconf(path string, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pread(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Rename(from string, to string) (errno int) {
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0)
+	errno = int(e1)
+	return
 }
 
 func Revoke(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Rmdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence));
-	newoffset = int64(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	errno = int(e1)
+	return
 }
 
 func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (errno int) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setegid(egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seteuid(euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setlogin(name string) (errno int) {
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setpgid(pid int, pgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setpriority(which int, who int, prio int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	errno = int(e1)
+	return
 }
 
 func Setprivexec(flag int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setregid(rgid int, egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setreuid(ruid int, euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setsid() (pid int, errno int) {
-	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0);
-	pid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Settimeofday(tp *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Statfs(path string, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Symlink(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Sync() (errno int) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Truncate(path string, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0)
+	errno = int(e1)
+	return
 }
 
 func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Undelete(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlink(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unmount(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func write(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func gettimeofday(tp *Timeval) (sec int64, usec int32, errno int) {
-	r0, r1, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0);
-	sec = int64(r0);
-	usec = int32(r1);
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int64(r0)
+	usec = int32(r1)
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsyscall_freebsd_386.go b/src/pkg/syscall/zsyscall_freebsd_386.go
index 055d12775..99f23d0fc 100644
--- a/src/pkg/syscall/zsyscall_freebsd_386.go
+++ b/src/pkg/syscall/zsyscall_freebsd_386.go
@@ -6,662 +6,662 @@ package syscall
 import "unsafe"
 
 func getgroups(ngid int, gid *_Gid_t) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setgroups(ngid int, gid *_Gid_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	errno = int(e1)
+	return
 }
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0);
-	wpid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func pipe() (r int, w int, errno int) {
-	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0);
-	r = int(r0);
-	w = int(r1);
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	errno = int(e1)
+	return
 }
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func bind(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func connect(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func socket(domain int, typ int, proto int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setsockopt(s int, level int, name int, val uintptr, vallen int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	errno = int(e1)
+	return
 }
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func Shutdown(s int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func kevent(kq int, change uintptr, nchange int, event uintptr, nevent int, timeout *Timespec) (n int, errno int) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (errno int) {
-	var _p0 *_C_int;
+	var _p0 *_C_int
 	if len(mib) > 0 {
 		_p0 = &mib[0]
 	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	errno = int(e1)
+	return
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg));
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Access(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	errno = int(e1)
+	return
 }
 
 func Chdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Chflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Chown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Chroot(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Dup(fd int) (nfd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0);
-	nfd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup2(from int, to int) (errno int) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
 }
 
 func Fchdir(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmod(fd int, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchown(fd int, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Flock(fd int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func Fpathconf(fd int, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fstatfs(fd int, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fsync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ftruncate(fd int, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0);
-	size = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0);
-	egid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
 }
 
 func Geteuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Getfsstat(buf []Statfs_t, flags int) (n int, errno int) {
-	var _p0 *Statfs_t;
+	var _p0 *Statfs_t
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0);
-	gid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
 }
 
 func Getpgid(pid int) (pgid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0);
-	pgid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0);
-	pgrp = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0);
-	ppid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
 }
 
 func Getpriority(which int, who int) (prio int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0);
-	prio = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getrusage(who int, rusage *Rusage) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getsid(pid int) (sid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0);
-	sid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Gettimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0);
-	tainted = bool(r0 != 0);
-	return;
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
 }
 
 func Kill(pid int, signum int, posix int) (errno int) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	errno = int(e1)
+	return
 }
 
 func Kqueue() (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Lchown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Link(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Listen(s int, backlog int) (errno int) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	errno = int(e1)
+	return
 }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdir(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkfifo(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mknod(path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev))
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pathconf(path string, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pread(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Rename(from string, to string) (errno int) {
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0)
+	errno = int(e1)
+	return
 }
 
 func Revoke(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Rmdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0);
-	newoffset = int64(int64(r1)<<32 | int64(r0));
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	errno = int(e1)
+	return
 }
 
 func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (errno int) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setegid(egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seteuid(euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setlogin(name string) (errno int) {
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setpgid(pid int, pgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setpriority(which int, who int, prio int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	errno = int(e1)
+	return
 }
 
 func Setregid(rgid int, egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setreuid(ruid int, euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setsid() (pid int, errno int) {
-	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0);
-	pid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Settimeofday(tp *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Statfs(path string, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Symlink(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Sync() (errno int) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Truncate(path string, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Undelete(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlink(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unmount(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func write(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsyscall_freebsd_amd64.go b/src/pkg/syscall/zsyscall_freebsd_amd64.go
index e619637d9..a670ce149 100644
--- a/src/pkg/syscall/zsyscall_freebsd_amd64.go
+++ b/src/pkg/syscall/zsyscall_freebsd_amd64.go
@@ -6,662 +6,662 @@ package syscall
 import "unsafe"
 
 func getgroups(ngid int, gid *_Gid_t) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setgroups(ngid int, gid *_Gid_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	errno = int(e1)
+	return
 }
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0);
-	wpid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func pipe() (r int, w int, errno int) {
-	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0);
-	r = int(r0);
-	w = int(r1);
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	errno = int(e1)
+	return
 }
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func bind(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func connect(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func socket(domain int, typ int, proto int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setsockopt(s int, level int, name int, val uintptr, vallen int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	errno = int(e1)
+	return
 }
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func Shutdown(s int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func kevent(kq int, change uintptr, nchange int, event uintptr, nevent int, timeout *Timespec) (n int, errno int) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (errno int) {
-	var _p0 *_C_int;
+	var _p0 *_C_int
 	if len(mib) > 0 {
 		_p0 = &mib[0]
 	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(unsafe.Pointer(_p0)), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	errno = int(e1)
+	return
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg));
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Access(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	errno = int(e1)
+	return
 }
 
 func Chdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Chflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Chown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Chroot(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Dup(fd int) (nfd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0);
-	nfd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup2(from int, to int) (errno int) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
 }
 
 func Fchdir(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchflags(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmod(fd int, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchown(fd int, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Flock(fd int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func Fpathconf(fd int, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fstatfs(fd int, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fsync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ftruncate(fd int, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	errno = int(e1)
+	return
 }
 
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0);
-	size = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0);
-	egid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
 }
 
 func Geteuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Getfsstat(buf []Statfs_t, flags int) (n int, errno int) {
-	var _p0 *Statfs_t;
+	var _p0 *Statfs_t
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0);
-	gid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
 }
 
 func Getpgid(pid int) (pgid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0);
-	pgid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgrp() (pgrp int) {
-	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0);
-	pgrp = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0);
-	ppid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
 }
 
 func Getpriority(which int, who int) (prio int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0);
-	prio = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getrusage(who int, rusage *Rusage) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getsid(pid int) (sid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0);
-	sid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Gettimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0);
-	tainted = bool(r0 != 0);
-	return;
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
 }
 
 func Kill(pid int, signum int, posix int) (errno int) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	errno = int(e1)
+	return
 }
 
 func Kqueue() (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Lchown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Link(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Listen(s int, backlog int) (errno int) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	errno = int(e1)
+	return
 }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdir(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkfifo(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mknod(path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev))
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pathconf(path string, name int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0);
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(name), 0)
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pread(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Rename(from string, to string) (errno int) {
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(from))), uintptr(unsafe.Pointer(StringBytePtr(to))), 0)
+	errno = int(e1)
+	return
 }
 
 func Revoke(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Rmdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, errno int) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence));
-	newoffset = int64(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	errno = int(e1)
+	return
 }
 
 func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (errno int) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setegid(egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Seteuid(euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setlogin(name string) (errno int) {
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(StringBytePtr(name))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setpgid(pid int, pgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setpriority(which int, who int, prio int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	errno = int(e1)
+	return
 }
 
 func Setregid(rgid int, egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setreuid(ruid int, euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setrlimit(which int, lim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setsid() (pid int, errno int) {
-	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0);
-	pid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Settimeofday(tp *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Statfs(path string, stat *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Symlink(path string, link string) (errno int) {
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(StringBytePtr(link))), 0)
+	errno = int(e1)
+	return
 }
 
 func Sync() (errno int) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Truncate(path string, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0)
+	errno = int(e1)
+	return
 }
 
 func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Undelete(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlink(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unmount(path string, flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func write(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/pkg/syscall/zsyscall_linux_386.go
index e7019b63e..519b52f0e 100644
--- a/src/pkg/syscall/zsyscall_linux_386.go
+++ b/src/pkg/syscall/zsyscall_linux_386.go
@@ -6,718 +6,718 @@ package syscall
 import "unsafe"
 
 func pipe(p *[2]_C_int) (errno int) {
-	_, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func utimes(path string, times *[2]Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)), 0)
+	errno = int(e1)
+	return
 }
 
 func futimesat(dirfd int, path string, times *[2]Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)))
+	errno = int(e1)
+	return
 }
 
 func Getcwd(buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0);
-	wpid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func ptrace(request int, pid int, addr uintptr, data uintptr) (errno int) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Access(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Acct(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Adjtimex(buf *Timex) (state int, errno int) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0);
-	state = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Chdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Chroot(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Creat(path string, mode int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup(oldfd int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup2(oldfd int, newfd int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func EpollCreate(size int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (errno int) {
-	_, _, e1 := Syscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, errno int) {
-	var _p0 *EpollEvent;
+	var _p0 *EpollEvent
 	if len(events) > 0 {
 		_p0 = &events[0]
 	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(unsafe.Pointer(_p0)), uintptr(len(events)), uintptr(msec), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(unsafe.Pointer(_p0)), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
 }
 
 func Faccessat(dirfd int, path string, mode int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fallocate(fd int, mode int, off int64, len int64) (errno int) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
+	errno = int(e1)
+	return
 }
 
 func Fchdir(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmod(fd int, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmodat(dirfd int, path string, mode int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg));
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Fdatasync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fsync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ftruncate(fd int, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Getdents(fd int, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgid(pid int) (pgid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0);
-	pgid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgrp() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0);
-	ppid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
 }
 
 func Getrlimit(resource int, rlim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getrusage(who int, rusage *Rusage) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	errno = int(e1)
+	return
 }
 
 func Gettid() (tid int) {
-	r0, _, _ := Syscall(SYS_GETTID, 0, 0, 0);
-	tid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
 }
 
 func Gettimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Kill(pid int, sig int) (errno int) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(sig), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	errno = int(e1)
+	return
 }
 
 func Klogctl(typ int, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Link(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdir(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdirat(dirfd int, path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode))
+	errno = int(e1)
+	return
 }
 
 func Mknod(path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev))
+	errno = int(e1)
+	return
 }
 
 func Mknodat(dirfd int, path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Nanosleep(time *Timespec, leftover *Timespec) (errno int) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Openat(dirfd int, path string, flags int, mode int) (fd int, errno int) {
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), uintptr(mode), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pause() (errno int) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func PivotRoot(newroot string, putold string) (errno int) {
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(StringBytePtr(newroot))), uintptr(unsafe.Pointer(StringBytePtr(putold))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(StringBytePtr(newroot))), uintptr(unsafe.Pointer(StringBytePtr(putold))), 0)
+	errno = int(e1)
+	return
 }
 
 func Pread(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Rename(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (errno int) {
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(newdirfd), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(newdirfd), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Rmdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setdomainname(p []byte) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0)
+	errno = int(e1)
+	return
 }
 
 func Sethostname(p []byte) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setpgid(pid int, pgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setrlimit(resource int, rlim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setsid() (pid int) {
-	r0, _, _ := Syscall(SYS_SETSID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Settimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, errno int) {
-	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags));
-	n = int64(int64(r1)<<32 | int64(r0));
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(int64(r1)<<32 | int64(r0))
+	errno = int(e1)
+	return
 }
 
 func Symlink(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0);
-	return;
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
 }
 
 func Sysinfo(info *Sysinfo_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Tee(rfd int, wfd int, len int, flags int) (n int64, errno int) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0);
-	n = int64(int64(r1)<<32 | int64(r0));
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r1)<<32 | int64(r0))
+	errno = int(e1)
+	return
 }
 
 func Tgkill(tgid int, tid int, sig int) (errno int) {
-	_, _, e1 := Syscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	errno = int(e1)
+	return
 }
 
 func Time(t *Time_t) (tt Time_t, errno int) {
-	r0, _, e1 := Syscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0);
-	tt = Time_t(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	errno = int(e1)
+	return
 }
 
 func Times(tms *Tms) (ticks uintptr, errno int) {
-	r0, _, e1 := Syscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0);
-	ticks = uintptr(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	errno = int(e1)
+	return
 }
 
 func Truncate(path string, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0);
-	oldmask = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
 }
 
 func Uname(buf *Utsname) (errno int) {
-	_, _, e1 := Syscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlink(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlinkat(dirfd int, path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), 0)
+	errno = int(e1)
+	return
 }
 
 func Unshare(flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ustat(dev int, ubuf *Ustat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Utime(path string, buf *Utimbuf) (errno int) {
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func exitThread(code int) (errno int) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, p *byte, np int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func write(fd int, p *byte, np int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Chown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHOWN32, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHOWN32, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Fchown(fd int, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := Syscall(SYS_GETEGID32, 0, 0, 0);
-	egid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEGID32, 0, 0, 0)
+	egid = int(r0)
+	return
 }
 
 func Geteuid() (euid int) {
-	r0, _, _ := Syscall(SYS_GETEUID32, 0, 0, 0);
-	euid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEUID32, 0, 0, 0)
+	euid = int(r0)
+	return
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := Syscall(SYS_GETGID32, 0, 0, 0);
-	gid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETGID32, 0, 0, 0)
+	gid = int(r0)
+	return
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETUID32, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETUID32, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Ioperm(from int, num int, on int) (errno int) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	errno = int(e1)
+	return
 }
 
 func Iopl(level int) (errno int) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Lchown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setfsgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setfsuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGID32, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGID32, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setregid(rgid int, egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setresgid(rgid int, egid int, sgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	errno = int(e1)
+	return
 }
 
 func Setresuid(ruid int, euid int, suid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
+	errno = int(e1)
+	return
 }
 
 func Setreuid(ruid int, euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func SyncFileRange(fd int, off int64, n int64, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags))
+	errno = int(e1)
+	return
 }
 
 func getgroups(n int, list *_Gid_t) (nn int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0);
-	nn = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setgroups(n int, list *_Gid_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	errno = int(e1)
+	return
 }
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsyscall_linux_amd64.go b/src/pkg/syscall/zsyscall_linux_amd64.go
index 15ccf3bbe..8eba79945 100644
--- a/src/pkg/syscall/zsyscall_linux_amd64.go
+++ b/src/pkg/syscall/zsyscall_linux_amd64.go
@@ -6,814 +6,814 @@ package syscall
 import "unsafe"
 
 func pipe(p *[2]_C_int) (errno int) {
-	_, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func utimes(path string, times *[2]Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)), 0)
+	errno = int(e1)
+	return
 }
 
 func futimesat(dirfd int, path string, times *[2]Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)))
+	errno = int(e1)
+	return
 }
 
 func Getcwd(buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0);
-	wpid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func ptrace(request int, pid int, addr uintptr, data uintptr) (errno int) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Access(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Acct(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Adjtimex(buf *Timex) (state int, errno int) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0);
-	state = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Chdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Chroot(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Creat(path string, mode int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup(oldfd int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup2(oldfd int, newfd int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func EpollCreate(size int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (errno int) {
-	_, _, e1 := Syscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, errno int) {
-	var _p0 *EpollEvent;
+	var _p0 *EpollEvent
 	if len(events) > 0 {
 		_p0 = &events[0]
 	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(unsafe.Pointer(_p0)), uintptr(len(events)), uintptr(msec), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(unsafe.Pointer(_p0)), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
 }
 
 func Faccessat(dirfd int, path string, mode int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fallocate(fd int, mode int, off int64, len int64) (errno int) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchdir(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmod(fd int, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmodat(dirfd int, path string, mode int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg));
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Fdatasync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fsync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ftruncate(fd int, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	errno = int(e1)
+	return
 }
 
 func Getdents(fd int, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgid(pid int) (pgid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0);
-	pgid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgrp() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0);
-	ppid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
 }
 
 func Getrlimit(resource int, rlim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getrusage(who int, rusage *Rusage) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	errno = int(e1)
+	return
 }
 
 func Gettid() (tid int) {
-	r0, _, _ := Syscall(SYS_GETTID, 0, 0, 0);
-	tid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
 }
 
 func Gettimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Kill(pid int, sig int) (errno int) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(sig), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	errno = int(e1)
+	return
 }
 
 func Klogctl(typ int, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Link(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdir(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdirat(dirfd int, path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode))
+	errno = int(e1)
+	return
 }
 
 func Mknod(path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev))
+	errno = int(e1)
+	return
 }
 
 func Mknodat(dirfd int, path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Nanosleep(time *Timespec, leftover *Timespec) (errno int) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Openat(dirfd int, path string, flags int, mode int) (fd int, errno int) {
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), uintptr(mode), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pause() (errno int) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func PivotRoot(newroot string, putold string) (errno int) {
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(StringBytePtr(newroot))), uintptr(unsafe.Pointer(StringBytePtr(putold))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(StringBytePtr(newroot))), uintptr(unsafe.Pointer(StringBytePtr(putold))), 0)
+	errno = int(e1)
+	return
 }
 
 func Pread(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Rename(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (errno int) {
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(newdirfd), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(newdirfd), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Rmdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setdomainname(p []byte) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0)
+	errno = int(e1)
+	return
 }
 
 func Sethostname(p []byte) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setpgid(pid int, pgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setrlimit(resource int, rlim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setsid() (pid int) {
-	r0, _, _ := Syscall(SYS_SETSID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Settimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, errno int) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags));
-	n = int64(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	errno = int(e1)
+	return
 }
 
 func Symlink(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0);
-	return;
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
 }
 
 func Sysinfo(info *Sysinfo_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Tee(rfd int, wfd int, len int, flags int) (n int64, errno int) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0);
-	n = int64(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	errno = int(e1)
+	return
 }
 
 func Tgkill(tgid int, tid int, sig int) (errno int) {
-	_, _, e1 := Syscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	errno = int(e1)
+	return
 }
 
 func Time(t *Time_t) (tt Time_t, errno int) {
-	r0, _, e1 := Syscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0);
-	tt = Time_t(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	errno = int(e1)
+	return
 }
 
 func Times(tms *Tms) (ticks uintptr, errno int) {
-	r0, _, e1 := Syscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0);
-	ticks = uintptr(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	errno = int(e1)
+	return
 }
 
 func Truncate(path string, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0)
+	errno = int(e1)
+	return
 }
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0);
-	oldmask = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
 }
 
 func Uname(buf *Utsname) (errno int) {
-	_, _, e1 := Syscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlink(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlinkat(dirfd int, path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), 0)
+	errno = int(e1)
+	return
 }
 
 func Unshare(flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ustat(dev int, ubuf *Ustat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Utime(path string, buf *Utimbuf) (errno int) {
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func exitThread(code int) (errno int) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, p *byte, np int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func write(fd int, p *byte, np int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Chown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Fchown(fd int, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fstatfs(fd int, buf *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0);
-	egid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
 }
 
 func Geteuid() (euid int) {
-	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0);
-	euid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0);
-	gid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Ioperm(from int, num int, on int) (errno int) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	errno = int(e1)
+	return
 }
 
 func Iopl(level int) (errno int) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Lchown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Listen(s int, n int) (errno int) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	errno = int(e1)
+	return
 }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Seek(fd int, offset int64, whence int) (off int64, errno int) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence));
-	off = int64(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	errno = int(e1)
+	return
 }
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Setfsgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setfsuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setregid(rgid int, egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setresgid(rgid int, egid int, sgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	errno = int(e1)
+	return
 }
 
 func Setresuid(ruid int, euid int, suid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	errno = int(e1)
+	return
 }
 
 func Setreuid(ruid int, euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	errno = int(e1)
+	return
 }
 
 func Shutdown(fd int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Statfs(path string, buf *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0)
+	errno = int(e1)
+	return
 }
 
 func SyncFileRange(fd int, off int64, n int64, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func bind(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func connect(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func getgroups(n int, list *_Gid_t) (nn int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0);
-	nn = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setgroups(n int, list *_Gid_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	errno = int(e1)
+	return
 }
 
 func setsockopt(s int, level int, name int, val uintptr, vallen int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	errno = int(e1)
+	return
 }
 
 func socket(domain int, typ int, proto int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsyscall_linux_arm.go b/src/pkg/syscall/zsyscall_linux_arm.go
index c221d3c48..bef7148ca 100644
--- a/src/pkg/syscall/zsyscall_linux_arm.go
+++ b/src/pkg/syscall/zsyscall_linux_arm.go
@@ -6,796 +6,796 @@ package syscall
 import "unsafe"
 
 func pipe(p *[2]_C_int) (errno int) {
-	_, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func utimes(path string, times *[2]Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)), 0)
+	errno = int(e1)
+	return
 }
 
 func futimesat(dirfd int, path string, times *[2]Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(times)))
+	errno = int(e1)
+	return
 }
 
 func Getcwd(buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, errno int) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0);
-	wpid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func ptrace(request int, pid int, addr uintptr, data uintptr) (errno int) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Access(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Acct(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Adjtimex(buf *Timex) (state int, errno int) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0);
-	state = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Chdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Chroot(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Creat(path string, mode int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup(oldfd int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Dup2(oldfd int, newfd int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func EpollCreate(size int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (errno int) {
-	_, _, e1 := Syscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, errno int) {
-	var _p0 *EpollEvent;
+	var _p0 *EpollEvent
 	if len(events) > 0 {
 		_p0 = &events[0]
 	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(unsafe.Pointer(_p0)), uintptr(len(events)), uintptr(msec), 0, 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(unsafe.Pointer(_p0)), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
 }
 
 func Faccessat(dirfd int, path string, mode int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fallocate(fd int, mode int, off int64, len int64) (errno int) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
+	errno = int(e1)
+	return
 }
 
 func Fchdir(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmod(fd int, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Fchmodat(dirfd int, path string, mode int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (errno int) {
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid), uintptr(flags), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	errno = int(e1)
+	return
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, errno int) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg));
-	val = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Fdatasync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Fsync(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ftruncate(fd int, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Getdents(fd int, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgid(pid int) (pgid int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0);
-	pgid = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpgrp() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPGRP, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0);
-	ppid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
 }
 
 func Getrlimit(resource int, rlim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getrusage(who int, rusage *Rusage) (errno int) {
-	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	errno = int(e1)
+	return
 }
 
 func Gettid() (tid int) {
-	r0, _, _ := Syscall(SYS_GETTID, 0, 0, 0);
-	tid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
 }
 
 func Gettimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Kill(pid int, sig int) (errno int) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(sig), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	errno = int(e1)
+	return
 }
 
 func Klogctl(typ int, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Link(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdir(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Mkdirat(dirfd int, path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode))
+	errno = int(e1)
+	return
 }
 
 func Mknod(path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev))
+	errno = int(e1)
+	return
 }
 
 func Mknodat(dirfd int, path string, mode int, dev int) (errno int) {
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(dev), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Nanosleep(time *Timespec, leftover *Timespec) (errno int) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Openat(dirfd int, path string, flags int, mode int) (fd int, errno int) {
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), uintptr(mode), 0, 0);
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(flags), uintptr(mode), 0, 0)
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pause() (errno int) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func PivotRoot(newroot string, putold string) (errno int) {
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(StringBytePtr(newroot))), uintptr(unsafe.Pointer(StringBytePtr(putold))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(StringBytePtr(newroot))), uintptr(unsafe.Pointer(StringBytePtr(putold))), 0)
+	errno = int(e1)
+	return
 }
 
 func Pread(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Rename(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (errno int) {
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(newdirfd), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(newdirfd), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Rmdir(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setdomainname(p []byte) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0)
+	errno = int(e1)
+	return
 }
 
 func Sethostname(p []byte) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setpgid(pid int, pgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setrlimit(resource int, rlim *Rlimit) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	errno = int(e1)
+	return
 }
 
 func Setsid() (pid int) {
-	r0, _, _ := Syscall(SYS_SETSID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Settimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, errno int) {
-	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags));
-	n = int64(int64(r1)<<32 | int64(r0));
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(int64(r1)<<32 | int64(r0))
+	errno = int(e1)
+	return
 }
 
 func Symlink(oldpath string, newpath string) (errno int) {
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(StringBytePtr(oldpath))), uintptr(unsafe.Pointer(StringBytePtr(newpath))), 0)
+	errno = int(e1)
+	return
 }
 
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0);
-	return;
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
 }
 
 func Sysinfo(info *Sysinfo_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Tee(rfd int, wfd int, len int, flags int) (n int64, errno int) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0);
-	n = int64(int64(r1)<<32 | int64(r0));
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r1)<<32 | int64(r0))
+	errno = int(e1)
+	return
 }
 
 func Tgkill(tgid int, tid int, sig int) (errno int) {
-	_, _, e1 := Syscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	errno = int(e1)
+	return
 }
 
 func Time(t *Time_t) (tt Time_t, errno int) {
-	r0, _, e1 := Syscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0);
-	tt = Time_t(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	errno = int(e1)
+	return
 }
 
 func Times(tms *Tms) (ticks uintptr, errno int) {
-	r0, _, e1 := Syscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0);
-	ticks = uintptr(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	errno = int(e1)
+	return
 }
 
 func Truncate(path string, length int64) (errno int) {
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
+	errno = int(e1)
+	return
 }
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0);
-	oldmask = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
 }
 
 func Uname(buf *Utsname) (errno int) {
-	_, _, e1 := Syscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlink(path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Unlinkat(dirfd int, path string) (errno int) {
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(StringBytePtr(path))), 0)
+	errno = int(e1)
+	return
 }
 
 func Unshare(flags int) (errno int) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Ustat(dev int, ubuf *Ustat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Utime(path string, buf *Utimbuf) (errno int) {
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func exitThread(code int) (errno int) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, p *byte, np int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func write(fd int, p *byte, np int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func bind(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func connect(s int, addr uintptr, addrlen _Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func getgroups(n int, list *_Gid_t) (nn int, errno int) {
-	r0, _, e1 := Syscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0);
-	nn = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	errno = int(e1)
+	return
 }
 
 func setgroups(n int, list *_Gid_t) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	errno = int(e1)
+	return
 }
 
 func setsockopt(s int, level int, name int, val uintptr, vallen int) (errno int) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	errno = int(e1)
+	return
 }
 
 func socket(domain int, typ int, proto int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (errno int) {
-	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	errno = int(e1)
+	return
 }
 
 func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	errno = int(e1)
+	return
 }
 
 func Chown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Fchown(fd int, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Fstatfs(fd int, buf *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0);
-	egid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
 }
 
 func Geteuid() (euid int) {
-	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0);
-	euid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0);
-	gid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0);
-	uid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
 }
 
 func Lchown(path string, uid int, gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(uid), uintptr(gid))
+	errno = int(e1)
+	return
 }
 
 func Listen(s int, n int) (errno int) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	errno = int(e1)
+	return
 }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Seek(fd int, offset int64, whence int) (off int64, errno int) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0);
-	off = int64(int64(r1)<<32 | int64(r0));
-	errno = int(e1);
-	return;
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	off = int64(int64(r1)<<32 | int64(r0))
+	errno = int(e1)
+	return
 }
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0);
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Setfsgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setfsuid(uid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setgid(gid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETGID, uintptr(gid), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Setregid(rgid int, egid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	errno = int(e1)
+	return
 }
 
 func Setresgid(rgid int, egid int, sgid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	errno = int(e1)
+	return
 }
 
 func Setresuid(ruid int, euid int, suid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	errno = int(e1)
+	return
 }
 
 func Setreuid(ruid int, euid int) (errno int) {
-	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	errno = int(e1)
+	return
 }
 
 func Shutdown(fd int, how int) (errno int) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Statfs(path string, buf *Statfs_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(buf)), 0)
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsyscall_nacl_386.go b/src/pkg/syscall/zsyscall_nacl_386.go
index 7cf331dba..34a0bd466 100644
--- a/src/pkg/syscall/zsyscall_nacl_386.go
+++ b/src/pkg/syscall/zsyscall_nacl_386.go
@@ -6,224 +6,224 @@ package syscall
 import "unsafe"
 
 func Chmod(path string, mode int) (errno int) {
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0)
+	errno = int(e1)
+	return
 }
 
 func Clock() (clock int) {
-	r0, _, _ := Syscall(SYS_CLOCK, 0, 0, 0);
-	clock = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_CLOCK, 0, 0, 0)
+	clock = int(r0)
+	return
 }
 
 func Close(fd int) (errno int) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0);
-	return;
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
 }
 
 func Fstat(fd int, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Getdents(fd int, buf []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0);
-	pid = int(r0);
-	return;
+	r0, _, _ := Syscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
 }
 
 func Gettimeofday(tv *Timeval) (errno int) {
-	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func Open(path string, mode int, perm int) (fd int, errno int) {
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm));
-	fd = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Read(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func read(fd int, buf *byte, nbuf int) (n int, errno int) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func Stat(path string, stat *Stat_t) (errno int) {
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(unsafe.Pointer(stat)), 0)
+	errno = int(e1)
+	return
 }
 
 func Write(fd int, p []byte) (n int, errno int) {
-	var _p0 *byte;
+	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)));
-	n = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)))
+	n = int(r0)
+	errno = int(e1)
+	return
 }
 
 func MultimediaInit(subsys int) (errno int) {
-	_, _, e1 := Syscall(SYS_MULTIMEDIA_INIT, uintptr(subsys), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MULTIMEDIA_INIT, uintptr(subsys), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func MultimediaShutdown() (errno int) {
-	_, _, e1 := Syscall(SYS_MULTIMEDIA_SHUTDOWN, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MULTIMEDIA_SHUTDOWN, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func CondCreate() (cv int, errno int) {
-	r0, _, e1 := Syscall(SYS_COND_CREATE, 0, 0, 0);
-	cv = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_COND_CREATE, 0, 0, 0)
+	cv = int(r0)
+	errno = int(e1)
+	return
 }
 
 func CondWait(cv int, mutex int) (errno int) {
-	_, _, e1 := Syscall(SYS_COND_WAIT, uintptr(cv), uintptr(mutex), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_COND_WAIT, uintptr(cv), uintptr(mutex), 0)
+	errno = int(e1)
+	return
 }
 
 func CondSignal(cv int) (errno int) {
-	_, _, e1 := Syscall(SYS_COND_SIGNAL, uintptr(cv), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_COND_SIGNAL, uintptr(cv), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func CondBroadcast(cv int) (errno int) {
-	_, _, e1 := Syscall(SYS_COND_BROADCAST, uintptr(cv), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_COND_BROADCAST, uintptr(cv), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func CondTimedWaitAbs(cv int, mutex int, abstime *Timespec) (errno int) {
-	_, _, e1 := Syscall(SYS_COND_TIMED_WAIT_ABS, uintptr(cv), uintptr(mutex), uintptr(unsafe.Pointer(abstime)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_COND_TIMED_WAIT_ABS, uintptr(cv), uintptr(mutex), uintptr(unsafe.Pointer(abstime)))
+	errno = int(e1)
+	return
 }
 
 func MutexCreate() (mutex int, errno int) {
-	r0, _, e1 := Syscall(SYS_MUTEX_CREATE, 0, 0, 0);
-	mutex = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_MUTEX_CREATE, 0, 0, 0)
+	mutex = int(r0)
+	errno = int(e1)
+	return
 }
 
 func MutexLock(mutex int) (errno int) {
-	_, _, e1 := Syscall(SYS_MUTEX_LOCK, uintptr(mutex), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MUTEX_LOCK, uintptr(mutex), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func MutexUnlock(mutex int) (errno int) {
-	_, _, e1 := Syscall(SYS_MUTEX_UNLOCK, uintptr(mutex), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MUTEX_UNLOCK, uintptr(mutex), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func MutexTryLock(mutex int) (errno int) {
-	_, _, e1 := Syscall(SYS_MUTEX_TRYLOCK, uintptr(mutex), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_MUTEX_TRYLOCK, uintptr(mutex), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func SemCreate() (sema int, errno int) {
-	r0, _, e1 := Syscall(SYS_SEM_CREATE, 0, 0, 0);
-	sema = int(r0);
-	errno = int(e1);
-	return;
+	r0, _, e1 := Syscall(SYS_SEM_CREATE, 0, 0, 0)
+	sema = int(r0)
+	errno = int(e1)
+	return
 }
 
 func SemWait(sema int) (errno int) {
-	_, _, e1 := Syscall(SYS_SEM_WAIT, uintptr(sema), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SEM_WAIT, uintptr(sema), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func SemPost(sema int) (errno int) {
-	_, _, e1 := Syscall(SYS_SEM_POST, uintptr(sema), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_SEM_POST, uintptr(sema), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func VideoInit(dx int, dy int) (errno int) {
-	_, _, e1 := Syscall(SYS_VIDEO_INIT, uintptr(dx), uintptr(dy), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_VIDEO_INIT, uintptr(dx), uintptr(dy), 0)
+	errno = int(e1)
+	return
 }
 
 func VideoUpdate(data *uint32) (errno int) {
-	_, _, e1 := Syscall(SYS_VIDEO_UPDATE, uintptr(unsafe.Pointer(data)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_VIDEO_UPDATE, uintptr(unsafe.Pointer(data)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func VideoPollEvent(ev *byte) (errno int) {
-	_, _, e1 := Syscall(SYS_VIDEO_POLL_EVENT, uintptr(unsafe.Pointer(ev)), 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_VIDEO_POLL_EVENT, uintptr(unsafe.Pointer(ev)), 0, 0)
+	errno = int(e1)
+	return
 }
 
 func VideoShutdown() (errno int) {
-	_, _, e1 := Syscall(SYS_VIDEO_SHUTDOWN, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_VIDEO_SHUTDOWN, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func AudioInit(fmt int, nreq int, data *int) (errno int) {
-	_, _, e1 := Syscall(SYS_AUDIO_INIT, uintptr(fmt), uintptr(nreq), uintptr(unsafe.Pointer(data)));
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_AUDIO_INIT, uintptr(fmt), uintptr(nreq), uintptr(unsafe.Pointer(data)))
+	errno = int(e1)
+	return
 }
 
 func AudioShutdown() (errno int) {
-	_, _, e1 := Syscall(SYS_AUDIO_SHUTDOWN, 0, 0, 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_AUDIO_SHUTDOWN, 0, 0, 0)
+	errno = int(e1)
+	return
 }
 
 func AudioStream(data *uint16, size *uintptr) (errno int) {
-	_, _, e1 := Syscall(SYS_AUDIO_STREAM, uintptr(unsafe.Pointer(data)), uintptr(unsafe.Pointer(size)), 0);
-	errno = int(e1);
-	return;
+	_, _, e1 := Syscall(SYS_AUDIO_STREAM, uintptr(unsafe.Pointer(data)), uintptr(unsafe.Pointer(size)), 0)
+	errno = int(e1)
+	return
 }
diff --git a/src/pkg/syscall/zsysnum_darwin_386.go b/src/pkg/syscall/zsysnum_darwin_386.go
index c1cfbd4fc..8d5c93478 100644
--- a/src/pkg/syscall/zsysnum_darwin_386.go
+++ b/src/pkg/syscall/zsysnum_darwin_386.go
@@ -5,120 +5,120 @@ package syscall
 
 const (
 	// SYS_NOSYS = 0;  // { int nosys(void); }   { indirect syscall }
-	SYS_EXIT	= 1;	// { void exit(int rval); }
-	SYS_FORK	= 2;	// { int fork(void); }
-	SYS_READ	= 3;	// { user_ssize_t read(int fd, user_addr_t cbuf, user_size_t nbyte); }
-	SYS_WRITE	= 4;	// { user_ssize_t write(int fd, user_addr_t cbuf, user_size_t nbyte); }
-	SYS_OPEN	= 5;	// { int open(user_addr_t path, int flags, int mode); }
-	SYS_CLOSE	= 6;	// { int close(int fd); }
-	SYS_WAIT4	= 7;	// { int wait4(int pid, user_addr_t status, int options, user_addr_t rusage); }
+	SYS_EXIT  = 1 // { void exit(int rval); }
+	SYS_FORK  = 2 // { int fork(void); }
+	SYS_READ  = 3 // { user_ssize_t read(int fd, user_addr_t cbuf, user_size_t nbyte); }
+	SYS_WRITE = 4 // { user_ssize_t write(int fd, user_addr_t cbuf, user_size_t nbyte); }
+	SYS_OPEN  = 5 // { int open(user_addr_t path, int flags, int mode); }
+	SYS_CLOSE = 6 // { int close(int fd); }
+	SYS_WAIT4 = 7 // { int wait4(int pid, user_addr_t status, int options, user_addr_t rusage); }
 	// SYS_NOSYS = 8;  // { int nosys(void); }   { old creat }
-	SYS_LINK	= 9;	// { int link(user_addr_t path, user_addr_t link); }
-	SYS_UNLINK	= 10;	// { int unlink(user_addr_t path); }
+	SYS_LINK   = 9  // { int link(user_addr_t path, user_addr_t link); }
+	SYS_UNLINK = 10 // { int unlink(user_addr_t path); }
 	// SYS_NOSYS = 11;  // { int nosys(void); }   { old execv }
-	SYS_CHDIR	= 12;	// { int chdir(user_addr_t path); }
-	SYS_FCHDIR	= 13;	// { int fchdir(int fd); }
-	SYS_MKNOD	= 14;	// { int mknod(user_addr_t path, int mode, int dev); }
-	SYS_CHMOD	= 15;	// { int chmod(user_addr_t path, int mode); }
-	SYS_CHOWN	= 16;	// { int chown(user_addr_t path, int uid, int gid); }
-	SYS_OGETFSSTAT	= 18;	// { int ogetfsstat(user_addr_t buf, int bufsize, int flags); }
-	SYS_GETFSSTAT	= 18;	// { int getfsstat(user_addr_t buf, int bufsize, int flags); }
+	SYS_CHDIR      = 12 // { int chdir(user_addr_t path); }
+	SYS_FCHDIR     = 13 // { int fchdir(int fd); }
+	SYS_MKNOD      = 14 // { int mknod(user_addr_t path, int mode, int dev); }
+	SYS_CHMOD      = 15 // { int chmod(user_addr_t path, int mode); }
+	SYS_CHOWN      = 16 // { int chown(user_addr_t path, int uid, int gid); }
+	SYS_OGETFSSTAT = 18 // { int ogetfsstat(user_addr_t buf, int bufsize, int flags); }
+	SYS_GETFSSTAT  = 18 // { int getfsstat(user_addr_t buf, int bufsize, int flags); }
 	// SYS_NOSYS = 19;  // { int nosys(void); }   { old lseek }
-	SYS_GETPID	= 20;	// { int getpid(void); }
+	SYS_GETPID = 20 // { int getpid(void); }
 	// SYS_NOSYS = 21;  // { int nosys(void); }   { old mount }
 	// SYS_NOSYS = 22;  // { int nosys(void); }   { old umount }
-	SYS_SETUID	= 23;	// { int setuid(uid_t uid); }
-	SYS_GETUID	= 24;	// { int getuid(void); }
-	SYS_GETEUID	= 25;	// { int geteuid(void); }
-	SYS_PTRACE	= 26;	// { int ptrace(int req, pid_t pid, caddr_t addr, int data); }
-	SYS_RECVMSG	= 27;	// { int recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG	= 28;	// { int sendmsg(int s, caddr_t msg, int flags); }
-	SYS_RECVFROM	= 29;	// { int recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr); }
-	SYS_ACCEPT	= 30;	// { int accept(int s, caddr_t name, socklen_t	*anamelen); }
-	SYS_GETPEERNAME	= 31;	// { int getpeername(int fdes, caddr_t asa, socklen_t *alen); }
-	SYS_GETSOCKNAME	= 32;	// { int getsockname(int fdes, caddr_t asa, socklen_t *alen); }
+	SYS_SETUID      = 23 // { int setuid(uid_t uid); }
+	SYS_GETUID      = 24 // { int getuid(void); }
+	SYS_GETEUID     = 25 // { int geteuid(void); }
+	SYS_PTRACE      = 26 // { int ptrace(int req, pid_t pid, caddr_t addr, int data); }
+	SYS_RECVMSG     = 27 // { int recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG     = 28 // { int sendmsg(int s, caddr_t msg, int flags); }
+	SYS_RECVFROM    = 29 // { int recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr); }
+	SYS_ACCEPT      = 30 // { int accept(int s, caddr_t name, socklen_t	*anamelen); }
+	SYS_GETPEERNAME = 31 // { int getpeername(int fdes, caddr_t asa, socklen_t *alen); }
+	SYS_GETSOCKNAME = 32 // { int getsockname(int fdes, caddr_t asa, socklen_t *alen); }
 	// SYS_NOSYS = 27;  // { int nosys(void); }
 	// SYS_NOSYS = 28;  // { int nosys(void); }
 	// SYS_NOSYS = 29;  // { int nosys(void); }
 	// SYS_NOSYS = 30;  // { int nosys(void); }
 	// SYS_NOSYS = 31;  // { int nosys(void); }
 	// SYS_NOSYS = 32;  // { int nosys(void); }
-	SYS_ACCESS	= 33;	// { int access(user_addr_t path, int flags); }
-	SYS_CHFLAGS	= 34;	// { int chflags(char *path, int flags); }
-	SYS_FCHFLAGS	= 35;	// { int fchflags(int fd, int flags); }
-	SYS_SYNC	= 36;	// { int sync(void); }
-	SYS_KILL	= 37;	// { int kill(int pid, int signum, int posix); }
+	SYS_ACCESS   = 33 // { int access(user_addr_t path, int flags); }
+	SYS_CHFLAGS  = 34 // { int chflags(char *path, int flags); }
+	SYS_FCHFLAGS = 35 // { int fchflags(int fd, int flags); }
+	SYS_SYNC     = 36 // { int sync(void); }
+	SYS_KILL     = 37 // { int kill(int pid, int signum, int posix); }
 	// SYS_NOSYS = 38;  // { int nosys(void); }   { old stat  }
-	SYS_GETPPID	= 39;	// { int getppid(void); }
+	SYS_GETPPID = 39 // { int getppid(void); }
 	// SYS_NOSYS = 40;  // { int nosys(void); }   { old lstat }
-	SYS_DUP		= 41;	// { int dup(u_int fd); }
-	SYS_PIPE	= 42;	// { int pipe(void); }
-	SYS_GETEGID	= 43;	// { int getegid(void); }
-	SYS_PROFIL	= 44;	// { int profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
+	SYS_DUP     = 41 // { int dup(u_int fd); }
+	SYS_PIPE    = 42 // { int pipe(void); }
+	SYS_GETEGID = 43 // { int getegid(void); }
+	SYS_PROFIL  = 44 // { int profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
 	// SYS_NOSYS = 45;  // { int nosys(void); } { old ktrace }
-	SYS_SIGACTION	= 46;	// { int sigaction(int signum, struct __sigaction *nsa, struct sigaction *osa); }
-	SYS_GETGID	= 47;	// { int getgid(void); }
-	SYS_SIGPROCMASK	= 48;	// { int sigprocmask(int how, user_addr_t mask, user_addr_t omask); }
-	SYS_GETLOGIN	= 49;	// { int getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN	= 50;	// { int setlogin(char *namebuf); }
-	SYS_ACCT	= 51;	// { int acct(char *path); }
-	SYS_SIGPENDING	= 52;	// { int sigpending(struct sigvec *osv); }
-	SYS_SIGALTSTACK	= 53;	// { int sigaltstack(struct sigaltstack *nss, struct sigaltstack *oss); }
-	SYS_IOCTL	= 54;	// { int ioctl(int fd, u_long com, caddr_t data); }
-	SYS_REBOOT	= 55;	// { int reboot(int opt, char *command); }
-	SYS_REVOKE	= 56;	// { int revoke(char *path); }
-	SYS_SYMLINK	= 57;	// { int symlink(char *path, char *link); }
-	SYS_READLINK	= 58;	// { int readlink(char *path, char *buf, int count); }
-	SYS_EXECVE	= 59;	// { int execve(char *fname, char **argp, char **envp); }
-	SYS_UMASK	= 60;	// { int umask(int newmask); }
-	SYS_CHROOT	= 61;	// { int chroot(user_addr_t path); }
+	SYS_SIGACTION   = 46 // { int sigaction(int signum, struct __sigaction *nsa, struct sigaction *osa); }
+	SYS_GETGID      = 47 // { int getgid(void); }
+	SYS_SIGPROCMASK = 48 // { int sigprocmask(int how, user_addr_t mask, user_addr_t omask); }
+	SYS_GETLOGIN    = 49 // { int getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN    = 50 // { int setlogin(char *namebuf); }
+	SYS_ACCT        = 51 // { int acct(char *path); }
+	SYS_SIGPENDING  = 52 // { int sigpending(struct sigvec *osv); }
+	SYS_SIGALTSTACK = 53 // { int sigaltstack(struct sigaltstack *nss, struct sigaltstack *oss); }
+	SYS_IOCTL       = 54 // { int ioctl(int fd, u_long com, caddr_t data); }
+	SYS_REBOOT      = 55 // { int reboot(int opt, char *command); }
+	SYS_REVOKE      = 56 // { int revoke(char *path); }
+	SYS_SYMLINK     = 57 // { int symlink(char *path, char *link); }
+	SYS_READLINK    = 58 // { int readlink(char *path, char *buf, int count); }
+	SYS_EXECVE      = 59 // { int execve(char *fname, char **argp, char **envp); }
+	SYS_UMASK       = 60 // { int umask(int newmask); }
+	SYS_CHROOT      = 61 // { int chroot(user_addr_t path); }
 	// SYS_NOSYS = 62;  // { int nosys(void); }   { old fstat }
 	// SYS_NOSYS = 63;  // { int nosys(void); }   { used internally, reserved }
 	// SYS_NOSYS = 64;  // { int nosys(void); }   { old getpagesize }
-	SYS_MSYNC	= 65;	// { int msync(caddr_t addr, size_t len, int flags); }
-	SYS_VFORK	= 66;	// { int vfork(void); }
+	SYS_MSYNC = 65 // { int msync(caddr_t addr, size_t len, int flags); }
+	SYS_VFORK = 66 // { int vfork(void); }
 	// SYS_NOSYS = 67;  // { int nosys(void); }   { old vread }
 	// SYS_NOSYS = 68;  // { int nosys(void); }   { old vwrite }
-	SYS_SBRK	= 69;	// { int sbrk(int incr) NO_SYSCALL_STUB; }
-	SYS_SSTK	= 70;	// { int sstk(int incr) NO_SYSCALL_STUB; }
+	SYS_SBRK = 69 // { int sbrk(int incr) NO_SYSCALL_STUB; }
+	SYS_SSTK = 70 // { int sstk(int incr) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 71;  // { int nosys(void); }   { old mmap }
-	SYS_OVADVISE	= 72;	// { int ovadvise(void) NO_SYSCALL_STUB; }   { old vadvise }
-	SYS_MUNMAP	= 73;	// { int munmap(caddr_t addr, size_t len); }
-	SYS_MPROTECT	= 74;	// { int mprotect(caddr_t addr, size_t len, int prot); }
-	SYS_MADVISE	= 75;	// { int madvise(caddr_t addr, size_t len, int behav); }
+	SYS_OVADVISE = 72 // { int ovadvise(void) NO_SYSCALL_STUB; }   { old vadvise }
+	SYS_MUNMAP   = 73 // { int munmap(caddr_t addr, size_t len); }
+	SYS_MPROTECT = 74 // { int mprotect(caddr_t addr, size_t len, int prot); }
+	SYS_MADVISE  = 75 // { int madvise(caddr_t addr, size_t len, int behav); }
 	// SYS_NOSYS = 76;  // { int nosys(void); }   { old vhangup }
 	// SYS_NOSYS = 77;  // { int nosys(void); }   { old vlimit }
-	SYS_MINCORE	= 78;	// { int mincore(user_addr_t addr, user_size_t len, user_addr_t vec); }
-	SYS_GETGROUPS	= 79;	// { int getgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS	= 80;	// { int setgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_GETPGRP	= 81;	// { int getpgrp(void); }
-	SYS_SETPGID	= 82;	// { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER	= 83;	// { int setitimer(u_int which, struct itimerval *itv, struct itimerval *oitv); }
+	SYS_MINCORE   = 78 // { int mincore(user_addr_t addr, user_size_t len, user_addr_t vec); }
+	SYS_GETGROUPS = 79 // { int getgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS = 80 // { int setgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_GETPGRP   = 81 // { int getpgrp(void); }
+	SYS_SETPGID   = 82 // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER = 83 // { int setitimer(u_int which, struct itimerval *itv, struct itimerval *oitv); }
 	// SYS_NOSYS = 84;  // { int nosys(void); }   { old wait }
-	SYS_SWAPON	= 85;	// { int swapon(void); }
-	SYS_GETITIMER	= 86;	// { int getitimer(u_int which, struct itimerval *itv); }
+	SYS_SWAPON    = 85 // { int swapon(void); }
+	SYS_GETITIMER = 86 // { int getitimer(u_int which, struct itimerval *itv); }
 	// SYS_NOSYS = 87;  // { int nosys(void); }   { old gethostname }
 	// SYS_NOSYS = 88;  // { int nosys(void); }   { old sethostname }
-	SYS_GETDTABLESIZE	= 89;	// { int getdtablesize(void); }
-	SYS_DUP2		= 90;	// { int dup2(u_int from, u_int to); }
+	SYS_GETDTABLESIZE = 89 // { int getdtablesize(void); }
+	SYS_DUP2          = 90 // { int dup2(u_int from, u_int to); }
 	// SYS_NOSYS = 91;  // { int nosys(void); }   { old getdopt }
-	SYS_FCNTL	= 92;	// { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT	= 93;	// { int select(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv); }
+	SYS_FCNTL  = 92 // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT = 93 // { int select(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv); }
 	// SYS_NOSYS = 94;  // { int nosys(void); }   { old setdopt }
-	SYS_FSYNC	= 95;	// { int fsync(int fd); }
-	SYS_SETPRIORITY	= 96;	// { int setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET	= 97;	// { int socket(int domain, int type, int protocol); }
-	SYS_CONNECT	= 98;	// { int connect(int s, caddr_t name, socklen_t namelen); }
+	SYS_FSYNC       = 95 // { int fsync(int fd); }
+	SYS_SETPRIORITY = 96 // { int setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET      = 97 // { int socket(int domain, int type, int protocol); }
+	SYS_CONNECT     = 98 // { int connect(int s, caddr_t name, socklen_t namelen); }
 	// SYS_NOSYS = 97;  // { int nosys(void); }
 	// SYS_NOSYS = 98;  // { int nosys(void); }
 	// SYS_NOSYS = 99;  // { int nosys(void); }   { old accept }
-	SYS_GETPRIORITY	= 100;	// { int getpriority(int which, id_t who); }
+	SYS_GETPRIORITY = 100 // { int getpriority(int which, id_t who); }
 	// SYS_NOSYS = 101;  // { int nosys(void); }   { old send }
 	// SYS_NOSYS = 102;  // { int nosys(void); }   { old recv }
 	// SYS_NOSYS = 103;  // { int nosys(void); }   { old sigreturn }
-	SYS_BIND	= 104;	// { int bind(int s, caddr_t name, socklen_t namelen); }
-	SYS_SETSOCKOPT	= 105;	// { int setsockopt(int s, int level, int name, caddr_t val, socklen_t valsize); }
-	SYS_LISTEN	= 106;	// { int listen(int s, int backlog); }
+	SYS_BIND       = 104 // { int bind(int s, caddr_t name, socklen_t namelen); }
+	SYS_SETSOCKOPT = 105 // { int setsockopt(int s, int level, int name, caddr_t val, socklen_t valsize); }
+	SYS_LISTEN     = 106 // { int listen(int s, int backlog); }
 	// SYS_NOSYS = 104;  // { int nosys(void); }
 	// SYS_NOSYS = 105;  // { int nosys(void); }
 	// SYS_NOSYS = 106;  // { int nosys(void); }
@@ -126,108 +126,108 @@ const (
 	// SYS_NOSYS = 108;  // { int nosys(void); }   { old sigvec }
 	// SYS_NOSYS = 109;  // { int nosys(void); }   { old sigblock }
 	// SYS_NOSYS = 110;  // { int nosys(void); }   { old sigsetmask }
-	SYS_SIGSUSPEND	= 111;	// { int sigsuspend(sigset_t mask); }
+	SYS_SIGSUSPEND = 111 // { int sigsuspend(sigset_t mask); }
 	// SYS_NOSYS = 112;  // { int nosys(void); }   { old sigstack }
 	// SYS_NOSYS = 113;  // { int nosys(void); }   { old recvmsg }
 	// SYS_NOSYS = 114;  // { int nosys(void); }   { old sendmsg }
 	// SYS_NOSYS = 113;  // { int nosys(void); }
 	// SYS_NOSYS = 114;  // { int nosys(void); }
 	// SYS_NOSYS = 115;  // { int nosys(void); }   { old vtrace }
-	SYS_GETTIMEOFDAY	= 116;	// { int gettimeofday(struct timeval *tp, struct timezone *tzp); }
-	SYS_GETRUSAGE		= 117;	// { int getrusage(int who, struct rusage *rusage); }
-	SYS_GETSOCKOPT		= 118;	// { int getsockopt(int s, int level, int name, caddr_t val, socklen_t *avalsize); }
+	SYS_GETTIMEOFDAY = 116 // { int gettimeofday(struct timeval *tp, struct timezone *tzp); }
+	SYS_GETRUSAGE    = 117 // { int getrusage(int who, struct rusage *rusage); }
+	SYS_GETSOCKOPT   = 118 // { int getsockopt(int s, int level, int name, caddr_t val, socklen_t *avalsize); }
 	// SYS_NOSYS = 118;  // { int nosys(void); }
 	// SYS_NOSYS = 119;  // { int nosys(void); }   { old resuba }
-	SYS_READV		= 120;	// { user_ssize_t readv(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_WRITEV		= 121;	// { user_ssize_t writev(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_SETTIMEOFDAY	= 122;	// { int settimeofday(struct timeval *tv, struct timezone *tzp); }
-	SYS_FCHOWN		= 123;	// { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD		= 124;	// { int fchmod(int fd, int mode); }
+	SYS_READV        = 120 // { user_ssize_t readv(int fd, struct iovec *iovp, u_int iovcnt); }
+	SYS_WRITEV       = 121 // { user_ssize_t writev(int fd, struct iovec *iovp, u_int iovcnt); }
+	SYS_SETTIMEOFDAY = 122 // { int settimeofday(struct timeval *tv, struct timezone *tzp); }
+	SYS_FCHOWN       = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD       = 124 // { int fchmod(int fd, int mode); }
 	// SYS_NOSYS = 125;  // { int nosys(void); }   { old recvfrom }
-	SYS_SETREUID	= 126;	// { int setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID	= 127;	// { int setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME	= 128;	// { int rename(char *from, char *to); }
+	SYS_SETREUID = 126 // { int setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID = 127 // { int setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME   = 128 // { int rename(char *from, char *to); }
 	// SYS_NOSYS = 129;  // { int nosys(void); }   { old truncate }
 	// SYS_NOSYS = 130;  // { int nosys(void); }   { old ftruncate }
-	SYS_FLOCK	= 131;	// { int flock(int fd, int how); }
-	SYS_MKFIFO	= 132;	// { int mkfifo(user_addr_t path, int mode); }
-	SYS_SENDTO	= 133;	// { int sendto(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen); }
-	SYS_SHUTDOWN	= 134;	// { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR	= 135;	// { int socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_FLOCK      = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO     = 132 // { int mkfifo(user_addr_t path, int mode); }
+	SYS_SENDTO     = 133 // { int sendto(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen); }
+	SYS_SHUTDOWN   = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR = 135 // { int socketpair(int domain, int type, int protocol, int *rsv); }
 	// SYS_NOSYS = 133;  // { int nosys(void); }
 	// SYS_NOSYS = 134;  // { int nosys(void); }
 	// SYS_NOSYS = 135;  // { int nosys(void); }
-	SYS_MKDIR	= 136;	// { int mkdir(user_addr_t path, int mode); }
-	SYS_RMDIR	= 137;	// { int rmdir(char *path); }
-	SYS_UTIMES	= 138;	// { int utimes(char *path, struct timeval *tptr); }
-	SYS_FUTIMES	= 139;	// { int futimes(int fd, struct timeval *tptr); }
-	SYS_ADJTIME	= 140;	// { int adjtime(struct timeval *delta, struct timeval *olddelta); }
+	SYS_MKDIR   = 136 // { int mkdir(user_addr_t path, int mode); }
+	SYS_RMDIR   = 137 // { int rmdir(char *path); }
+	SYS_UTIMES  = 138 // { int utimes(char *path, struct timeval *tptr); }
+	SYS_FUTIMES = 139 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_ADJTIME = 140 // { int adjtime(struct timeval *delta, struct timeval *olddelta); }
 	// SYS_NOSYS = 141;  // { int nosys(void); }   { old getpeername }
-	SYS_GETHOSTUUID	= 142;	// { int gethostuuid(unsigned char *uuid_buf, const struct timespec *timeoutp); }
+	SYS_GETHOSTUUID = 142 // { int gethostuuid(unsigned char *uuid_buf, const struct timespec *timeoutp); }
 	// SYS_NOSYS = 143;  // { int nosys(void); }   { old sethostid 	}
 	// SYS_NOSYS = 144;  // { int nosys(void); }   { old getrlimit }
 	// SYS_NOSYS = 145;  // { int nosys(void); }   { old setrlimit }
 	// SYS_NOSYS = 146;  // { int nosys(void); }   { old killpg }
-	SYS_SETSID	= 147;	// { int setsid(void); }
+	SYS_SETSID = 147 // { int setsid(void); }
 	// SYS_NOSYS = 148;  // { int nosys(void); }   { old setquota }
 	// SYS_NOSYS = 149;  // { int nosys(void); }   { old qquota }
 	// SYS_NOSYS = 150;  // { int nosys(void); }   { old getsockname }
-	SYS_GETPGID	= 151;	// { int getpgid(pid_t pid); }
-	SYS_SETPRIVEXEC	= 152;	// { int setprivexec(int flag); }
-	SYS_PREAD	= 153;	// { user_ssize_t pread(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
-	SYS_PWRITE	= 154;	// { user_ssize_t pwrite(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
-	SYS_NFSSVC	= 155;	// { int nfssvc(int flag, caddr_t argp); }
+	SYS_GETPGID     = 151 // { int getpgid(pid_t pid); }
+	SYS_SETPRIVEXEC = 152 // { int setprivexec(int flag); }
+	SYS_PREAD       = 153 // { user_ssize_t pread(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
+	SYS_PWRITE      = 154 // { user_ssize_t pwrite(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
+	SYS_NFSSVC      = 155 // { int nfssvc(int flag, caddr_t argp); }
 	// SYS_NOSYS = 155;  // { int nosys(void); }
 	// SYS_NOSYS = 156;  // { int nosys(void); }   { old getdirentries }
-	SYS_STATFS	= 157;	// { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS	= 158;	// { int fstatfs(int fd, struct statfs *buf); }
-	SYS_UNMOUNT	= 159;	// { int unmount(user_addr_t path, int flags); }
+	SYS_STATFS  = 157 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS = 158 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_UNMOUNT = 159 // { int unmount(user_addr_t path, int flags); }
 	// SYS_NOSYS = 160;  // { int nosys(void); }   { old async_daemon }
-	SYS_GETFH	= 161;	// { int getfh(char *fname, fhandle_t *fhp); }
+	SYS_GETFH = 161 // { int getfh(char *fname, fhandle_t *fhp); }
 	// SYS_NOSYS = 161;  // { int nosys(void); }
 	// SYS_NOSYS = 162;  // { int nosys(void); }   { old getdomainname }
 	// SYS_NOSYS = 163;  // { int nosys(void); }   { old setdomainname }
 	// SYS_NOSYS = 164;  // { int nosys(void); }
-	SYS_QUOTACTL	= 165;	// { int quotactl(const char *path, int cmd, int uid, caddr_t arg); }
+	SYS_QUOTACTL = 165 // { int quotactl(const char *path, int cmd, int uid, caddr_t arg); }
 	// SYS_NOSYS = 166;  // { int nosys(void); }   { old exportfs }
-	SYS_MOUNT	= 167;	// { int mount(char *type, char *path, int flags, caddr_t data); }
+	SYS_MOUNT = 167 // { int mount(char *type, char *path, int flags, caddr_t data); }
 	// SYS_NOSYS = 168;  // { int nosys(void); }   { old ustat }
-	SYS_CSOPS	= 169;	// { int csops(pid_t pid, uint32_t ops, user_addr_t useraddr, user_size_t usersize); }
+	SYS_CSOPS = 169 // { int csops(pid_t pid, uint32_t ops, user_addr_t useraddr, user_size_t usersize); }
 	// SYS_NOSYS = 171;  // { int nosys(void); }   { old wait3 }
 	// SYS_NOSYS = 172;  // { int nosys(void); }   { old rpause	}
-	SYS_WAITID	= 173;	// { int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options); }
+	SYS_WAITID = 173 // { int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options); }
 	// SYS_NOSYS = 174;  // { int nosys(void); }   { old getdents }
 	// SYS_NOSYS = 175;  // { int nosys(void); }   { old gc_control }
-	SYS_ADD_PROFIL	= 176;	// { int add_profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
+	SYS_ADD_PROFIL = 176 // { int add_profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
 	// SYS_NOSYS = 177;  // { int nosys(void); }
 	// SYS_NOSYS = 178;  // { int nosys(void); }
 	// SYS_NOSYS = 179;  // { int nosys(void); }
-	SYS_KDEBUG_TRACE	= 180;	// { int kdebug_trace(int code, int arg1, int arg2, int arg3, int arg4, int arg5) NO_SYSCALL_STUB; }
-	SYS_SETGID		= 181;	// { int setgid(gid_t gid); }
-	SYS_SETEGID		= 182;	// { int setegid(gid_t egid); }
-	SYS_SETEUID		= 183;	// { int seteuid(uid_t euid); }
-	SYS_SIGRETURN		= 184;	// { int sigreturn(struct ucontext *uctx, int infostyle); }
+	SYS_KDEBUG_TRACE = 180 // { int kdebug_trace(int code, int arg1, int arg2, int arg3, int arg4, int arg5) NO_SYSCALL_STUB; }
+	SYS_SETGID       = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID      = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID      = 183 // { int seteuid(uid_t euid); }
+	SYS_SIGRETURN    = 184 // { int sigreturn(struct ucontext *uctx, int infostyle); }
 	// SYS_NOSYS = 186;  // { int nosys(void); }
 	// SYS_NOSYS = 187;  // { int nosys(void); }
-	SYS_STAT	= 188;	// { int stat(user_addr_t path, user_addr_t ub); }
-	SYS_FSTAT	= 189;	// { int fstat(int fd, user_addr_t ub); }
-	SYS_LSTAT	= 190;	// { int lstat(user_addr_t path, user_addr_t ub); }
-	SYS_PATHCONF	= 191;	// { int pathconf(char *path, int name); }
-	SYS_FPATHCONF	= 192;	// { int fpathconf(int fd, int name); }
+	SYS_STAT      = 188 // { int stat(user_addr_t path, user_addr_t ub); }
+	SYS_FSTAT     = 189 // { int fstat(int fd, user_addr_t ub); }
+	SYS_LSTAT     = 190 // { int lstat(user_addr_t path, user_addr_t ub); }
+	SYS_PATHCONF  = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF = 192 // { int fpathconf(int fd, int name); }
 	// SYS_NOSYS = 193;  // { int nosys(void); }
-	SYS_GETRLIMIT		= 194;	// { int getrlimit(u_int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT		= 195;	// { int setrlimit(u_int which, struct rlimit *rlp); }
-	SYS_GETDIRENTRIES	= 196;	// { int getdirentries(int fd, char *buf, u_int count, long *basep); }
-	SYS_MMAP		= 197;	// { user_addr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
+	SYS_GETRLIMIT     = 194 // { int getrlimit(u_int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT     = 195 // { int setrlimit(u_int which, struct rlimit *rlp); }
+	SYS_GETDIRENTRIES = 196 // { int getdirentries(int fd, char *buf, u_int count, long *basep); }
+	SYS_MMAP          = 197 // { user_addr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
 	// SYS_NOSYS = 198;  // { int nosys(void); } 	{ __syscall }
-	SYS_LSEEK	= 199;	// { off_t lseek(int fd, off_t offset, int whence); }
-	SYS_TRUNCATE	= 200;	// { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE	= 201;	// { int ftruncate(int fd, off_t length); }
-	SYS___SYSCTL	= 202;	// { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_MLOCK	= 203;	// { int mlock(caddr_t addr, size_t len); }
-	SYS_MUNLOCK	= 204;	// { int munlock(caddr_t addr, size_t len); }
-	SYS_UNDELETE	= 205;	// { int undelete(user_addr_t path); }
-	SYS_ATSOCKET	= 206;	// { int ATsocket(int proto); }
+	SYS_LSEEK     = 199 // { off_t lseek(int fd, off_t offset, int whence); }
+	SYS_TRUNCATE  = 200 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE = 201 // { int ftruncate(int fd, off_t length); }
+	SYS___SYSCTL  = 202 // { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
+	SYS_MLOCK     = 203 // { int mlock(caddr_t addr, size_t len); }
+	SYS_MUNLOCK   = 204 // { int munlock(caddr_t addr, size_t len); }
+	SYS_UNDELETE  = 205 // { int undelete(user_addr_t path); }
+	SYS_ATSOCKET  = 206 // { int ATsocket(int proto); }
 	// SYS_NOSYS = 213;  // { int nosys(void); } 	{ Reserved for AppleTalk }
 	// SYS_NOSYS = 206;  // { int nosys(void); }
 	// SYS_NOSYS = 207;  // { int nosys(void); }
@@ -237,166 +237,166 @@ const (
 	// SYS_NOSYS = 211;  // { int nosys(void); }
 	// SYS_NOSYS = 212;  // { int nosys(void); }
 	// SYS_NOSYS = 213;  // { int nosys(void); } 	{ Reserved for AppleTalk }
-	SYS_KQUEUE_FROM_PORTSET_NP	= 214;	// { int kqueue_from_portset_np(int portset); }
-	SYS_KQUEUE_PORTSET_NP		= 215;	// { int kqueue_portset_np(int fd); }
-	SYS_GETATTRLIST			= 220;	// { int getattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
-	SYS_SETATTRLIST			= 221;	// { int setattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
-	SYS_GETDIRENTRIESATTR		= 222;	// { int getdirentriesattr(int fd, struct attrlist *alist, void *buffer, size_t buffersize, u_long *count, u_long *basep, u_long *newstate, u_long options); }
-	SYS_EXCHANGEDATA		= 223;	// { int exchangedata(const char *path1, const char *path2, u_long options); }
+	SYS_KQUEUE_FROM_PORTSET_NP = 214 // { int kqueue_from_portset_np(int portset); }
+	SYS_KQUEUE_PORTSET_NP      = 215 // { int kqueue_portset_np(int fd); }
+	SYS_GETATTRLIST            = 220 // { int getattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
+	SYS_SETATTRLIST            = 221 // { int setattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
+	SYS_GETDIRENTRIESATTR      = 222 // { int getdirentriesattr(int fd, struct attrlist *alist, void *buffer, size_t buffersize, u_long *count, u_long *basep, u_long *newstate, u_long options); }
+	SYS_EXCHANGEDATA           = 223 // { int exchangedata(const char *path1, const char *path2, u_long options); }
 	// SYS_NOSYS = 224;  // { int nosys(void); } { was checkuseraccess }
-	SYS_SEARCHFS	= 225;	// { int searchfs(const char *path, struct fssearchblock *searchblock, u_long *nummatches, u_long scriptcode, u_long options, struct searchstate *state); }
-	SYS_DELETE	= 226;	// { int delete(user_addr_t path) NO_SYSCALL_STUB; }       { private delete (Carbon semantics) }
-	SYS_COPYFILE	= 227;	// { int copyfile(char *from, char *to, int mode, int flags) NO_SYSCALL_STUB; }
+	SYS_SEARCHFS = 225 // { int searchfs(const char *path, struct fssearchblock *searchblock, u_long *nummatches, u_long scriptcode, u_long options, struct searchstate *state); }
+	SYS_DELETE   = 226 // { int delete(user_addr_t path) NO_SYSCALL_STUB; }       { private delete (Carbon semantics) }
+	SYS_COPYFILE = 227 // { int copyfile(char *from, char *to, int mode, int flags) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 228;  // { int nosys(void); }
 	// SYS_NOSYS = 229;  // { int nosys(void); }
-	SYS_POLL		= 230;	// { int poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_WATCHEVENT		= 231;	// { int watchevent(struct eventreq *u_req, int u_eventmask); }
-	SYS_WAITEVENT		= 232;	// { int waitevent(struct eventreq *u_req, struct timeval *tv); }
-	SYS_MODWATCH		= 233;	// { int modwatch(struct eventreq *u_req, int u_eventmask); }
-	SYS_GETXATTR		= 234;	// { user_ssize_t getxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_FGETXATTR		= 235;	// { user_ssize_t fgetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_SETXATTR		= 236;	// { int setxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_FSETXATTR		= 237;	// { int fsetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_REMOVEXATTR		= 238;	// { int removexattr(user_addr_t path, user_addr_t attrname, int options); }
-	SYS_FREMOVEXATTR	= 239;	// { int fremovexattr(int fd, user_addr_t attrname, int options); }
-	SYS_LISTXATTR		= 240;	// { user_ssize_t listxattr(user_addr_t path, user_addr_t namebuf, size_t bufsize, int options); }
-	SYS_FLISTXATTR		= 241;	// { user_ssize_t flistxattr(int fd, user_addr_t namebuf, size_t bufsize, int options); }
-	SYS_FSCTL		= 242;	// { int fsctl(const char *path, u_long cmd, caddr_t data, u_long options); }
-	SYS_INITGROUPS		= 243;	// { int initgroups(u_int gidsetsize, gid_t *gidset, int gmuid); }
-	SYS_POSIX_SPAWN		= 244;	// { int posix_spawn(pid_t *pid, const char *path, const struct _posix_spawn_args_desc *adesc, char **argv, char **envp); }
+	SYS_POLL         = 230 // { int poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_WATCHEVENT   = 231 // { int watchevent(struct eventreq *u_req, int u_eventmask); }
+	SYS_WAITEVENT    = 232 // { int waitevent(struct eventreq *u_req, struct timeval *tv); }
+	SYS_MODWATCH     = 233 // { int modwatch(struct eventreq *u_req, int u_eventmask); }
+	SYS_GETXATTR     = 234 // { user_ssize_t getxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_FGETXATTR    = 235 // { user_ssize_t fgetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_SETXATTR     = 236 // { int setxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_FSETXATTR    = 237 // { int fsetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_REMOVEXATTR  = 238 // { int removexattr(user_addr_t path, user_addr_t attrname, int options); }
+	SYS_FREMOVEXATTR = 239 // { int fremovexattr(int fd, user_addr_t attrname, int options); }
+	SYS_LISTXATTR    = 240 // { user_ssize_t listxattr(user_addr_t path, user_addr_t namebuf, size_t bufsize, int options); }
+	SYS_FLISTXATTR   = 241 // { user_ssize_t flistxattr(int fd, user_addr_t namebuf, size_t bufsize, int options); }
+	SYS_FSCTL        = 242 // { int fsctl(const char *path, u_long cmd, caddr_t data, u_long options); }
+	SYS_INITGROUPS   = 243 // { int initgroups(u_int gidsetsize, gid_t *gidset, int gmuid); }
+	SYS_POSIX_SPAWN  = 244 // { int posix_spawn(pid_t *pid, const char *path, const struct _posix_spawn_args_desc *adesc, char **argv, char **envp); }
 	// SYS_NOSYS = 245;  // { int nosys(void); }
 	// SYS_NOSYS = 246;  // { int nosys(void); }
-	SYS_NFSCLNT	= 247;	// { int nfsclnt(int flag, caddr_t argp); }
+	SYS_NFSCLNT = 247 // { int nfsclnt(int flag, caddr_t argp); }
 	// SYS_NOSYS = 247;  // { int nosys(void); }
-	SYS_FHOPEN	= 248;	// { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_FHOPEN = 248 // { int fhopen(const struct fhandle *u_fhp, int flags); }
 	// SYS_NOSYS = 248;  // { int nosys(void); }
 	// SYS_NOSYS = 249;  // { int nosys(void); }
-	SYS_MINHERIT	= 250;	// { int minherit(void *addr, size_t len, int inherit); }
-	SYS_SEMSYS	= 251;	// { int semsys(u_int which, int a2, int a3, int a4, int a5); }
+	SYS_MINHERIT = 250 // { int minherit(void *addr, size_t len, int inherit); }
+	SYS_SEMSYS   = 251 // { int semsys(u_int which, int a2, int a3, int a4, int a5); }
 	// SYS_NOSYS = 251;  // { int nosys(void); }
-	SYS_MSGSYS	= 252;	// { int msgsys(u_int which, int a2, int a3, int a4, int a5); }
+	SYS_MSGSYS = 252 // { int msgsys(u_int which, int a2, int a3, int a4, int a5); }
 	// SYS_NOSYS = 252;  // { int nosys(void); }
-	SYS_SHMSYS	= 253;	// { int shmsys(u_int which, int a2, int a3, int a4); }
+	SYS_SHMSYS = 253 // { int shmsys(u_int which, int a2, int a3, int a4); }
 	// SYS_NOSYS = 253;  // { int nosys(void); }
-	SYS_SEMCTL	= 254;	// { int semctl(int semid, int semnum, int cmd, semun_t arg); }
-	SYS_SEMGET	= 255;	// { int semget(key_t key, int	nsems, int semflg); }
-	SYS_SEMOP	= 256;	// { int semop(int semid, struct sembuf *sops, int nsops); }
+	SYS_SEMCTL = 254 // { int semctl(int semid, int semnum, int cmd, semun_t arg); }
+	SYS_SEMGET = 255 // { int semget(key_t key, int	nsems, int semflg); }
+	SYS_SEMOP  = 256 // { int semop(int semid, struct sembuf *sops, int nsops); }
 	// SYS_NOSYS = 257;  // { int nosys(void); }
 	// SYS_NOSYS = 254;  // { int nosys(void); }
 	// SYS_NOSYS = 255;  // { int nosys(void); }
 	// SYS_NOSYS = 256;  // { int nosys(void); }
 	// SYS_NOSYS = 257;  // { int nosys(void); }
-	SYS_MSGCTL	= 258;	// { int msgctl(int msqid, int cmd, struct	msqid_ds *buf); }
-	SYS_MSGGET	= 259;	// { int msgget(key_t key, int msgflg); }
-	SYS_MSGSND	= 260;	// { int msgsnd(int msqid, void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV	= 261;	// { user_ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_MSGCTL = 258 // { int msgctl(int msqid, int cmd, struct	msqid_ds *buf); }
+	SYS_MSGGET = 259 // { int msgget(key_t key, int msgflg); }
+	SYS_MSGSND = 260 // { int msgsnd(int msqid, void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV = 261 // { user_ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
 	// SYS_NOSYS = 258;  // { int nosys(void); }
 	// SYS_NOSYS = 259;  // { int nosys(void); }
 	// SYS_NOSYS = 260;  // { int nosys(void); }
 	// SYS_NOSYS = 261;  // { int nosys(void); }
-	SYS_SHMAT	= 262;	// { user_addr_t shmat(int shmid, void *shmaddr, int shmflg); }
-	SYS_SHMCTL	= 263;	// { int shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_SHMDT	= 264;	// { int shmdt(void *shmaddr); }
-	SYS_SHMGET	= 265;	// { int shmget(key_t key, size_t size, int shmflg); }
+	SYS_SHMAT  = 262 // { user_addr_t shmat(int shmid, void *shmaddr, int shmflg); }
+	SYS_SHMCTL = 263 // { int shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_SHMDT  = 264 // { int shmdt(void *shmaddr); }
+	SYS_SHMGET = 265 // { int shmget(key_t key, size_t size, int shmflg); }
 	// SYS_NOSYS = 262;  // { int nosys(void); }
 	// SYS_NOSYS = 263;  // { int nosys(void); }
 	// SYS_NOSYS = 264;  // { int nosys(void); }
 	// SYS_NOSYS = 265;  // { int nosys(void); }
-	SYS_SHM_OPEN			= 266;	// { int shm_open(const char *name, int oflag, int mode); }
-	SYS_SHM_UNLINK			= 267;	// { int shm_unlink(const char *name); }
-	SYS_SEM_OPEN			= 268;	// { user_addr_t sem_open(const char *name, int oflag, int mode, int value); }
-	SYS_SEM_CLOSE			= 269;	// { int sem_close(sem_t *sem); }
-	SYS_SEM_UNLINK			= 270;	// { int sem_unlink(const char *name); }
-	SYS_SEM_WAIT			= 271;	// { int sem_wait(sem_t *sem); }
-	SYS_SEM_TRYWAIT			= 272;	// { int sem_trywait(sem_t *sem); }
-	SYS_SEM_POST			= 273;	// { int sem_post(sem_t *sem); }
-	SYS_SEM_GETVALUE		= 274;	// { int sem_getvalue(sem_t *sem, int *sval); }
-	SYS_SEM_INIT			= 275;	// { int sem_init(sem_t *sem, int phsared, u_int value); }
-	SYS_SEM_DESTROY			= 276;	// { int sem_destroy(sem_t *sem); }
-	SYS_OPEN_EXTENDED		= 277;	// { int open_extended(user_addr_t path, int flags, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_UMASK_EXTENDED		= 278;	// { int umask_extended(int newmask, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_STAT_EXTENDED		= 279;	// { int stat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_LSTAT_EXTENDED		= 280;	// { int lstat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_FSTAT_EXTENDED		= 281;	// { int fstat_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_CHMOD_EXTENDED		= 282;	// { int chmod_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_FCHMOD_EXTENDED		= 283;	// { int fchmod_extended(int fd, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_ACCESS_EXTENDED		= 284;	// { int access_extended(user_addr_t entries, size_t size, user_addr_t results, uid_t uid) NO_SYSCALL_STUB; }
-	SYS_SETTID			= 285;	// { int settid(uid_t uid, gid_t gid) NO_SYSCALL_STUB; }
-	SYS_GETTID			= 286;	// { int gettid(uid_t *uidp, gid_t *gidp) NO_SYSCALL_STUB; }
-	SYS_SETSGROUPS			= 287;	// { int setsgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_GETSGROUPS			= 288;	// { int getsgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_SETWGROUPS			= 289;	// { int setwgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_GETWGROUPS			= 290;	// { int getwgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_MKFIFO_EXTENDED		= 291;	// { int mkfifo_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_MKDIR_EXTENDED		= 292;	// { int mkdir_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_IDENTITYSVC			= 293;	// { int identitysvc(int opcode, user_addr_t message) NO_SYSCALL_STUB; }
-	SYS_SHARED_REGION_CHECK_NP	= 294;	// { int shared_region_check_np(uint64_t *start_address) NO_SYSCALL_STUB; }
-	SYS_SHARED_REGION_MAP_NP	= 295;	// { int shared_region_map_np(int fd, uint32_t count, const struct shared_file_mapping_np *mappings) NO_SYSCALL_STUB; }
+	SYS_SHM_OPEN               = 266 // { int shm_open(const char *name, int oflag, int mode); }
+	SYS_SHM_UNLINK             = 267 // { int shm_unlink(const char *name); }
+	SYS_SEM_OPEN               = 268 // { user_addr_t sem_open(const char *name, int oflag, int mode, int value); }
+	SYS_SEM_CLOSE              = 269 // { int sem_close(sem_t *sem); }
+	SYS_SEM_UNLINK             = 270 // { int sem_unlink(const char *name); }
+	SYS_SEM_WAIT               = 271 // { int sem_wait(sem_t *sem); }
+	SYS_SEM_TRYWAIT            = 272 // { int sem_trywait(sem_t *sem); }
+	SYS_SEM_POST               = 273 // { int sem_post(sem_t *sem); }
+	SYS_SEM_GETVALUE           = 274 // { int sem_getvalue(sem_t *sem, int *sval); }
+	SYS_SEM_INIT               = 275 // { int sem_init(sem_t *sem, int phsared, u_int value); }
+	SYS_SEM_DESTROY            = 276 // { int sem_destroy(sem_t *sem); }
+	SYS_OPEN_EXTENDED          = 277 // { int open_extended(user_addr_t path, int flags, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_UMASK_EXTENDED         = 278 // { int umask_extended(int newmask, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_STAT_EXTENDED          = 279 // { int stat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_LSTAT_EXTENDED         = 280 // { int lstat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_FSTAT_EXTENDED         = 281 // { int fstat_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_CHMOD_EXTENDED         = 282 // { int chmod_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_FCHMOD_EXTENDED        = 283 // { int fchmod_extended(int fd, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_ACCESS_EXTENDED        = 284 // { int access_extended(user_addr_t entries, size_t size, user_addr_t results, uid_t uid) NO_SYSCALL_STUB; }
+	SYS_SETTID                 = 285 // { int settid(uid_t uid, gid_t gid) NO_SYSCALL_STUB; }
+	SYS_GETTID                 = 286 // { int gettid(uid_t *uidp, gid_t *gidp) NO_SYSCALL_STUB; }
+	SYS_SETSGROUPS             = 287 // { int setsgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_GETSGROUPS             = 288 // { int getsgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_SETWGROUPS             = 289 // { int setwgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_GETWGROUPS             = 290 // { int getwgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_MKFIFO_EXTENDED        = 291 // { int mkfifo_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_MKDIR_EXTENDED         = 292 // { int mkdir_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_IDENTITYSVC            = 293 // { int identitysvc(int opcode, user_addr_t message) NO_SYSCALL_STUB; }
+	SYS_SHARED_REGION_CHECK_NP = 294 // { int shared_region_check_np(uint64_t *start_address) NO_SYSCALL_STUB; }
+	SYS_SHARED_REGION_MAP_NP   = 295 // { int shared_region_map_np(int fd, uint32_t count, const struct shared_file_mapping_np *mappings) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 296;  // { int nosys(void); } { old load_shared_file }
 	// SYS_NOSYS = 297;  // { int nosys(void); } { old reset_shared_file }
 	// SYS_NOSYS = 298;  // { int nosys(void); } { old new_system_shared_regions }
 	// SYS_ENOSYS = 299;  // { int enosys(void); } { old shared_region_map_file_np }
 	// SYS_ENOSYS = 300;  // { int enosys(void); } { old shared_region_make_private_np }
-	SYS___PTHREAD_MUTEX_DESTROY	= 301;	// { int __pthread_mutex_destroy(int mutexid); }
-	SYS___PTHREAD_MUTEX_INIT	= 302;	// { int __pthread_mutex_init(user_addr_t  mutex, user_addr_t attr); }
-	SYS___PTHREAD_MUTEX_LOCK	= 303;	// { int __pthread_mutex_lock(int mutexid); }
-	SYS___PTHREAD_MUTEX_TRYLOCK	= 304;	// { int __pthread_mutex_trylock(int mutexid); }
-	SYS___PTHREAD_MUTEX_UNLOCK	= 305;	// { int __pthread_mutex_unlock(int mutexid); }
-	SYS___PTHREAD_COND_INIT		= 306;	// { int __pthread_cond_init(user_addr_t cond, user_addr_t attr); }
-	SYS___PTHREAD_COND_DESTROY	= 307;	// { int __pthread_cond_destroy(int condid); }
-	SYS___PTHREAD_COND_BROADCAST	= 308;	// { int __pthread_cond_broadcast(int condid); }
-	SYS___PTHREAD_COND_SIGNAL	= 309;	// { int __pthread_cond_signal(int condid); }
-	SYS_GETSID			= 310;	// { int getsid(pid_t pid); }
-	SYS_SETTID_WITH_PID		= 311;	// { int settid_with_pid(pid_t pid, int assume) NO_SYSCALL_STUB; }
-	SYS___PTHREAD_COND_TIMEDWAIT	= 312;	// { int __pthread_cond_timedwait(int condid, int mutexid, user_addr_t abstime); }
-	SYS_AIO_FSYNC			= 313;	// { int aio_fsync(int op, user_addr_t aiocbp); }
-	SYS_AIO_RETURN			= 314;	// { user_ssize_t aio_return(user_addr_t aiocbp); }
-	SYS_AIO_SUSPEND			= 315;	// { int aio_suspend(user_addr_t aiocblist, int nent, user_addr_t timeoutp); }
-	SYS_AIO_CANCEL			= 316;	// { int aio_cancel(int fd, user_addr_t aiocbp); }
-	SYS_AIO_ERROR			= 317;	// { int aio_error(user_addr_t aiocbp); }
-	SYS_AIO_READ			= 318;	// { int aio_read(user_addr_t aiocbp); }
-	SYS_AIO_WRITE			= 319;	// { int aio_write(user_addr_t aiocbp); }
-	SYS_LIO_LISTIO			= 320;	// { int lio_listio(int mode, user_addr_t aiocblist, int nent, user_addr_t sigp); }
-	SYS___PTHREAD_COND_WAIT		= 321;	// { int __pthread_cond_wait(int condid, int mutexid); }
-	SYS_IOPOLICYSYS			= 322;	// { int iopolicysys(int cmd, void *arg) NO_SYSCALL_STUB; }
+	SYS___PTHREAD_MUTEX_DESTROY  = 301 // { int __pthread_mutex_destroy(int mutexid); }
+	SYS___PTHREAD_MUTEX_INIT     = 302 // { int __pthread_mutex_init(user_addr_t  mutex, user_addr_t attr); }
+	SYS___PTHREAD_MUTEX_LOCK     = 303 // { int __pthread_mutex_lock(int mutexid); }
+	SYS___PTHREAD_MUTEX_TRYLOCK  = 304 // { int __pthread_mutex_trylock(int mutexid); }
+	SYS___PTHREAD_MUTEX_UNLOCK   = 305 // { int __pthread_mutex_unlock(int mutexid); }
+	SYS___PTHREAD_COND_INIT      = 306 // { int __pthread_cond_init(user_addr_t cond, user_addr_t attr); }
+	SYS___PTHREAD_COND_DESTROY   = 307 // { int __pthread_cond_destroy(int condid); }
+	SYS___PTHREAD_COND_BROADCAST = 308 // { int __pthread_cond_broadcast(int condid); }
+	SYS___PTHREAD_COND_SIGNAL    = 309 // { int __pthread_cond_signal(int condid); }
+	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
+	SYS_SETTID_WITH_PID          = 311 // { int settid_with_pid(pid_t pid, int assume) NO_SYSCALL_STUB; }
+	SYS___PTHREAD_COND_TIMEDWAIT = 312 // { int __pthread_cond_timedwait(int condid, int mutexid, user_addr_t abstime); }
+	SYS_AIO_FSYNC                = 313 // { int aio_fsync(int op, user_addr_t aiocbp); }
+	SYS_AIO_RETURN               = 314 // { user_ssize_t aio_return(user_addr_t aiocbp); }
+	SYS_AIO_SUSPEND              = 315 // { int aio_suspend(user_addr_t aiocblist, int nent, user_addr_t timeoutp); }
+	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, user_addr_t aiocbp); }
+	SYS_AIO_ERROR                = 317 // { int aio_error(user_addr_t aiocbp); }
+	SYS_AIO_READ                 = 318 // { int aio_read(user_addr_t aiocbp); }
+	SYS_AIO_WRITE                = 319 // { int aio_write(user_addr_t aiocbp); }
+	SYS_LIO_LISTIO               = 320 // { int lio_listio(int mode, user_addr_t aiocblist, int nent, user_addr_t sigp); }
+	SYS___PTHREAD_COND_WAIT      = 321 // { int __pthread_cond_wait(int condid, int mutexid); }
+	SYS_IOPOLICYSYS              = 322 // { int iopolicysys(int cmd, void *arg) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 323;  // { int nosys(void); }
-	SYS_MLOCKALL	= 324;	// { int mlockall(int how); }
-	SYS_MUNLOCKALL	= 325;	// { int munlockall(int how); }
+	SYS_MLOCKALL   = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL = 325 // { int munlockall(int how); }
 	// SYS_NOSYS = 326;  // { int nosys(void); }
-	SYS_ISSETUGID			= 327;	// { int issetugid(void); }
-	SYS___PTHREAD_KILL		= 328;	// { int __pthread_kill(int thread_port, int sig); }
-	SYS___PTHREAD_SIGMASK		= 329;	// { int __pthread_sigmask(int how, user_addr_t set, user_addr_t oset); }
-	SYS___SIGWAIT			= 330;	// { int __sigwait(user_addr_t set, user_addr_t sig); }
-	SYS___DISABLE_THREADSIGNAL	= 331;	// { int __disable_threadsignal(int value); }
-	SYS___PTHREAD_MARKCANCEL	= 332;	// { int __pthread_markcancel(int thread_port); }
-	SYS___PTHREAD_CANCELED		= 333;	// { int __pthread_canceled(int  action); }
-	SYS___SEMWAIT_SIGNAL		= 334;	// { int __semwait_signal(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec); }
+	SYS_ISSETUGID              = 327 // { int issetugid(void); }
+	SYS___PTHREAD_KILL         = 328 // { int __pthread_kill(int thread_port, int sig); }
+	SYS___PTHREAD_SIGMASK      = 329 // { int __pthread_sigmask(int how, user_addr_t set, user_addr_t oset); }
+	SYS___SIGWAIT              = 330 // { int __sigwait(user_addr_t set, user_addr_t sig); }
+	SYS___DISABLE_THREADSIGNAL = 331 // { int __disable_threadsignal(int value); }
+	SYS___PTHREAD_MARKCANCEL   = 332 // { int __pthread_markcancel(int thread_port); }
+	SYS___PTHREAD_CANCELED     = 333 // { int __pthread_canceled(int  action); }
+	SYS___SEMWAIT_SIGNAL       = 334 // { int __semwait_signal(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec); }
 	// SYS_NOSYS = 335;  // { int nosys(void); }   { old utrace }
-	SYS_PROC_INFO	= 336;	// { int proc_info(int32_t callnum,int32_t pid,uint32_t flavor, uint64_t arg,user_addr_t buffer,int32_t buffersize) NO_SYSCALL_STUB; }
-	SYS_SENDFILE	= 337;	// { int sendfile(int fd, int s, off_t offset, off_t *nbytes, struct sf_hdtr *hdtr, int flags); }
+	SYS_PROC_INFO = 336 // { int proc_info(int32_t callnum,int32_t pid,uint32_t flavor, uint64_t arg,user_addr_t buffer,int32_t buffersize) NO_SYSCALL_STUB; }
+	SYS_SENDFILE  = 337 // { int sendfile(int fd, int s, off_t offset, off_t *nbytes, struct sf_hdtr *hdtr, int flags); }
 	// SYS_NOSYS = 337;  // { int nosys(void); }
-	SYS_STAT64		= 338;	// { int stat64(user_addr_t path, user_addr_t ub); }
-	SYS_FSTAT64		= 339;	// { int fstat64(int fd, user_addr_t ub); }
-	SYS_LSTAT64		= 340;	// { int lstat64(user_addr_t path, user_addr_t ub); }
-	SYS_STAT64_EXTENDED	= 341;	// { int stat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_LSTAT64_EXTENDED	= 342;	// { int lstat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_FSTAT64_EXTENDED	= 343;	// { int fstat64_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_GETDIRENTRIES64	= 344;	// { user_ssize_t getdirentries64(int fd, void *buf, user_size_t bufsize, off_t *position) NO_SYSCALL_STUB; }
-	SYS_STATFS64		= 345;	// { int statfs64(char *path, struct statfs64 *buf); }
-	SYS_FSTATFS64		= 346;	// { int fstatfs64(int fd, struct statfs64 *buf); }
-	SYS_GETFSSTAT64		= 347;	// { int getfsstat64(user_addr_t buf, int bufsize, int flags); }
-	SYS___PTHREAD_CHDIR	= 348;	// { int __pthread_chdir(user_addr_t path); }
-	SYS___PTHREAD_FCHDIR	= 349;	// { int __pthread_fchdir(int fd); }
-	SYS_AUDIT		= 350;	// { int audit(void *record, int length); }
-	SYS_AUDITON		= 351;	// { int auditon(int cmd, void *data, int length); }
+	SYS_STAT64           = 338 // { int stat64(user_addr_t path, user_addr_t ub); }
+	SYS_FSTAT64          = 339 // { int fstat64(int fd, user_addr_t ub); }
+	SYS_LSTAT64          = 340 // { int lstat64(user_addr_t path, user_addr_t ub); }
+	SYS_STAT64_EXTENDED  = 341 // { int stat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_LSTAT64_EXTENDED = 342 // { int lstat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_FSTAT64_EXTENDED = 343 // { int fstat64_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_GETDIRENTRIES64  = 344 // { user_ssize_t getdirentries64(int fd, void *buf, user_size_t bufsize, off_t *position) NO_SYSCALL_STUB; }
+	SYS_STATFS64         = 345 // { int statfs64(char *path, struct statfs64 *buf); }
+	SYS_FSTATFS64        = 346 // { int fstatfs64(int fd, struct statfs64 *buf); }
+	SYS_GETFSSTAT64      = 347 // { int getfsstat64(user_addr_t buf, int bufsize, int flags); }
+	SYS___PTHREAD_CHDIR  = 348 // { int __pthread_chdir(user_addr_t path); }
+	SYS___PTHREAD_FCHDIR = 349 // { int __pthread_fchdir(int fd); }
+	SYS_AUDIT            = 350 // { int audit(void *record, int length); }
+	SYS_AUDITON          = 351 // { int auditon(int cmd, void *data, int length); }
 	// SYS_NOSYS = 352;  // { int nosys(void); }
-	SYS_GETAUID		= 353;	// { int getauid(au_id_t *auid); }
-	SYS_SETAUID		= 354;	// { int setauid(au_id_t *auid); }
-	SYS_GETAUDIT		= 355;	// { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT		= 356;	// { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR	= 357;	// { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
-	SYS_SETAUDIT_ADDR	= 358;	// { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
-	SYS_AUDITCTL		= 359;	// { int auditctl(char *path); }
+	SYS_GETAUID       = 353 // { int getauid(au_id_t *auid); }
+	SYS_SETAUID       = 354 // { int setauid(au_id_t *auid); }
+	SYS_GETAUDIT      = 355 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT      = 356 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR = 357 // { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
+	SYS_SETAUDIT_ADDR = 358 // { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
+	SYS_AUDITCTL      = 359 // { int auditctl(char *path); }
 	// SYS_NOSYS = 350;  // { int nosys(void); }
 	// SYS_NOSYS = 351;  // { int nosys(void); }
 	// SYS_NOSYS = 352;  // { int nosys(void); }
@@ -407,15 +407,15 @@ const (
 	// SYS_NOSYS = 357;  // { int nosys(void); }
 	// SYS_NOSYS = 358;  // { int nosys(void); }
 	// SYS_NOSYS = 359;  // { int nosys(void); }
-	SYS_BSDTHREAD_CREATE	= 360;	// { user_addr_t bsdthread_create(user_addr_t func, user_addr_t func_arg, user_addr_t stack, user_addr_t pthread, uint32_t flags) NO_SYSCALL_STUB; }
-	SYS_BSDTHREAD_TERMINATE	= 361;	// { int bsdthread_terminate(user_addr_t stackaddr, size_t freesize, uint32_t port, uint32_t sem) NO_SYSCALL_STUB; }
-	SYS_KQUEUE		= 362;	// { int kqueue(void); }
-	SYS_KEVENT		= 363;	// { int kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_LCHOWN		= 364;	// { int lchown(user_addr_t path, uid_t owner, gid_t group); }
-	SYS_STACK_SNAPSHOT	= 365;	// { int stack_snapshot(pid_t pid, user_addr_t tracebuf, uint32_t tracebuf_size, uint32_t options) NO_SYSCALL_STUB; }
-	SYS_BSDTHREAD_REGISTER	= 366;	// { int bsdthread_register(user_addr_t threadstart, user_addr_t wqthread, int pthsize) NO_SYSCALL_STUB; }
-	SYS_WORKQ_OPEN		= 367;	// { int workq_open(void) NO_SYSCALL_STUB; }
-	SYS_WORKQ_OPS		= 368;	// { int workq_ops(int options, user_addr_t item, int prio) NO_SYSCALL_STUB; }
+	SYS_BSDTHREAD_CREATE    = 360 // { user_addr_t bsdthread_create(user_addr_t func, user_addr_t func_arg, user_addr_t stack, user_addr_t pthread, uint32_t flags) NO_SYSCALL_STUB; }
+	SYS_BSDTHREAD_TERMINATE = 361 // { int bsdthread_terminate(user_addr_t stackaddr, size_t freesize, uint32_t port, uint32_t sem) NO_SYSCALL_STUB; }
+	SYS_KQUEUE              = 362 // { int kqueue(void); }
+	SYS_KEVENT              = 363 // { int kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
+	SYS_LCHOWN              = 364 // { int lchown(user_addr_t path, uid_t owner, gid_t group); }
+	SYS_STACK_SNAPSHOT      = 365 // { int stack_snapshot(pid_t pid, user_addr_t tracebuf, uint32_t tracebuf_size, uint32_t options) NO_SYSCALL_STUB; }
+	SYS_BSDTHREAD_REGISTER  = 366 // { int bsdthread_register(user_addr_t threadstart, user_addr_t wqthread, int pthsize) NO_SYSCALL_STUB; }
+	SYS_WORKQ_OPEN          = 367 // { int workq_open(void) NO_SYSCALL_STUB; }
+	SYS_WORKQ_OPS           = 368 // { int workq_ops(int options, user_addr_t item, int prio) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 369;  // { int nosys(void); }
 	// SYS_NOSYS = 370;  // { int nosys(void); }
 	// SYS_NOSYS = 371;  // { int nosys(void); }
@@ -427,59 +427,59 @@ const (
 	// SYS_NOSYS = 377;  // { int nosys(void); }
 	// SYS_NOSYS = 378;  // { int nosys(void); }
 	// SYS_NOSYS = 379;  // { int nosys(void); }
-	SYS___MAC_EXECVE	= 380;	// { int __mac_execve(char *fname, char **argp, char **envp, struct mac *mac_p); }
-	SYS___MAC_SYSCALL	= 381;	// { int __mac_syscall(char *policy, int call, user_addr_t arg); }
-	SYS___MAC_GET_FILE	= 382;	// { int __mac_get_file(char *path_p, struct mac *mac_p); }
-	SYS___MAC_SET_FILE	= 383;	// { int __mac_set_file(char *path_p, struct mac *mac_p); }
-	SYS___MAC_GET_LINK	= 384;	// { int __mac_get_link(char *path_p, struct mac *mac_p); }
-	SYS___MAC_SET_LINK	= 385;	// { int __mac_set_link(char *path_p, struct mac *mac_p); }
-	SYS___MAC_GET_PROC	= 386;	// { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC	= 387;	// { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD	= 388;	// { int __mac_get_fd(int fd, struct mac *mac_p); }
-	SYS___MAC_SET_FD	= 389;	// { int __mac_set_fd(int fd, struct mac *mac_p); }
-	SYS___MAC_GET_PID	= 390;	// { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
-	SYS___MAC_GET_LCID	= 391;	// { int __mac_get_lcid(pid_t lcid, struct mac *mac_p); }
-	SYS___MAC_GET_LCTX	= 392;	// { int __mac_get_lctx(struct mac *mac_p); }
-	SYS___MAC_SET_LCTX	= 393;	// { int __mac_set_lctx(struct mac *mac_p); }
-	SYS_SETLCID		= 394;	// { int setlcid(pid_t pid, pid_t lcid) NO_SYSCALL_STUB; }
-	SYS_GETLCID		= 395;	// { int getlcid(pid_t pid) NO_SYSCALL_STUB; }
-	SYS_READ_NOCANCEL	= 396;	// { user_ssize_t read_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
-	SYS_WRITE_NOCANCEL	= 397;	// { user_ssize_t write_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
-	SYS_OPEN_NOCANCEL	= 398;	// { int open_nocancel(user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; }
-	SYS_CLOSE_NOCANCEL	= 399;	// { int close_nocancel(int fd) NO_SYSCALL_STUB; }
-	SYS_WAIT4_NOCANCEL	= 400;	// { int wait4_nocancel(int pid, user_addr_t status, int options, user_addr_t rusage) NO_SYSCALL_STUB; }
-	SYS_RECVMSG_NOCANCEL	= 401;	// { int recvmsg_nocancel(int s, struct msghdr *msg, int flags) NO_SYSCALL_STUB; }
-	SYS_SENDMSG_NOCANCEL	= 402;	// { int sendmsg_nocancel(int s, caddr_t msg, int flags) NO_SYSCALL_STUB; }
-	SYS_RECVFROM_NOCANCEL	= 403;	// { int recvfrom_nocancel(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr) NO_SYSCALL_STUB; }
-	SYS_ACCEPT_NOCANCEL	= 404;	// { int accept_nocancel(int s, caddr_t name, socklen_t	*anamelen) NO_SYSCALL_STUB; }
+	SYS___MAC_EXECVE      = 380 // { int __mac_execve(char *fname, char **argp, char **envp, struct mac *mac_p); }
+	SYS___MAC_SYSCALL     = 381 // { int __mac_syscall(char *policy, int call, user_addr_t arg); }
+	SYS___MAC_GET_FILE    = 382 // { int __mac_get_file(char *path_p, struct mac *mac_p); }
+	SYS___MAC_SET_FILE    = 383 // { int __mac_set_file(char *path_p, struct mac *mac_p); }
+	SYS___MAC_GET_LINK    = 384 // { int __mac_get_link(char *path_p, struct mac *mac_p); }
+	SYS___MAC_SET_LINK    = 385 // { int __mac_set_link(char *path_p, struct mac *mac_p); }
+	SYS___MAC_GET_PROC    = 386 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC    = 387 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD      = 388 // { int __mac_get_fd(int fd, struct mac *mac_p); }
+	SYS___MAC_SET_FD      = 389 // { int __mac_set_fd(int fd, struct mac *mac_p); }
+	SYS___MAC_GET_PID     = 390 // { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
+	SYS___MAC_GET_LCID    = 391 // { int __mac_get_lcid(pid_t lcid, struct mac *mac_p); }
+	SYS___MAC_GET_LCTX    = 392 // { int __mac_get_lctx(struct mac *mac_p); }
+	SYS___MAC_SET_LCTX    = 393 // { int __mac_set_lctx(struct mac *mac_p); }
+	SYS_SETLCID           = 394 // { int setlcid(pid_t pid, pid_t lcid) NO_SYSCALL_STUB; }
+	SYS_GETLCID           = 395 // { int getlcid(pid_t pid) NO_SYSCALL_STUB; }
+	SYS_READ_NOCANCEL     = 396 // { user_ssize_t read_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
+	SYS_WRITE_NOCANCEL    = 397 // { user_ssize_t write_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
+	SYS_OPEN_NOCANCEL     = 398 // { int open_nocancel(user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; }
+	SYS_CLOSE_NOCANCEL    = 399 // { int close_nocancel(int fd) NO_SYSCALL_STUB; }
+	SYS_WAIT4_NOCANCEL    = 400 // { int wait4_nocancel(int pid, user_addr_t status, int options, user_addr_t rusage) NO_SYSCALL_STUB; }
+	SYS_RECVMSG_NOCANCEL  = 401 // { int recvmsg_nocancel(int s, struct msghdr *msg, int flags) NO_SYSCALL_STUB; }
+	SYS_SENDMSG_NOCANCEL  = 402 // { int sendmsg_nocancel(int s, caddr_t msg, int flags) NO_SYSCALL_STUB; }
+	SYS_RECVFROM_NOCANCEL = 403 // { int recvfrom_nocancel(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr) NO_SYSCALL_STUB; }
+	SYS_ACCEPT_NOCANCEL   = 404 // { int accept_nocancel(int s, caddr_t name, socklen_t	*anamelen) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 401;  // { int nosys(void); }
 	// SYS_NOSYS = 402;  // { int nosys(void); }
 	// SYS_NOSYS = 403;  // { int nosys(void); }
 	// SYS_NOSYS = 404;  // { int nosys(void); }
-	SYS_MSYNC_NOCANCEL	= 405;	// { int msync_nocancel(caddr_t addr, size_t len, int flags) NO_SYSCALL_STUB; }
-	SYS_FCNTL_NOCANCEL	= 406;	// { int fcntl_nocancel(int fd, int cmd, long arg) NO_SYSCALL_STUB; }
-	SYS_SELECT_NOCANCEL	= 407;	// { int select_nocancel(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv) NO_SYSCALL_STUB; }
-	SYS_FSYNC_NOCANCEL	= 408;	// { int fsync_nocancel(int fd) NO_SYSCALL_STUB; }
-	SYS_CONNECT_NOCANCEL	= 409;	// { int connect_nocancel(int s, caddr_t name, socklen_t namelen) NO_SYSCALL_STUB; }
+	SYS_MSYNC_NOCANCEL   = 405 // { int msync_nocancel(caddr_t addr, size_t len, int flags) NO_SYSCALL_STUB; }
+	SYS_FCNTL_NOCANCEL   = 406 // { int fcntl_nocancel(int fd, int cmd, long arg) NO_SYSCALL_STUB; }
+	SYS_SELECT_NOCANCEL  = 407 // { int select_nocancel(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv) NO_SYSCALL_STUB; }
+	SYS_FSYNC_NOCANCEL   = 408 // { int fsync_nocancel(int fd) NO_SYSCALL_STUB; }
+	SYS_CONNECT_NOCANCEL = 409 // { int connect_nocancel(int s, caddr_t name, socklen_t namelen) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 409;  // { int nosys(void); }
-	SYS_SIGSUSPEND_NOCANCEL	= 410;	// { int sigsuspend_nocancel(sigset_t mask) NO_SYSCALL_STUB; }
-	SYS_READV_NOCANCEL	= 411;	// { user_ssize_t readv_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
-	SYS_WRITEV_NOCANCEL	= 412;	// { user_ssize_t writev_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
-	SYS_SENDTO_NOCANCEL	= 413;	// { int sendto_nocancel(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen) NO_SYSCALL_STUB; }
+	SYS_SIGSUSPEND_NOCANCEL = 410 // { int sigsuspend_nocancel(sigset_t mask) NO_SYSCALL_STUB; }
+	SYS_READV_NOCANCEL      = 411 // { user_ssize_t readv_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
+	SYS_WRITEV_NOCANCEL     = 412 // { user_ssize_t writev_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
+	SYS_SENDTO_NOCANCEL     = 413 // { int sendto_nocancel(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 413;  // { int nosys(void); }
-	SYS_PREAD_NOCANCEL	= 414;	// { user_ssize_t pread_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
-	SYS_PWRITE_NOCANCEL	= 415;	// { user_ssize_t pwrite_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
-	SYS_WAITID_NOCANCEL	= 416;	// { int waitid_nocancel(idtype_t idtype, id_t id, siginfo_t *infop, int options) NO_SYSCALL_STUB; }
-	SYS_POLL_NOCANCEL	= 417;	// { int poll_nocancel(struct pollfd *fds, u_int nfds, int timeout) NO_SYSCALL_STUB; }
-	SYS_MSGSND_NOCANCEL	= 418;	// { int msgsnd_nocancel(int msqid, void *msgp, size_t msgsz, int msgflg) NO_SYSCALL_STUB; }
-	SYS_MSGRCV_NOCANCEL	= 419;	// { user_ssize_t msgrcv_nocancel(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg) NO_SYSCALL_STUB; }
+	SYS_PREAD_NOCANCEL  = 414 // { user_ssize_t pread_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
+	SYS_PWRITE_NOCANCEL = 415 // { user_ssize_t pwrite_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
+	SYS_WAITID_NOCANCEL = 416 // { int waitid_nocancel(idtype_t idtype, id_t id, siginfo_t *infop, int options) NO_SYSCALL_STUB; }
+	SYS_POLL_NOCANCEL   = 417 // { int poll_nocancel(struct pollfd *fds, u_int nfds, int timeout) NO_SYSCALL_STUB; }
+	SYS_MSGSND_NOCANCEL = 418 // { int msgsnd_nocancel(int msqid, void *msgp, size_t msgsz, int msgflg) NO_SYSCALL_STUB; }
+	SYS_MSGRCV_NOCANCEL = 419 // { user_ssize_t msgrcv_nocancel(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 418;  // { int nosys(void); }
 	// SYS_NOSYS = 419;  // { int nosys(void); }
-	SYS_SEM_WAIT_NOCANCEL		= 420;	// { int sem_wait_nocancel(sem_t *sem) NO_SYSCALL_STUB; }
-	SYS_AIO_SUSPEND_NOCANCEL	= 421;	// { int aio_suspend_nocancel(user_addr_t aiocblist, int nent, user_addr_t timeoutp) NO_SYSCALL_STUB; }
-	SYS___SIGWAIT_NOCANCEL		= 422;	// { int __sigwait_nocancel(user_addr_t set, user_addr_t sig) NO_SYSCALL_STUB; }
-	SYS___SEMWAIT_SIGNAL_NOCANCEL	= 423;	// { int __semwait_signal_nocancel(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec) NO_SYSCALL_STUB; }
-	SYS___MAC_MOUNT			= 424;	// { int __mac_mount(char *type, char *path, int flags, caddr_t data, struct mac *mac_p); }
-	SYS___MAC_GET_MOUNT		= 425;	// { int __mac_get_mount(char *path, struct mac *mac_p); }
-	SYS___MAC_GETFSSTAT		= 426;	// { int __mac_getfsstat(user_addr_t buf, int bufsize, user_addr_t mac, int macsize, int flags); }
+	SYS_SEM_WAIT_NOCANCEL         = 420 // { int sem_wait_nocancel(sem_t *sem) NO_SYSCALL_STUB; }
+	SYS_AIO_SUSPEND_NOCANCEL      = 421 // { int aio_suspend_nocancel(user_addr_t aiocblist, int nent, user_addr_t timeoutp) NO_SYSCALL_STUB; }
+	SYS___SIGWAIT_NOCANCEL        = 422 // { int __sigwait_nocancel(user_addr_t set, user_addr_t sig) NO_SYSCALL_STUB; }
+	SYS___SEMWAIT_SIGNAL_NOCANCEL = 423 // { int __semwait_signal_nocancel(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec) NO_SYSCALL_STUB; }
+	SYS___MAC_MOUNT               = 424 // { int __mac_mount(char *type, char *path, int flags, caddr_t data, struct mac *mac_p); }
+	SYS___MAC_GET_MOUNT           = 425 // { int __mac_get_mount(char *path, struct mac *mac_p); }
+	SYS___MAC_GETFSSTAT           = 426 // { int __mac_getfsstat(user_addr_t buf, int bufsize, user_addr_t mac, int macsize, int flags); }
 )
diff --git a/src/pkg/syscall/zsysnum_darwin_amd64.go b/src/pkg/syscall/zsysnum_darwin_amd64.go
index c1cfbd4fc..8d5c93478 100644
--- a/src/pkg/syscall/zsysnum_darwin_amd64.go
+++ b/src/pkg/syscall/zsysnum_darwin_amd64.go
@@ -5,120 +5,120 @@ package syscall
 
 const (
 	// SYS_NOSYS = 0;  // { int nosys(void); }   { indirect syscall }
-	SYS_EXIT	= 1;	// { void exit(int rval); }
-	SYS_FORK	= 2;	// { int fork(void); }
-	SYS_READ	= 3;	// { user_ssize_t read(int fd, user_addr_t cbuf, user_size_t nbyte); }
-	SYS_WRITE	= 4;	// { user_ssize_t write(int fd, user_addr_t cbuf, user_size_t nbyte); }
-	SYS_OPEN	= 5;	// { int open(user_addr_t path, int flags, int mode); }
-	SYS_CLOSE	= 6;	// { int close(int fd); }
-	SYS_WAIT4	= 7;	// { int wait4(int pid, user_addr_t status, int options, user_addr_t rusage); }
+	SYS_EXIT  = 1 // { void exit(int rval); }
+	SYS_FORK  = 2 // { int fork(void); }
+	SYS_READ  = 3 // { user_ssize_t read(int fd, user_addr_t cbuf, user_size_t nbyte); }
+	SYS_WRITE = 4 // { user_ssize_t write(int fd, user_addr_t cbuf, user_size_t nbyte); }
+	SYS_OPEN  = 5 // { int open(user_addr_t path, int flags, int mode); }
+	SYS_CLOSE = 6 // { int close(int fd); }
+	SYS_WAIT4 = 7 // { int wait4(int pid, user_addr_t status, int options, user_addr_t rusage); }
 	// SYS_NOSYS = 8;  // { int nosys(void); }   { old creat }
-	SYS_LINK	= 9;	// { int link(user_addr_t path, user_addr_t link); }
-	SYS_UNLINK	= 10;	// { int unlink(user_addr_t path); }
+	SYS_LINK   = 9  // { int link(user_addr_t path, user_addr_t link); }
+	SYS_UNLINK = 10 // { int unlink(user_addr_t path); }
 	// SYS_NOSYS = 11;  // { int nosys(void); }   { old execv }
-	SYS_CHDIR	= 12;	// { int chdir(user_addr_t path); }
-	SYS_FCHDIR	= 13;	// { int fchdir(int fd); }
-	SYS_MKNOD	= 14;	// { int mknod(user_addr_t path, int mode, int dev); }
-	SYS_CHMOD	= 15;	// { int chmod(user_addr_t path, int mode); }
-	SYS_CHOWN	= 16;	// { int chown(user_addr_t path, int uid, int gid); }
-	SYS_OGETFSSTAT	= 18;	// { int ogetfsstat(user_addr_t buf, int bufsize, int flags); }
-	SYS_GETFSSTAT	= 18;	// { int getfsstat(user_addr_t buf, int bufsize, int flags); }
+	SYS_CHDIR      = 12 // { int chdir(user_addr_t path); }
+	SYS_FCHDIR     = 13 // { int fchdir(int fd); }
+	SYS_MKNOD      = 14 // { int mknod(user_addr_t path, int mode, int dev); }
+	SYS_CHMOD      = 15 // { int chmod(user_addr_t path, int mode); }
+	SYS_CHOWN      = 16 // { int chown(user_addr_t path, int uid, int gid); }
+	SYS_OGETFSSTAT = 18 // { int ogetfsstat(user_addr_t buf, int bufsize, int flags); }
+	SYS_GETFSSTAT  = 18 // { int getfsstat(user_addr_t buf, int bufsize, int flags); }
 	// SYS_NOSYS = 19;  // { int nosys(void); }   { old lseek }
-	SYS_GETPID	= 20;	// { int getpid(void); }
+	SYS_GETPID = 20 // { int getpid(void); }
 	// SYS_NOSYS = 21;  // { int nosys(void); }   { old mount }
 	// SYS_NOSYS = 22;  // { int nosys(void); }   { old umount }
-	SYS_SETUID	= 23;	// { int setuid(uid_t uid); }
-	SYS_GETUID	= 24;	// { int getuid(void); }
-	SYS_GETEUID	= 25;	// { int geteuid(void); }
-	SYS_PTRACE	= 26;	// { int ptrace(int req, pid_t pid, caddr_t addr, int data); }
-	SYS_RECVMSG	= 27;	// { int recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG	= 28;	// { int sendmsg(int s, caddr_t msg, int flags); }
-	SYS_RECVFROM	= 29;	// { int recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr); }
-	SYS_ACCEPT	= 30;	// { int accept(int s, caddr_t name, socklen_t	*anamelen); }
-	SYS_GETPEERNAME	= 31;	// { int getpeername(int fdes, caddr_t asa, socklen_t *alen); }
-	SYS_GETSOCKNAME	= 32;	// { int getsockname(int fdes, caddr_t asa, socklen_t *alen); }
+	SYS_SETUID      = 23 // { int setuid(uid_t uid); }
+	SYS_GETUID      = 24 // { int getuid(void); }
+	SYS_GETEUID     = 25 // { int geteuid(void); }
+	SYS_PTRACE      = 26 // { int ptrace(int req, pid_t pid, caddr_t addr, int data); }
+	SYS_RECVMSG     = 27 // { int recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG     = 28 // { int sendmsg(int s, caddr_t msg, int flags); }
+	SYS_RECVFROM    = 29 // { int recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr); }
+	SYS_ACCEPT      = 30 // { int accept(int s, caddr_t name, socklen_t	*anamelen); }
+	SYS_GETPEERNAME = 31 // { int getpeername(int fdes, caddr_t asa, socklen_t *alen); }
+	SYS_GETSOCKNAME = 32 // { int getsockname(int fdes, caddr_t asa, socklen_t *alen); }
 	// SYS_NOSYS = 27;  // { int nosys(void); }
 	// SYS_NOSYS = 28;  // { int nosys(void); }
 	// SYS_NOSYS = 29;  // { int nosys(void); }
 	// SYS_NOSYS = 30;  // { int nosys(void); }
 	// SYS_NOSYS = 31;  // { int nosys(void); }
 	// SYS_NOSYS = 32;  // { int nosys(void); }
-	SYS_ACCESS	= 33;	// { int access(user_addr_t path, int flags); }
-	SYS_CHFLAGS	= 34;	// { int chflags(char *path, int flags); }
-	SYS_FCHFLAGS	= 35;	// { int fchflags(int fd, int flags); }
-	SYS_SYNC	= 36;	// { int sync(void); }
-	SYS_KILL	= 37;	// { int kill(int pid, int signum, int posix); }
+	SYS_ACCESS   = 33 // { int access(user_addr_t path, int flags); }
+	SYS_CHFLAGS  = 34 // { int chflags(char *path, int flags); }
+	SYS_FCHFLAGS = 35 // { int fchflags(int fd, int flags); }
+	SYS_SYNC     = 36 // { int sync(void); }
+	SYS_KILL     = 37 // { int kill(int pid, int signum, int posix); }
 	// SYS_NOSYS = 38;  // { int nosys(void); }   { old stat  }
-	SYS_GETPPID	= 39;	// { int getppid(void); }
+	SYS_GETPPID = 39 // { int getppid(void); }
 	// SYS_NOSYS = 40;  // { int nosys(void); }   { old lstat }
-	SYS_DUP		= 41;	// { int dup(u_int fd); }
-	SYS_PIPE	= 42;	// { int pipe(void); }
-	SYS_GETEGID	= 43;	// { int getegid(void); }
-	SYS_PROFIL	= 44;	// { int profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
+	SYS_DUP     = 41 // { int dup(u_int fd); }
+	SYS_PIPE    = 42 // { int pipe(void); }
+	SYS_GETEGID = 43 // { int getegid(void); }
+	SYS_PROFIL  = 44 // { int profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
 	// SYS_NOSYS = 45;  // { int nosys(void); } { old ktrace }
-	SYS_SIGACTION	= 46;	// { int sigaction(int signum, struct __sigaction *nsa, struct sigaction *osa); }
-	SYS_GETGID	= 47;	// { int getgid(void); }
-	SYS_SIGPROCMASK	= 48;	// { int sigprocmask(int how, user_addr_t mask, user_addr_t omask); }
-	SYS_GETLOGIN	= 49;	// { int getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN	= 50;	// { int setlogin(char *namebuf); }
-	SYS_ACCT	= 51;	// { int acct(char *path); }
-	SYS_SIGPENDING	= 52;	// { int sigpending(struct sigvec *osv); }
-	SYS_SIGALTSTACK	= 53;	// { int sigaltstack(struct sigaltstack *nss, struct sigaltstack *oss); }
-	SYS_IOCTL	= 54;	// { int ioctl(int fd, u_long com, caddr_t data); }
-	SYS_REBOOT	= 55;	// { int reboot(int opt, char *command); }
-	SYS_REVOKE	= 56;	// { int revoke(char *path); }
-	SYS_SYMLINK	= 57;	// { int symlink(char *path, char *link); }
-	SYS_READLINK	= 58;	// { int readlink(char *path, char *buf, int count); }
-	SYS_EXECVE	= 59;	// { int execve(char *fname, char **argp, char **envp); }
-	SYS_UMASK	= 60;	// { int umask(int newmask); }
-	SYS_CHROOT	= 61;	// { int chroot(user_addr_t path); }
+	SYS_SIGACTION   = 46 // { int sigaction(int signum, struct __sigaction *nsa, struct sigaction *osa); }
+	SYS_GETGID      = 47 // { int getgid(void); }
+	SYS_SIGPROCMASK = 48 // { int sigprocmask(int how, user_addr_t mask, user_addr_t omask); }
+	SYS_GETLOGIN    = 49 // { int getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN    = 50 // { int setlogin(char *namebuf); }
+	SYS_ACCT        = 51 // { int acct(char *path); }
+	SYS_SIGPENDING  = 52 // { int sigpending(struct sigvec *osv); }
+	SYS_SIGALTSTACK = 53 // { int sigaltstack(struct sigaltstack *nss, struct sigaltstack *oss); }
+	SYS_IOCTL       = 54 // { int ioctl(int fd, u_long com, caddr_t data); }
+	SYS_REBOOT      = 55 // { int reboot(int opt, char *command); }
+	SYS_REVOKE      = 56 // { int revoke(char *path); }
+	SYS_SYMLINK     = 57 // { int symlink(char *path, char *link); }
+	SYS_READLINK    = 58 // { int readlink(char *path, char *buf, int count); }
+	SYS_EXECVE      = 59 // { int execve(char *fname, char **argp, char **envp); }
+	SYS_UMASK       = 60 // { int umask(int newmask); }
+	SYS_CHROOT      = 61 // { int chroot(user_addr_t path); }
 	// SYS_NOSYS = 62;  // { int nosys(void); }   { old fstat }
 	// SYS_NOSYS = 63;  // { int nosys(void); }   { used internally, reserved }
 	// SYS_NOSYS = 64;  // { int nosys(void); }   { old getpagesize }
-	SYS_MSYNC	= 65;	// { int msync(caddr_t addr, size_t len, int flags); }
-	SYS_VFORK	= 66;	// { int vfork(void); }
+	SYS_MSYNC = 65 // { int msync(caddr_t addr, size_t len, int flags); }
+	SYS_VFORK = 66 // { int vfork(void); }
 	// SYS_NOSYS = 67;  // { int nosys(void); }   { old vread }
 	// SYS_NOSYS = 68;  // { int nosys(void); }   { old vwrite }
-	SYS_SBRK	= 69;	// { int sbrk(int incr) NO_SYSCALL_STUB; }
-	SYS_SSTK	= 70;	// { int sstk(int incr) NO_SYSCALL_STUB; }
+	SYS_SBRK = 69 // { int sbrk(int incr) NO_SYSCALL_STUB; }
+	SYS_SSTK = 70 // { int sstk(int incr) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 71;  // { int nosys(void); }   { old mmap }
-	SYS_OVADVISE	= 72;	// { int ovadvise(void) NO_SYSCALL_STUB; }   { old vadvise }
-	SYS_MUNMAP	= 73;	// { int munmap(caddr_t addr, size_t len); }
-	SYS_MPROTECT	= 74;	// { int mprotect(caddr_t addr, size_t len, int prot); }
-	SYS_MADVISE	= 75;	// { int madvise(caddr_t addr, size_t len, int behav); }
+	SYS_OVADVISE = 72 // { int ovadvise(void) NO_SYSCALL_STUB; }   { old vadvise }
+	SYS_MUNMAP   = 73 // { int munmap(caddr_t addr, size_t len); }
+	SYS_MPROTECT = 74 // { int mprotect(caddr_t addr, size_t len, int prot); }
+	SYS_MADVISE  = 75 // { int madvise(caddr_t addr, size_t len, int behav); }
 	// SYS_NOSYS = 76;  // { int nosys(void); }   { old vhangup }
 	// SYS_NOSYS = 77;  // { int nosys(void); }   { old vlimit }
-	SYS_MINCORE	= 78;	// { int mincore(user_addr_t addr, user_size_t len, user_addr_t vec); }
-	SYS_GETGROUPS	= 79;	// { int getgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS	= 80;	// { int setgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_GETPGRP	= 81;	// { int getpgrp(void); }
-	SYS_SETPGID	= 82;	// { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER	= 83;	// { int setitimer(u_int which, struct itimerval *itv, struct itimerval *oitv); }
+	SYS_MINCORE   = 78 // { int mincore(user_addr_t addr, user_size_t len, user_addr_t vec); }
+	SYS_GETGROUPS = 79 // { int getgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS = 80 // { int setgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_GETPGRP   = 81 // { int getpgrp(void); }
+	SYS_SETPGID   = 82 // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER = 83 // { int setitimer(u_int which, struct itimerval *itv, struct itimerval *oitv); }
 	// SYS_NOSYS = 84;  // { int nosys(void); }   { old wait }
-	SYS_SWAPON	= 85;	// { int swapon(void); }
-	SYS_GETITIMER	= 86;	// { int getitimer(u_int which, struct itimerval *itv); }
+	SYS_SWAPON    = 85 // { int swapon(void); }
+	SYS_GETITIMER = 86 // { int getitimer(u_int which, struct itimerval *itv); }
 	// SYS_NOSYS = 87;  // { int nosys(void); }   { old gethostname }
 	// SYS_NOSYS = 88;  // { int nosys(void); }   { old sethostname }
-	SYS_GETDTABLESIZE	= 89;	// { int getdtablesize(void); }
-	SYS_DUP2		= 90;	// { int dup2(u_int from, u_int to); }
+	SYS_GETDTABLESIZE = 89 // { int getdtablesize(void); }
+	SYS_DUP2          = 90 // { int dup2(u_int from, u_int to); }
 	// SYS_NOSYS = 91;  // { int nosys(void); }   { old getdopt }
-	SYS_FCNTL	= 92;	// { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT	= 93;	// { int select(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv); }
+	SYS_FCNTL  = 92 // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT = 93 // { int select(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv); }
 	// SYS_NOSYS = 94;  // { int nosys(void); }   { old setdopt }
-	SYS_FSYNC	= 95;	// { int fsync(int fd); }
-	SYS_SETPRIORITY	= 96;	// { int setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET	= 97;	// { int socket(int domain, int type, int protocol); }
-	SYS_CONNECT	= 98;	// { int connect(int s, caddr_t name, socklen_t namelen); }
+	SYS_FSYNC       = 95 // { int fsync(int fd); }
+	SYS_SETPRIORITY = 96 // { int setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET      = 97 // { int socket(int domain, int type, int protocol); }
+	SYS_CONNECT     = 98 // { int connect(int s, caddr_t name, socklen_t namelen); }
 	// SYS_NOSYS = 97;  // { int nosys(void); }
 	// SYS_NOSYS = 98;  // { int nosys(void); }
 	// SYS_NOSYS = 99;  // { int nosys(void); }   { old accept }
-	SYS_GETPRIORITY	= 100;	// { int getpriority(int which, id_t who); }
+	SYS_GETPRIORITY = 100 // { int getpriority(int which, id_t who); }
 	// SYS_NOSYS = 101;  // { int nosys(void); }   { old send }
 	// SYS_NOSYS = 102;  // { int nosys(void); }   { old recv }
 	// SYS_NOSYS = 103;  // { int nosys(void); }   { old sigreturn }
-	SYS_BIND	= 104;	// { int bind(int s, caddr_t name, socklen_t namelen); }
-	SYS_SETSOCKOPT	= 105;	// { int setsockopt(int s, int level, int name, caddr_t val, socklen_t valsize); }
-	SYS_LISTEN	= 106;	// { int listen(int s, int backlog); }
+	SYS_BIND       = 104 // { int bind(int s, caddr_t name, socklen_t namelen); }
+	SYS_SETSOCKOPT = 105 // { int setsockopt(int s, int level, int name, caddr_t val, socklen_t valsize); }
+	SYS_LISTEN     = 106 // { int listen(int s, int backlog); }
 	// SYS_NOSYS = 104;  // { int nosys(void); }
 	// SYS_NOSYS = 105;  // { int nosys(void); }
 	// SYS_NOSYS = 106;  // { int nosys(void); }
@@ -126,108 +126,108 @@ const (
 	// SYS_NOSYS = 108;  // { int nosys(void); }   { old sigvec }
 	// SYS_NOSYS = 109;  // { int nosys(void); }   { old sigblock }
 	// SYS_NOSYS = 110;  // { int nosys(void); }   { old sigsetmask }
-	SYS_SIGSUSPEND	= 111;	// { int sigsuspend(sigset_t mask); }
+	SYS_SIGSUSPEND = 111 // { int sigsuspend(sigset_t mask); }
 	// SYS_NOSYS = 112;  // { int nosys(void); }   { old sigstack }
 	// SYS_NOSYS = 113;  // { int nosys(void); }   { old recvmsg }
 	// SYS_NOSYS = 114;  // { int nosys(void); }   { old sendmsg }
 	// SYS_NOSYS = 113;  // { int nosys(void); }
 	// SYS_NOSYS = 114;  // { int nosys(void); }
 	// SYS_NOSYS = 115;  // { int nosys(void); }   { old vtrace }
-	SYS_GETTIMEOFDAY	= 116;	// { int gettimeofday(struct timeval *tp, struct timezone *tzp); }
-	SYS_GETRUSAGE		= 117;	// { int getrusage(int who, struct rusage *rusage); }
-	SYS_GETSOCKOPT		= 118;	// { int getsockopt(int s, int level, int name, caddr_t val, socklen_t *avalsize); }
+	SYS_GETTIMEOFDAY = 116 // { int gettimeofday(struct timeval *tp, struct timezone *tzp); }
+	SYS_GETRUSAGE    = 117 // { int getrusage(int who, struct rusage *rusage); }
+	SYS_GETSOCKOPT   = 118 // { int getsockopt(int s, int level, int name, caddr_t val, socklen_t *avalsize); }
 	// SYS_NOSYS = 118;  // { int nosys(void); }
 	// SYS_NOSYS = 119;  // { int nosys(void); }   { old resuba }
-	SYS_READV		= 120;	// { user_ssize_t readv(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_WRITEV		= 121;	// { user_ssize_t writev(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_SETTIMEOFDAY	= 122;	// { int settimeofday(struct timeval *tv, struct timezone *tzp); }
-	SYS_FCHOWN		= 123;	// { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD		= 124;	// { int fchmod(int fd, int mode); }
+	SYS_READV        = 120 // { user_ssize_t readv(int fd, struct iovec *iovp, u_int iovcnt); }
+	SYS_WRITEV       = 121 // { user_ssize_t writev(int fd, struct iovec *iovp, u_int iovcnt); }
+	SYS_SETTIMEOFDAY = 122 // { int settimeofday(struct timeval *tv, struct timezone *tzp); }
+	SYS_FCHOWN       = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD       = 124 // { int fchmod(int fd, int mode); }
 	// SYS_NOSYS = 125;  // { int nosys(void); }   { old recvfrom }
-	SYS_SETREUID	= 126;	// { int setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID	= 127;	// { int setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME	= 128;	// { int rename(char *from, char *to); }
+	SYS_SETREUID = 126 // { int setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID = 127 // { int setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME   = 128 // { int rename(char *from, char *to); }
 	// SYS_NOSYS = 129;  // { int nosys(void); }   { old truncate }
 	// SYS_NOSYS = 130;  // { int nosys(void); }   { old ftruncate }
-	SYS_FLOCK	= 131;	// { int flock(int fd, int how); }
-	SYS_MKFIFO	= 132;	// { int mkfifo(user_addr_t path, int mode); }
-	SYS_SENDTO	= 133;	// { int sendto(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen); }
-	SYS_SHUTDOWN	= 134;	// { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR	= 135;	// { int socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_FLOCK      = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO     = 132 // { int mkfifo(user_addr_t path, int mode); }
+	SYS_SENDTO     = 133 // { int sendto(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen); }
+	SYS_SHUTDOWN   = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR = 135 // { int socketpair(int domain, int type, int protocol, int *rsv); }
 	// SYS_NOSYS = 133;  // { int nosys(void); }
 	// SYS_NOSYS = 134;  // { int nosys(void); }
 	// SYS_NOSYS = 135;  // { int nosys(void); }
-	SYS_MKDIR	= 136;	// { int mkdir(user_addr_t path, int mode); }
-	SYS_RMDIR	= 137;	// { int rmdir(char *path); }
-	SYS_UTIMES	= 138;	// { int utimes(char *path, struct timeval *tptr); }
-	SYS_FUTIMES	= 139;	// { int futimes(int fd, struct timeval *tptr); }
-	SYS_ADJTIME	= 140;	// { int adjtime(struct timeval *delta, struct timeval *olddelta); }
+	SYS_MKDIR   = 136 // { int mkdir(user_addr_t path, int mode); }
+	SYS_RMDIR   = 137 // { int rmdir(char *path); }
+	SYS_UTIMES  = 138 // { int utimes(char *path, struct timeval *tptr); }
+	SYS_FUTIMES = 139 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_ADJTIME = 140 // { int adjtime(struct timeval *delta, struct timeval *olddelta); }
 	// SYS_NOSYS = 141;  // { int nosys(void); }   { old getpeername }
-	SYS_GETHOSTUUID	= 142;	// { int gethostuuid(unsigned char *uuid_buf, const struct timespec *timeoutp); }
+	SYS_GETHOSTUUID = 142 // { int gethostuuid(unsigned char *uuid_buf, const struct timespec *timeoutp); }
 	// SYS_NOSYS = 143;  // { int nosys(void); }   { old sethostid 	}
 	// SYS_NOSYS = 144;  // { int nosys(void); }   { old getrlimit }
 	// SYS_NOSYS = 145;  // { int nosys(void); }   { old setrlimit }
 	// SYS_NOSYS = 146;  // { int nosys(void); }   { old killpg }
-	SYS_SETSID	= 147;	// { int setsid(void); }
+	SYS_SETSID = 147 // { int setsid(void); }
 	// SYS_NOSYS = 148;  // { int nosys(void); }   { old setquota }
 	// SYS_NOSYS = 149;  // { int nosys(void); }   { old qquota }
 	// SYS_NOSYS = 150;  // { int nosys(void); }   { old getsockname }
-	SYS_GETPGID	= 151;	// { int getpgid(pid_t pid); }
-	SYS_SETPRIVEXEC	= 152;	// { int setprivexec(int flag); }
-	SYS_PREAD	= 153;	// { user_ssize_t pread(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
-	SYS_PWRITE	= 154;	// { user_ssize_t pwrite(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
-	SYS_NFSSVC	= 155;	// { int nfssvc(int flag, caddr_t argp); }
+	SYS_GETPGID     = 151 // { int getpgid(pid_t pid); }
+	SYS_SETPRIVEXEC = 152 // { int setprivexec(int flag); }
+	SYS_PREAD       = 153 // { user_ssize_t pread(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
+	SYS_PWRITE      = 154 // { user_ssize_t pwrite(int fd, user_addr_t buf, user_size_t nbyte, off_t offset); }
+	SYS_NFSSVC      = 155 // { int nfssvc(int flag, caddr_t argp); }
 	// SYS_NOSYS = 155;  // { int nosys(void); }
 	// SYS_NOSYS = 156;  // { int nosys(void); }   { old getdirentries }
-	SYS_STATFS	= 157;	// { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS	= 158;	// { int fstatfs(int fd, struct statfs *buf); }
-	SYS_UNMOUNT	= 159;	// { int unmount(user_addr_t path, int flags); }
+	SYS_STATFS  = 157 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS = 158 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_UNMOUNT = 159 // { int unmount(user_addr_t path, int flags); }
 	// SYS_NOSYS = 160;  // { int nosys(void); }   { old async_daemon }
-	SYS_GETFH	= 161;	// { int getfh(char *fname, fhandle_t *fhp); }
+	SYS_GETFH = 161 // { int getfh(char *fname, fhandle_t *fhp); }
 	// SYS_NOSYS = 161;  // { int nosys(void); }
 	// SYS_NOSYS = 162;  // { int nosys(void); }   { old getdomainname }
 	// SYS_NOSYS = 163;  // { int nosys(void); }   { old setdomainname }
 	// SYS_NOSYS = 164;  // { int nosys(void); }
-	SYS_QUOTACTL	= 165;	// { int quotactl(const char *path, int cmd, int uid, caddr_t arg); }
+	SYS_QUOTACTL = 165 // { int quotactl(const char *path, int cmd, int uid, caddr_t arg); }
 	// SYS_NOSYS = 166;  // { int nosys(void); }   { old exportfs }
-	SYS_MOUNT	= 167;	// { int mount(char *type, char *path, int flags, caddr_t data); }
+	SYS_MOUNT = 167 // { int mount(char *type, char *path, int flags, caddr_t data); }
 	// SYS_NOSYS = 168;  // { int nosys(void); }   { old ustat }
-	SYS_CSOPS	= 169;	// { int csops(pid_t pid, uint32_t ops, user_addr_t useraddr, user_size_t usersize); }
+	SYS_CSOPS = 169 // { int csops(pid_t pid, uint32_t ops, user_addr_t useraddr, user_size_t usersize); }
 	// SYS_NOSYS = 171;  // { int nosys(void); }   { old wait3 }
 	// SYS_NOSYS = 172;  // { int nosys(void); }   { old rpause	}
-	SYS_WAITID	= 173;	// { int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options); }
+	SYS_WAITID = 173 // { int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options); }
 	// SYS_NOSYS = 174;  // { int nosys(void); }   { old getdents }
 	// SYS_NOSYS = 175;  // { int nosys(void); }   { old gc_control }
-	SYS_ADD_PROFIL	= 176;	// { int add_profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
+	SYS_ADD_PROFIL = 176 // { int add_profil(short *bufbase, size_t bufsize, u_long pcoffset, u_int pcscale); }
 	// SYS_NOSYS = 177;  // { int nosys(void); }
 	// SYS_NOSYS = 178;  // { int nosys(void); }
 	// SYS_NOSYS = 179;  // { int nosys(void); }
-	SYS_KDEBUG_TRACE	= 180;	// { int kdebug_trace(int code, int arg1, int arg2, int arg3, int arg4, int arg5) NO_SYSCALL_STUB; }
-	SYS_SETGID		= 181;	// { int setgid(gid_t gid); }
-	SYS_SETEGID		= 182;	// { int setegid(gid_t egid); }
-	SYS_SETEUID		= 183;	// { int seteuid(uid_t euid); }
-	SYS_SIGRETURN		= 184;	// { int sigreturn(struct ucontext *uctx, int infostyle); }
+	SYS_KDEBUG_TRACE = 180 // { int kdebug_trace(int code, int arg1, int arg2, int arg3, int arg4, int arg5) NO_SYSCALL_STUB; }
+	SYS_SETGID       = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID      = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID      = 183 // { int seteuid(uid_t euid); }
+	SYS_SIGRETURN    = 184 // { int sigreturn(struct ucontext *uctx, int infostyle); }
 	// SYS_NOSYS = 186;  // { int nosys(void); }
 	// SYS_NOSYS = 187;  // { int nosys(void); }
-	SYS_STAT	= 188;	// { int stat(user_addr_t path, user_addr_t ub); }
-	SYS_FSTAT	= 189;	// { int fstat(int fd, user_addr_t ub); }
-	SYS_LSTAT	= 190;	// { int lstat(user_addr_t path, user_addr_t ub); }
-	SYS_PATHCONF	= 191;	// { int pathconf(char *path, int name); }
-	SYS_FPATHCONF	= 192;	// { int fpathconf(int fd, int name); }
+	SYS_STAT      = 188 // { int stat(user_addr_t path, user_addr_t ub); }
+	SYS_FSTAT     = 189 // { int fstat(int fd, user_addr_t ub); }
+	SYS_LSTAT     = 190 // { int lstat(user_addr_t path, user_addr_t ub); }
+	SYS_PATHCONF  = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF = 192 // { int fpathconf(int fd, int name); }
 	// SYS_NOSYS = 193;  // { int nosys(void); }
-	SYS_GETRLIMIT		= 194;	// { int getrlimit(u_int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT		= 195;	// { int setrlimit(u_int which, struct rlimit *rlp); }
-	SYS_GETDIRENTRIES	= 196;	// { int getdirentries(int fd, char *buf, u_int count, long *basep); }
-	SYS_MMAP		= 197;	// { user_addr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
+	SYS_GETRLIMIT     = 194 // { int getrlimit(u_int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT     = 195 // { int setrlimit(u_int which, struct rlimit *rlp); }
+	SYS_GETDIRENTRIES = 196 // { int getdirentries(int fd, char *buf, u_int count, long *basep); }
+	SYS_MMAP          = 197 // { user_addr_t mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos); }
 	// SYS_NOSYS = 198;  // { int nosys(void); } 	{ __syscall }
-	SYS_LSEEK	= 199;	// { off_t lseek(int fd, off_t offset, int whence); }
-	SYS_TRUNCATE	= 200;	// { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE	= 201;	// { int ftruncate(int fd, off_t length); }
-	SYS___SYSCTL	= 202;	// { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
-	SYS_MLOCK	= 203;	// { int mlock(caddr_t addr, size_t len); }
-	SYS_MUNLOCK	= 204;	// { int munlock(caddr_t addr, size_t len); }
-	SYS_UNDELETE	= 205;	// { int undelete(user_addr_t path); }
-	SYS_ATSOCKET	= 206;	// { int ATsocket(int proto); }
+	SYS_LSEEK     = 199 // { off_t lseek(int fd, off_t offset, int whence); }
+	SYS_TRUNCATE  = 200 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE = 201 // { int ftruncate(int fd, off_t length); }
+	SYS___SYSCTL  = 202 // { int __sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen); }
+	SYS_MLOCK     = 203 // { int mlock(caddr_t addr, size_t len); }
+	SYS_MUNLOCK   = 204 // { int munlock(caddr_t addr, size_t len); }
+	SYS_UNDELETE  = 205 // { int undelete(user_addr_t path); }
+	SYS_ATSOCKET  = 206 // { int ATsocket(int proto); }
 	// SYS_NOSYS = 213;  // { int nosys(void); } 	{ Reserved for AppleTalk }
 	// SYS_NOSYS = 206;  // { int nosys(void); }
 	// SYS_NOSYS = 207;  // { int nosys(void); }
@@ -237,166 +237,166 @@ const (
 	// SYS_NOSYS = 211;  // { int nosys(void); }
 	// SYS_NOSYS = 212;  // { int nosys(void); }
 	// SYS_NOSYS = 213;  // { int nosys(void); } 	{ Reserved for AppleTalk }
-	SYS_KQUEUE_FROM_PORTSET_NP	= 214;	// { int kqueue_from_portset_np(int portset); }
-	SYS_KQUEUE_PORTSET_NP		= 215;	// { int kqueue_portset_np(int fd); }
-	SYS_GETATTRLIST			= 220;	// { int getattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
-	SYS_SETATTRLIST			= 221;	// { int setattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
-	SYS_GETDIRENTRIESATTR		= 222;	// { int getdirentriesattr(int fd, struct attrlist *alist, void *buffer, size_t buffersize, u_long *count, u_long *basep, u_long *newstate, u_long options); }
-	SYS_EXCHANGEDATA		= 223;	// { int exchangedata(const char *path1, const char *path2, u_long options); }
+	SYS_KQUEUE_FROM_PORTSET_NP = 214 // { int kqueue_from_portset_np(int portset); }
+	SYS_KQUEUE_PORTSET_NP      = 215 // { int kqueue_portset_np(int fd); }
+	SYS_GETATTRLIST            = 220 // { int getattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
+	SYS_SETATTRLIST            = 221 // { int setattrlist(const char *path, struct attrlist *alist, void *attributeBuffer, size_t bufferSize, u_long options); }
+	SYS_GETDIRENTRIESATTR      = 222 // { int getdirentriesattr(int fd, struct attrlist *alist, void *buffer, size_t buffersize, u_long *count, u_long *basep, u_long *newstate, u_long options); }
+	SYS_EXCHANGEDATA           = 223 // { int exchangedata(const char *path1, const char *path2, u_long options); }
 	// SYS_NOSYS = 224;  // { int nosys(void); } { was checkuseraccess }
-	SYS_SEARCHFS	= 225;	// { int searchfs(const char *path, struct fssearchblock *searchblock, u_long *nummatches, u_long scriptcode, u_long options, struct searchstate *state); }
-	SYS_DELETE	= 226;	// { int delete(user_addr_t path) NO_SYSCALL_STUB; }       { private delete (Carbon semantics) }
-	SYS_COPYFILE	= 227;	// { int copyfile(char *from, char *to, int mode, int flags) NO_SYSCALL_STUB; }
+	SYS_SEARCHFS = 225 // { int searchfs(const char *path, struct fssearchblock *searchblock, u_long *nummatches, u_long scriptcode, u_long options, struct searchstate *state); }
+	SYS_DELETE   = 226 // { int delete(user_addr_t path) NO_SYSCALL_STUB; }       { private delete (Carbon semantics) }
+	SYS_COPYFILE = 227 // { int copyfile(char *from, char *to, int mode, int flags) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 228;  // { int nosys(void); }
 	// SYS_NOSYS = 229;  // { int nosys(void); }
-	SYS_POLL		= 230;	// { int poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_WATCHEVENT		= 231;	// { int watchevent(struct eventreq *u_req, int u_eventmask); }
-	SYS_WAITEVENT		= 232;	// { int waitevent(struct eventreq *u_req, struct timeval *tv); }
-	SYS_MODWATCH		= 233;	// { int modwatch(struct eventreq *u_req, int u_eventmask); }
-	SYS_GETXATTR		= 234;	// { user_ssize_t getxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_FGETXATTR		= 235;	// { user_ssize_t fgetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_SETXATTR		= 236;	// { int setxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_FSETXATTR		= 237;	// { int fsetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
-	SYS_REMOVEXATTR		= 238;	// { int removexattr(user_addr_t path, user_addr_t attrname, int options); }
-	SYS_FREMOVEXATTR	= 239;	// { int fremovexattr(int fd, user_addr_t attrname, int options); }
-	SYS_LISTXATTR		= 240;	// { user_ssize_t listxattr(user_addr_t path, user_addr_t namebuf, size_t bufsize, int options); }
-	SYS_FLISTXATTR		= 241;	// { user_ssize_t flistxattr(int fd, user_addr_t namebuf, size_t bufsize, int options); }
-	SYS_FSCTL		= 242;	// { int fsctl(const char *path, u_long cmd, caddr_t data, u_long options); }
-	SYS_INITGROUPS		= 243;	// { int initgroups(u_int gidsetsize, gid_t *gidset, int gmuid); }
-	SYS_POSIX_SPAWN		= 244;	// { int posix_spawn(pid_t *pid, const char *path, const struct _posix_spawn_args_desc *adesc, char **argv, char **envp); }
+	SYS_POLL         = 230 // { int poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_WATCHEVENT   = 231 // { int watchevent(struct eventreq *u_req, int u_eventmask); }
+	SYS_WAITEVENT    = 232 // { int waitevent(struct eventreq *u_req, struct timeval *tv); }
+	SYS_MODWATCH     = 233 // { int modwatch(struct eventreq *u_req, int u_eventmask); }
+	SYS_GETXATTR     = 234 // { user_ssize_t getxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_FGETXATTR    = 235 // { user_ssize_t fgetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_SETXATTR     = 236 // { int setxattr(user_addr_t path, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_FSETXATTR    = 237 // { int fsetxattr(int fd, user_addr_t attrname, user_addr_t value, size_t size, uint32_t position, int options); }
+	SYS_REMOVEXATTR  = 238 // { int removexattr(user_addr_t path, user_addr_t attrname, int options); }
+	SYS_FREMOVEXATTR = 239 // { int fremovexattr(int fd, user_addr_t attrname, int options); }
+	SYS_LISTXATTR    = 240 // { user_ssize_t listxattr(user_addr_t path, user_addr_t namebuf, size_t bufsize, int options); }
+	SYS_FLISTXATTR   = 241 // { user_ssize_t flistxattr(int fd, user_addr_t namebuf, size_t bufsize, int options); }
+	SYS_FSCTL        = 242 // { int fsctl(const char *path, u_long cmd, caddr_t data, u_long options); }
+	SYS_INITGROUPS   = 243 // { int initgroups(u_int gidsetsize, gid_t *gidset, int gmuid); }
+	SYS_POSIX_SPAWN  = 244 // { int posix_spawn(pid_t *pid, const char *path, const struct _posix_spawn_args_desc *adesc, char **argv, char **envp); }
 	// SYS_NOSYS = 245;  // { int nosys(void); }
 	// SYS_NOSYS = 246;  // { int nosys(void); }
-	SYS_NFSCLNT	= 247;	// { int nfsclnt(int flag, caddr_t argp); }
+	SYS_NFSCLNT = 247 // { int nfsclnt(int flag, caddr_t argp); }
 	// SYS_NOSYS = 247;  // { int nosys(void); }
-	SYS_FHOPEN	= 248;	// { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_FHOPEN = 248 // { int fhopen(const struct fhandle *u_fhp, int flags); }
 	// SYS_NOSYS = 248;  // { int nosys(void); }
 	// SYS_NOSYS = 249;  // { int nosys(void); }
-	SYS_MINHERIT	= 250;	// { int minherit(void *addr, size_t len, int inherit); }
-	SYS_SEMSYS	= 251;	// { int semsys(u_int which, int a2, int a3, int a4, int a5); }
+	SYS_MINHERIT = 250 // { int minherit(void *addr, size_t len, int inherit); }
+	SYS_SEMSYS   = 251 // { int semsys(u_int which, int a2, int a3, int a4, int a5); }
 	// SYS_NOSYS = 251;  // { int nosys(void); }
-	SYS_MSGSYS	= 252;	// { int msgsys(u_int which, int a2, int a3, int a4, int a5); }
+	SYS_MSGSYS = 252 // { int msgsys(u_int which, int a2, int a3, int a4, int a5); }
 	// SYS_NOSYS = 252;  // { int nosys(void); }
-	SYS_SHMSYS	= 253;	// { int shmsys(u_int which, int a2, int a3, int a4); }
+	SYS_SHMSYS = 253 // { int shmsys(u_int which, int a2, int a3, int a4); }
 	// SYS_NOSYS = 253;  // { int nosys(void); }
-	SYS_SEMCTL	= 254;	// { int semctl(int semid, int semnum, int cmd, semun_t arg); }
-	SYS_SEMGET	= 255;	// { int semget(key_t key, int	nsems, int semflg); }
-	SYS_SEMOP	= 256;	// { int semop(int semid, struct sembuf *sops, int nsops); }
+	SYS_SEMCTL = 254 // { int semctl(int semid, int semnum, int cmd, semun_t arg); }
+	SYS_SEMGET = 255 // { int semget(key_t key, int	nsems, int semflg); }
+	SYS_SEMOP  = 256 // { int semop(int semid, struct sembuf *sops, int nsops); }
 	// SYS_NOSYS = 257;  // { int nosys(void); }
 	// SYS_NOSYS = 254;  // { int nosys(void); }
 	// SYS_NOSYS = 255;  // { int nosys(void); }
 	// SYS_NOSYS = 256;  // { int nosys(void); }
 	// SYS_NOSYS = 257;  // { int nosys(void); }
-	SYS_MSGCTL	= 258;	// { int msgctl(int msqid, int cmd, struct	msqid_ds *buf); }
-	SYS_MSGGET	= 259;	// { int msgget(key_t key, int msgflg); }
-	SYS_MSGSND	= 260;	// { int msgsnd(int msqid, void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV	= 261;	// { user_ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_MSGCTL = 258 // { int msgctl(int msqid, int cmd, struct	msqid_ds *buf); }
+	SYS_MSGGET = 259 // { int msgget(key_t key, int msgflg); }
+	SYS_MSGSND = 260 // { int msgsnd(int msqid, void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV = 261 // { user_ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
 	// SYS_NOSYS = 258;  // { int nosys(void); }
 	// SYS_NOSYS = 259;  // { int nosys(void); }
 	// SYS_NOSYS = 260;  // { int nosys(void); }
 	// SYS_NOSYS = 261;  // { int nosys(void); }
-	SYS_SHMAT	= 262;	// { user_addr_t shmat(int shmid, void *shmaddr, int shmflg); }
-	SYS_SHMCTL	= 263;	// { int shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_SHMDT	= 264;	// { int shmdt(void *shmaddr); }
-	SYS_SHMGET	= 265;	// { int shmget(key_t key, size_t size, int shmflg); }
+	SYS_SHMAT  = 262 // { user_addr_t shmat(int shmid, void *shmaddr, int shmflg); }
+	SYS_SHMCTL = 263 // { int shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_SHMDT  = 264 // { int shmdt(void *shmaddr); }
+	SYS_SHMGET = 265 // { int shmget(key_t key, size_t size, int shmflg); }
 	// SYS_NOSYS = 262;  // { int nosys(void); }
 	// SYS_NOSYS = 263;  // { int nosys(void); }
 	// SYS_NOSYS = 264;  // { int nosys(void); }
 	// SYS_NOSYS = 265;  // { int nosys(void); }
-	SYS_SHM_OPEN			= 266;	// { int shm_open(const char *name, int oflag, int mode); }
-	SYS_SHM_UNLINK			= 267;	// { int shm_unlink(const char *name); }
-	SYS_SEM_OPEN			= 268;	// { user_addr_t sem_open(const char *name, int oflag, int mode, int value); }
-	SYS_SEM_CLOSE			= 269;	// { int sem_close(sem_t *sem); }
-	SYS_SEM_UNLINK			= 270;	// { int sem_unlink(const char *name); }
-	SYS_SEM_WAIT			= 271;	// { int sem_wait(sem_t *sem); }
-	SYS_SEM_TRYWAIT			= 272;	// { int sem_trywait(sem_t *sem); }
-	SYS_SEM_POST			= 273;	// { int sem_post(sem_t *sem); }
-	SYS_SEM_GETVALUE		= 274;	// { int sem_getvalue(sem_t *sem, int *sval); }
-	SYS_SEM_INIT			= 275;	// { int sem_init(sem_t *sem, int phsared, u_int value); }
-	SYS_SEM_DESTROY			= 276;	// { int sem_destroy(sem_t *sem); }
-	SYS_OPEN_EXTENDED		= 277;	// { int open_extended(user_addr_t path, int flags, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_UMASK_EXTENDED		= 278;	// { int umask_extended(int newmask, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_STAT_EXTENDED		= 279;	// { int stat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_LSTAT_EXTENDED		= 280;	// { int lstat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_FSTAT_EXTENDED		= 281;	// { int fstat_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_CHMOD_EXTENDED		= 282;	// { int chmod_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_FCHMOD_EXTENDED		= 283;	// { int fchmod_extended(int fd, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_ACCESS_EXTENDED		= 284;	// { int access_extended(user_addr_t entries, size_t size, user_addr_t results, uid_t uid) NO_SYSCALL_STUB; }
-	SYS_SETTID			= 285;	// { int settid(uid_t uid, gid_t gid) NO_SYSCALL_STUB; }
-	SYS_GETTID			= 286;	// { int gettid(uid_t *uidp, gid_t *gidp) NO_SYSCALL_STUB; }
-	SYS_SETSGROUPS			= 287;	// { int setsgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_GETSGROUPS			= 288;	// { int getsgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_SETWGROUPS			= 289;	// { int setwgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_GETWGROUPS			= 290;	// { int getwgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
-	SYS_MKFIFO_EXTENDED		= 291;	// { int mkfifo_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_MKDIR_EXTENDED		= 292;	// { int mkdir_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
-	SYS_IDENTITYSVC			= 293;	// { int identitysvc(int opcode, user_addr_t message) NO_SYSCALL_STUB; }
-	SYS_SHARED_REGION_CHECK_NP	= 294;	// { int shared_region_check_np(uint64_t *start_address) NO_SYSCALL_STUB; }
-	SYS_SHARED_REGION_MAP_NP	= 295;	// { int shared_region_map_np(int fd, uint32_t count, const struct shared_file_mapping_np *mappings) NO_SYSCALL_STUB; }
+	SYS_SHM_OPEN               = 266 // { int shm_open(const char *name, int oflag, int mode); }
+	SYS_SHM_UNLINK             = 267 // { int shm_unlink(const char *name); }
+	SYS_SEM_OPEN               = 268 // { user_addr_t sem_open(const char *name, int oflag, int mode, int value); }
+	SYS_SEM_CLOSE              = 269 // { int sem_close(sem_t *sem); }
+	SYS_SEM_UNLINK             = 270 // { int sem_unlink(const char *name); }
+	SYS_SEM_WAIT               = 271 // { int sem_wait(sem_t *sem); }
+	SYS_SEM_TRYWAIT            = 272 // { int sem_trywait(sem_t *sem); }
+	SYS_SEM_POST               = 273 // { int sem_post(sem_t *sem); }
+	SYS_SEM_GETVALUE           = 274 // { int sem_getvalue(sem_t *sem, int *sval); }
+	SYS_SEM_INIT               = 275 // { int sem_init(sem_t *sem, int phsared, u_int value); }
+	SYS_SEM_DESTROY            = 276 // { int sem_destroy(sem_t *sem); }
+	SYS_OPEN_EXTENDED          = 277 // { int open_extended(user_addr_t path, int flags, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_UMASK_EXTENDED         = 278 // { int umask_extended(int newmask, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_STAT_EXTENDED          = 279 // { int stat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_LSTAT_EXTENDED         = 280 // { int lstat_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_FSTAT_EXTENDED         = 281 // { int fstat_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_CHMOD_EXTENDED         = 282 // { int chmod_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_FCHMOD_EXTENDED        = 283 // { int fchmod_extended(int fd, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_ACCESS_EXTENDED        = 284 // { int access_extended(user_addr_t entries, size_t size, user_addr_t results, uid_t uid) NO_SYSCALL_STUB; }
+	SYS_SETTID                 = 285 // { int settid(uid_t uid, gid_t gid) NO_SYSCALL_STUB; }
+	SYS_GETTID                 = 286 // { int gettid(uid_t *uidp, gid_t *gidp) NO_SYSCALL_STUB; }
+	SYS_SETSGROUPS             = 287 // { int setsgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_GETSGROUPS             = 288 // { int getsgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_SETWGROUPS             = 289 // { int setwgroups(int setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_GETWGROUPS             = 290 // { int getwgroups(user_addr_t setlen, user_addr_t guidset) NO_SYSCALL_STUB; }
+	SYS_MKFIFO_EXTENDED        = 291 // { int mkfifo_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_MKDIR_EXTENDED         = 292 // { int mkdir_extended(user_addr_t path, uid_t uid, gid_t gid, int mode, user_addr_t xsecurity) NO_SYSCALL_STUB; }
+	SYS_IDENTITYSVC            = 293 // { int identitysvc(int opcode, user_addr_t message) NO_SYSCALL_STUB; }
+	SYS_SHARED_REGION_CHECK_NP = 294 // { int shared_region_check_np(uint64_t *start_address) NO_SYSCALL_STUB; }
+	SYS_SHARED_REGION_MAP_NP   = 295 // { int shared_region_map_np(int fd, uint32_t count, const struct shared_file_mapping_np *mappings) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 296;  // { int nosys(void); } { old load_shared_file }
 	// SYS_NOSYS = 297;  // { int nosys(void); } { old reset_shared_file }
 	// SYS_NOSYS = 298;  // { int nosys(void); } { old new_system_shared_regions }
 	// SYS_ENOSYS = 299;  // { int enosys(void); } { old shared_region_map_file_np }
 	// SYS_ENOSYS = 300;  // { int enosys(void); } { old shared_region_make_private_np }
-	SYS___PTHREAD_MUTEX_DESTROY	= 301;	// { int __pthread_mutex_destroy(int mutexid); }
-	SYS___PTHREAD_MUTEX_INIT	= 302;	// { int __pthread_mutex_init(user_addr_t  mutex, user_addr_t attr); }
-	SYS___PTHREAD_MUTEX_LOCK	= 303;	// { int __pthread_mutex_lock(int mutexid); }
-	SYS___PTHREAD_MUTEX_TRYLOCK	= 304;	// { int __pthread_mutex_trylock(int mutexid); }
-	SYS___PTHREAD_MUTEX_UNLOCK	= 305;	// { int __pthread_mutex_unlock(int mutexid); }
-	SYS___PTHREAD_COND_INIT		= 306;	// { int __pthread_cond_init(user_addr_t cond, user_addr_t attr); }
-	SYS___PTHREAD_COND_DESTROY	= 307;	// { int __pthread_cond_destroy(int condid); }
-	SYS___PTHREAD_COND_BROADCAST	= 308;	// { int __pthread_cond_broadcast(int condid); }
-	SYS___PTHREAD_COND_SIGNAL	= 309;	// { int __pthread_cond_signal(int condid); }
-	SYS_GETSID			= 310;	// { int getsid(pid_t pid); }
-	SYS_SETTID_WITH_PID		= 311;	// { int settid_with_pid(pid_t pid, int assume) NO_SYSCALL_STUB; }
-	SYS___PTHREAD_COND_TIMEDWAIT	= 312;	// { int __pthread_cond_timedwait(int condid, int mutexid, user_addr_t abstime); }
-	SYS_AIO_FSYNC			= 313;	// { int aio_fsync(int op, user_addr_t aiocbp); }
-	SYS_AIO_RETURN			= 314;	// { user_ssize_t aio_return(user_addr_t aiocbp); }
-	SYS_AIO_SUSPEND			= 315;	// { int aio_suspend(user_addr_t aiocblist, int nent, user_addr_t timeoutp); }
-	SYS_AIO_CANCEL			= 316;	// { int aio_cancel(int fd, user_addr_t aiocbp); }
-	SYS_AIO_ERROR			= 317;	// { int aio_error(user_addr_t aiocbp); }
-	SYS_AIO_READ			= 318;	// { int aio_read(user_addr_t aiocbp); }
-	SYS_AIO_WRITE			= 319;	// { int aio_write(user_addr_t aiocbp); }
-	SYS_LIO_LISTIO			= 320;	// { int lio_listio(int mode, user_addr_t aiocblist, int nent, user_addr_t sigp); }
-	SYS___PTHREAD_COND_WAIT		= 321;	// { int __pthread_cond_wait(int condid, int mutexid); }
-	SYS_IOPOLICYSYS			= 322;	// { int iopolicysys(int cmd, void *arg) NO_SYSCALL_STUB; }
+	SYS___PTHREAD_MUTEX_DESTROY  = 301 // { int __pthread_mutex_destroy(int mutexid); }
+	SYS___PTHREAD_MUTEX_INIT     = 302 // { int __pthread_mutex_init(user_addr_t  mutex, user_addr_t attr); }
+	SYS___PTHREAD_MUTEX_LOCK     = 303 // { int __pthread_mutex_lock(int mutexid); }
+	SYS___PTHREAD_MUTEX_TRYLOCK  = 304 // { int __pthread_mutex_trylock(int mutexid); }
+	SYS___PTHREAD_MUTEX_UNLOCK   = 305 // { int __pthread_mutex_unlock(int mutexid); }
+	SYS___PTHREAD_COND_INIT      = 306 // { int __pthread_cond_init(user_addr_t cond, user_addr_t attr); }
+	SYS___PTHREAD_COND_DESTROY   = 307 // { int __pthread_cond_destroy(int condid); }
+	SYS___PTHREAD_COND_BROADCAST = 308 // { int __pthread_cond_broadcast(int condid); }
+	SYS___PTHREAD_COND_SIGNAL    = 309 // { int __pthread_cond_signal(int condid); }
+	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
+	SYS_SETTID_WITH_PID          = 311 // { int settid_with_pid(pid_t pid, int assume) NO_SYSCALL_STUB; }
+	SYS___PTHREAD_COND_TIMEDWAIT = 312 // { int __pthread_cond_timedwait(int condid, int mutexid, user_addr_t abstime); }
+	SYS_AIO_FSYNC                = 313 // { int aio_fsync(int op, user_addr_t aiocbp); }
+	SYS_AIO_RETURN               = 314 // { user_ssize_t aio_return(user_addr_t aiocbp); }
+	SYS_AIO_SUSPEND              = 315 // { int aio_suspend(user_addr_t aiocblist, int nent, user_addr_t timeoutp); }
+	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, user_addr_t aiocbp); }
+	SYS_AIO_ERROR                = 317 // { int aio_error(user_addr_t aiocbp); }
+	SYS_AIO_READ                 = 318 // { int aio_read(user_addr_t aiocbp); }
+	SYS_AIO_WRITE                = 319 // { int aio_write(user_addr_t aiocbp); }
+	SYS_LIO_LISTIO               = 320 // { int lio_listio(int mode, user_addr_t aiocblist, int nent, user_addr_t sigp); }
+	SYS___PTHREAD_COND_WAIT      = 321 // { int __pthread_cond_wait(int condid, int mutexid); }
+	SYS_IOPOLICYSYS              = 322 // { int iopolicysys(int cmd, void *arg) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 323;  // { int nosys(void); }
-	SYS_MLOCKALL	= 324;	// { int mlockall(int how); }
-	SYS_MUNLOCKALL	= 325;	// { int munlockall(int how); }
+	SYS_MLOCKALL   = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL = 325 // { int munlockall(int how); }
 	// SYS_NOSYS = 326;  // { int nosys(void); }
-	SYS_ISSETUGID			= 327;	// { int issetugid(void); }
-	SYS___PTHREAD_KILL		= 328;	// { int __pthread_kill(int thread_port, int sig); }
-	SYS___PTHREAD_SIGMASK		= 329;	// { int __pthread_sigmask(int how, user_addr_t set, user_addr_t oset); }
-	SYS___SIGWAIT			= 330;	// { int __sigwait(user_addr_t set, user_addr_t sig); }
-	SYS___DISABLE_THREADSIGNAL	= 331;	// { int __disable_threadsignal(int value); }
-	SYS___PTHREAD_MARKCANCEL	= 332;	// { int __pthread_markcancel(int thread_port); }
-	SYS___PTHREAD_CANCELED		= 333;	// { int __pthread_canceled(int  action); }
-	SYS___SEMWAIT_SIGNAL		= 334;	// { int __semwait_signal(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec); }
+	SYS_ISSETUGID              = 327 // { int issetugid(void); }
+	SYS___PTHREAD_KILL         = 328 // { int __pthread_kill(int thread_port, int sig); }
+	SYS___PTHREAD_SIGMASK      = 329 // { int __pthread_sigmask(int how, user_addr_t set, user_addr_t oset); }
+	SYS___SIGWAIT              = 330 // { int __sigwait(user_addr_t set, user_addr_t sig); }
+	SYS___DISABLE_THREADSIGNAL = 331 // { int __disable_threadsignal(int value); }
+	SYS___PTHREAD_MARKCANCEL   = 332 // { int __pthread_markcancel(int thread_port); }
+	SYS___PTHREAD_CANCELED     = 333 // { int __pthread_canceled(int  action); }
+	SYS___SEMWAIT_SIGNAL       = 334 // { int __semwait_signal(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec); }
 	// SYS_NOSYS = 335;  // { int nosys(void); }   { old utrace }
-	SYS_PROC_INFO	= 336;	// { int proc_info(int32_t callnum,int32_t pid,uint32_t flavor, uint64_t arg,user_addr_t buffer,int32_t buffersize) NO_SYSCALL_STUB; }
-	SYS_SENDFILE	= 337;	// { int sendfile(int fd, int s, off_t offset, off_t *nbytes, struct sf_hdtr *hdtr, int flags); }
+	SYS_PROC_INFO = 336 // { int proc_info(int32_t callnum,int32_t pid,uint32_t flavor, uint64_t arg,user_addr_t buffer,int32_t buffersize) NO_SYSCALL_STUB; }
+	SYS_SENDFILE  = 337 // { int sendfile(int fd, int s, off_t offset, off_t *nbytes, struct sf_hdtr *hdtr, int flags); }
 	// SYS_NOSYS = 337;  // { int nosys(void); }
-	SYS_STAT64		= 338;	// { int stat64(user_addr_t path, user_addr_t ub); }
-	SYS_FSTAT64		= 339;	// { int fstat64(int fd, user_addr_t ub); }
-	SYS_LSTAT64		= 340;	// { int lstat64(user_addr_t path, user_addr_t ub); }
-	SYS_STAT64_EXTENDED	= 341;	// { int stat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_LSTAT64_EXTENDED	= 342;	// { int lstat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_FSTAT64_EXTENDED	= 343;	// { int fstat64_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
-	SYS_GETDIRENTRIES64	= 344;	// { user_ssize_t getdirentries64(int fd, void *buf, user_size_t bufsize, off_t *position) NO_SYSCALL_STUB; }
-	SYS_STATFS64		= 345;	// { int statfs64(char *path, struct statfs64 *buf); }
-	SYS_FSTATFS64		= 346;	// { int fstatfs64(int fd, struct statfs64 *buf); }
-	SYS_GETFSSTAT64		= 347;	// { int getfsstat64(user_addr_t buf, int bufsize, int flags); }
-	SYS___PTHREAD_CHDIR	= 348;	// { int __pthread_chdir(user_addr_t path); }
-	SYS___PTHREAD_FCHDIR	= 349;	// { int __pthread_fchdir(int fd); }
-	SYS_AUDIT		= 350;	// { int audit(void *record, int length); }
-	SYS_AUDITON		= 351;	// { int auditon(int cmd, void *data, int length); }
+	SYS_STAT64           = 338 // { int stat64(user_addr_t path, user_addr_t ub); }
+	SYS_FSTAT64          = 339 // { int fstat64(int fd, user_addr_t ub); }
+	SYS_LSTAT64          = 340 // { int lstat64(user_addr_t path, user_addr_t ub); }
+	SYS_STAT64_EXTENDED  = 341 // { int stat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_LSTAT64_EXTENDED = 342 // { int lstat64_extended(user_addr_t path, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_FSTAT64_EXTENDED = 343 // { int fstat64_extended(int fd, user_addr_t ub, user_addr_t xsecurity, user_addr_t xsecurity_size) NO_SYSCALL_STUB; }
+	SYS_GETDIRENTRIES64  = 344 // { user_ssize_t getdirentries64(int fd, void *buf, user_size_t bufsize, off_t *position) NO_SYSCALL_STUB; }
+	SYS_STATFS64         = 345 // { int statfs64(char *path, struct statfs64 *buf); }
+	SYS_FSTATFS64        = 346 // { int fstatfs64(int fd, struct statfs64 *buf); }
+	SYS_GETFSSTAT64      = 347 // { int getfsstat64(user_addr_t buf, int bufsize, int flags); }
+	SYS___PTHREAD_CHDIR  = 348 // { int __pthread_chdir(user_addr_t path); }
+	SYS___PTHREAD_FCHDIR = 349 // { int __pthread_fchdir(int fd); }
+	SYS_AUDIT            = 350 // { int audit(void *record, int length); }
+	SYS_AUDITON          = 351 // { int auditon(int cmd, void *data, int length); }
 	// SYS_NOSYS = 352;  // { int nosys(void); }
-	SYS_GETAUID		= 353;	// { int getauid(au_id_t *auid); }
-	SYS_SETAUID		= 354;	// { int setauid(au_id_t *auid); }
-	SYS_GETAUDIT		= 355;	// { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT		= 356;	// { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR	= 357;	// { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
-	SYS_SETAUDIT_ADDR	= 358;	// { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
-	SYS_AUDITCTL		= 359;	// { int auditctl(char *path); }
+	SYS_GETAUID       = 353 // { int getauid(au_id_t *auid); }
+	SYS_SETAUID       = 354 // { int setauid(au_id_t *auid); }
+	SYS_GETAUDIT      = 355 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT      = 356 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR = 357 // { int getaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
+	SYS_SETAUDIT_ADDR = 358 // { int setaudit_addr(struct auditinfo_addr *auditinfo_addr, int length); }
+	SYS_AUDITCTL      = 359 // { int auditctl(char *path); }
 	// SYS_NOSYS = 350;  // { int nosys(void); }
 	// SYS_NOSYS = 351;  // { int nosys(void); }
 	// SYS_NOSYS = 352;  // { int nosys(void); }
@@ -407,15 +407,15 @@ const (
 	// SYS_NOSYS = 357;  // { int nosys(void); }
 	// SYS_NOSYS = 358;  // { int nosys(void); }
 	// SYS_NOSYS = 359;  // { int nosys(void); }
-	SYS_BSDTHREAD_CREATE	= 360;	// { user_addr_t bsdthread_create(user_addr_t func, user_addr_t func_arg, user_addr_t stack, user_addr_t pthread, uint32_t flags) NO_SYSCALL_STUB; }
-	SYS_BSDTHREAD_TERMINATE	= 361;	// { int bsdthread_terminate(user_addr_t stackaddr, size_t freesize, uint32_t port, uint32_t sem) NO_SYSCALL_STUB; }
-	SYS_KQUEUE		= 362;	// { int kqueue(void); }
-	SYS_KEVENT		= 363;	// { int kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
-	SYS_LCHOWN		= 364;	// { int lchown(user_addr_t path, uid_t owner, gid_t group); }
-	SYS_STACK_SNAPSHOT	= 365;	// { int stack_snapshot(pid_t pid, user_addr_t tracebuf, uint32_t tracebuf_size, uint32_t options) NO_SYSCALL_STUB; }
-	SYS_BSDTHREAD_REGISTER	= 366;	// { int bsdthread_register(user_addr_t threadstart, user_addr_t wqthread, int pthsize) NO_SYSCALL_STUB; }
-	SYS_WORKQ_OPEN		= 367;	// { int workq_open(void) NO_SYSCALL_STUB; }
-	SYS_WORKQ_OPS		= 368;	// { int workq_ops(int options, user_addr_t item, int prio) NO_SYSCALL_STUB; }
+	SYS_BSDTHREAD_CREATE    = 360 // { user_addr_t bsdthread_create(user_addr_t func, user_addr_t func_arg, user_addr_t stack, user_addr_t pthread, uint32_t flags) NO_SYSCALL_STUB; }
+	SYS_BSDTHREAD_TERMINATE = 361 // { int bsdthread_terminate(user_addr_t stackaddr, size_t freesize, uint32_t port, uint32_t sem) NO_SYSCALL_STUB; }
+	SYS_KQUEUE              = 362 // { int kqueue(void); }
+	SYS_KEVENT              = 363 // { int kevent(int fd, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout); }
+	SYS_LCHOWN              = 364 // { int lchown(user_addr_t path, uid_t owner, gid_t group); }
+	SYS_STACK_SNAPSHOT      = 365 // { int stack_snapshot(pid_t pid, user_addr_t tracebuf, uint32_t tracebuf_size, uint32_t options) NO_SYSCALL_STUB; }
+	SYS_BSDTHREAD_REGISTER  = 366 // { int bsdthread_register(user_addr_t threadstart, user_addr_t wqthread, int pthsize) NO_SYSCALL_STUB; }
+	SYS_WORKQ_OPEN          = 367 // { int workq_open(void) NO_SYSCALL_STUB; }
+	SYS_WORKQ_OPS           = 368 // { int workq_ops(int options, user_addr_t item, int prio) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 369;  // { int nosys(void); }
 	// SYS_NOSYS = 370;  // { int nosys(void); }
 	// SYS_NOSYS = 371;  // { int nosys(void); }
@@ -427,59 +427,59 @@ const (
 	// SYS_NOSYS = 377;  // { int nosys(void); }
 	// SYS_NOSYS = 378;  // { int nosys(void); }
 	// SYS_NOSYS = 379;  // { int nosys(void); }
-	SYS___MAC_EXECVE	= 380;	// { int __mac_execve(char *fname, char **argp, char **envp, struct mac *mac_p); }
-	SYS___MAC_SYSCALL	= 381;	// { int __mac_syscall(char *policy, int call, user_addr_t arg); }
-	SYS___MAC_GET_FILE	= 382;	// { int __mac_get_file(char *path_p, struct mac *mac_p); }
-	SYS___MAC_SET_FILE	= 383;	// { int __mac_set_file(char *path_p, struct mac *mac_p); }
-	SYS___MAC_GET_LINK	= 384;	// { int __mac_get_link(char *path_p, struct mac *mac_p); }
-	SYS___MAC_SET_LINK	= 385;	// { int __mac_set_link(char *path_p, struct mac *mac_p); }
-	SYS___MAC_GET_PROC	= 386;	// { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC	= 387;	// { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD	= 388;	// { int __mac_get_fd(int fd, struct mac *mac_p); }
-	SYS___MAC_SET_FD	= 389;	// { int __mac_set_fd(int fd, struct mac *mac_p); }
-	SYS___MAC_GET_PID	= 390;	// { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
-	SYS___MAC_GET_LCID	= 391;	// { int __mac_get_lcid(pid_t lcid, struct mac *mac_p); }
-	SYS___MAC_GET_LCTX	= 392;	// { int __mac_get_lctx(struct mac *mac_p); }
-	SYS___MAC_SET_LCTX	= 393;	// { int __mac_set_lctx(struct mac *mac_p); }
-	SYS_SETLCID		= 394;	// { int setlcid(pid_t pid, pid_t lcid) NO_SYSCALL_STUB; }
-	SYS_GETLCID		= 395;	// { int getlcid(pid_t pid) NO_SYSCALL_STUB; }
-	SYS_READ_NOCANCEL	= 396;	// { user_ssize_t read_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
-	SYS_WRITE_NOCANCEL	= 397;	// { user_ssize_t write_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
-	SYS_OPEN_NOCANCEL	= 398;	// { int open_nocancel(user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; }
-	SYS_CLOSE_NOCANCEL	= 399;	// { int close_nocancel(int fd) NO_SYSCALL_STUB; }
-	SYS_WAIT4_NOCANCEL	= 400;	// { int wait4_nocancel(int pid, user_addr_t status, int options, user_addr_t rusage) NO_SYSCALL_STUB; }
-	SYS_RECVMSG_NOCANCEL	= 401;	// { int recvmsg_nocancel(int s, struct msghdr *msg, int flags) NO_SYSCALL_STUB; }
-	SYS_SENDMSG_NOCANCEL	= 402;	// { int sendmsg_nocancel(int s, caddr_t msg, int flags) NO_SYSCALL_STUB; }
-	SYS_RECVFROM_NOCANCEL	= 403;	// { int recvfrom_nocancel(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr) NO_SYSCALL_STUB; }
-	SYS_ACCEPT_NOCANCEL	= 404;	// { int accept_nocancel(int s, caddr_t name, socklen_t	*anamelen) NO_SYSCALL_STUB; }
+	SYS___MAC_EXECVE      = 380 // { int __mac_execve(char *fname, char **argp, char **envp, struct mac *mac_p); }
+	SYS___MAC_SYSCALL     = 381 // { int __mac_syscall(char *policy, int call, user_addr_t arg); }
+	SYS___MAC_GET_FILE    = 382 // { int __mac_get_file(char *path_p, struct mac *mac_p); }
+	SYS___MAC_SET_FILE    = 383 // { int __mac_set_file(char *path_p, struct mac *mac_p); }
+	SYS___MAC_GET_LINK    = 384 // { int __mac_get_link(char *path_p, struct mac *mac_p); }
+	SYS___MAC_SET_LINK    = 385 // { int __mac_set_link(char *path_p, struct mac *mac_p); }
+	SYS___MAC_GET_PROC    = 386 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC    = 387 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD      = 388 // { int __mac_get_fd(int fd, struct mac *mac_p); }
+	SYS___MAC_SET_FD      = 389 // { int __mac_set_fd(int fd, struct mac *mac_p); }
+	SYS___MAC_GET_PID     = 390 // { int __mac_get_pid(pid_t pid, struct mac *mac_p); }
+	SYS___MAC_GET_LCID    = 391 // { int __mac_get_lcid(pid_t lcid, struct mac *mac_p); }
+	SYS___MAC_GET_LCTX    = 392 // { int __mac_get_lctx(struct mac *mac_p); }
+	SYS___MAC_SET_LCTX    = 393 // { int __mac_set_lctx(struct mac *mac_p); }
+	SYS_SETLCID           = 394 // { int setlcid(pid_t pid, pid_t lcid) NO_SYSCALL_STUB; }
+	SYS_GETLCID           = 395 // { int getlcid(pid_t pid) NO_SYSCALL_STUB; }
+	SYS_READ_NOCANCEL     = 396 // { user_ssize_t read_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
+	SYS_WRITE_NOCANCEL    = 397 // { user_ssize_t write_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; }
+	SYS_OPEN_NOCANCEL     = 398 // { int open_nocancel(user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; }
+	SYS_CLOSE_NOCANCEL    = 399 // { int close_nocancel(int fd) NO_SYSCALL_STUB; }
+	SYS_WAIT4_NOCANCEL    = 400 // { int wait4_nocancel(int pid, user_addr_t status, int options, user_addr_t rusage) NO_SYSCALL_STUB; }
+	SYS_RECVMSG_NOCANCEL  = 401 // { int recvmsg_nocancel(int s, struct msghdr *msg, int flags) NO_SYSCALL_STUB; }
+	SYS_SENDMSG_NOCANCEL  = 402 // { int sendmsg_nocancel(int s, caddr_t msg, int flags) NO_SYSCALL_STUB; }
+	SYS_RECVFROM_NOCANCEL = 403 // { int recvfrom_nocancel(int s, void *buf, size_t len, int flags, struct sockaddr *from, int *fromlenaddr) NO_SYSCALL_STUB; }
+	SYS_ACCEPT_NOCANCEL   = 404 // { int accept_nocancel(int s, caddr_t name, socklen_t	*anamelen) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 401;  // { int nosys(void); }
 	// SYS_NOSYS = 402;  // { int nosys(void); }
 	// SYS_NOSYS = 403;  // { int nosys(void); }
 	// SYS_NOSYS = 404;  // { int nosys(void); }
-	SYS_MSYNC_NOCANCEL	= 405;	// { int msync_nocancel(caddr_t addr, size_t len, int flags) NO_SYSCALL_STUB; }
-	SYS_FCNTL_NOCANCEL	= 406;	// { int fcntl_nocancel(int fd, int cmd, long arg) NO_SYSCALL_STUB; }
-	SYS_SELECT_NOCANCEL	= 407;	// { int select_nocancel(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv) NO_SYSCALL_STUB; }
-	SYS_FSYNC_NOCANCEL	= 408;	// { int fsync_nocancel(int fd) NO_SYSCALL_STUB; }
-	SYS_CONNECT_NOCANCEL	= 409;	// { int connect_nocancel(int s, caddr_t name, socklen_t namelen) NO_SYSCALL_STUB; }
+	SYS_MSYNC_NOCANCEL   = 405 // { int msync_nocancel(caddr_t addr, size_t len, int flags) NO_SYSCALL_STUB; }
+	SYS_FCNTL_NOCANCEL   = 406 // { int fcntl_nocancel(int fd, int cmd, long arg) NO_SYSCALL_STUB; }
+	SYS_SELECT_NOCANCEL  = 407 // { int select_nocancel(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, struct timeval *tv) NO_SYSCALL_STUB; }
+	SYS_FSYNC_NOCANCEL   = 408 // { int fsync_nocancel(int fd) NO_SYSCALL_STUB; }
+	SYS_CONNECT_NOCANCEL = 409 // { int connect_nocancel(int s, caddr_t name, socklen_t namelen) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 409;  // { int nosys(void); }
-	SYS_SIGSUSPEND_NOCANCEL	= 410;	// { int sigsuspend_nocancel(sigset_t mask) NO_SYSCALL_STUB; }
-	SYS_READV_NOCANCEL	= 411;	// { user_ssize_t readv_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
-	SYS_WRITEV_NOCANCEL	= 412;	// { user_ssize_t writev_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
-	SYS_SENDTO_NOCANCEL	= 413;	// { int sendto_nocancel(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen) NO_SYSCALL_STUB; }
+	SYS_SIGSUSPEND_NOCANCEL = 410 // { int sigsuspend_nocancel(sigset_t mask) NO_SYSCALL_STUB; }
+	SYS_READV_NOCANCEL      = 411 // { user_ssize_t readv_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
+	SYS_WRITEV_NOCANCEL     = 412 // { user_ssize_t writev_nocancel(int fd, struct iovec *iovp, u_int iovcnt) NO_SYSCALL_STUB; }
+	SYS_SENDTO_NOCANCEL     = 413 // { int sendto_nocancel(int s, caddr_t buf, size_t len, int flags, caddr_t to, socklen_t tolen) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 413;  // { int nosys(void); }
-	SYS_PREAD_NOCANCEL	= 414;	// { user_ssize_t pread_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
-	SYS_PWRITE_NOCANCEL	= 415;	// { user_ssize_t pwrite_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
-	SYS_WAITID_NOCANCEL	= 416;	// { int waitid_nocancel(idtype_t idtype, id_t id, siginfo_t *infop, int options) NO_SYSCALL_STUB; }
-	SYS_POLL_NOCANCEL	= 417;	// { int poll_nocancel(struct pollfd *fds, u_int nfds, int timeout) NO_SYSCALL_STUB; }
-	SYS_MSGSND_NOCANCEL	= 418;	// { int msgsnd_nocancel(int msqid, void *msgp, size_t msgsz, int msgflg) NO_SYSCALL_STUB; }
-	SYS_MSGRCV_NOCANCEL	= 419;	// { user_ssize_t msgrcv_nocancel(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg) NO_SYSCALL_STUB; }
+	SYS_PREAD_NOCANCEL  = 414 // { user_ssize_t pread_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
+	SYS_PWRITE_NOCANCEL = 415 // { user_ssize_t pwrite_nocancel(int fd, user_addr_t buf, user_size_t nbyte, off_t offset) NO_SYSCALL_STUB; }
+	SYS_WAITID_NOCANCEL = 416 // { int waitid_nocancel(idtype_t idtype, id_t id, siginfo_t *infop, int options) NO_SYSCALL_STUB; }
+	SYS_POLL_NOCANCEL   = 417 // { int poll_nocancel(struct pollfd *fds, u_int nfds, int timeout) NO_SYSCALL_STUB; }
+	SYS_MSGSND_NOCANCEL = 418 // { int msgsnd_nocancel(int msqid, void *msgp, size_t msgsz, int msgflg) NO_SYSCALL_STUB; }
+	SYS_MSGRCV_NOCANCEL = 419 // { user_ssize_t msgrcv_nocancel(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg) NO_SYSCALL_STUB; }
 	// SYS_NOSYS = 418;  // { int nosys(void); }
 	// SYS_NOSYS = 419;  // { int nosys(void); }
-	SYS_SEM_WAIT_NOCANCEL		= 420;	// { int sem_wait_nocancel(sem_t *sem) NO_SYSCALL_STUB; }
-	SYS_AIO_SUSPEND_NOCANCEL	= 421;	// { int aio_suspend_nocancel(user_addr_t aiocblist, int nent, user_addr_t timeoutp) NO_SYSCALL_STUB; }
-	SYS___SIGWAIT_NOCANCEL		= 422;	// { int __sigwait_nocancel(user_addr_t set, user_addr_t sig) NO_SYSCALL_STUB; }
-	SYS___SEMWAIT_SIGNAL_NOCANCEL	= 423;	// { int __semwait_signal_nocancel(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec) NO_SYSCALL_STUB; }
-	SYS___MAC_MOUNT			= 424;	// { int __mac_mount(char *type, char *path, int flags, caddr_t data, struct mac *mac_p); }
-	SYS___MAC_GET_MOUNT		= 425;	// { int __mac_get_mount(char *path, struct mac *mac_p); }
-	SYS___MAC_GETFSSTAT		= 426;	// { int __mac_getfsstat(user_addr_t buf, int bufsize, user_addr_t mac, int macsize, int flags); }
+	SYS_SEM_WAIT_NOCANCEL         = 420 // { int sem_wait_nocancel(sem_t *sem) NO_SYSCALL_STUB; }
+	SYS_AIO_SUSPEND_NOCANCEL      = 421 // { int aio_suspend_nocancel(user_addr_t aiocblist, int nent, user_addr_t timeoutp) NO_SYSCALL_STUB; }
+	SYS___SIGWAIT_NOCANCEL        = 422 // { int __sigwait_nocancel(user_addr_t set, user_addr_t sig) NO_SYSCALL_STUB; }
+	SYS___SEMWAIT_SIGNAL_NOCANCEL = 423 // { int __semwait_signal_nocancel(int cond_sem, int mutex_sem, int timeout, int relative, time_t tv_sec, int32_t tv_nsec) NO_SYSCALL_STUB; }
+	SYS___MAC_MOUNT               = 424 // { int __mac_mount(char *type, char *path, int flags, caddr_t data, struct mac *mac_p); }
+	SYS___MAC_GET_MOUNT           = 425 // { int __mac_get_mount(char *path, struct mac *mac_p); }
+	SYS___MAC_GETFSSTAT           = 426 // { int __mac_getfsstat(user_addr_t buf, int bufsize, user_addr_t mac, int macsize, int flags); }
 )
diff --git a/src/pkg/syscall/zsysnum_freebsd_386.go b/src/pkg/syscall/zsysnum_freebsd_386.go
index 71d35cb61..b7c6abeca 100644
--- a/src/pkg/syscall/zsysnum_freebsd_386.go
+++ b/src/pkg/syscall/zsysnum_freebsd_386.go
@@ -5,316 +5,316 @@ package syscall
 
 const (
 	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT			= 1;	// { void sys_exit(int rval); } exit \
-	SYS_FORK			= 2;	// { int fork(void); }
-	SYS_READ			= 3;	// { ssize_t read(int fd, void *buf, \
-	SYS_WRITE			= 4;	// { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN			= 5;	// { int open(char *path, int flags, int mode); }
-	SYS_CLOSE			= 6;	// { int close(int fd); }
-	SYS_WAIT4			= 7;	// { int wait4(int pid, int *status, \
-	SYS_LINK			= 9;	// { int link(char *path, char *link); }
-	SYS_UNLINK			= 10;	// { int unlink(char *path); }
-	SYS_CHDIR			= 12;	// { int chdir(char *path); }
-	SYS_FCHDIR			= 13;	// { int fchdir(int fd); }
-	SYS_MKNOD			= 14;	// { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD			= 15;	// { int chmod(char *path, int mode); }
-	SYS_CHOWN			= 16;	// { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK			= 17;	// { int obreak(char *nsize); } break \
-	SYS_GETPID			= 20;	// { pid_t getpid(void); }
-	SYS_MOUNT			= 21;	// { int mount(char *type, char *path, \
-	SYS_UNMOUNT			= 22;	// { int unmount(char *path, int flags); }
-	SYS_SETUID			= 23;	// { int setuid(uid_t uid); }
-	SYS_GETUID			= 24;	// { uid_t getuid(void); }
-	SYS_GETEUID			= 25;	// { uid_t geteuid(void); }
-	SYS_PTRACE			= 26;	// { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG			= 27;	// { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG			= 28;	// { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM			= 29;	// { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT			= 30;	// { int accept(int s, \
-	SYS_GETPEERNAME			= 31;	// { int getpeername(int fdes, \
-	SYS_GETSOCKNAME			= 32;	// { int getsockname(int fdes, \
-	SYS_ACCESS			= 33;	// { int access(char *path, int flags); }
-	SYS_CHFLAGS			= 34;	// { int chflags(char *path, int flags); }
-	SYS_FCHFLAGS			= 35;	// { int fchflags(int fd, int flags); }
-	SYS_SYNC			= 36;	// { int sync(void); }
-	SYS_KILL			= 37;	// { int kill(int pid, int signum); }
-	SYS_GETPPID			= 39;	// { pid_t getppid(void); }
-	SYS_DUP				= 41;	// { int dup(u_int fd); }
-	SYS_PIPE			= 42;	// { int pipe(void); }
-	SYS_GETEGID			= 43;	// { gid_t getegid(void); }
-	SYS_PROFIL			= 44;	// { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE			= 45;	// { int ktrace(const char *fname, int ops, \
-	SYS_GETGID			= 47;	// { gid_t getgid(void); }
-	SYS_GETLOGIN			= 49;	// { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN			= 50;	// { int setlogin(char *namebuf); }
-	SYS_ACCT			= 51;	// { int acct(char *path); }
-	SYS_SIGALTSTACK			= 53;	// { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL			= 54;	// { int ioctl(int fd, u_long com, \
-	SYS_REBOOT			= 55;	// { int reboot(int opt); }
-	SYS_REVOKE			= 56;	// { int revoke(char *path); }
-	SYS_SYMLINK			= 57;	// { int symlink(char *path, char *link); }
-	SYS_READLINK			= 58;	// { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE			= 59;	// { int execve(char *fname, char **argv, \
-	SYS_UMASK			= 60;	// { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT			= 61;	// { int chroot(char *path); }
-	SYS_MSYNC			= 65;	// { int msync(void *addr, size_t len, \
-	SYS_VFORK			= 66;	// { int vfork(void); }
-	SYS_SBRK			= 69;	// { int sbrk(int incr); }
-	SYS_SSTK			= 70;	// { int sstk(int incr); }
-	SYS_OVADVISE			= 72;	// { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP			= 73;	// { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT			= 74;	// { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE			= 75;	// { int madvise(void *addr, size_t len, \
-	SYS_MINCORE			= 78;	// { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS			= 79;	// { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS			= 80;	// { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP			= 81;	// { int getpgrp(void); }
-	SYS_SETPGID			= 82;	// { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER			= 83;	// { int setitimer(u_int which, struct \
-	SYS_SWAPON			= 85;	// { int swapon(char *name); }
-	SYS_GETITIMER			= 86;	// { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE		= 89;	// { int getdtablesize(void); }
-	SYS_DUP2			= 90;	// { int dup2(u_int from, u_int to); }
-	SYS_FCNTL			= 92;	// { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT			= 93;	// { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC			= 95;	// { int fsync(int fd); }
-	SYS_SETPRIORITY			= 96;	// { int setpriority(int which, int who, \
-	SYS_SOCKET			= 97;	// { int socket(int domain, int type, \
-	SYS_CONNECT			= 98;	// { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY			= 100;	// { int getpriority(int which, int who); }
-	SYS_BIND			= 104;	// { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT			= 105;	// { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN			= 106;	// { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY		= 116;	// { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE			= 117;	// { int getrusage(int who, \
-	SYS_GETSOCKOPT			= 118;	// { int getsockopt(int s, int level, int name, \
-	SYS_READV			= 120;	// { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV			= 121;	// { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY		= 122;	// { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN			= 123;	// { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD			= 124;	// { int fchmod(int fd, int mode); }
-	SYS_SETREUID			= 126;	// { int setreuid(int ruid, int euid); }
-	SYS_SETREGID			= 127;	// { int setregid(int rgid, int egid); }
-	SYS_RENAME			= 128;	// { int rename(char *from, char *to); }
-	SYS_FLOCK			= 131;	// { int flock(int fd, int how); }
-	SYS_MKFIFO			= 132;	// { int mkfifo(char *path, int mode); }
-	SYS_SENDTO			= 133;	// { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN			= 134;	// { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR			= 135;	// { int socketpair(int domain, int type, \
-	SYS_MKDIR			= 136;	// { int mkdir(char *path, int mode); }
-	SYS_RMDIR			= 137;	// { int rmdir(char *path); }
-	SYS_UTIMES			= 138;	// { int utimes(char *path, \
-	SYS_ADJTIME			= 140;	// { int adjtime(struct timeval *delta, \
-	SYS_SETSID			= 147;	// { int setsid(void); }
-	SYS_QUOTACTL			= 148;	// { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH			= 160;	// { int lgetfh(char *fname, \
-	SYS_GETFH			= 161;	// { int getfh(char *fname, \
-	SYS_SYSARCH			= 165;	// { int sysarch(int op, char *parms); }
-	SYS_RTPRIO			= 166;	// { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD		= 173;	// { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE		= 174;	// { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB			= 175;	// { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME			= 176;	// { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID			= 181;	// { int setgid(gid_t gid); }
-	SYS_SETEGID			= 182;	// { int setegid(gid_t egid); }
-	SYS_SETEUID			= 183;	// { int seteuid(uid_t euid); }
-	SYS_STAT			= 188;	// { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT			= 189;	// { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT			= 190;	// { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF			= 191;	// { int pathconf(char *path, int name); }
-	SYS_FPATHCONF			= 192;	// { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT			= 194;	// { int getrlimit(u_int which, \
-	SYS_SETRLIMIT			= 195;	// { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES		= 196;	// { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP		= 197;	// { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK		= 199;	// { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE		= 200;	// { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE		= 201;	// { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL			= 202;	// { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK			= 203;	// { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK			= 204;	// { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE			= 205;	// { int undelete(char *path); }
-	SYS_FUTIMES			= 206;	// { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID			= 207;	// { int getpgid(pid_t pid); }
-	SYS_POLL			= 209;	// { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME		= 232;	// { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME		= 233;	// { int clock_settime( \
-	SYS_CLOCK_GETRES		= 234;	// { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE		= 235;	// { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE		= 236;	// { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME		= 237;	// { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME		= 238;	// { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN		= 239;	// { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP			= 240;	// { int nanosleep(const struct timespec *rqtp, \
-	SYS_NTP_GETTIME			= 248;	// { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT			= 250;	// { int minherit(void *addr, size_t len, \
-	SYS_RFORK			= 251;	// { int rfork(int flags); }
-	SYS_OPENBSD_POLL		= 252;	// { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID			= 253;	// { int issetugid(void); }
-	SYS_LCHOWN			= 254;	// { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS			= 272;	// { int getdents(int fd, char *buf, \
-	SYS_LCHMOD			= 274;	// { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES			= 276;	// { int lutimes(char *path, \
-	SYS_NSTAT			= 278;	// { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT			= 279;	// { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT			= 280;	// { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV			= 289;	// { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV			= 290;	// { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN			= 298;	// { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT			= 299;	// { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT			= 300;	// { int modnext(int modid); }
-	SYS_MODSTAT			= 301;	// { int modstat(int modid, \
-	SYS_MODFNEXT			= 302;	// { int modfnext(int modid); }
-	SYS_MODFIND			= 303;	// { int modfind(const char *name); }
-	SYS_KLDLOAD			= 304;	// { int kldload(const char *file); }
-	SYS_KLDUNLOAD			= 305;	// { int kldunload(int fileid); }
-	SYS_KLDFIND			= 306;	// { int kldfind(const char *file); }
-	SYS_KLDNEXT			= 307;	// { int kldnext(int fileid); }
-	SYS_KLDSTAT			= 308;	// { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD			= 309;	// { int kldfirstmod(int fileid); }
-	SYS_GETSID			= 310;	// { int getsid(pid_t pid); }
-	SYS_SETRESUID			= 311;	// { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID			= 312;	// { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD			= 321;	// { int yield(void); }
-	SYS_MLOCKALL			= 324;	// { int mlockall(int how); }
-	SYS_MUNLOCKALL			= 325;	// { int munlockall(void); }
-	SYS___GETCWD			= 326;	// { int __getcwd(u_char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM		= 327;	// { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM		= 328;	// { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER		= 329;	// { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER		= 330;	// { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD			= 331;	// { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX	= 332;	// { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN	= 333;	// { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL	= 334;	// { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE			= 335;	// { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM			= 337;	// { int kldsym(int fileid, int cmd, \
-	SYS_JAIL			= 338;	// { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK			= 340;	// { int sigprocmask(int how, \
-	SYS_SIGSUSPEND			= 341;	// { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING			= 343;	// { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT		= 345;	// { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO			= 346;	// { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE		= 347;	// { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE		= 348;	// { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD		= 349;	// { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD		= 350;	// { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE		= 351;	// { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD		= 352;	// { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE		= 353;	// { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD		= 354;	// { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL			= 355;	// { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE		= 356;	// { int extattr_set_file( \
-	SYS_EXTATTR_GET_FILE		= 357;	// { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE		= 358;	// { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID			= 360;	// { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID			= 361;	// { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE			= 362;	// { int kqueue(void); }
-	SYS_KEVENT			= 363;	// { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD		= 371;	// { int extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD		= 372;	// { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD		= 373;	// { int extattr_delete_fd(int fd, \
-	SYS___SETUGID			= 374;	// { int __setugid(int flag); }
-	SYS_EACCESS			= 376;	// { int eaccess(char *path, int flags); }
-	SYS_NMOUNT			= 378;	// { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC		= 384;	// { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC		= 385;	// { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD		= 386;	// { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE		= 387;	// { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD		= 388;	// { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE		= 389;	// { int __mac_set_file(const char *path_p, \
-	SYS_KENV			= 390;	// { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS			= 391;	// { int lchflags(const char *path, int flags); }
-	SYS_UUIDGEN			= 392;	// { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE			= 393;	// { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL			= 394;	// { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT			= 395;	// { int getfsstat(struct statfs *buf, \
-	SYS_STATFS			= 396;	// { int statfs(char *path, \
-	SYS_FSTATFS			= 397;	// { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS			= 398;	// { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID		= 409;	// { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK		= 410;	// { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK		= 411;	// { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK		= 412;	// { int extattr_set_link( \
-	SYS_EXTATTR_GET_LINK		= 413;	// { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK		= 414;	// { int extattr_delete_link( \
-	SYS___MAC_EXECVE		= 415;	// { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION			= 416;	// { int sigaction(int sig, \
-	SYS_SIGRETURN			= 417;	// { int sigreturn( \
-	SYS_GETCONTEXT			= 421;	// { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT			= 422;	// { int setcontext( \
-	SYS_SWAPCONTEXT			= 423;	// { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF			= 424;	// { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK		= 425;	// { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK		= 426;	// { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK		= 427;	// { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK		= 428;	// { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT			= 429;	// { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE			= 430;	// { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT			= 431;	// { void thr_exit(long *state); }
-	SYS_THR_SELF			= 432;	// { int thr_self(long *id); }
-	SYS_THR_KILL			= 433;	// { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK			= 434;	// { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK		= 435;	// { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH			= 436;	// { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD		= 437;	// { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE		= 438;	// { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK		= 439;	// { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND			= 442;	// { int thr_suspend( \
-	SYS_THR_WAKE			= 443;	// { int thr_wake(long id); }
-	SYS_KLDUNLOADF			= 444;	// { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT			= 445;	// { int audit(const void *record, \
-	SYS_AUDITON			= 446;	// { int auditon(int cmd, void *data, \
-	SYS_GETAUID			= 447;	// { int getauid(uid_t *auid); }
-	SYS_SETAUID			= 448;	// { int setauid(uid_t *auid); }
-	SYS_GETAUDIT			= 449;	// { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT			= 450;	// { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR		= 451;	// { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR		= 452;	// { int setaudit_addr( \
-	SYS_AUDITCTL			= 453;	// { int auditctl(char *path); }
-	SYS__UMTX_OP			= 454;	// { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW			= 455;	// { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE			= 456;	// { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2			= 463;	// { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME		= 464;	// { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD		= 466;	// { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF		= 471;	// { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG	= 472;	// { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV	= 473;	// { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG	= 474;	// { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD			= 475;	// { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE			= 476;	// { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP			= 477;	// { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK			= 478;	// { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE			= 479;	// { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE			= 480;	// { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2			= 481;	// { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN			= 482;	// { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK			= 483;	// { int shm_unlink(const char *path); }
-	SYS_CPUSET			= 484;	// { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID		= 485;	// { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID		= 486;	// { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY		= 487;	// { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY		= 488;	// { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT			= 489;	// { int faccessat(int fd, char *path, int mode, \
-	SYS_FCHMODAT			= 490;	// { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT			= 491;	// { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE			= 492;	// { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT			= 493;	// { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT			= 494;	// { int futimesat(int fd, char *path, \
-	SYS_LINKAT			= 495;	// { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT			= 496;	// { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT			= 497;	// { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT			= 498;	// { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT			= 499;	// { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT			= 500;	// { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT			= 501;	// { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT			= 502;	// { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT			= 503;	// { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT		= 504;	// { int posix_openpt(int flags); }
-	SYS_JAIL_GET			= 506;	// { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET			= 507;	// { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE			= 508;	// { int jail_remove(int jid); }
-	SYS_CLOSEFROM			= 509;	// { int closefrom(int lowfd); }
-	SYS_LPATHCONF			= 513;	// { int lpathconf(char *path, int name); }
+	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                     = 2   // { int fork(void); }
+	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                    = 6   // { int close(int fd); }
+	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                     = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                   = 10  // { int unlink(char *path); }
+	SYS_CHDIR                    = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                   = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                   = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                   = 30  // { int accept(int s, \
+	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                   = 33  // { int access(char *path, int flags); }
+	SYS_CHFLAGS                  = 34  // { int chflags(char *path, int flags); }
+	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, int flags); }
+	SYS_SYNC                     = 36  // { int sync(void); }
+	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
+	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
+	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                   = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                     = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                   = 55  // { int reboot(int opt); }
+	SYS_REVOKE                   = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                   = 61  // { int chroot(char *path); }
+	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                    = 66  // { int vfork(void); }
+	SYS_SBRK                     = 69  // { int sbrk(int incr); }
+	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
+	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                   = 85  // { int swapon(char *name); }
+	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
+	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                    = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                   = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                   = 147 // { int setsid(void); }
+	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                    = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID                = 253 // { int issetugid(void); }
+	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                    = 321 // { int yield(void); }
+	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
+	SYS___GETCWD                 = 326 // { int __getcwd(u_char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE         = 356 // { int extattr_set_file( \
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD           = 371 // { int extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID                = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                  = 376 // { int eaccess(char *path, int flags); }
+	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, int flags); }
+	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                   = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK         = 412 // { int extattr_set_link( \
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN                = 417 // { int sigreturn( \
+	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
+	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                    = 445 // { int audit(const void *record, \
+	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
+	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
+	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
+	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
+	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int mode, \
+	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
 )
diff --git a/src/pkg/syscall/zsysnum_freebsd_amd64.go b/src/pkg/syscall/zsysnum_freebsd_amd64.go
index 71d35cb61..b7c6abeca 100644
--- a/src/pkg/syscall/zsysnum_freebsd_amd64.go
+++ b/src/pkg/syscall/zsysnum_freebsd_amd64.go
@@ -5,316 +5,316 @@ package syscall
 
 const (
 	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT			= 1;	// { void sys_exit(int rval); } exit \
-	SYS_FORK			= 2;	// { int fork(void); }
-	SYS_READ			= 3;	// { ssize_t read(int fd, void *buf, \
-	SYS_WRITE			= 4;	// { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN			= 5;	// { int open(char *path, int flags, int mode); }
-	SYS_CLOSE			= 6;	// { int close(int fd); }
-	SYS_WAIT4			= 7;	// { int wait4(int pid, int *status, \
-	SYS_LINK			= 9;	// { int link(char *path, char *link); }
-	SYS_UNLINK			= 10;	// { int unlink(char *path); }
-	SYS_CHDIR			= 12;	// { int chdir(char *path); }
-	SYS_FCHDIR			= 13;	// { int fchdir(int fd); }
-	SYS_MKNOD			= 14;	// { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD			= 15;	// { int chmod(char *path, int mode); }
-	SYS_CHOWN			= 16;	// { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK			= 17;	// { int obreak(char *nsize); } break \
-	SYS_GETPID			= 20;	// { pid_t getpid(void); }
-	SYS_MOUNT			= 21;	// { int mount(char *type, char *path, \
-	SYS_UNMOUNT			= 22;	// { int unmount(char *path, int flags); }
-	SYS_SETUID			= 23;	// { int setuid(uid_t uid); }
-	SYS_GETUID			= 24;	// { uid_t getuid(void); }
-	SYS_GETEUID			= 25;	// { uid_t geteuid(void); }
-	SYS_PTRACE			= 26;	// { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG			= 27;	// { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG			= 28;	// { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM			= 29;	// { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT			= 30;	// { int accept(int s, \
-	SYS_GETPEERNAME			= 31;	// { int getpeername(int fdes, \
-	SYS_GETSOCKNAME			= 32;	// { int getsockname(int fdes, \
-	SYS_ACCESS			= 33;	// { int access(char *path, int flags); }
-	SYS_CHFLAGS			= 34;	// { int chflags(char *path, int flags); }
-	SYS_FCHFLAGS			= 35;	// { int fchflags(int fd, int flags); }
-	SYS_SYNC			= 36;	// { int sync(void); }
-	SYS_KILL			= 37;	// { int kill(int pid, int signum); }
-	SYS_GETPPID			= 39;	// { pid_t getppid(void); }
-	SYS_DUP				= 41;	// { int dup(u_int fd); }
-	SYS_PIPE			= 42;	// { int pipe(void); }
-	SYS_GETEGID			= 43;	// { gid_t getegid(void); }
-	SYS_PROFIL			= 44;	// { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE			= 45;	// { int ktrace(const char *fname, int ops, \
-	SYS_GETGID			= 47;	// { gid_t getgid(void); }
-	SYS_GETLOGIN			= 49;	// { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN			= 50;	// { int setlogin(char *namebuf); }
-	SYS_ACCT			= 51;	// { int acct(char *path); }
-	SYS_SIGALTSTACK			= 53;	// { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL			= 54;	// { int ioctl(int fd, u_long com, \
-	SYS_REBOOT			= 55;	// { int reboot(int opt); }
-	SYS_REVOKE			= 56;	// { int revoke(char *path); }
-	SYS_SYMLINK			= 57;	// { int symlink(char *path, char *link); }
-	SYS_READLINK			= 58;	// { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE			= 59;	// { int execve(char *fname, char **argv, \
-	SYS_UMASK			= 60;	// { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT			= 61;	// { int chroot(char *path); }
-	SYS_MSYNC			= 65;	// { int msync(void *addr, size_t len, \
-	SYS_VFORK			= 66;	// { int vfork(void); }
-	SYS_SBRK			= 69;	// { int sbrk(int incr); }
-	SYS_SSTK			= 70;	// { int sstk(int incr); }
-	SYS_OVADVISE			= 72;	// { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP			= 73;	// { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT			= 74;	// { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE			= 75;	// { int madvise(void *addr, size_t len, \
-	SYS_MINCORE			= 78;	// { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS			= 79;	// { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS			= 80;	// { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP			= 81;	// { int getpgrp(void); }
-	SYS_SETPGID			= 82;	// { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER			= 83;	// { int setitimer(u_int which, struct \
-	SYS_SWAPON			= 85;	// { int swapon(char *name); }
-	SYS_GETITIMER			= 86;	// { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE		= 89;	// { int getdtablesize(void); }
-	SYS_DUP2			= 90;	// { int dup2(u_int from, u_int to); }
-	SYS_FCNTL			= 92;	// { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT			= 93;	// { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC			= 95;	// { int fsync(int fd); }
-	SYS_SETPRIORITY			= 96;	// { int setpriority(int which, int who, \
-	SYS_SOCKET			= 97;	// { int socket(int domain, int type, \
-	SYS_CONNECT			= 98;	// { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY			= 100;	// { int getpriority(int which, int who); }
-	SYS_BIND			= 104;	// { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT			= 105;	// { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN			= 106;	// { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY		= 116;	// { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE			= 117;	// { int getrusage(int who, \
-	SYS_GETSOCKOPT			= 118;	// { int getsockopt(int s, int level, int name, \
-	SYS_READV			= 120;	// { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV			= 121;	// { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY		= 122;	// { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN			= 123;	// { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD			= 124;	// { int fchmod(int fd, int mode); }
-	SYS_SETREUID			= 126;	// { int setreuid(int ruid, int euid); }
-	SYS_SETREGID			= 127;	// { int setregid(int rgid, int egid); }
-	SYS_RENAME			= 128;	// { int rename(char *from, char *to); }
-	SYS_FLOCK			= 131;	// { int flock(int fd, int how); }
-	SYS_MKFIFO			= 132;	// { int mkfifo(char *path, int mode); }
-	SYS_SENDTO			= 133;	// { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN			= 134;	// { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR			= 135;	// { int socketpair(int domain, int type, \
-	SYS_MKDIR			= 136;	// { int mkdir(char *path, int mode); }
-	SYS_RMDIR			= 137;	// { int rmdir(char *path); }
-	SYS_UTIMES			= 138;	// { int utimes(char *path, \
-	SYS_ADJTIME			= 140;	// { int adjtime(struct timeval *delta, \
-	SYS_SETSID			= 147;	// { int setsid(void); }
-	SYS_QUOTACTL			= 148;	// { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH			= 160;	// { int lgetfh(char *fname, \
-	SYS_GETFH			= 161;	// { int getfh(char *fname, \
-	SYS_SYSARCH			= 165;	// { int sysarch(int op, char *parms); }
-	SYS_RTPRIO			= 166;	// { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD		= 173;	// { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE		= 174;	// { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB			= 175;	// { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME			= 176;	// { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID			= 181;	// { int setgid(gid_t gid); }
-	SYS_SETEGID			= 182;	// { int setegid(gid_t egid); }
-	SYS_SETEUID			= 183;	// { int seteuid(uid_t euid); }
-	SYS_STAT			= 188;	// { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT			= 189;	// { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT			= 190;	// { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF			= 191;	// { int pathconf(char *path, int name); }
-	SYS_FPATHCONF			= 192;	// { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT			= 194;	// { int getrlimit(u_int which, \
-	SYS_SETRLIMIT			= 195;	// { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES		= 196;	// { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP		= 197;	// { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK		= 199;	// { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE		= 200;	// { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE		= 201;	// { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL			= 202;	// { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK			= 203;	// { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK			= 204;	// { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE			= 205;	// { int undelete(char *path); }
-	SYS_FUTIMES			= 206;	// { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID			= 207;	// { int getpgid(pid_t pid); }
-	SYS_POLL			= 209;	// { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME		= 232;	// { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME		= 233;	// { int clock_settime( \
-	SYS_CLOCK_GETRES		= 234;	// { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE		= 235;	// { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE		= 236;	// { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME		= 237;	// { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME		= 238;	// { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN		= 239;	// { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP			= 240;	// { int nanosleep(const struct timespec *rqtp, \
-	SYS_NTP_GETTIME			= 248;	// { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT			= 250;	// { int minherit(void *addr, size_t len, \
-	SYS_RFORK			= 251;	// { int rfork(int flags); }
-	SYS_OPENBSD_POLL		= 252;	// { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID			= 253;	// { int issetugid(void); }
-	SYS_LCHOWN			= 254;	// { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS			= 272;	// { int getdents(int fd, char *buf, \
-	SYS_LCHMOD			= 274;	// { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES			= 276;	// { int lutimes(char *path, \
-	SYS_NSTAT			= 278;	// { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT			= 279;	// { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT			= 280;	// { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV			= 289;	// { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV			= 290;	// { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN			= 298;	// { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT			= 299;	// { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT			= 300;	// { int modnext(int modid); }
-	SYS_MODSTAT			= 301;	// { int modstat(int modid, \
-	SYS_MODFNEXT			= 302;	// { int modfnext(int modid); }
-	SYS_MODFIND			= 303;	// { int modfind(const char *name); }
-	SYS_KLDLOAD			= 304;	// { int kldload(const char *file); }
-	SYS_KLDUNLOAD			= 305;	// { int kldunload(int fileid); }
-	SYS_KLDFIND			= 306;	// { int kldfind(const char *file); }
-	SYS_KLDNEXT			= 307;	// { int kldnext(int fileid); }
-	SYS_KLDSTAT			= 308;	// { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD			= 309;	// { int kldfirstmod(int fileid); }
-	SYS_GETSID			= 310;	// { int getsid(pid_t pid); }
-	SYS_SETRESUID			= 311;	// { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID			= 312;	// { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD			= 321;	// { int yield(void); }
-	SYS_MLOCKALL			= 324;	// { int mlockall(int how); }
-	SYS_MUNLOCKALL			= 325;	// { int munlockall(void); }
-	SYS___GETCWD			= 326;	// { int __getcwd(u_char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM		= 327;	// { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM		= 328;	// { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER		= 329;	// { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER		= 330;	// { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD			= 331;	// { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX	= 332;	// { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN	= 333;	// { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL	= 334;	// { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE			= 335;	// { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM			= 337;	// { int kldsym(int fileid, int cmd, \
-	SYS_JAIL			= 338;	// { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK			= 340;	// { int sigprocmask(int how, \
-	SYS_SIGSUSPEND			= 341;	// { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING			= 343;	// { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT		= 345;	// { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO			= 346;	// { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE		= 347;	// { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE		= 348;	// { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD		= 349;	// { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD		= 350;	// { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE		= 351;	// { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD		= 352;	// { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE		= 353;	// { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD		= 354;	// { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL			= 355;	// { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE		= 356;	// { int extattr_set_file( \
-	SYS_EXTATTR_GET_FILE		= 357;	// { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE		= 358;	// { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID			= 360;	// { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID			= 361;	// { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE			= 362;	// { int kqueue(void); }
-	SYS_KEVENT			= 363;	// { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD		= 371;	// { int extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD		= 372;	// { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD		= 373;	// { int extattr_delete_fd(int fd, \
-	SYS___SETUGID			= 374;	// { int __setugid(int flag); }
-	SYS_EACCESS			= 376;	// { int eaccess(char *path, int flags); }
-	SYS_NMOUNT			= 378;	// { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC		= 384;	// { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC		= 385;	// { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD		= 386;	// { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE		= 387;	// { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD		= 388;	// { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE		= 389;	// { int __mac_set_file(const char *path_p, \
-	SYS_KENV			= 390;	// { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS			= 391;	// { int lchflags(const char *path, int flags); }
-	SYS_UUIDGEN			= 392;	// { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE			= 393;	// { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL			= 394;	// { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT			= 395;	// { int getfsstat(struct statfs *buf, \
-	SYS_STATFS			= 396;	// { int statfs(char *path, \
-	SYS_FSTATFS			= 397;	// { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS			= 398;	// { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID		= 409;	// { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK		= 410;	// { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK		= 411;	// { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK		= 412;	// { int extattr_set_link( \
-	SYS_EXTATTR_GET_LINK		= 413;	// { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK		= 414;	// { int extattr_delete_link( \
-	SYS___MAC_EXECVE		= 415;	// { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION			= 416;	// { int sigaction(int sig, \
-	SYS_SIGRETURN			= 417;	// { int sigreturn( \
-	SYS_GETCONTEXT			= 421;	// { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT			= 422;	// { int setcontext( \
-	SYS_SWAPCONTEXT			= 423;	// { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF			= 424;	// { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK		= 425;	// { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK		= 426;	// { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK		= 427;	// { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK		= 428;	// { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT			= 429;	// { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE			= 430;	// { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT			= 431;	// { void thr_exit(long *state); }
-	SYS_THR_SELF			= 432;	// { int thr_self(long *id); }
-	SYS_THR_KILL			= 433;	// { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK			= 434;	// { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK		= 435;	// { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH			= 436;	// { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD		= 437;	// { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE		= 438;	// { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK		= 439;	// { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND			= 442;	// { int thr_suspend( \
-	SYS_THR_WAKE			= 443;	// { int thr_wake(long id); }
-	SYS_KLDUNLOADF			= 444;	// { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT			= 445;	// { int audit(const void *record, \
-	SYS_AUDITON			= 446;	// { int auditon(int cmd, void *data, \
-	SYS_GETAUID			= 447;	// { int getauid(uid_t *auid); }
-	SYS_SETAUID			= 448;	// { int setauid(uid_t *auid); }
-	SYS_GETAUDIT			= 449;	// { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT			= 450;	// { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR		= 451;	// { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR		= 452;	// { int setaudit_addr( \
-	SYS_AUDITCTL			= 453;	// { int auditctl(char *path); }
-	SYS__UMTX_OP			= 454;	// { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW			= 455;	// { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE			= 456;	// { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2			= 463;	// { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME		= 464;	// { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD		= 466;	// { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF		= 471;	// { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG	= 472;	// { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV	= 473;	// { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG	= 474;	// { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD			= 475;	// { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE			= 476;	// { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP			= 477;	// { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK			= 478;	// { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE			= 479;	// { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE			= 480;	// { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2			= 481;	// { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN			= 482;	// { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK			= 483;	// { int shm_unlink(const char *path); }
-	SYS_CPUSET			= 484;	// { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID		= 485;	// { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID		= 486;	// { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY		= 487;	// { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY		= 488;	// { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT			= 489;	// { int faccessat(int fd, char *path, int mode, \
-	SYS_FCHMODAT			= 490;	// { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT			= 491;	// { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE			= 492;	// { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT			= 493;	// { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT			= 494;	// { int futimesat(int fd, char *path, \
-	SYS_LINKAT			= 495;	// { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT			= 496;	// { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT			= 497;	// { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT			= 498;	// { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT			= 499;	// { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT			= 500;	// { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT			= 501;	// { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT			= 502;	// { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT			= 503;	// { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT		= 504;	// { int posix_openpt(int flags); }
-	SYS_JAIL_GET			= 506;	// { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET			= 507;	// { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE			= 508;	// { int jail_remove(int jid); }
-	SYS_CLOSEFROM			= 509;	// { int closefrom(int lowfd); }
-	SYS_LPATHCONF			= 513;	// { int lpathconf(char *path, int name); }
+	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                     = 2   // { int fork(void); }
+	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                    = 6   // { int close(int fd); }
+	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                     = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                   = 10  // { int unlink(char *path); }
+	SYS_CHDIR                    = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                   = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                   = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                   = 30  // { int accept(int s, \
+	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                   = 33  // { int access(char *path, int flags); }
+	SYS_CHFLAGS                  = 34  // { int chflags(char *path, int flags); }
+	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, int flags); }
+	SYS_SYNC                     = 36  // { int sync(void); }
+	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
+	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
+	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                   = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                     = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                   = 55  // { int reboot(int opt); }
+	SYS_REVOKE                   = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                   = 61  // { int chroot(char *path); }
+	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                    = 66  // { int vfork(void); }
+	SYS_SBRK                     = 69  // { int sbrk(int incr); }
+	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
+	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                   = 85  // { int swapon(char *name); }
+	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
+	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                    = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                   = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                   = 147 // { int setsid(void); }
+	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                    = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID                = 253 // { int issetugid(void); }
+	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                    = 321 // { int yield(void); }
+	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
+	SYS___GETCWD                 = 326 // { int __getcwd(u_char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE         = 356 // { int extattr_set_file( \
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD           = 371 // { int extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID                = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                  = 376 // { int eaccess(char *path, int flags); }
+	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, int flags); }
+	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                   = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK         = 412 // { int extattr_set_link( \
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN                = 417 // { int sigreturn( \
+	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
+	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                    = 445 // { int audit(const void *record, \
+	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
+	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
+	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
+	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
+	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int mode, \
+	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
 )
diff --git a/src/pkg/syscall/zsysnum_linux_386.go b/src/pkg/syscall/zsysnum_linux_386.go
index d0d743f3e..fca0a1a6a 100644
--- a/src/pkg/syscall/zsysnum_linux_386.go
+++ b/src/pkg/syscall/zsysnum_linux_386.go
@@ -4,315 +4,315 @@
 package syscall
 
 const (
-	SYS_RESTART_SYSCALL		= 0;
-	SYS_EXIT			= 1;
-	SYS_FORK			= 2;
-	SYS_READ			= 3;
-	SYS_WRITE			= 4;
-	SYS_OPEN			= 5;
-	SYS_CLOSE			= 6;
-	SYS_WAITPID			= 7;
-	SYS_CREAT			= 8;
-	SYS_LINK			= 9;
-	SYS_UNLINK			= 10;
-	SYS_EXECVE			= 11;
-	SYS_CHDIR			= 12;
-	SYS_TIME			= 13;
-	SYS_MKNOD			= 14;
-	SYS_CHMOD			= 15;
-	SYS_LCHOWN			= 16;
-	SYS_BREAK			= 17;
-	SYS_OLDSTAT			= 18;
-	SYS_LSEEK			= 19;
-	SYS_GETPID			= 20;
-	SYS_MOUNT			= 21;
-	SYS_UMOUNT			= 22;
-	SYS_SETUID			= 23;
-	SYS_GETUID			= 24;
-	SYS_STIME			= 25;
-	SYS_PTRACE			= 26;
-	SYS_ALARM			= 27;
-	SYS_OLDFSTAT			= 28;
-	SYS_PAUSE			= 29;
-	SYS_UTIME			= 30;
-	SYS_STTY			= 31;
-	SYS_GTTY			= 32;
-	SYS_ACCESS			= 33;
-	SYS_NICE			= 34;
-	SYS_FTIME			= 35;
-	SYS_SYNC			= 36;
-	SYS_KILL			= 37;
-	SYS_RENAME			= 38;
-	SYS_MKDIR			= 39;
-	SYS_RMDIR			= 40;
-	SYS_DUP				= 41;
-	SYS_PIPE			= 42;
-	SYS_TIMES			= 43;
-	SYS_PROF			= 44;
-	SYS_BRK				= 45;
-	SYS_SETGID			= 46;
-	SYS_GETGID			= 47;
-	SYS_SIGNAL			= 48;
-	SYS_GETEUID			= 49;
-	SYS_GETEGID			= 50;
-	SYS_ACCT			= 51;
-	SYS_UMOUNT2			= 52;
-	SYS_LOCK			= 53;
-	SYS_IOCTL			= 54;
-	SYS_FCNTL			= 55;
-	SYS_MPX				= 56;
-	SYS_SETPGID			= 57;
-	SYS_ULIMIT			= 58;
-	SYS_OLDOLDUNAME			= 59;
-	SYS_UMASK			= 60;
-	SYS_CHROOT			= 61;
-	SYS_USTAT			= 62;
-	SYS_DUP2			= 63;
-	SYS_GETPPID			= 64;
-	SYS_GETPGRP			= 65;
-	SYS_SETSID			= 66;
-	SYS_SIGACTION			= 67;
-	SYS_SGETMASK			= 68;
-	SYS_SSETMASK			= 69;
-	SYS_SETREUID			= 70;
-	SYS_SETREGID			= 71;
-	SYS_SIGSUSPEND			= 72;
-	SYS_SIGPENDING			= 73;
-	SYS_SETHOSTNAME			= 74;
-	SYS_SETRLIMIT			= 75;
-	SYS_GETRLIMIT			= 76;
-	SYS_GETRUSAGE			= 77;
-	SYS_GETTIMEOFDAY		= 78;
-	SYS_SETTIMEOFDAY		= 79;
-	SYS_GETGROUPS			= 80;
-	SYS_SETGROUPS			= 81;
-	SYS_SELECT			= 82;
-	SYS_SYMLINK			= 83;
-	SYS_OLDLSTAT			= 84;
-	SYS_READLINK			= 85;
-	SYS_USELIB			= 86;
-	SYS_SWAPON			= 87;
-	SYS_REBOOT			= 88;
-	SYS_READDIR			= 89;
-	SYS_MMAP			= 90;
-	SYS_MUNMAP			= 91;
-	SYS_TRUNCATE			= 92;
-	SYS_FTRUNCATE			= 93;
-	SYS_FCHMOD			= 94;
-	SYS_FCHOWN			= 95;
-	SYS_GETPRIORITY			= 96;
-	SYS_SETPRIORITY			= 97;
-	SYS_PROFIL			= 98;
-	SYS_STATFS			= 99;
-	SYS_FSTATFS			= 100;
-	SYS_IOPERM			= 101;
-	SYS_SOCKETCALL			= 102;
-	SYS_SYSLOG			= 103;
-	SYS_SETITIMER			= 104;
-	SYS_GETITIMER			= 105;
-	SYS_STAT			= 106;
-	SYS_LSTAT			= 107;
-	SYS_FSTAT			= 108;
-	SYS_OLDUNAME			= 109;
-	SYS_IOPL			= 110;
-	SYS_VHANGUP			= 111;
-	SYS_IDLE			= 112;
-	SYS_VM86OLD			= 113;
-	SYS_WAIT4			= 114;
-	SYS_SWAPOFF			= 115;
-	SYS_SYSINFO			= 116;
-	SYS_IPC				= 117;
-	SYS_FSYNC			= 118;
-	SYS_SIGRETURN			= 119;
-	SYS_CLONE			= 120;
-	SYS_SETDOMAINNAME		= 121;
-	SYS_UNAME			= 122;
-	SYS_MODIFY_LDT			= 123;
-	SYS_ADJTIMEX			= 124;
-	SYS_MPROTECT			= 125;
-	SYS_SIGPROCMASK			= 126;
-	SYS_CREATE_MODULE		= 127;
-	SYS_INIT_MODULE			= 128;
-	SYS_DELETE_MODULE		= 129;
-	SYS_GET_KERNEL_SYMS		= 130;
-	SYS_QUOTACTL			= 131;
-	SYS_GETPGID			= 132;
-	SYS_FCHDIR			= 133;
-	SYS_BDFLUSH			= 134;
-	SYS_SYSFS			= 135;
-	SYS_PERSONALITY			= 136;
-	SYS_AFS_SYSCALL			= 137;
-	SYS_SETFSUID			= 138;
-	SYS_SETFSGID			= 139;
-	SYS__LLSEEK			= 140;
-	SYS_GETDENTS			= 141;
-	SYS__NEWSELECT			= 142;
-	SYS_FLOCK			= 143;
-	SYS_MSYNC			= 144;
-	SYS_READV			= 145;
-	SYS_WRITEV			= 146;
-	SYS_GETSID			= 147;
-	SYS_FDATASYNC			= 148;
-	SYS__SYSCTL			= 149;
-	SYS_MLOCK			= 150;
-	SYS_MUNLOCK			= 151;
-	SYS_MLOCKALL			= 152;
-	SYS_MUNLOCKALL			= 153;
-	SYS_SCHED_SETPARAM		= 154;
-	SYS_SCHED_GETPARAM		= 155;
-	SYS_SCHED_SETSCHEDULER		= 156;
-	SYS_SCHED_GETSCHEDULER		= 157;
-	SYS_SCHED_YIELD			= 158;
-	SYS_SCHED_GET_PRIORITY_MAX	= 159;
-	SYS_SCHED_GET_PRIORITY_MIN	= 160;
-	SYS_SCHED_RR_GET_INTERVAL	= 161;
-	SYS_NANOSLEEP			= 162;
-	SYS_MREMAP			= 163;
-	SYS_SETRESUID			= 164;
-	SYS_GETRESUID			= 165;
-	SYS_VM86			= 166;
-	SYS_QUERY_MODULE		= 167;
-	SYS_POLL			= 168;
-	SYS_NFSSERVCTL			= 169;
-	SYS_SETRESGID			= 170;
-	SYS_GETRESGID			= 171;
-	SYS_PRCTL			= 172;
-	SYS_RT_SIGRETURN		= 173;
-	SYS_RT_SIGACTION		= 174;
-	SYS_RT_SIGPROCMASK		= 175;
-	SYS_RT_SIGPENDING		= 176;
-	SYS_RT_SIGTIMEDWAIT		= 177;
-	SYS_RT_SIGQUEUEINFO		= 178;
-	SYS_RT_SIGSUSPEND		= 179;
-	SYS_PREAD64			= 180;
-	SYS_PWRITE64			= 181;
-	SYS_CHOWN			= 182;
-	SYS_GETCWD			= 183;
-	SYS_CAPGET			= 184;
-	SYS_CAPSET			= 185;
-	SYS_SIGALTSTACK			= 186;
-	SYS_SENDFILE			= 187;
-	SYS_GETPMSG			= 188;
-	SYS_PUTPMSG			= 189;
-	SYS_VFORK			= 190;
-	SYS_UGETRLIMIT			= 191;
-	SYS_MMAP2			= 192;
-	SYS_TRUNCATE64			= 193;
-	SYS_FTRUNCATE64			= 194;
-	SYS_STAT64			= 195;
-	SYS_LSTAT64			= 196;
-	SYS_FSTAT64			= 197;
-	SYS_LCHOWN32			= 198;
-	SYS_GETUID32			= 199;
-	SYS_GETGID32			= 200;
-	SYS_GETEUID32			= 201;
-	SYS_GETEGID32			= 202;
-	SYS_SETREUID32			= 203;
-	SYS_SETREGID32			= 204;
-	SYS_GETGROUPS32			= 205;
-	SYS_SETGROUPS32			= 206;
-	SYS_FCHOWN32			= 207;
-	SYS_SETRESUID32			= 208;
-	SYS_GETRESUID32			= 209;
-	SYS_SETRESGID32			= 210;
-	SYS_GETRESGID32			= 211;
-	SYS_CHOWN32			= 212;
-	SYS_SETUID32			= 213;
-	SYS_SETGID32			= 214;
-	SYS_SETFSUID32			= 215;
-	SYS_SETFSGID32			= 216;
-	SYS_PIVOT_ROOT			= 217;
-	SYS_MINCORE			= 218;
-	SYS_MADVISE			= 219;
-	SYS_MADVISE1			= 219;
-	SYS_GETDENTS64			= 220;
-	SYS_FCNTL64			= 221;
-	SYS_GETTID			= 224;
-	SYS_READAHEAD			= 225;
-	SYS_SETXATTR			= 226;
-	SYS_LSETXATTR			= 227;
-	SYS_FSETXATTR			= 228;
-	SYS_GETXATTR			= 229;
-	SYS_LGETXATTR			= 230;
-	SYS_FGETXATTR			= 231;
-	SYS_LISTXATTR			= 232;
-	SYS_LLISTXATTR			= 233;
-	SYS_FLISTXATTR			= 234;
-	SYS_REMOVEXATTR			= 235;
-	SYS_LREMOVEXATTR		= 236;
-	SYS_FREMOVEXATTR		= 237;
-	SYS_TKILL			= 238;
-	SYS_SENDFILE64			= 239;
-	SYS_FUTEX			= 240;
-	SYS_SCHED_SETAFFINITY		= 241;
-	SYS_SCHED_GETAFFINITY		= 242;
-	SYS_SET_THREAD_AREA		= 243;
-	SYS_GET_THREAD_AREA		= 244;
-	SYS_IO_SETUP			= 245;
-	SYS_IO_DESTROY			= 246;
-	SYS_IO_GETEVENTS		= 247;
-	SYS_IO_SUBMIT			= 248;
-	SYS_IO_CANCEL			= 249;
-	SYS_FADVISE64			= 250;
-	SYS_EXIT_GROUP			= 252;
-	SYS_LOOKUP_DCOOKIE		= 253;
-	SYS_EPOLL_CREATE		= 254;
-	SYS_EPOLL_CTL			= 255;
-	SYS_EPOLL_WAIT			= 256;
-	SYS_REMAP_FILE_PAGES		= 257;
-	SYS_SET_TID_ADDRESS		= 258;
-	SYS_TIMER_CREATE		= 259;
-	SYS_STATFS64			= 268;
-	SYS_FSTATFS64			= 269;
-	SYS_TGKILL			= 270;
-	SYS_UTIMES			= 271;
-	SYS_FADVISE64_64		= 272;
-	SYS_VSERVER			= 273;
-	SYS_MBIND			= 274;
-	SYS_GET_MEMPOLICY		= 275;
-	SYS_SET_MEMPOLICY		= 276;
-	SYS_MQ_OPEN			= 277;
-	SYS_KEXEC_LOAD			= 283;
-	SYS_WAITID			= 284;
-	SYS_ADD_KEY			= 286;
-	SYS_REQUEST_KEY			= 287;
-	SYS_KEYCTL			= 288;
-	SYS_IOPRIO_SET			= 289;
-	SYS_IOPRIO_GET			= 290;
-	SYS_INOTIFY_INIT		= 291;
-	SYS_INOTIFY_ADD_WATCH		= 292;
-	SYS_INOTIFY_RM_WATCH		= 293;
-	SYS_MIGRATE_PAGES		= 294;
-	SYS_OPENAT			= 295;
-	SYS_MKDIRAT			= 296;
-	SYS_MKNODAT			= 297;
-	SYS_FCHOWNAT			= 298;
-	SYS_FUTIMESAT			= 299;
-	SYS_FSTATAT64			= 300;
-	SYS_UNLINKAT			= 301;
-	SYS_RENAMEAT			= 302;
-	SYS_LINKAT			= 303;
-	SYS_SYMLINKAT			= 304;
-	SYS_READLINKAT			= 305;
-	SYS_FCHMODAT			= 306;
-	SYS_FACCESSAT			= 307;
-	SYS_PSELECT6			= 308;
-	SYS_PPOLL			= 309;
-	SYS_UNSHARE			= 310;
-	SYS_SET_ROBUST_LIST		= 311;
-	SYS_GET_ROBUST_LIST		= 312;
-	SYS_SPLICE			= 313;
-	SYS_SYNC_FILE_RANGE		= 314;
-	SYS_TEE				= 315;
-	SYS_VMSPLICE			= 316;
-	SYS_MOVE_PAGES			= 317;
-	SYS_GETCPU			= 318;
-	SYS_EPOLL_PWAIT			= 319;
-	SYS_UTIMENSAT			= 320;
-	SYS_SIGNALFD			= 321;
-	SYS_TIMERFD			= 322;
-	SYS_EVENTFD			= 323;
-	SYS_FALLOCATE			= 324;
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86OLD                = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_VM86                   = 166
+	SYS_QUERY_MODULE           = 167
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_SETRESGID              = 170
+	SYS_GETRESGID              = 171
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_CHOWN                  = 182
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_GETPMSG                = 188
+	SYS_PUTPMSG                = 189
+	SYS_VFORK                  = 190
+	SYS_UGETRLIMIT             = 191
+	SYS_MMAP2                  = 192
+	SYS_TRUNCATE64             = 193
+	SYS_FTRUNCATE64            = 194
+	SYS_STAT64                 = 195
+	SYS_LSTAT64                = 196
+	SYS_FSTAT64                = 197
+	SYS_LCHOWN32               = 198
+	SYS_GETUID32               = 199
+	SYS_GETGID32               = 200
+	SYS_GETEUID32              = 201
+	SYS_GETEGID32              = 202
+	SYS_SETREUID32             = 203
+	SYS_SETREGID32             = 204
+	SYS_GETGROUPS32            = 205
+	SYS_SETGROUPS32            = 206
+	SYS_FCHOWN32               = 207
+	SYS_SETRESUID32            = 208
+	SYS_GETRESUID32            = 209
+	SYS_SETRESGID32            = 210
+	SYS_GETRESGID32            = 211
+	SYS_CHOWN32                = 212
+	SYS_SETUID32               = 213
+	SYS_SETGID32               = 214
+	SYS_SETFSUID32             = 215
+	SYS_SETFSGID32             = 216
+	SYS_PIVOT_ROOT             = 217
+	SYS_MINCORE                = 218
+	SYS_MADVISE                = 219
+	SYS_MADVISE1               = 219
+	SYS_GETDENTS64             = 220
+	SYS_FCNTL64                = 221
+	SYS_GETTID                 = 224
+	SYS_READAHEAD              = 225
+	SYS_SETXATTR               = 226
+	SYS_LSETXATTR              = 227
+	SYS_FSETXATTR              = 228
+	SYS_GETXATTR               = 229
+	SYS_LGETXATTR              = 230
+	SYS_FGETXATTR              = 231
+	SYS_LISTXATTR              = 232
+	SYS_LLISTXATTR             = 233
+	SYS_FLISTXATTR             = 234
+	SYS_REMOVEXATTR            = 235
+	SYS_LREMOVEXATTR           = 236
+	SYS_FREMOVEXATTR           = 237
+	SYS_TKILL                  = 238
+	SYS_SENDFILE64             = 239
+	SYS_FUTEX                  = 240
+	SYS_SCHED_SETAFFINITY      = 241
+	SYS_SCHED_GETAFFINITY      = 242
+	SYS_SET_THREAD_AREA        = 243
+	SYS_GET_THREAD_AREA        = 244
+	SYS_IO_SETUP               = 245
+	SYS_IO_DESTROY             = 246
+	SYS_IO_GETEVENTS           = 247
+	SYS_IO_SUBMIT              = 248
+	SYS_IO_CANCEL              = 249
+	SYS_FADVISE64              = 250
+	SYS_EXIT_GROUP             = 252
+	SYS_LOOKUP_DCOOKIE         = 253
+	SYS_EPOLL_CREATE           = 254
+	SYS_EPOLL_CTL              = 255
+	SYS_EPOLL_WAIT             = 256
+	SYS_REMAP_FILE_PAGES       = 257
+	SYS_SET_TID_ADDRESS        = 258
+	SYS_TIMER_CREATE           = 259
+	SYS_STATFS64               = 268
+	SYS_FSTATFS64              = 269
+	SYS_TGKILL                 = 270
+	SYS_UTIMES                 = 271
+	SYS_FADVISE64_64           = 272
+	SYS_VSERVER                = 273
+	SYS_MBIND                  = 274
+	SYS_GET_MEMPOLICY          = 275
+	SYS_SET_MEMPOLICY          = 276
+	SYS_MQ_OPEN                = 277
+	SYS_KEXEC_LOAD             = 283
+	SYS_WAITID                 = 284
+	SYS_ADD_KEY                = 286
+	SYS_REQUEST_KEY            = 287
+	SYS_KEYCTL                 = 288
+	SYS_IOPRIO_SET             = 289
+	SYS_IOPRIO_GET             = 290
+	SYS_INOTIFY_INIT           = 291
+	SYS_INOTIFY_ADD_WATCH      = 292
+	SYS_INOTIFY_RM_WATCH       = 293
+	SYS_MIGRATE_PAGES          = 294
+	SYS_OPENAT                 = 295
+	SYS_MKDIRAT                = 296
+	SYS_MKNODAT                = 297
+	SYS_FCHOWNAT               = 298
+	SYS_FUTIMESAT              = 299
+	SYS_FSTATAT64              = 300
+	SYS_UNLINKAT               = 301
+	SYS_RENAMEAT               = 302
+	SYS_LINKAT                 = 303
+	SYS_SYMLINKAT              = 304
+	SYS_READLINKAT             = 305
+	SYS_FCHMODAT               = 306
+	SYS_FACCESSAT              = 307
+	SYS_PSELECT6               = 308
+	SYS_PPOLL                  = 309
+	SYS_UNSHARE                = 310
+	SYS_SET_ROBUST_LIST        = 311
+	SYS_GET_ROBUST_LIST        = 312
+	SYS_SPLICE                 = 313
+	SYS_SYNC_FILE_RANGE        = 314
+	SYS_TEE                    = 315
+	SYS_VMSPLICE               = 316
+	SYS_MOVE_PAGES             = 317
+	SYS_GETCPU                 = 318
+	SYS_EPOLL_PWAIT            = 319
+	SYS_UTIMENSAT              = 320
+	SYS_SIGNALFD               = 321
+	SYS_TIMERFD                = 322
+	SYS_EVENTFD                = 323
+	SYS_FALLOCATE              = 324
 )
 
-func _darwin_system_call_conflict()	{}
+func _darwin_system_call_conflict() {}
diff --git a/src/pkg/syscall/zsysnum_linux_amd64.go b/src/pkg/syscall/zsysnum_linux_amd64.go
index 055e65b5d..e7a292994 100644
--- a/src/pkg/syscall/zsysnum_linux_amd64.go
+++ b/src/pkg/syscall/zsysnum_linux_amd64.go
@@ -4,292 +4,292 @@
 package syscall
 
 const (
-	SYS_READ			= 0;
-	SYS_WRITE			= 1;
-	SYS_OPEN			= 2;
-	SYS_CLOSE			= 3;
-	SYS_STAT			= 4;
-	SYS_FSTAT			= 5;
-	SYS_LSTAT			= 6;
-	SYS_POLL			= 7;
-	SYS_LSEEK			= 8;
-	SYS_MMAP			= 9;
-	SYS_MPROTECT			= 10;
-	SYS_MUNMAP			= 11;
-	SYS_BRK				= 12;
-	SYS_RT_SIGACTION		= 13;
-	SYS_RT_SIGPROCMASK		= 14;
-	SYS_RT_SIGRETURN		= 15;
-	SYS_IOCTL			= 16;
-	SYS_PREAD64			= 17;
-	SYS_PWRITE64			= 18;
-	SYS_READV			= 19;
-	SYS_WRITEV			= 20;
-	SYS_ACCESS			= 21;
-	SYS_PIPE			= 22;
-	SYS_SELECT			= 23;
-	SYS_SCHED_YIELD			= 24;
-	SYS_MREMAP			= 25;
-	SYS_MSYNC			= 26;
-	SYS_MINCORE			= 27;
-	SYS_MADVISE			= 28;
-	SYS_SHMGET			= 29;
-	SYS_SHMAT			= 30;
-	SYS_SHMCTL			= 31;
-	SYS_DUP				= 32;
-	SYS_DUP2			= 33;
-	SYS_PAUSE			= 34;
-	SYS_NANOSLEEP			= 35;
-	SYS_GETITIMER			= 36;
-	SYS_ALARM			= 37;
-	SYS_SETITIMER			= 38;
-	SYS_GETPID			= 39;
-	SYS_SENDFILE			= 40;
-	SYS_SOCKET			= 41;
-	SYS_CONNECT			= 42;
-	SYS_ACCEPT			= 43;
-	SYS_SENDTO			= 44;
-	SYS_RECVFROM			= 45;
-	SYS_SENDMSG			= 46;
-	SYS_RECVMSG			= 47;
-	SYS_SHUTDOWN			= 48;
-	SYS_BIND			= 49;
-	SYS_LISTEN			= 50;
-	SYS_GETSOCKNAME			= 51;
-	SYS_GETPEERNAME			= 52;
-	SYS_SOCKETPAIR			= 53;
-	SYS_SETSOCKOPT			= 54;
-	SYS_GETSOCKOPT			= 55;
-	SYS_CLONE			= 56;
-	SYS_FORK			= 57;
-	SYS_VFORK			= 58;
-	SYS_EXECVE			= 59;
-	SYS_EXIT			= 60;
-	SYS_WAIT4			= 61;
-	SYS_KILL			= 62;
-	SYS_UNAME			= 63;
-	SYS_SEMGET			= 64;
-	SYS_SEMOP			= 65;
-	SYS_SEMCTL			= 66;
-	SYS_SHMDT			= 67;
-	SYS_MSGGET			= 68;
-	SYS_MSGSND			= 69;
-	SYS_MSGRCV			= 70;
-	SYS_MSGCTL			= 71;
-	SYS_FCNTL			= 72;
-	SYS_FLOCK			= 73;
-	SYS_FSYNC			= 74;
-	SYS_FDATASYNC			= 75;
-	SYS_TRUNCATE			= 76;
-	SYS_FTRUNCATE			= 77;
-	SYS_GETDENTS			= 78;
-	SYS_GETCWD			= 79;
-	SYS_CHDIR			= 80;
-	SYS_FCHDIR			= 81;
-	SYS_RENAME			= 82;
-	SYS_MKDIR			= 83;
-	SYS_RMDIR			= 84;
-	SYS_CREAT			= 85;
-	SYS_LINK			= 86;
-	SYS_UNLINK			= 87;
-	SYS_SYMLINK			= 88;
-	SYS_READLINK			= 89;
-	SYS_CHMOD			= 90;
-	SYS_FCHMOD			= 91;
-	SYS_CHOWN			= 92;
-	SYS_FCHOWN			= 93;
-	SYS_LCHOWN			= 94;
-	SYS_UMASK			= 95;
-	SYS_GETTIMEOFDAY		= 96;
-	SYS_GETRLIMIT			= 97;
-	SYS_GETRUSAGE			= 98;
-	SYS_SYSINFO			= 99;
-	SYS_TIMES			= 100;
-	SYS_PTRACE			= 101;
-	SYS_GETUID			= 102;
-	SYS_SYSLOG			= 103;
-	SYS_GETGID			= 104;
-	SYS_SETUID			= 105;
-	SYS_SETGID			= 106;
-	SYS_GETEUID			= 107;
-	SYS_GETEGID			= 108;
-	SYS_SETPGID			= 109;
-	SYS_GETPPID			= 110;
-	SYS_GETPGRP			= 111;
-	SYS_SETSID			= 112;
-	SYS_SETREUID			= 113;
-	SYS_SETREGID			= 114;
-	SYS_GETGROUPS			= 115;
-	SYS_SETGROUPS			= 116;
-	SYS_SETRESUID			= 117;
-	SYS_GETRESUID			= 118;
-	SYS_SETRESGID			= 119;
-	SYS_GETRESGID			= 120;
-	SYS_GETPGID			= 121;
-	SYS_SETFSUID			= 122;
-	SYS_SETFSGID			= 123;
-	SYS_GETSID			= 124;
-	SYS_CAPGET			= 125;
-	SYS_CAPSET			= 126;
-	SYS_RT_SIGPENDING		= 127;
-	SYS_RT_SIGTIMEDWAIT		= 128;
-	SYS_RT_SIGQUEUEINFO		= 129;
-	SYS_RT_SIGSUSPEND		= 130;
-	SYS_SIGALTSTACK			= 131;
-	SYS_UTIME			= 132;
-	SYS_MKNOD			= 133;
-	SYS_USELIB			= 134;
-	SYS_PERSONALITY			= 135;
-	SYS_USTAT			= 136;
-	SYS_STATFS			= 137;
-	SYS_FSTATFS			= 138;
-	SYS_SYSFS			= 139;
-	SYS_GETPRIORITY			= 140;
-	SYS_SETPRIORITY			= 141;
-	SYS_SCHED_SETPARAM		= 142;
-	SYS_SCHED_GETPARAM		= 143;
-	SYS_SCHED_SETSCHEDULER		= 144;
-	SYS_SCHED_GETSCHEDULER		= 145;
-	SYS_SCHED_GET_PRIORITY_MAX	= 146;
-	SYS_SCHED_GET_PRIORITY_MIN	= 147;
-	SYS_SCHED_RR_GET_INTERVAL	= 148;
-	SYS_MLOCK			= 149;
-	SYS_MUNLOCK			= 150;
-	SYS_MLOCKALL			= 151;
-	SYS_MUNLOCKALL			= 152;
-	SYS_VHANGUP			= 153;
-	SYS_MODIFY_LDT			= 154;
-	SYS_PIVOT_ROOT			= 155;
-	SYS__SYSCTL			= 156;
-	SYS_PRCTL			= 157;
-	SYS_ARCH_PRCTL			= 158;
-	SYS_ADJTIMEX			= 159;
-	SYS_SETRLIMIT			= 160;
-	SYS_CHROOT			= 161;
-	SYS_SYNC			= 162;
-	SYS_ACCT			= 163;
-	SYS_SETTIMEOFDAY		= 164;
-	SYS_MOUNT			= 165;
-	SYS_UMOUNT2			= 166;
-	SYS_SWAPON			= 167;
-	SYS_SWAPOFF			= 168;
-	SYS_REBOOT			= 169;
-	SYS_SETHOSTNAME			= 170;
-	SYS_SETDOMAINNAME		= 171;
-	SYS_IOPL			= 172;
-	SYS_IOPERM			= 173;
-	SYS_CREATE_MODULE		= 174;
-	SYS_INIT_MODULE			= 175;
-	SYS_DELETE_MODULE		= 176;
-	SYS_GET_KERNEL_SYMS		= 177;
-	SYS_QUERY_MODULE		= 178;
-	SYS_QUOTACTL			= 179;
-	SYS_NFSSERVCTL			= 180;
-	SYS_GETPMSG			= 181;
-	SYS_PUTPMSG			= 182;
-	SYS_AFS_SYSCALL			= 183;
-	SYS_TUXCALL			= 184;
-	SYS_SECURITY			= 185;
-	SYS_GETTID			= 186;
-	SYS_READAHEAD			= 187;
-	SYS_SETXATTR			= 188;
-	SYS_LSETXATTR			= 189;
-	SYS_FSETXATTR			= 190;
-	SYS_GETXATTR			= 191;
-	SYS_LGETXATTR			= 192;
-	SYS_FGETXATTR			= 193;
-	SYS_LISTXATTR			= 194;
-	SYS_LLISTXATTR			= 195;
-	SYS_FLISTXATTR			= 196;
-	SYS_REMOVEXATTR			= 197;
-	SYS_LREMOVEXATTR		= 198;
-	SYS_FREMOVEXATTR		= 199;
-	SYS_TKILL			= 200;
-	SYS_TIME			= 201;
-	SYS_FUTEX			= 202;
-	SYS_SCHED_SETAFFINITY		= 203;
-	SYS_SCHED_GETAFFINITY		= 204;
-	SYS_SET_THREAD_AREA		= 205;
-	SYS_IO_SETUP			= 206;
-	SYS_IO_DESTROY			= 207;
-	SYS_IO_GETEVENTS		= 208;
-	SYS_IO_SUBMIT			= 209;
-	SYS_IO_CANCEL			= 210;
-	SYS_GET_THREAD_AREA		= 211;
-	SYS_LOOKUP_DCOOKIE		= 212;
-	SYS_EPOLL_CREATE		= 213;
-	SYS_EPOLL_CTL_OLD		= 214;
-	SYS_EPOLL_WAIT_OLD		= 215;
-	SYS_REMAP_FILE_PAGES		= 216;
-	SYS_GETDENTS64			= 217;
-	SYS_SET_TID_ADDRESS		= 218;
-	SYS_RESTART_SYSCALL		= 219;
-	SYS_SEMTIMEDOP			= 220;
-	SYS_FADVISE64			= 221;
-	SYS_TIMER_CREATE		= 222;
-	SYS_TIMER_SETTIME		= 223;
-	SYS_TIMER_GETTIME		= 224;
-	SYS_TIMER_GETOVERRUN		= 225;
-	SYS_TIMER_DELETE		= 226;
-	SYS_CLOCK_SETTIME		= 227;
-	SYS_CLOCK_GETTIME		= 228;
-	SYS_CLOCK_GETRES		= 229;
-	SYS_CLOCK_NANOSLEEP		= 230;
-	SYS_EXIT_GROUP			= 231;
-	SYS_EPOLL_WAIT			= 232;
-	SYS_EPOLL_CTL			= 233;
-	SYS_TGKILL			= 234;
-	SYS_UTIMES			= 235;
-	SYS_VSERVER			= 236;
-	SYS_MBIND			= 237;
-	SYS_SET_MEMPOLICY		= 238;
-	SYS_GET_MEMPOLICY		= 239;
-	SYS_MQ_OPEN			= 240;
-	SYS_MQ_UNLINK			= 241;
-	SYS_MQ_TIMEDSEND		= 242;
-	SYS_MQ_TIMEDRECEIVE		= 243;
-	SYS_MQ_NOTIFY			= 244;
-	SYS_MQ_GETSETATTR		= 245;
-	SYS_KEXEC_LOAD			= 246;
-	SYS_WAITID			= 247;
-	SYS_ADD_KEY			= 248;
-	SYS_REQUEST_KEY			= 249;
-	SYS_KEYCTL			= 250;
-	SYS_IOPRIO_SET			= 251;
-	SYS_IOPRIO_GET			= 252;
-	SYS_INOTIFY_INIT		= 253;
-	SYS_INOTIFY_ADD_WATCH		= 254;
-	SYS_INOTIFY_RM_WATCH		= 255;
-	SYS_MIGRATE_PAGES		= 256;
-	SYS_OPENAT			= 257;
-	SYS_MKDIRAT			= 258;
-	SYS_MKNODAT			= 259;
-	SYS_FCHOWNAT			= 260;
-	SYS_FUTIMESAT			= 261;
-	SYS_NEWFSTATAT			= 262;
-	SYS_UNLINKAT			= 263;
-	SYS_RENAMEAT			= 264;
-	SYS_LINKAT			= 265;
-	SYS_SYMLINKAT			= 266;
-	SYS_READLINKAT			= 267;
-	SYS_FCHMODAT			= 268;
-	SYS_FACCESSAT			= 269;
-	SYS_PSELECT6			= 270;
-	SYS_PPOLL			= 271;
-	SYS_UNSHARE			= 272;
-	SYS_SET_ROBUST_LIST		= 273;
-	SYS_GET_ROBUST_LIST		= 274;
-	SYS_SPLICE			= 275;
-	SYS_TEE				= 276;
-	SYS_SYNC_FILE_RANGE		= 277;
-	SYS_VMSPLICE			= 278;
-	SYS_MOVE_PAGES			= 279;
-	SYS_UTIMENSAT			= 280;
-	SYS_EPOLL_PWAIT			= 281;
-	SYS_SIGNALFD			= 282;
-	SYS_TIMERFD			= 283;
-	SYS_EVENTFD			= 284;
-	SYS_FALLOCATE			= 285;
+	SYS_READ                   = 0
+	SYS_WRITE                  = 1
+	SYS_OPEN                   = 2
+	SYS_CLOSE                  = 3
+	SYS_STAT                   = 4
+	SYS_FSTAT                  = 5
+	SYS_LSTAT                  = 6
+	SYS_POLL                   = 7
+	SYS_LSEEK                  = 8
+	SYS_MMAP                   = 9
+	SYS_MPROTECT               = 10
+	SYS_MUNMAP                 = 11
+	SYS_BRK                    = 12
+	SYS_RT_SIGACTION           = 13
+	SYS_RT_SIGPROCMASK         = 14
+	SYS_RT_SIGRETURN           = 15
+	SYS_IOCTL                  = 16
+	SYS_PREAD64                = 17
+	SYS_PWRITE64               = 18
+	SYS_READV                  = 19
+	SYS_WRITEV                 = 20
+	SYS_ACCESS                 = 21
+	SYS_PIPE                   = 22
+	SYS_SELECT                 = 23
+	SYS_SCHED_YIELD            = 24
+	SYS_MREMAP                 = 25
+	SYS_MSYNC                  = 26
+	SYS_MINCORE                = 27
+	SYS_MADVISE                = 28
+	SYS_SHMGET                 = 29
+	SYS_SHMAT                  = 30
+	SYS_SHMCTL                 = 31
+	SYS_DUP                    = 32
+	SYS_DUP2                   = 33
+	SYS_PAUSE                  = 34
+	SYS_NANOSLEEP              = 35
+	SYS_GETITIMER              = 36
+	SYS_ALARM                  = 37
+	SYS_SETITIMER              = 38
+	SYS_GETPID                 = 39
+	SYS_SENDFILE               = 40
+	SYS_SOCKET                 = 41
+	SYS_CONNECT                = 42
+	SYS_ACCEPT                 = 43
+	SYS_SENDTO                 = 44
+	SYS_RECVFROM               = 45
+	SYS_SENDMSG                = 46
+	SYS_RECVMSG                = 47
+	SYS_SHUTDOWN               = 48
+	SYS_BIND                   = 49
+	SYS_LISTEN                 = 50
+	SYS_GETSOCKNAME            = 51
+	SYS_GETPEERNAME            = 52
+	SYS_SOCKETPAIR             = 53
+	SYS_SETSOCKOPT             = 54
+	SYS_GETSOCKOPT             = 55
+	SYS_CLONE                  = 56
+	SYS_FORK                   = 57
+	SYS_VFORK                  = 58
+	SYS_EXECVE                 = 59
+	SYS_EXIT                   = 60
+	SYS_WAIT4                  = 61
+	SYS_KILL                   = 62
+	SYS_UNAME                  = 63
+	SYS_SEMGET                 = 64
+	SYS_SEMOP                  = 65
+	SYS_SEMCTL                 = 66
+	SYS_SHMDT                  = 67
+	SYS_MSGGET                 = 68
+	SYS_MSGSND                 = 69
+	SYS_MSGRCV                 = 70
+	SYS_MSGCTL                 = 71
+	SYS_FCNTL                  = 72
+	SYS_FLOCK                  = 73
+	SYS_FSYNC                  = 74
+	SYS_FDATASYNC              = 75
+	SYS_TRUNCATE               = 76
+	SYS_FTRUNCATE              = 77
+	SYS_GETDENTS               = 78
+	SYS_GETCWD                 = 79
+	SYS_CHDIR                  = 80
+	SYS_FCHDIR                 = 81
+	SYS_RENAME                 = 82
+	SYS_MKDIR                  = 83
+	SYS_RMDIR                  = 84
+	SYS_CREAT                  = 85
+	SYS_LINK                   = 86
+	SYS_UNLINK                 = 87
+	SYS_SYMLINK                = 88
+	SYS_READLINK               = 89
+	SYS_CHMOD                  = 90
+	SYS_FCHMOD                 = 91
+	SYS_CHOWN                  = 92
+	SYS_FCHOWN                 = 93
+	SYS_LCHOWN                 = 94
+	SYS_UMASK                  = 95
+	SYS_GETTIMEOFDAY           = 96
+	SYS_GETRLIMIT              = 97
+	SYS_GETRUSAGE              = 98
+	SYS_SYSINFO                = 99
+	SYS_TIMES                  = 100
+	SYS_PTRACE                 = 101
+	SYS_GETUID                 = 102
+	SYS_SYSLOG                 = 103
+	SYS_GETGID                 = 104
+	SYS_SETUID                 = 105
+	SYS_SETGID                 = 106
+	SYS_GETEUID                = 107
+	SYS_GETEGID                = 108
+	SYS_SETPGID                = 109
+	SYS_GETPPID                = 110
+	SYS_GETPGRP                = 111
+	SYS_SETSID                 = 112
+	SYS_SETREUID               = 113
+	SYS_SETREGID               = 114
+	SYS_GETGROUPS              = 115
+	SYS_SETGROUPS              = 116
+	SYS_SETRESUID              = 117
+	SYS_GETRESUID              = 118
+	SYS_SETRESGID              = 119
+	SYS_GETRESGID              = 120
+	SYS_GETPGID                = 121
+	SYS_SETFSUID               = 122
+	SYS_SETFSGID               = 123
+	SYS_GETSID                 = 124
+	SYS_CAPGET                 = 125
+	SYS_CAPSET                 = 126
+	SYS_RT_SIGPENDING          = 127
+	SYS_RT_SIGTIMEDWAIT        = 128
+	SYS_RT_SIGQUEUEINFO        = 129
+	SYS_RT_SIGSUSPEND          = 130
+	SYS_SIGALTSTACK            = 131
+	SYS_UTIME                  = 132
+	SYS_MKNOD                  = 133
+	SYS_USELIB                 = 134
+	SYS_PERSONALITY            = 135
+	SYS_USTAT                  = 136
+	SYS_STATFS                 = 137
+	SYS_FSTATFS                = 138
+	SYS_SYSFS                  = 139
+	SYS_GETPRIORITY            = 140
+	SYS_SETPRIORITY            = 141
+	SYS_SCHED_SETPARAM         = 142
+	SYS_SCHED_GETPARAM         = 143
+	SYS_SCHED_SETSCHEDULER     = 144
+	SYS_SCHED_GETSCHEDULER     = 145
+	SYS_SCHED_GET_PRIORITY_MAX = 146
+	SYS_SCHED_GET_PRIORITY_MIN = 147
+	SYS_SCHED_RR_GET_INTERVAL  = 148
+	SYS_MLOCK                  = 149
+	SYS_MUNLOCK                = 150
+	SYS_MLOCKALL               = 151
+	SYS_MUNLOCKALL             = 152
+	SYS_VHANGUP                = 153
+	SYS_MODIFY_LDT             = 154
+	SYS_PIVOT_ROOT             = 155
+	SYS__SYSCTL                = 156
+	SYS_PRCTL                  = 157
+	SYS_ARCH_PRCTL             = 158
+	SYS_ADJTIMEX               = 159
+	SYS_SETRLIMIT              = 160
+	SYS_CHROOT                 = 161
+	SYS_SYNC                   = 162
+	SYS_ACCT                   = 163
+	SYS_SETTIMEOFDAY           = 164
+	SYS_MOUNT                  = 165
+	SYS_UMOUNT2                = 166
+	SYS_SWAPON                 = 167
+	SYS_SWAPOFF                = 168
+	SYS_REBOOT                 = 169
+	SYS_SETHOSTNAME            = 170
+	SYS_SETDOMAINNAME          = 171
+	SYS_IOPL                   = 172
+	SYS_IOPERM                 = 173
+	SYS_CREATE_MODULE          = 174
+	SYS_INIT_MODULE            = 175
+	SYS_DELETE_MODULE          = 176
+	SYS_GET_KERNEL_SYMS        = 177
+	SYS_QUERY_MODULE           = 178
+	SYS_QUOTACTL               = 179
+	SYS_NFSSERVCTL             = 180
+	SYS_GETPMSG                = 181
+	SYS_PUTPMSG                = 182
+	SYS_AFS_SYSCALL            = 183
+	SYS_TUXCALL                = 184
+	SYS_SECURITY               = 185
+	SYS_GETTID                 = 186
+	SYS_READAHEAD              = 187
+	SYS_SETXATTR               = 188
+	SYS_LSETXATTR              = 189
+	SYS_FSETXATTR              = 190
+	SYS_GETXATTR               = 191
+	SYS_LGETXATTR              = 192
+	SYS_FGETXATTR              = 193
+	SYS_LISTXATTR              = 194
+	SYS_LLISTXATTR             = 195
+	SYS_FLISTXATTR             = 196
+	SYS_REMOVEXATTR            = 197
+	SYS_LREMOVEXATTR           = 198
+	SYS_FREMOVEXATTR           = 199
+	SYS_TKILL                  = 200
+	SYS_TIME                   = 201
+	SYS_FUTEX                  = 202
+	SYS_SCHED_SETAFFINITY      = 203
+	SYS_SCHED_GETAFFINITY      = 204
+	SYS_SET_THREAD_AREA        = 205
+	SYS_IO_SETUP               = 206
+	SYS_IO_DESTROY             = 207
+	SYS_IO_GETEVENTS           = 208
+	SYS_IO_SUBMIT              = 209
+	SYS_IO_CANCEL              = 210
+	SYS_GET_THREAD_AREA        = 211
+	SYS_LOOKUP_DCOOKIE         = 212
+	SYS_EPOLL_CREATE           = 213
+	SYS_EPOLL_CTL_OLD          = 214
+	SYS_EPOLL_WAIT_OLD         = 215
+	SYS_REMAP_FILE_PAGES       = 216
+	SYS_GETDENTS64             = 217
+	SYS_SET_TID_ADDRESS        = 218
+	SYS_RESTART_SYSCALL        = 219
+	SYS_SEMTIMEDOP             = 220
+	SYS_FADVISE64              = 221
+	SYS_TIMER_CREATE           = 222
+	SYS_TIMER_SETTIME          = 223
+	SYS_TIMER_GETTIME          = 224
+	SYS_TIMER_GETOVERRUN       = 225
+	SYS_TIMER_DELETE           = 226
+	SYS_CLOCK_SETTIME          = 227
+	SYS_CLOCK_GETTIME          = 228
+	SYS_CLOCK_GETRES           = 229
+	SYS_CLOCK_NANOSLEEP        = 230
+	SYS_EXIT_GROUP             = 231
+	SYS_EPOLL_WAIT             = 232
+	SYS_EPOLL_CTL              = 233
+	SYS_TGKILL                 = 234
+	SYS_UTIMES                 = 235
+	SYS_VSERVER                = 236
+	SYS_MBIND                  = 237
+	SYS_SET_MEMPOLICY          = 238
+	SYS_GET_MEMPOLICY          = 239
+	SYS_MQ_OPEN                = 240
+	SYS_MQ_UNLINK              = 241
+	SYS_MQ_TIMEDSEND           = 242
+	SYS_MQ_TIMEDRECEIVE        = 243
+	SYS_MQ_NOTIFY              = 244
+	SYS_MQ_GETSETATTR          = 245
+	SYS_KEXEC_LOAD             = 246
+	SYS_WAITID                 = 247
+	SYS_ADD_KEY                = 248
+	SYS_REQUEST_KEY            = 249
+	SYS_KEYCTL                 = 250
+	SYS_IOPRIO_SET             = 251
+	SYS_IOPRIO_GET             = 252
+	SYS_INOTIFY_INIT           = 253
+	SYS_INOTIFY_ADD_WATCH      = 254
+	SYS_INOTIFY_RM_WATCH       = 255
+	SYS_MIGRATE_PAGES          = 256
+	SYS_OPENAT                 = 257
+	SYS_MKDIRAT                = 258
+	SYS_MKNODAT                = 259
+	SYS_FCHOWNAT               = 260
+	SYS_FUTIMESAT              = 261
+	SYS_NEWFSTATAT             = 262
+	SYS_UNLINKAT               = 263
+	SYS_RENAMEAT               = 264
+	SYS_LINKAT                 = 265
+	SYS_SYMLINKAT              = 266
+	SYS_READLINKAT             = 267
+	SYS_FCHMODAT               = 268
+	SYS_FACCESSAT              = 269
+	SYS_PSELECT6               = 270
+	SYS_PPOLL                  = 271
+	SYS_UNSHARE                = 272
+	SYS_SET_ROBUST_LIST        = 273
+	SYS_GET_ROBUST_LIST        = 274
+	SYS_SPLICE                 = 275
+	SYS_TEE                    = 276
+	SYS_SYNC_FILE_RANGE        = 277
+	SYS_VMSPLICE               = 278
+	SYS_MOVE_PAGES             = 279
+	SYS_UTIMENSAT              = 280
+	SYS_EPOLL_PWAIT            = 281
+	SYS_SIGNALFD               = 282
+	SYS_TIMERFD                = 283
+	SYS_EVENTFD                = 284
+	SYS_FALLOCATE              = 285
 )
 
-func _darwin_system_call_conflict()	{}
+func _darwin_system_call_conflict() {}
diff --git a/src/pkg/syscall/zsysnum_linux_arm.go b/src/pkg/syscall/zsysnum_linux_arm.go
index d1936c049..8d22929ef 100644
--- a/src/pkg/syscall/zsysnum_linux_arm.go
+++ b/src/pkg/syscall/zsysnum_linux_arm.go
@@ -3,334 +3,334 @@
 package syscall
 
 const (
-	SYS_SYSCALL_BASE	= 0;
+	SYS_SYSCALL_BASE = 0
 
-	SYS_RESTART_SYSCALL		= (SYS_SYSCALL_BASE + 0);
-	SYS_EXIT			= (SYS_SYSCALL_BASE + 1);
-	SYS_FORK			= (SYS_SYSCALL_BASE + 2);
-	SYS_READ			= (SYS_SYSCALL_BASE + 3);
-	SYS_WRITE			= (SYS_SYSCALL_BASE + 4);
-	SYS_OPEN			= (SYS_SYSCALL_BASE + 5);
-	SYS_CLOSE			= (SYS_SYSCALL_BASE + 6);
-	SYS_CREAT			= (SYS_SYSCALL_BASE + 8);
-	SYS_LINK			= (SYS_SYSCALL_BASE + 9);
-	SYS_UNLINK			= (SYS_SYSCALL_BASE + 10);
-	SYS_EXECVE			= (SYS_SYSCALL_BASE + 11);
-	SYS_CHDIR			= (SYS_SYSCALL_BASE + 12);
-	SYS_TIME			= (SYS_SYSCALL_BASE + 13);
-	SYS_MKNOD			= (SYS_SYSCALL_BASE + 14);
-	SYS_CHMOD			= (SYS_SYSCALL_BASE + 15);
-	SYS_LCHOWN			= (SYS_SYSCALL_BASE + 16);
-	SYS_LSEEK			= (SYS_SYSCALL_BASE + 19);
-	SYS_GETPID			= (SYS_SYSCALL_BASE + 20);
-	SYS_MOUNT			= (SYS_SYSCALL_BASE + 21);
-	SYS_UMOUNT			= (SYS_SYSCALL_BASE + 22);
-	SYS_SETUID			= (SYS_SYSCALL_BASE + 23);
-	SYS_GETUID			= (SYS_SYSCALL_BASE + 24);
-	SYS_STIME			= (SYS_SYSCALL_BASE + 25);
-	SYS_PTRACE			= (SYS_SYSCALL_BASE + 26);
-	SYS_ALARM			= (SYS_SYSCALL_BASE + 27);
-	SYS_PAUSE			= (SYS_SYSCALL_BASE + 29);
-	SYS_UTIME			= (SYS_SYSCALL_BASE + 30);
-	SYS_ACCESS			= (SYS_SYSCALL_BASE + 33);
-	SYS_NICE			= (SYS_SYSCALL_BASE + 34);
-	SYS_SYNC			= (SYS_SYSCALL_BASE + 36);
-	SYS_KILL			= (SYS_SYSCALL_BASE + 37);
-	SYS_RENAME			= (SYS_SYSCALL_BASE + 38);
-	SYS_MKDIR			= (SYS_SYSCALL_BASE + 39);
-	SYS_RMDIR			= (SYS_SYSCALL_BASE + 40);
-	SYS_DUP				= (SYS_SYSCALL_BASE + 41);
-	SYS_PIPE			= (SYS_SYSCALL_BASE + 42);
-	SYS_TIMES			= (SYS_SYSCALL_BASE + 43);
-	SYS_BRK				= (SYS_SYSCALL_BASE + 45);
-	SYS_SETGID			= (SYS_SYSCALL_BASE + 46);
-	SYS_GETGID			= (SYS_SYSCALL_BASE + 47);
-	SYS_GETEUID			= (SYS_SYSCALL_BASE + 49);
-	SYS_GETEGID			= (SYS_SYSCALL_BASE + 50);
-	SYS_ACCT			= (SYS_SYSCALL_BASE + 51);
-	SYS_UMOUNT2			= (SYS_SYSCALL_BASE + 52);
-	SYS_IOCTL			= (SYS_SYSCALL_BASE + 54);
-	SYS_FCNTL			= (SYS_SYSCALL_BASE + 55);
-	SYS_SETPGID			= (SYS_SYSCALL_BASE + 57);
-	SYS_UMASK			= (SYS_SYSCALL_BASE + 60);
-	SYS_CHROOT			= (SYS_SYSCALL_BASE + 61);
-	SYS_USTAT			= (SYS_SYSCALL_BASE + 62);
-	SYS_DUP2			= (SYS_SYSCALL_BASE + 63);
-	SYS_GETPPID			= (SYS_SYSCALL_BASE + 64);
-	SYS_GETPGRP			= (SYS_SYSCALL_BASE + 65);
-	SYS_SETSID			= (SYS_SYSCALL_BASE + 66);
-	SYS_SIGACTION			= (SYS_SYSCALL_BASE + 67);
-	SYS_SETREUID			= (SYS_SYSCALL_BASE + 70);
-	SYS_SETREGID			= (SYS_SYSCALL_BASE + 71);
-	SYS_SIGSUSPEND			= (SYS_SYSCALL_BASE + 72);
-	SYS_SIGPENDING			= (SYS_SYSCALL_BASE + 73);
-	SYS_SETHOSTNAME			= (SYS_SYSCALL_BASE + 74);
-	SYS_SETRLIMIT			= (SYS_SYSCALL_BASE + 75);
-	SYS_GETRLIMIT			= (SYS_SYSCALL_BASE + 76);
-	SYS_GETRUSAGE			= (SYS_SYSCALL_BASE + 77);
-	SYS_GETTIMEOFDAY		= (SYS_SYSCALL_BASE + 78);
-	SYS_SETTIMEOFDAY		= (SYS_SYSCALL_BASE + 79);
-	SYS_GETGROUPS			= (SYS_SYSCALL_BASE + 80);
-	SYS_SETGROUPS			= (SYS_SYSCALL_BASE + 81);
-	SYS_SELECT			= (SYS_SYSCALL_BASE + 82);
-	SYS_SYMLINK			= (SYS_SYSCALL_BASE + 83);
-	SYS_READLINK			= (SYS_SYSCALL_BASE + 85);
-	SYS_USELIB			= (SYS_SYSCALL_BASE + 86);
-	SYS_SWAPON			= (SYS_SYSCALL_BASE + 87);
-	SYS_REBOOT			= (SYS_SYSCALL_BASE + 88);
-	SYS_READDIR			= (SYS_SYSCALL_BASE + 89);
-	SYS_MMAP			= (SYS_SYSCALL_BASE + 90);
-	SYS_MUNMAP			= (SYS_SYSCALL_BASE + 91);
-	SYS_TRUNCATE			= (SYS_SYSCALL_BASE + 92);
-	SYS_FTRUNCATE			= (SYS_SYSCALL_BASE + 93);
-	SYS_FCHMOD			= (SYS_SYSCALL_BASE + 94);
-	SYS_FCHOWN			= (SYS_SYSCALL_BASE + 95);
-	SYS_GETPRIORITY			= (SYS_SYSCALL_BASE + 96);
-	SYS_SETPRIORITY			= (SYS_SYSCALL_BASE + 97);
-	SYS_STATFS			= (SYS_SYSCALL_BASE + 99);
-	SYS_FSTATFS			= (SYS_SYSCALL_BASE + 100);
-	SYS_SOCKETCALL			= (SYS_SYSCALL_BASE + 102);
-	SYS_SYSLOG			= (SYS_SYSCALL_BASE + 103);
-	SYS_SETITIMER			= (SYS_SYSCALL_BASE + 104);
-	SYS_GETITIMER			= (SYS_SYSCALL_BASE + 105);
-	SYS_STAT			= (SYS_SYSCALL_BASE + 106);
-	SYS_LSTAT			= (SYS_SYSCALL_BASE + 107);
-	SYS_FSTAT			= (SYS_SYSCALL_BASE + 108);
-	SYS_VHANGUP			= (SYS_SYSCALL_BASE + 111);
-	SYS_SYSCALL			= (SYS_SYSCALL_BASE + 113);
-	SYS_WAIT4			= (SYS_SYSCALL_BASE + 114);
-	SYS_SWAPOFF			= (SYS_SYSCALL_BASE + 115);
-	SYS_SYSINFO			= (SYS_SYSCALL_BASE + 116);
-	SYS_IPC				= (SYS_SYSCALL_BASE + 117);
-	SYS_FSYNC			= (SYS_SYSCALL_BASE + 118);
-	SYS_SIGRETURN			= (SYS_SYSCALL_BASE + 119);
-	SYS_CLONE			= (SYS_SYSCALL_BASE + 120);
-	SYS_SETDOMAINNAME		= (SYS_SYSCALL_BASE + 121);
-	SYS_UNAME			= (SYS_SYSCALL_BASE + 122);
-	SYS_ADJTIMEX			= (SYS_SYSCALL_BASE + 124);
-	SYS_MPROTECT			= (SYS_SYSCALL_BASE + 125);
-	SYS_SIGPROCMASK			= (SYS_SYSCALL_BASE + 126);
-	SYS_INIT_MODULE			= (SYS_SYSCALL_BASE + 128);
-	SYS_DELETE_MODULE		= (SYS_SYSCALL_BASE + 129);
-	SYS_QUOTACTL			= (SYS_SYSCALL_BASE + 131);
-	SYS_GETPGID			= (SYS_SYSCALL_BASE + 132);
-	SYS_FCHDIR			= (SYS_SYSCALL_BASE + 133);
-	SYS_BDFLUSH			= (SYS_SYSCALL_BASE + 134);
-	SYS_SYSFS			= (SYS_SYSCALL_BASE + 135);
-	SYS_PERSONALITY			= (SYS_SYSCALL_BASE + 136);
-	SYS_SETFSUID			= (SYS_SYSCALL_BASE + 138);
-	SYS_SETFSGID			= (SYS_SYSCALL_BASE + 139);
-	SYS__LLSEEK			= (SYS_SYSCALL_BASE + 140);
-	SYS_GETDENTS			= (SYS_SYSCALL_BASE + 141);
-	SYS__NEWSELECT			= (SYS_SYSCALL_BASE + 142);
-	SYS_FLOCK			= (SYS_SYSCALL_BASE + 143);
-	SYS_MSYNC			= (SYS_SYSCALL_BASE + 144);
-	SYS_READV			= (SYS_SYSCALL_BASE + 145);
-	SYS_WRITEV			= (SYS_SYSCALL_BASE + 146);
-	SYS_GETSID			= (SYS_SYSCALL_BASE + 147);
-	SYS_FDATASYNC			= (SYS_SYSCALL_BASE + 148);
-	SYS__SYSCTL			= (SYS_SYSCALL_BASE + 149);
-	SYS_MLOCK			= (SYS_SYSCALL_BASE + 150);
-	SYS_MUNLOCK			= (SYS_SYSCALL_BASE + 151);
-	SYS_MLOCKALL			= (SYS_SYSCALL_BASE + 152);
-	SYS_MUNLOCKALL			= (SYS_SYSCALL_BASE + 153);
-	SYS_SCHED_SETPARAM		= (SYS_SYSCALL_BASE + 154);
-	SYS_SCHED_GETPARAM		= (SYS_SYSCALL_BASE + 155);
-	SYS_SCHED_SETSCHEDULER		= (SYS_SYSCALL_BASE + 156);
-	SYS_SCHED_GETSCHEDULER		= (SYS_SYSCALL_BASE + 157);
-	SYS_SCHED_YIELD			= (SYS_SYSCALL_BASE + 158);
-	SYS_SCHED_GET_PRIORITY_MAX	= (SYS_SYSCALL_BASE + 159);
-	SYS_SCHED_GET_PRIORITY_MIN	= (SYS_SYSCALL_BASE + 160);
-	SYS_SCHED_RR_GET_INTERVAL	= (SYS_SYSCALL_BASE + 161);
-	SYS_NANOSLEEP			= (SYS_SYSCALL_BASE + 162);
-	SYS_MREMAP			= (SYS_SYSCALL_BASE + 163);
-	SYS_SETRESUID			= (SYS_SYSCALL_BASE + 164);
-	SYS_GETRESUID			= (SYS_SYSCALL_BASE + 165);
-	SYS_POLL			= (SYS_SYSCALL_BASE + 168);
-	SYS_NFSSERVCTL			= (SYS_SYSCALL_BASE + 169);
-	SYS_SETRESGID			= (SYS_SYSCALL_BASE + 170);
-	SYS_GETRESGID			= (SYS_SYSCALL_BASE + 171);
-	SYS_PRCTL			= (SYS_SYSCALL_BASE + 172);
-	SYS_RT_SIGRETURN		= (SYS_SYSCALL_BASE + 173);
-	SYS_RT_SIGACTION		= (SYS_SYSCALL_BASE + 174);
-	SYS_RT_SIGPROCMASK		= (SYS_SYSCALL_BASE + 175);
-	SYS_RT_SIGPENDING		= (SYS_SYSCALL_BASE + 176);
-	SYS_RT_SIGTIMEDWAIT		= (SYS_SYSCALL_BASE + 177);
-	SYS_RT_SIGQUEUEINFO		= (SYS_SYSCALL_BASE + 178);
-	SYS_RT_SIGSUSPEND		= (SYS_SYSCALL_BASE + 179);
-	SYS_PREAD64			= (SYS_SYSCALL_BASE + 180);
-	SYS_PWRITE64			= (SYS_SYSCALL_BASE + 181);
-	SYS_CHOWN			= (SYS_SYSCALL_BASE + 182);
-	SYS_GETCWD			= (SYS_SYSCALL_BASE + 183);
-	SYS_CAPGET			= (SYS_SYSCALL_BASE + 184);
-	SYS_CAPSET			= (SYS_SYSCALL_BASE + 185);
-	SYS_SIGALTSTACK			= (SYS_SYSCALL_BASE + 186);
-	SYS_SENDFILE			= (SYS_SYSCALL_BASE + 187);
-	SYS_VFORK			= (SYS_SYSCALL_BASE + 190);
-	SYS_UGETRLIMIT			= (SYS_SYSCALL_BASE + 191);
-	SYS_MMAP2			= (SYS_SYSCALL_BASE + 192);
-	SYS_TRUNCATE64			= (SYS_SYSCALL_BASE + 193);
-	SYS_FTRUNCATE64			= (SYS_SYSCALL_BASE + 194);
-	SYS_STAT64			= (SYS_SYSCALL_BASE + 195);
-	SYS_LSTAT64			= (SYS_SYSCALL_BASE + 196);
-	SYS_FSTAT64			= (SYS_SYSCALL_BASE + 197);
-	SYS_LCHOWN32			= (SYS_SYSCALL_BASE + 198);
-	SYS_GETUID32			= (SYS_SYSCALL_BASE + 199);
-	SYS_GETGID32			= (SYS_SYSCALL_BASE + 200);
-	SYS_GETEUID32			= (SYS_SYSCALL_BASE + 201);
-	SYS_GETEGID32			= (SYS_SYSCALL_BASE + 202);
-	SYS_SETREUID32			= (SYS_SYSCALL_BASE + 203);
-	SYS_SETREGID32			= (SYS_SYSCALL_BASE + 204);
-	SYS_GETGROUPS32			= (SYS_SYSCALL_BASE + 205);
-	SYS_SETGROUPS32			= (SYS_SYSCALL_BASE + 206);
-	SYS_FCHOWN32			= (SYS_SYSCALL_BASE + 207);
-	SYS_SETRESUID32			= (SYS_SYSCALL_BASE + 208);
-	SYS_GETRESUID32			= (SYS_SYSCALL_BASE + 209);
-	SYS_SETRESGID32			= (SYS_SYSCALL_BASE + 210);
-	SYS_GETRESGID32			= (SYS_SYSCALL_BASE + 211);
-	SYS_CHOWN32			= (SYS_SYSCALL_BASE + 212);
-	SYS_SETUID32			= (SYS_SYSCALL_BASE + 213);
-	SYS_SETGID32			= (SYS_SYSCALL_BASE + 214);
-	SYS_SETFSUID32			= (SYS_SYSCALL_BASE + 215);
-	SYS_SETFSGID32			= (SYS_SYSCALL_BASE + 216);
-	SYS_GETDENTS64			= (SYS_SYSCALL_BASE + 217);
-	SYS_PIVOT_ROOT			= (SYS_SYSCALL_BASE + 218);
-	SYS_MINCORE			= (SYS_SYSCALL_BASE + 219);
-	SYS_MADVISE			= (SYS_SYSCALL_BASE + 220);
-	SYS_FCNTL64			= (SYS_SYSCALL_BASE + 221);
-	SYS_GETTID			= (SYS_SYSCALL_BASE + 224);
-	SYS_READAHEAD			= (SYS_SYSCALL_BASE + 225);
-	SYS_SETXATTR			= (SYS_SYSCALL_BASE + 226);
-	SYS_LSETXATTR			= (SYS_SYSCALL_BASE + 227);
-	SYS_FSETXATTR			= (SYS_SYSCALL_BASE + 228);
-	SYS_GETXATTR			= (SYS_SYSCALL_BASE + 229);
-	SYS_LGETXATTR			= (SYS_SYSCALL_BASE + 230);
-	SYS_FGETXATTR			= (SYS_SYSCALL_BASE + 231);
-	SYS_LISTXATTR			= (SYS_SYSCALL_BASE + 232);
-	SYS_LLISTXATTR			= (SYS_SYSCALL_BASE + 233);
-	SYS_FLISTXATTR			= (SYS_SYSCALL_BASE + 234);
-	SYS_REMOVEXATTR			= (SYS_SYSCALL_BASE + 235);
-	SYS_LREMOVEXATTR		= (SYS_SYSCALL_BASE + 236);
-	SYS_FREMOVEXATTR		= (SYS_SYSCALL_BASE + 237);
-	SYS_TKILL			= (SYS_SYSCALL_BASE + 238);
-	SYS_SENDFILE64			= (SYS_SYSCALL_BASE + 239);
-	SYS_FUTEX			= (SYS_SYSCALL_BASE + 240);
-	SYS_SCHED_SETAFFINITY		= (SYS_SYSCALL_BASE + 241);
-	SYS_SCHED_GETAFFINITY		= (SYS_SYSCALL_BASE + 242);
-	SYS_IO_SETUP			= (SYS_SYSCALL_BASE + 243);
-	SYS_IO_DESTROY			= (SYS_SYSCALL_BASE + 244);
-	SYS_IO_GETEVENTS		= (SYS_SYSCALL_BASE + 245);
-	SYS_IO_SUBMIT			= (SYS_SYSCALL_BASE + 246);
-	SYS_IO_CANCEL			= (SYS_SYSCALL_BASE + 247);
-	SYS_EXIT_GROUP			= (SYS_SYSCALL_BASE + 248);
-	SYS_LOOKUP_DCOOKIE		= (SYS_SYSCALL_BASE + 249);
-	SYS_EPOLL_CREATE		= (SYS_SYSCALL_BASE + 250);
-	SYS_EPOLL_CTL			= (SYS_SYSCALL_BASE + 251);
-	SYS_EPOLL_WAIT			= (SYS_SYSCALL_BASE + 252);
-	SYS_REMAP_FILE_PAGES		= (SYS_SYSCALL_BASE + 253);
-	SYS_SET_TID_ADDRESS		= (SYS_SYSCALL_BASE + 256);
-	SYS_TIMER_CREATE		= (SYS_SYSCALL_BASE + 257);
-	SYS_TIMER_SETTIME		= (SYS_SYSCALL_BASE + 258);
-	SYS_TIMER_GETTIME		= (SYS_SYSCALL_BASE + 259);
-	SYS_TIMER_GETOVERRUN		= (SYS_SYSCALL_BASE + 260);
-	SYS_TIMER_DELETE		= (SYS_SYSCALL_BASE + 261);
-	SYS_CLOCK_SETTIME		= (SYS_SYSCALL_BASE + 262);
-	SYS_CLOCK_GETTIME		= (SYS_SYSCALL_BASE + 263);
-	SYS_CLOCK_GETRES		= (SYS_SYSCALL_BASE + 264);
-	SYS_CLOCK_NANOSLEEP		= (SYS_SYSCALL_BASE + 265);
-	SYS_STATFS64			= (SYS_SYSCALL_BASE + 266);
-	SYS_FSTATFS64			= (SYS_SYSCALL_BASE + 267);
-	SYS_TGKILL			= (SYS_SYSCALL_BASE + 268);
-	SYS_UTIMES			= (SYS_SYSCALL_BASE + 269);
-	SYS_ARM_FADVISE64_64		= (SYS_SYSCALL_BASE + 270);
-	SYS_PCICONFIG_IOBASE		= (SYS_SYSCALL_BASE + 271);
-	SYS_PCICONFIG_READ		= (SYS_SYSCALL_BASE + 272);
-	SYS_PCICONFIG_WRITE		= (SYS_SYSCALL_BASE + 273);
-	SYS_MQ_OPEN			= (SYS_SYSCALL_BASE + 274);
-	SYS_MQ_UNLINK			= (SYS_SYSCALL_BASE + 275);
-	SYS_MQ_TIMEDSEND		= (SYS_SYSCALL_BASE + 276);
-	SYS_MQ_TIMEDRECEIVE		= (SYS_SYSCALL_BASE + 277);
-	SYS_MQ_NOTIFY			= (SYS_SYSCALL_BASE + 278);
-	SYS_MQ_GETSETATTR		= (SYS_SYSCALL_BASE + 279);
-	SYS_WAITID			= (SYS_SYSCALL_BASE + 280);
-	SYS_SOCKET			= (SYS_SYSCALL_BASE + 281);
-	SYS_BIND			= (SYS_SYSCALL_BASE + 282);
-	SYS_CONNECT			= (SYS_SYSCALL_BASE + 283);
-	SYS_LISTEN			= (SYS_SYSCALL_BASE + 284);
-	SYS_ACCEPT			= (SYS_SYSCALL_BASE + 285);
-	SYS_GETSOCKNAME			= (SYS_SYSCALL_BASE + 286);
-	SYS_GETPEERNAME			= (SYS_SYSCALL_BASE + 287);
-	SYS_SOCKETPAIR			= (SYS_SYSCALL_BASE + 288);
-	SYS_SEND			= (SYS_SYSCALL_BASE + 289);
-	SYS_SENDTO			= (SYS_SYSCALL_BASE + 290);
-	SYS_RECV			= (SYS_SYSCALL_BASE + 291);
-	SYS_RECVFROM			= (SYS_SYSCALL_BASE + 292);
-	SYS_SHUTDOWN			= (SYS_SYSCALL_BASE + 293);
-	SYS_SETSOCKOPT			= (SYS_SYSCALL_BASE + 294);
-	SYS_GETSOCKOPT			= (SYS_SYSCALL_BASE + 295);
-	SYS_SENDMSG			= (SYS_SYSCALL_BASE + 296);
-	SYS_RECVMSG			= (SYS_SYSCALL_BASE + 297);
-	SYS_SEMOP			= (SYS_SYSCALL_BASE + 298);
-	SYS_SEMGET			= (SYS_SYSCALL_BASE + 299);
-	SYS_SEMCTL			= (SYS_SYSCALL_BASE + 300);
-	SYS_MSGSND			= (SYS_SYSCALL_BASE + 301);
-	SYS_MSGRCV			= (SYS_SYSCALL_BASE + 302);
-	SYS_MSGGET			= (SYS_SYSCALL_BASE + 303);
-	SYS_MSGCTL			= (SYS_SYSCALL_BASE + 304);
-	SYS_SHMAT			= (SYS_SYSCALL_BASE + 305);
-	SYS_SHMDT			= (SYS_SYSCALL_BASE + 306);
-	SYS_SHMGET			= (SYS_SYSCALL_BASE + 307);
-	SYS_SHMCTL			= (SYS_SYSCALL_BASE + 308);
-	SYS_ADD_KEY			= (SYS_SYSCALL_BASE + 309);
-	SYS_REQUEST_KEY			= (SYS_SYSCALL_BASE + 310);
-	SYS_KEYCTL			= (SYS_SYSCALL_BASE + 311);
-	SYS_SEMTIMEDOP			= (SYS_SYSCALL_BASE + 312);
-	SYS_VSERVER			= (SYS_SYSCALL_BASE + 313);
-	SYS_IOPRIO_SET			= (SYS_SYSCALL_BASE + 314);
-	SYS_IOPRIO_GET			= (SYS_SYSCALL_BASE + 315);
-	SYS_INOTIFY_INIT		= (SYS_SYSCALL_BASE + 316);
-	SYS_INOTIFY_ADD_WATCH		= (SYS_SYSCALL_BASE + 317);
-	SYS_INOTIFY_RM_WATCH		= (SYS_SYSCALL_BASE + 318);
-	SYS_MBIND			= (SYS_SYSCALL_BASE + 319);
-	SYS_GET_MEMPOLICY		= (SYS_SYSCALL_BASE + 320);
-	SYS_SET_MEMPOLICY		= (SYS_SYSCALL_BASE + 321);
-	SYS_OPENAT			= (SYS_SYSCALL_BASE + 322);
-	SYS_MKDIRAT			= (SYS_SYSCALL_BASE + 323);
-	SYS_MKNODAT			= (SYS_SYSCALL_BASE + 324);
-	SYS_FCHOWNAT			= (SYS_SYSCALL_BASE + 325);
-	SYS_FUTIMESAT			= (SYS_SYSCALL_BASE + 326);
-	SYS_FSTATAT64			= (SYS_SYSCALL_BASE + 327);
-	SYS_UNLINKAT			= (SYS_SYSCALL_BASE + 328);
-	SYS_RENAMEAT			= (SYS_SYSCALL_BASE + 329);
-	SYS_LINKAT			= (SYS_SYSCALL_BASE + 330);
-	SYS_SYMLINKAT			= (SYS_SYSCALL_BASE + 331);
-	SYS_READLINKAT			= (SYS_SYSCALL_BASE + 332);
-	SYS_FCHMODAT			= (SYS_SYSCALL_BASE + 333);
-	SYS_FACCESSAT			= (SYS_SYSCALL_BASE + 334);
-	SYS_UNSHARE			= (SYS_SYSCALL_BASE + 337);
-	SYS_SET_ROBUST_LIST		= (SYS_SYSCALL_BASE + 338);
-	SYS_GET_ROBUST_LIST		= (SYS_SYSCALL_BASE + 339);
-	SYS_SPLICE			= (SYS_SYSCALL_BASE + 340);
-	SYS_ARM_SYNC_FILE_RANGE		= (SYS_SYSCALL_BASE + 341);
-	SYS_SYNC_FILE_RANGE2		= SYS_ARM_SYNC_FILE_RANGE;
-	SYS_TEE				= (SYS_SYSCALL_BASE + 342);
-	SYS_VMSPLICE			= (SYS_SYSCALL_BASE + 343);
-	SYS_MOVE_PAGES			= (SYS_SYSCALL_BASE + 344);
-	SYS_GETCPU			= (SYS_SYSCALL_BASE + 345);
-	SYS_KEXEC_LOAD			= (SYS_SYSCALL_BASE + 347);
-	SYS_UTIMENSAT			= (SYS_SYSCALL_BASE + 348);
-	SYS_SIGNALFD			= (SYS_SYSCALL_BASE + 349);
-	SYS_TIMERFD_CREATE		= (SYS_SYSCALL_BASE + 350);
-	SYS_EVENTFD			= (SYS_SYSCALL_BASE + 351);
-	SYS_FALLOCATE			= (SYS_SYSCALL_BASE + 352);
-	SYS_TIMERFD_SETTIME		= (SYS_SYSCALL_BASE + 353);
-	SYS_TIMERFD_GETTIME		= (SYS_SYSCALL_BASE + 354);
-	SYS_SIGNALFD4			= (SYS_SYSCALL_BASE + 355);
-	SYS_EVENTFD2			= (SYS_SYSCALL_BASE + 356);
-	SYS_EPOLL_CREATE1		= (SYS_SYSCALL_BASE + 357);
-	SYS_DUP3			= (SYS_SYSCALL_BASE + 358);
-	SYS_PIPE2			= (SYS_SYSCALL_BASE + 359);
-	SYS_INOTIFY_INIT1		= (SYS_SYSCALL_BASE + 360);
+	SYS_RESTART_SYSCALL        = (SYS_SYSCALL_BASE + 0)
+	SYS_EXIT                   = (SYS_SYSCALL_BASE + 1)
+	SYS_FORK                   = (SYS_SYSCALL_BASE + 2)
+	SYS_READ                   = (SYS_SYSCALL_BASE + 3)
+	SYS_WRITE                  = (SYS_SYSCALL_BASE + 4)
+	SYS_OPEN                   = (SYS_SYSCALL_BASE + 5)
+	SYS_CLOSE                  = (SYS_SYSCALL_BASE + 6)
+	SYS_CREAT                  = (SYS_SYSCALL_BASE + 8)
+	SYS_LINK                   = (SYS_SYSCALL_BASE + 9)
+	SYS_UNLINK                 = (SYS_SYSCALL_BASE + 10)
+	SYS_EXECVE                 = (SYS_SYSCALL_BASE + 11)
+	SYS_CHDIR                  = (SYS_SYSCALL_BASE + 12)
+	SYS_TIME                   = (SYS_SYSCALL_BASE + 13)
+	SYS_MKNOD                  = (SYS_SYSCALL_BASE + 14)
+	SYS_CHMOD                  = (SYS_SYSCALL_BASE + 15)
+	SYS_LCHOWN                 = (SYS_SYSCALL_BASE + 16)
+	SYS_LSEEK                  = (SYS_SYSCALL_BASE + 19)
+	SYS_GETPID                 = (SYS_SYSCALL_BASE + 20)
+	SYS_MOUNT                  = (SYS_SYSCALL_BASE + 21)
+	SYS_UMOUNT                 = (SYS_SYSCALL_BASE + 22)
+	SYS_SETUID                 = (SYS_SYSCALL_BASE + 23)
+	SYS_GETUID                 = (SYS_SYSCALL_BASE + 24)
+	SYS_STIME                  = (SYS_SYSCALL_BASE + 25)
+	SYS_PTRACE                 = (SYS_SYSCALL_BASE + 26)
+	SYS_ALARM                  = (SYS_SYSCALL_BASE + 27)
+	SYS_PAUSE                  = (SYS_SYSCALL_BASE + 29)
+	SYS_UTIME                  = (SYS_SYSCALL_BASE + 30)
+	SYS_ACCESS                 = (SYS_SYSCALL_BASE + 33)
+	SYS_NICE                   = (SYS_SYSCALL_BASE + 34)
+	SYS_SYNC                   = (SYS_SYSCALL_BASE + 36)
+	SYS_KILL                   = (SYS_SYSCALL_BASE + 37)
+	SYS_RENAME                 = (SYS_SYSCALL_BASE + 38)
+	SYS_MKDIR                  = (SYS_SYSCALL_BASE + 39)
+	SYS_RMDIR                  = (SYS_SYSCALL_BASE + 40)
+	SYS_DUP                    = (SYS_SYSCALL_BASE + 41)
+	SYS_PIPE                   = (SYS_SYSCALL_BASE + 42)
+	SYS_TIMES                  = (SYS_SYSCALL_BASE + 43)
+	SYS_BRK                    = (SYS_SYSCALL_BASE + 45)
+	SYS_SETGID                 = (SYS_SYSCALL_BASE + 46)
+	SYS_GETGID                 = (SYS_SYSCALL_BASE + 47)
+	SYS_GETEUID                = (SYS_SYSCALL_BASE + 49)
+	SYS_GETEGID                = (SYS_SYSCALL_BASE + 50)
+	SYS_ACCT                   = (SYS_SYSCALL_BASE + 51)
+	SYS_UMOUNT2                = (SYS_SYSCALL_BASE + 52)
+	SYS_IOCTL                  = (SYS_SYSCALL_BASE + 54)
+	SYS_FCNTL                  = (SYS_SYSCALL_BASE + 55)
+	SYS_SETPGID                = (SYS_SYSCALL_BASE + 57)
+	SYS_UMASK                  = (SYS_SYSCALL_BASE + 60)
+	SYS_CHROOT                 = (SYS_SYSCALL_BASE + 61)
+	SYS_USTAT                  = (SYS_SYSCALL_BASE + 62)
+	SYS_DUP2                   = (SYS_SYSCALL_BASE + 63)
+	SYS_GETPPID                = (SYS_SYSCALL_BASE + 64)
+	SYS_GETPGRP                = (SYS_SYSCALL_BASE + 65)
+	SYS_SETSID                 = (SYS_SYSCALL_BASE + 66)
+	SYS_SIGACTION              = (SYS_SYSCALL_BASE + 67)
+	SYS_SETREUID               = (SYS_SYSCALL_BASE + 70)
+	SYS_SETREGID               = (SYS_SYSCALL_BASE + 71)
+	SYS_SIGSUSPEND             = (SYS_SYSCALL_BASE + 72)
+	SYS_SIGPENDING             = (SYS_SYSCALL_BASE + 73)
+	SYS_SETHOSTNAME            = (SYS_SYSCALL_BASE + 74)
+	SYS_SETRLIMIT              = (SYS_SYSCALL_BASE + 75)
+	SYS_GETRLIMIT              = (SYS_SYSCALL_BASE + 76)
+	SYS_GETRUSAGE              = (SYS_SYSCALL_BASE + 77)
+	SYS_GETTIMEOFDAY           = (SYS_SYSCALL_BASE + 78)
+	SYS_SETTIMEOFDAY           = (SYS_SYSCALL_BASE + 79)
+	SYS_GETGROUPS              = (SYS_SYSCALL_BASE + 80)
+	SYS_SETGROUPS              = (SYS_SYSCALL_BASE + 81)
+	SYS_SELECT                 = (SYS_SYSCALL_BASE + 82)
+	SYS_SYMLINK                = (SYS_SYSCALL_BASE + 83)
+	SYS_READLINK               = (SYS_SYSCALL_BASE + 85)
+	SYS_USELIB                 = (SYS_SYSCALL_BASE + 86)
+	SYS_SWAPON                 = (SYS_SYSCALL_BASE + 87)
+	SYS_REBOOT                 = (SYS_SYSCALL_BASE + 88)
+	SYS_READDIR                = (SYS_SYSCALL_BASE + 89)
+	SYS_MMAP                   = (SYS_SYSCALL_BASE + 90)
+	SYS_MUNMAP                 = (SYS_SYSCALL_BASE + 91)
+	SYS_TRUNCATE               = (SYS_SYSCALL_BASE + 92)
+	SYS_FTRUNCATE              = (SYS_SYSCALL_BASE + 93)
+	SYS_FCHMOD                 = (SYS_SYSCALL_BASE + 94)
+	SYS_FCHOWN                 = (SYS_SYSCALL_BASE + 95)
+	SYS_GETPRIORITY            = (SYS_SYSCALL_BASE + 96)
+	SYS_SETPRIORITY            = (SYS_SYSCALL_BASE + 97)
+	SYS_STATFS                 = (SYS_SYSCALL_BASE + 99)
+	SYS_FSTATFS                = (SYS_SYSCALL_BASE + 100)
+	SYS_SOCKETCALL             = (SYS_SYSCALL_BASE + 102)
+	SYS_SYSLOG                 = (SYS_SYSCALL_BASE + 103)
+	SYS_SETITIMER              = (SYS_SYSCALL_BASE + 104)
+	SYS_GETITIMER              = (SYS_SYSCALL_BASE + 105)
+	SYS_STAT                   = (SYS_SYSCALL_BASE + 106)
+	SYS_LSTAT                  = (SYS_SYSCALL_BASE + 107)
+	SYS_FSTAT                  = (SYS_SYSCALL_BASE + 108)
+	SYS_VHANGUP                = (SYS_SYSCALL_BASE + 111)
+	SYS_SYSCALL                = (SYS_SYSCALL_BASE + 113)
+	SYS_WAIT4                  = (SYS_SYSCALL_BASE + 114)
+	SYS_SWAPOFF                = (SYS_SYSCALL_BASE + 115)
+	SYS_SYSINFO                = (SYS_SYSCALL_BASE + 116)
+	SYS_IPC                    = (SYS_SYSCALL_BASE + 117)
+	SYS_FSYNC                  = (SYS_SYSCALL_BASE + 118)
+	SYS_SIGRETURN              = (SYS_SYSCALL_BASE + 119)
+	SYS_CLONE                  = (SYS_SYSCALL_BASE + 120)
+	SYS_SETDOMAINNAME          = (SYS_SYSCALL_BASE + 121)
+	SYS_UNAME                  = (SYS_SYSCALL_BASE + 122)
+	SYS_ADJTIMEX               = (SYS_SYSCALL_BASE + 124)
+	SYS_MPROTECT               = (SYS_SYSCALL_BASE + 125)
+	SYS_SIGPROCMASK            = (SYS_SYSCALL_BASE + 126)
+	SYS_INIT_MODULE            = (SYS_SYSCALL_BASE + 128)
+	SYS_DELETE_MODULE          = (SYS_SYSCALL_BASE + 129)
+	SYS_QUOTACTL               = (SYS_SYSCALL_BASE + 131)
+	SYS_GETPGID                = (SYS_SYSCALL_BASE + 132)
+	SYS_FCHDIR                 = (SYS_SYSCALL_BASE + 133)
+	SYS_BDFLUSH                = (SYS_SYSCALL_BASE + 134)
+	SYS_SYSFS                  = (SYS_SYSCALL_BASE + 135)
+	SYS_PERSONALITY            = (SYS_SYSCALL_BASE + 136)
+	SYS_SETFSUID               = (SYS_SYSCALL_BASE + 138)
+	SYS_SETFSGID               = (SYS_SYSCALL_BASE + 139)
+	SYS__LLSEEK                = (SYS_SYSCALL_BASE + 140)
+	SYS_GETDENTS               = (SYS_SYSCALL_BASE + 141)
+	SYS__NEWSELECT             = (SYS_SYSCALL_BASE + 142)
+	SYS_FLOCK                  = (SYS_SYSCALL_BASE + 143)
+	SYS_MSYNC                  = (SYS_SYSCALL_BASE + 144)
+	SYS_READV                  = (SYS_SYSCALL_BASE + 145)
+	SYS_WRITEV                 = (SYS_SYSCALL_BASE + 146)
+	SYS_GETSID                 = (SYS_SYSCALL_BASE + 147)
+	SYS_FDATASYNC              = (SYS_SYSCALL_BASE + 148)
+	SYS__SYSCTL                = (SYS_SYSCALL_BASE + 149)
+	SYS_MLOCK                  = (SYS_SYSCALL_BASE + 150)
+	SYS_MUNLOCK                = (SYS_SYSCALL_BASE + 151)
+	SYS_MLOCKALL               = (SYS_SYSCALL_BASE + 152)
+	SYS_MUNLOCKALL             = (SYS_SYSCALL_BASE + 153)
+	SYS_SCHED_SETPARAM         = (SYS_SYSCALL_BASE + 154)
+	SYS_SCHED_GETPARAM         = (SYS_SYSCALL_BASE + 155)
+	SYS_SCHED_SETSCHEDULER     = (SYS_SYSCALL_BASE + 156)
+	SYS_SCHED_GETSCHEDULER     = (SYS_SYSCALL_BASE + 157)
+	SYS_SCHED_YIELD            = (SYS_SYSCALL_BASE + 158)
+	SYS_SCHED_GET_PRIORITY_MAX = (SYS_SYSCALL_BASE + 159)
+	SYS_SCHED_GET_PRIORITY_MIN = (SYS_SYSCALL_BASE + 160)
+	SYS_SCHED_RR_GET_INTERVAL  = (SYS_SYSCALL_BASE + 161)
+	SYS_NANOSLEEP              = (SYS_SYSCALL_BASE + 162)
+	SYS_MREMAP                 = (SYS_SYSCALL_BASE + 163)
+	SYS_SETRESUID              = (SYS_SYSCALL_BASE + 164)
+	SYS_GETRESUID              = (SYS_SYSCALL_BASE + 165)
+	SYS_POLL                   = (SYS_SYSCALL_BASE + 168)
+	SYS_NFSSERVCTL             = (SYS_SYSCALL_BASE + 169)
+	SYS_SETRESGID              = (SYS_SYSCALL_BASE + 170)
+	SYS_GETRESGID              = (SYS_SYSCALL_BASE + 171)
+	SYS_PRCTL                  = (SYS_SYSCALL_BASE + 172)
+	SYS_RT_SIGRETURN           = (SYS_SYSCALL_BASE + 173)
+	SYS_RT_SIGACTION           = (SYS_SYSCALL_BASE + 174)
+	SYS_RT_SIGPROCMASK         = (SYS_SYSCALL_BASE + 175)
+	SYS_RT_SIGPENDING          = (SYS_SYSCALL_BASE + 176)
+	SYS_RT_SIGTIMEDWAIT        = (SYS_SYSCALL_BASE + 177)
+	SYS_RT_SIGQUEUEINFO        = (SYS_SYSCALL_BASE + 178)
+	SYS_RT_SIGSUSPEND          = (SYS_SYSCALL_BASE + 179)
+	SYS_PREAD64                = (SYS_SYSCALL_BASE + 180)
+	SYS_PWRITE64               = (SYS_SYSCALL_BASE + 181)
+	SYS_CHOWN                  = (SYS_SYSCALL_BASE + 182)
+	SYS_GETCWD                 = (SYS_SYSCALL_BASE + 183)
+	SYS_CAPGET                 = (SYS_SYSCALL_BASE + 184)
+	SYS_CAPSET                 = (SYS_SYSCALL_BASE + 185)
+	SYS_SIGALTSTACK            = (SYS_SYSCALL_BASE + 186)
+	SYS_SENDFILE               = (SYS_SYSCALL_BASE + 187)
+	SYS_VFORK                  = (SYS_SYSCALL_BASE + 190)
+	SYS_UGETRLIMIT             = (SYS_SYSCALL_BASE + 191)
+	SYS_MMAP2                  = (SYS_SYSCALL_BASE + 192)
+	SYS_TRUNCATE64             = (SYS_SYSCALL_BASE + 193)
+	SYS_FTRUNCATE64            = (SYS_SYSCALL_BASE + 194)
+	SYS_STAT64                 = (SYS_SYSCALL_BASE + 195)
+	SYS_LSTAT64                = (SYS_SYSCALL_BASE + 196)
+	SYS_FSTAT64                = (SYS_SYSCALL_BASE + 197)
+	SYS_LCHOWN32               = (SYS_SYSCALL_BASE + 198)
+	SYS_GETUID32               = (SYS_SYSCALL_BASE + 199)
+	SYS_GETGID32               = (SYS_SYSCALL_BASE + 200)
+	SYS_GETEUID32              = (SYS_SYSCALL_BASE + 201)
+	SYS_GETEGID32              = (SYS_SYSCALL_BASE + 202)
+	SYS_SETREUID32             = (SYS_SYSCALL_BASE + 203)
+	SYS_SETREGID32             = (SYS_SYSCALL_BASE + 204)
+	SYS_GETGROUPS32            = (SYS_SYSCALL_BASE + 205)
+	SYS_SETGROUPS32            = (SYS_SYSCALL_BASE + 206)
+	SYS_FCHOWN32               = (SYS_SYSCALL_BASE + 207)
+	SYS_SETRESUID32            = (SYS_SYSCALL_BASE + 208)
+	SYS_GETRESUID32            = (SYS_SYSCALL_BASE + 209)
+	SYS_SETRESGID32            = (SYS_SYSCALL_BASE + 210)
+	SYS_GETRESGID32            = (SYS_SYSCALL_BASE + 211)
+	SYS_CHOWN32                = (SYS_SYSCALL_BASE + 212)
+	SYS_SETUID32               = (SYS_SYSCALL_BASE + 213)
+	SYS_SETGID32               = (SYS_SYSCALL_BASE + 214)
+	SYS_SETFSUID32             = (SYS_SYSCALL_BASE + 215)
+	SYS_SETFSGID32             = (SYS_SYSCALL_BASE + 216)
+	SYS_GETDENTS64             = (SYS_SYSCALL_BASE + 217)
+	SYS_PIVOT_ROOT             = (SYS_SYSCALL_BASE + 218)
+	SYS_MINCORE                = (SYS_SYSCALL_BASE + 219)
+	SYS_MADVISE                = (SYS_SYSCALL_BASE + 220)
+	SYS_FCNTL64                = (SYS_SYSCALL_BASE + 221)
+	SYS_GETTID                 = (SYS_SYSCALL_BASE + 224)
+	SYS_READAHEAD              = (SYS_SYSCALL_BASE + 225)
+	SYS_SETXATTR               = (SYS_SYSCALL_BASE + 226)
+	SYS_LSETXATTR              = (SYS_SYSCALL_BASE + 227)
+	SYS_FSETXATTR              = (SYS_SYSCALL_BASE + 228)
+	SYS_GETXATTR               = (SYS_SYSCALL_BASE + 229)
+	SYS_LGETXATTR              = (SYS_SYSCALL_BASE + 230)
+	SYS_FGETXATTR              = (SYS_SYSCALL_BASE + 231)
+	SYS_LISTXATTR              = (SYS_SYSCALL_BASE + 232)
+	SYS_LLISTXATTR             = (SYS_SYSCALL_BASE + 233)
+	SYS_FLISTXATTR             = (SYS_SYSCALL_BASE + 234)
+	SYS_REMOVEXATTR            = (SYS_SYSCALL_BASE + 235)
+	SYS_LREMOVEXATTR           = (SYS_SYSCALL_BASE + 236)
+	SYS_FREMOVEXATTR           = (SYS_SYSCALL_BASE + 237)
+	SYS_TKILL                  = (SYS_SYSCALL_BASE + 238)
+	SYS_SENDFILE64             = (SYS_SYSCALL_BASE + 239)
+	SYS_FUTEX                  = (SYS_SYSCALL_BASE + 240)
+	SYS_SCHED_SETAFFINITY      = (SYS_SYSCALL_BASE + 241)
+	SYS_SCHED_GETAFFINITY      = (SYS_SYSCALL_BASE + 242)
+	SYS_IO_SETUP               = (SYS_SYSCALL_BASE + 243)
+	SYS_IO_DESTROY             = (SYS_SYSCALL_BASE + 244)
+	SYS_IO_GETEVENTS           = (SYS_SYSCALL_BASE + 245)
+	SYS_IO_SUBMIT              = (SYS_SYSCALL_BASE + 246)
+	SYS_IO_CANCEL              = (SYS_SYSCALL_BASE + 247)
+	SYS_EXIT_GROUP             = (SYS_SYSCALL_BASE + 248)
+	SYS_LOOKUP_DCOOKIE         = (SYS_SYSCALL_BASE + 249)
+	SYS_EPOLL_CREATE           = (SYS_SYSCALL_BASE + 250)
+	SYS_EPOLL_CTL              = (SYS_SYSCALL_BASE + 251)
+	SYS_EPOLL_WAIT             = (SYS_SYSCALL_BASE + 252)
+	SYS_REMAP_FILE_PAGES       = (SYS_SYSCALL_BASE + 253)
+	SYS_SET_TID_ADDRESS        = (SYS_SYSCALL_BASE + 256)
+	SYS_TIMER_CREATE           = (SYS_SYSCALL_BASE + 257)
+	SYS_TIMER_SETTIME          = (SYS_SYSCALL_BASE + 258)
+	SYS_TIMER_GETTIME          = (SYS_SYSCALL_BASE + 259)
+	SYS_TIMER_GETOVERRUN       = (SYS_SYSCALL_BASE + 260)
+	SYS_TIMER_DELETE           = (SYS_SYSCALL_BASE + 261)
+	SYS_CLOCK_SETTIME          = (SYS_SYSCALL_BASE + 262)
+	SYS_CLOCK_GETTIME          = (SYS_SYSCALL_BASE + 263)
+	SYS_CLOCK_GETRES           = (SYS_SYSCALL_BASE + 264)
+	SYS_CLOCK_NANOSLEEP        = (SYS_SYSCALL_BASE + 265)
+	SYS_STATFS64               = (SYS_SYSCALL_BASE + 266)
+	SYS_FSTATFS64              = (SYS_SYSCALL_BASE + 267)
+	SYS_TGKILL                 = (SYS_SYSCALL_BASE + 268)
+	SYS_UTIMES                 = (SYS_SYSCALL_BASE + 269)
+	SYS_ARM_FADVISE64_64       = (SYS_SYSCALL_BASE + 270)
+	SYS_PCICONFIG_IOBASE       = (SYS_SYSCALL_BASE + 271)
+	SYS_PCICONFIG_READ         = (SYS_SYSCALL_BASE + 272)
+	SYS_PCICONFIG_WRITE        = (SYS_SYSCALL_BASE + 273)
+	SYS_MQ_OPEN                = (SYS_SYSCALL_BASE + 274)
+	SYS_MQ_UNLINK              = (SYS_SYSCALL_BASE + 275)
+	SYS_MQ_TIMEDSEND           = (SYS_SYSCALL_BASE + 276)
+	SYS_MQ_TIMEDRECEIVE        = (SYS_SYSCALL_BASE + 277)
+	SYS_MQ_NOTIFY              = (SYS_SYSCALL_BASE + 278)
+	SYS_MQ_GETSETATTR          = (SYS_SYSCALL_BASE + 279)
+	SYS_WAITID                 = (SYS_SYSCALL_BASE + 280)
+	SYS_SOCKET                 = (SYS_SYSCALL_BASE + 281)
+	SYS_BIND                   = (SYS_SYSCALL_BASE + 282)
+	SYS_CONNECT                = (SYS_SYSCALL_BASE + 283)
+	SYS_LISTEN                 = (SYS_SYSCALL_BASE + 284)
+	SYS_ACCEPT                 = (SYS_SYSCALL_BASE + 285)
+	SYS_GETSOCKNAME            = (SYS_SYSCALL_BASE + 286)
+	SYS_GETPEERNAME            = (SYS_SYSCALL_BASE + 287)
+	SYS_SOCKETPAIR             = (SYS_SYSCALL_BASE + 288)
+	SYS_SEND                   = (SYS_SYSCALL_BASE + 289)
+	SYS_SENDTO                 = (SYS_SYSCALL_BASE + 290)
+	SYS_RECV                   = (SYS_SYSCALL_BASE + 291)
+	SYS_RECVFROM               = (SYS_SYSCALL_BASE + 292)
+	SYS_SHUTDOWN               = (SYS_SYSCALL_BASE + 293)
+	SYS_SETSOCKOPT             = (SYS_SYSCALL_BASE + 294)
+	SYS_GETSOCKOPT             = (SYS_SYSCALL_BASE + 295)
+	SYS_SENDMSG                = (SYS_SYSCALL_BASE + 296)
+	SYS_RECVMSG                = (SYS_SYSCALL_BASE + 297)
+	SYS_SEMOP                  = (SYS_SYSCALL_BASE + 298)
+	SYS_SEMGET                 = (SYS_SYSCALL_BASE + 299)
+	SYS_SEMCTL                 = (SYS_SYSCALL_BASE + 300)
+	SYS_MSGSND                 = (SYS_SYSCALL_BASE + 301)
+	SYS_MSGRCV                 = (SYS_SYSCALL_BASE + 302)
+	SYS_MSGGET                 = (SYS_SYSCALL_BASE + 303)
+	SYS_MSGCTL                 = (SYS_SYSCALL_BASE + 304)
+	SYS_SHMAT                  = (SYS_SYSCALL_BASE + 305)
+	SYS_SHMDT                  = (SYS_SYSCALL_BASE + 306)
+	SYS_SHMGET                 = (SYS_SYSCALL_BASE + 307)
+	SYS_SHMCTL                 = (SYS_SYSCALL_BASE + 308)
+	SYS_ADD_KEY                = (SYS_SYSCALL_BASE + 309)
+	SYS_REQUEST_KEY            = (SYS_SYSCALL_BASE + 310)
+	SYS_KEYCTL                 = (SYS_SYSCALL_BASE + 311)
+	SYS_SEMTIMEDOP             = (SYS_SYSCALL_BASE + 312)
+	SYS_VSERVER                = (SYS_SYSCALL_BASE + 313)
+	SYS_IOPRIO_SET             = (SYS_SYSCALL_BASE + 314)
+	SYS_IOPRIO_GET             = (SYS_SYSCALL_BASE + 315)
+	SYS_INOTIFY_INIT           = (SYS_SYSCALL_BASE + 316)
+	SYS_INOTIFY_ADD_WATCH      = (SYS_SYSCALL_BASE + 317)
+	SYS_INOTIFY_RM_WATCH       = (SYS_SYSCALL_BASE + 318)
+	SYS_MBIND                  = (SYS_SYSCALL_BASE + 319)
+	SYS_GET_MEMPOLICY          = (SYS_SYSCALL_BASE + 320)
+	SYS_SET_MEMPOLICY          = (SYS_SYSCALL_BASE + 321)
+	SYS_OPENAT                 = (SYS_SYSCALL_BASE + 322)
+	SYS_MKDIRAT                = (SYS_SYSCALL_BASE + 323)
+	SYS_MKNODAT                = (SYS_SYSCALL_BASE + 324)
+	SYS_FCHOWNAT               = (SYS_SYSCALL_BASE + 325)
+	SYS_FUTIMESAT              = (SYS_SYSCALL_BASE + 326)
+	SYS_FSTATAT64              = (SYS_SYSCALL_BASE + 327)
+	SYS_UNLINKAT               = (SYS_SYSCALL_BASE + 328)
+	SYS_RENAMEAT               = (SYS_SYSCALL_BASE + 329)
+	SYS_LINKAT                 = (SYS_SYSCALL_BASE + 330)
+	SYS_SYMLINKAT              = (SYS_SYSCALL_BASE + 331)
+	SYS_READLINKAT             = (SYS_SYSCALL_BASE + 332)
+	SYS_FCHMODAT               = (SYS_SYSCALL_BASE + 333)
+	SYS_FACCESSAT              = (SYS_SYSCALL_BASE + 334)
+	SYS_UNSHARE                = (SYS_SYSCALL_BASE + 337)
+	SYS_SET_ROBUST_LIST        = (SYS_SYSCALL_BASE + 338)
+	SYS_GET_ROBUST_LIST        = (SYS_SYSCALL_BASE + 339)
+	SYS_SPLICE                 = (SYS_SYSCALL_BASE + 340)
+	SYS_ARM_SYNC_FILE_RANGE    = (SYS_SYSCALL_BASE + 341)
+	SYS_SYNC_FILE_RANGE2       = SYS_ARM_SYNC_FILE_RANGE
+	SYS_TEE                    = (SYS_SYSCALL_BASE + 342)
+	SYS_VMSPLICE               = (SYS_SYSCALL_BASE + 343)
+	SYS_MOVE_PAGES             = (SYS_SYSCALL_BASE + 344)
+	SYS_GETCPU                 = (SYS_SYSCALL_BASE + 345)
+	SYS_KEXEC_LOAD             = (SYS_SYSCALL_BASE + 347)
+	SYS_UTIMENSAT              = (SYS_SYSCALL_BASE + 348)
+	SYS_SIGNALFD               = (SYS_SYSCALL_BASE + 349)
+	SYS_TIMERFD_CREATE         = (SYS_SYSCALL_BASE + 350)
+	SYS_EVENTFD                = (SYS_SYSCALL_BASE + 351)
+	SYS_FALLOCATE              = (SYS_SYSCALL_BASE + 352)
+	SYS_TIMERFD_SETTIME        = (SYS_SYSCALL_BASE + 353)
+	SYS_TIMERFD_GETTIME        = (SYS_SYSCALL_BASE + 354)
+	SYS_SIGNALFD4              = (SYS_SYSCALL_BASE + 355)
+	SYS_EVENTFD2               = (SYS_SYSCALL_BASE + 356)
+	SYS_EPOLL_CREATE1          = (SYS_SYSCALL_BASE + 357)
+	SYS_DUP3                   = (SYS_SYSCALL_BASE + 358)
+	SYS_PIPE2                  = (SYS_SYSCALL_BASE + 359)
+	SYS_INOTIFY_INIT1          = (SYS_SYSCALL_BASE + 360)
 )
 
-func _darwin_system_call_conflict()	{}
+func _darwin_system_call_conflict() {}
diff --git a/src/pkg/syscall/zsysnum_nacl_386.go b/src/pkg/syscall/zsysnum_nacl_386.go
index d41cfec77..4099b2507 100644
--- a/src/pkg/syscall/zsysnum_nacl_386.go
+++ b/src/pkg/syscall/zsysnum_nacl_386.go
@@ -4,58 +4,58 @@
 package syscall
 
 const (
-	SYS_NULL		= 1;
-	SYS_OPEN		= 10;
-	SYS_CLOSE		= 11;
-	SYS_READ		= 12;
-	SYS_WRITE		= 13;
-	SYS_LSEEK		= 14;
-	SYS_IOCTL		= 15;
-	SYS_STAT		= 16;
-	SYS_FSTAT		= 17;
-	SYS_CHMOD		= 18;
-	SYS_SYSBRK		= 20;
-	SYS_MMAP		= 21;
-	SYS_MUNMAP		= 22;
-	SYS_GETDENTS		= 23;
-	SYS_EXIT		= 30;
-	SYS_GETPID		= 31;
-	SYS_SCHED_YIELD		= 32;
-	SYS_SYSCONF		= 33;
-	SYS_GETTIMEOFDAY	= 40;
-	SYS_CLOCK		= 41;
-	SYS_MULTIMEDIA_INIT	= 50;
-	SYS_MULTIMEDIA_SHUTDOWN	= 51;
-	SYS_VIDEO_INIT		= 52;
-	SYS_VIDEO_SHUTDOWN	= 53;
-	SYS_VIDEO_UPDATE	= 54;
-	SYS_VIDEO_POLL_EVENT	= 55;
-	SYS_AUDIO_INIT		= 56;
-	SYS_AUDIO_SHUTDOWN	= 57;
-	SYS_AUDIO_STREAM	= 58;
-	SYS_IMC_MAKEBOUNDSOCK	= 60;
-	SYS_IMC_ACCEPT		= 61;
-	SYS_IMC_CONNECT		= 62;
-	SYS_IMC_SENDMSG		= 63;
-	SYS_IMC_RECVMSG		= 64;
-	SYS_IMC_MEM_OBJ_CREATE	= 65;
-	SYS_IMC_SOCKETPAIR	= 66;
-	SYS_MUTEX_CREATE	= 70;
-	SYS_MUTEX_LOCK		= 71;
-	SYS_MUTEX_TRYLOCK	= 72;
-	SYS_MUTEX_UNLOCK	= 73;
-	SYS_COND_CREATE		= 74;
-	SYS_COND_WAIT		= 75;
-	SYS_COND_SIGNAL		= 76;
-	SYS_COND_BROADCAST	= 77;
-	SYS_COND_TIMED_WAIT_ABS	= 79;
-	SYS_THREAD_CREATE	= 80;
-	SYS_THREAD_EXIT		= 81;
-	SYS_TLS_INIT		= 82;
-	SYS_THREAD_NICE		= 83;
-	SYS_SRPC_GET_FD		= 90;
-	SYS_SEM_CREATE		= 100;
-	SYS_SEM_WAIT		= 101;
-	SYS_SEM_POST		= 102;
-	SYS_SEM_GET_VALUE	= 103;
+	SYS_NULL                = 1
+	SYS_OPEN                = 10
+	SYS_CLOSE               = 11
+	SYS_READ                = 12
+	SYS_WRITE               = 13
+	SYS_LSEEK               = 14
+	SYS_IOCTL               = 15
+	SYS_STAT                = 16
+	SYS_FSTAT               = 17
+	SYS_CHMOD               = 18
+	SYS_SYSBRK              = 20
+	SYS_MMAP                = 21
+	SYS_MUNMAP              = 22
+	SYS_GETDENTS            = 23
+	SYS_EXIT                = 30
+	SYS_GETPID              = 31
+	SYS_SCHED_YIELD         = 32
+	SYS_SYSCONF             = 33
+	SYS_GETTIMEOFDAY        = 40
+	SYS_CLOCK               = 41
+	SYS_MULTIMEDIA_INIT     = 50
+	SYS_MULTIMEDIA_SHUTDOWN = 51
+	SYS_VIDEO_INIT          = 52
+	SYS_VIDEO_SHUTDOWN      = 53
+	SYS_VIDEO_UPDATE        = 54
+	SYS_VIDEO_POLL_EVENT    = 55
+	SYS_AUDIO_INIT          = 56
+	SYS_AUDIO_SHUTDOWN      = 57
+	SYS_AUDIO_STREAM        = 58
+	SYS_IMC_MAKEBOUNDSOCK   = 60
+	SYS_IMC_ACCEPT          = 61
+	SYS_IMC_CONNECT         = 62
+	SYS_IMC_SENDMSG         = 63
+	SYS_IMC_RECVMSG         = 64
+	SYS_IMC_MEM_OBJ_CREATE  = 65
+	SYS_IMC_SOCKETPAIR      = 66
+	SYS_MUTEX_CREATE        = 70
+	SYS_MUTEX_LOCK          = 71
+	SYS_MUTEX_TRYLOCK       = 72
+	SYS_MUTEX_UNLOCK        = 73
+	SYS_COND_CREATE         = 74
+	SYS_COND_WAIT           = 75
+	SYS_COND_SIGNAL         = 76
+	SYS_COND_BROADCAST      = 77
+	SYS_COND_TIMED_WAIT_ABS = 79
+	SYS_THREAD_CREATE       = 80
+	SYS_THREAD_EXIT         = 81
+	SYS_TLS_INIT            = 82
+	SYS_THREAD_NICE         = 83
+	SYS_SRPC_GET_FD         = 90
+	SYS_SEM_CREATE          = 100
+	SYS_SEM_WAIT            = 101
+	SYS_SEM_POST            = 102
+	SYS_SEM_GET_VALUE       = 103
 )
diff --git a/src/pkg/syscall/ztypes_darwin_386.go b/src/pkg/syscall/ztypes_darwin_386.go
index 003d58ba3..708bba400 100644
--- a/src/pkg/syscall/ztypes_darwin_386.go
+++ b/src/pkg/syscall/ztypes_darwin_386.go
@@ -6,22 +6,22 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr		= 0x4;
-	sizeofShort		= 0x2;
-	sizeofInt		= 0x4;
-	sizeofLong		= 0x4;
-	sizeofLongLong		= 0x8;
-	O_CLOEXEC		= 0;
-	SizeofSockaddrInet4	= 0x10;
-	SizeofSockaddrInet6	= 0x1c;
-	SizeofSockaddrAny	= 0x6c;
-	SizeofSockaddrUnix	= 0x6a;
-	SizeofLinger		= 0x8;
-	SizeofMsghdr		= 0x1c;
-	SizeofCmsghdr		= 0xc;
-	PTRACE_TRACEME		= 0;
-	PTRACE_CONT		= 0x7;
-	PTRACE_KILL		= 0x8;
+	sizeofPtr           = 0x4
+	sizeofShort         = 0x2
+	sizeofInt           = 0x4
+	sizeofLong          = 0x4
+	sizeofLongLong      = 0x8
+	O_CLOEXEC           = 0
+	SizeofSockaddrInet4 = 0x10
+	SizeofSockaddrInet6 = 0x1c
+	SizeofSockaddrAny   = 0x6c
+	SizeofSockaddrUnix  = 0x6a
+	SizeofLinger        = 0x8
+	SizeofMsghdr        = 0x1c
+	SizeofCmsghdr       = 0xc
+	PTRACE_TRACEME      = 0
+	PTRACE_CONT         = 0x7
+	PTRACE_KILL         = 0x8
 )
 
 // Types
@@ -35,195 +35,195 @@ type _C_long int32
 type _C_long_long int64
 
 type Timespec struct {
-	Sec	int32;
-	Nsec	int32;
+	Sec  int32
+	Nsec int32
 }
 
 type Timeval struct {
-	Sec	int32;
-	Usec	int32;
+	Sec  int32
+	Usec int32
 }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int32;
-	Ixrss		int32;
-	Idrss		int32;
-	Isrss		int32;
-	Minflt		int32;
-	Majflt		int32;
-	Nswap		int32;
-	Inblock		int32;
-	Oublock		int32;
-	Msgsnd		int32;
-	Msgrcv		int32;
-	Nsignals	int32;
-	Nvcsw		int32;
-	Nivcsw		int32;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
 }
 
 type Rlimit struct {
-	Cur	uint64;
-	Max	uint64;
+	Cur uint64
+	Max uint64
 }
 
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		int32;
-	Mode		uint16;
-	Nlink		uint16;
-	Ino		uint64;
-	Uid		uint32;
-	Gid		uint32;
-	Rdev		int32;
-	Atimespec	Timespec;
-	Mtimespec	Timespec;
-	Ctimespec	Timespec;
-	Birthtimespec	Timespec;
-	Size		int64;
-	Blocks		int64;
-	Blksize		int32;
-	Flags		uint32;
-	Gen		uint32;
-	Lspare		int32;
-	Qspare		[2]int64;
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
 }
 
 type Statfs_t struct {
-	Bsize		uint32;
-	Iosize		int32;
-	Blocks		uint64;
-	Bfree		uint64;
-	Bavail		uint64;
-	Files		uint64;
-	Ffree		uint64;
-	Fsid		[8]byte;	/* fsid */
-	Owner		uint32;
-	Type		uint32;
-	Flags		uint32;
-	Fssubtype	uint32;
-	Fstypename	[16]int8;
-	Mntonname	[1024]int8;
-	Mntfromname	[1024]int8;
-	Reserved	[8]uint32;
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        [8]byte /* fsid */
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
 }
 
 type Flock_t struct {
-	Start	int64;
-	Len	int64;
-	Pid	int32;
-	Type	int16;
-	Whence	int16;
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
 }
 
 type Fstore_t struct {
-	Flags		uint32;
-	Posmode		int32;
-	Offset		int64;
-	Length		int64;
-	Bytesalloc	int64;
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
 }
 
 type Radvisory_t struct {
-	Offset	int64;
-	Count	int32;
+	Offset int64
+	Count  int32
 }
 
 type Fbootstraptransfer_t struct {
-	Offset	int64;
-	Length	uint32;
-	Buffer	*byte;
+	Offset int64
+	Length uint32
+	Buffer *byte
 }
 
 type Log2phys_t struct {
-	Flags		uint32;
-	Contigbytes	int64;
-	Devoffset	int64;
+	Flags       uint32
+	Contigbytes int64
+	Devoffset   int64
 }
 
 type Dirent struct {
-	Ino	uint64;
-	Seekoff	uint64;
-	Reclen	uint16;
-	Namlen	uint16;
-	Type	uint8;
-	Name	[1024]int8;
-	Pad0	[3]byte;
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	Pad0    [3]byte
 }
 
 type RawSockaddrInet4 struct {
-	Len	uint8;
-	Family	uint8;
-	Port	uint16;
-	Addr	[4]byte;	/* in_addr */
-	Zero	[8]int8;
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
 }
 
 type RawSockaddrInet6 struct {
-	Len		uint8;
-	Family		uint8;
-	Port		uint16;
-	Flowinfo	uint32;
-	Addr		[16]byte;	/* in6_addr */
-	Scope_id	uint32;
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
 }
 
 type RawSockaddrUnix struct {
-	Len	uint8;
-	Family	uint8;
-	Path	[104]int8;
+	Len    uint8
+	Family uint8
+	Path   [104]int8
 }
 
 type RawSockaddr struct {
-	Len	uint8;
-	Family	uint8;
-	Data	[14]int8;
+	Len    uint8
+	Family uint8
+	Data   [14]int8
 }
 
 type RawSockaddrAny struct {
-	Addr	RawSockaddr;
-	Pad	[92]int8;
+	Addr RawSockaddr
+	Pad  [92]int8
 }
 
 type _Socklen uint32
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 type Iovec struct {
-	Base	*byte;
-	Len	uint32;
+	Base *byte
+	Len  uint32
 }
 
 type Msghdr struct {
-	Name		*byte;
-	Namelen		uint32;
-	Iov		*Iovec;
-	Iovlen		int32;
-	Control		*byte;
-	Controllen	uint32;
-	Flags		int32;
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
 }
 
 type Cmsghdr struct {
-	Len	uint32;
-	Level	int32;
-	Type	int32;
+	Len   uint32
+	Level int32
+	Type  int32
 }
 
 type Kevent_t struct {
-	Ident	uint32;
-	Filter	int16;
-	Flags	uint16;
-	Fflags	uint32;
-	Data	int32;
-	Udata	*byte;
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
 }
 
 type FdSet struct {
-	Bits [32]int32;
+	Bits [32]int32
 }
diff --git a/src/pkg/syscall/ztypes_darwin_amd64.go b/src/pkg/syscall/ztypes_darwin_amd64.go
index ff85b2723..5b273768f 100644
--- a/src/pkg/syscall/ztypes_darwin_amd64.go
+++ b/src/pkg/syscall/ztypes_darwin_amd64.go
@@ -6,22 +6,22 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr		= 0x8;
-	sizeofShort		= 0x2;
-	sizeofInt		= 0x4;
-	sizeofLong		= 0x8;
-	sizeofLongLong		= 0x8;
-	O_CLOEXEC		= 0;
-	SizeofSockaddrInet4	= 0x10;
-	SizeofSockaddrInet6	= 0x1c;
-	SizeofSockaddrAny	= 0x6c;
-	SizeofSockaddrUnix	= 0x6a;
-	SizeofLinger		= 0x8;
-	SizeofMsghdr		= 0x30;
-	SizeofCmsghdr		= 0xc;
-	PTRACE_TRACEME		= 0;
-	PTRACE_CONT		= 0x7;
-	PTRACE_KILL		= 0x8;
+	sizeofPtr           = 0x8
+	sizeofShort         = 0x2
+	sizeofInt           = 0x4
+	sizeofLong          = 0x8
+	sizeofLongLong      = 0x8
+	O_CLOEXEC           = 0
+	SizeofSockaddrInet4 = 0x10
+	SizeofSockaddrInet6 = 0x1c
+	SizeofSockaddrAny   = 0x6c
+	SizeofSockaddrUnix  = 0x6a
+	SizeofLinger        = 0x8
+	SizeofMsghdr        = 0x30
+	SizeofCmsghdr       = 0xc
+	PTRACE_TRACEME      = 0
+	PTRACE_CONT         = 0x7
+	PTRACE_KILL         = 0x8
 )
 
 // Types
@@ -35,200 +35,200 @@ type _C_long int64
 type _C_long_long int64
 
 type Timespec struct {
-	Sec	int64;
-	Nsec	int64;
+	Sec  int64
+	Nsec int64
 }
 
 type Timeval struct {
-	Sec	int64;
-	Usec	int32;
-	Pad0	[4]byte;
+	Sec  int64
+	Usec int32
+	Pad0 [4]byte
 }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int64;
-	Ixrss		int64;
-	Idrss		int64;
-	Isrss		int64;
-	Minflt		int64;
-	Majflt		int64;
-	Nswap		int64;
-	Inblock		int64;
-	Oublock		int64;
-	Msgsnd		int64;
-	Msgrcv		int64;
-	Nsignals	int64;
-	Nvcsw		int64;
-	Nivcsw		int64;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
 }
 
 type Rlimit struct {
-	Cur	uint64;
-	Max	uint64;
+	Cur uint64
+	Max uint64
 }
 
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		int32;
-	Mode		uint16;
-	Nlink		uint16;
-	Ino		uint64;
-	Uid		uint32;
-	Gid		uint32;
-	Rdev		int32;
-	Pad0		[4]byte;
-	Atimespec	Timespec;
-	Mtimespec	Timespec;
-	Ctimespec	Timespec;
-	Birthtimespec	Timespec;
-	Size		int64;
-	Blocks		int64;
-	Blksize		int32;
-	Flags		uint32;
-	Gen		uint32;
-	Lspare		int32;
-	Qspare		[2]int64;
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Pad0          [4]byte
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
 }
 
 type Statfs_t struct {
-	Bsize		uint32;
-	Iosize		int32;
-	Blocks		uint64;
-	Bfree		uint64;
-	Bavail		uint64;
-	Files		uint64;
-	Ffree		uint64;
-	Fsid		[8]byte;	/* fsid */
-	Owner		uint32;
-	Type		uint32;
-	Flags		uint32;
-	Fssubtype	uint32;
-	Fstypename	[16]int8;
-	Mntonname	[1024]int8;
-	Mntfromname	[1024]int8;
-	Reserved	[8]uint32;
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        [8]byte /* fsid */
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
 }
 
 type Flock_t struct {
-	Start	int64;
-	Len	int64;
-	Pid	int32;
-	Type	int16;
-	Whence	int16;
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
 }
 
 type Fstore_t struct {
-	Flags		uint32;
-	Posmode		int32;
-	Offset		int64;
-	Length		int64;
-	Bytesalloc	int64;
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
 }
 
 type Radvisory_t struct {
-	Offset	int64;
-	Count	int32;
-	Pad0	[4]byte;
+	Offset int64
+	Count  int32
+	Pad0   [4]byte
 }
 
 type Fbootstraptransfer_t struct {
-	Offset	int64;
-	Length	uint64;
-	Buffer	*byte;
+	Offset int64
+	Length uint64
+	Buffer *byte
 }
 
 type Log2phys_t struct {
-	Flags		uint32;
-	Contigbytes	int64;
-	Devoffset	int64;
+	Flags       uint32
+	Contigbytes int64
+	Devoffset   int64
 }
 
 type Dirent struct {
-	Ino	uint64;
-	Seekoff	uint64;
-	Reclen	uint16;
-	Namlen	uint16;
-	Type	uint8;
-	Name	[1024]int8;
-	Pad0	[3]byte;
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	Pad0    [3]byte
 }
 
 type RawSockaddrInet4 struct {
-	Len	uint8;
-	Family	uint8;
-	Port	uint16;
-	Addr	[4]byte;	/* in_addr */
-	Zero	[8]int8;
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
 }
 
 type RawSockaddrInet6 struct {
-	Len		uint8;
-	Family		uint8;
-	Port		uint16;
-	Flowinfo	uint32;
-	Addr		[16]byte;	/* in6_addr */
-	Scope_id	uint32;
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
 }
 
 type RawSockaddrUnix struct {
-	Len	uint8;
-	Family	uint8;
-	Path	[104]int8;
+	Len    uint8
+	Family uint8
+	Path   [104]int8
 }
 
 type RawSockaddr struct {
-	Len	uint8;
-	Family	uint8;
-	Data	[14]int8;
+	Len    uint8
+	Family uint8
+	Data   [14]int8
 }
 
 type RawSockaddrAny struct {
-	Addr	RawSockaddr;
-	Pad	[92]int8;
+	Addr RawSockaddr
+	Pad  [92]int8
 }
 
 type _Socklen uint32
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 type Iovec struct {
-	Base	*byte;
-	Len	uint64;
+	Base *byte
+	Len  uint64
 }
 
 type Msghdr struct {
-	Name		*byte;
-	Namelen		uint32;
-	Pad0		[4]byte;
-	Iov		*Iovec;
-	Iovlen		int32;
-	Pad1		[4]byte;
-	Control		*byte;
-	Controllen	uint32;
-	Flags		int32;
+	Name       *byte
+	Namelen    uint32
+	Pad0       [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad1       [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
 }
 
 type Cmsghdr struct {
-	Len	uint32;
-	Level	int32;
-	Type	int32;
+	Len   uint32
+	Level int32
+	Type  int32
 }
 
 type Kevent_t struct {
-	Ident	uint64;
-	Filter	int16;
-	Flags	uint16;
-	Fflags	uint32;
-	Data	int64;
-	Udata	*byte;
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
 }
 
 type FdSet struct {
-	Bits [32]int32;
+	Bits [32]int32
 }
diff --git a/src/pkg/syscall/ztypes_freebsd_386.go b/src/pkg/syscall/ztypes_freebsd_386.go
index 5a67a9fc7..39e74522d 100644
--- a/src/pkg/syscall/ztypes_freebsd_386.go
+++ b/src/pkg/syscall/ztypes_freebsd_386.go
@@ -6,36 +6,36 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr		= 0x4;
-	sizeofShort		= 0x2;
-	sizeofInt		= 0x4;
-	sizeofLong		= 0x4;
-	sizeofLongLong		= 0x8;
-	O_CLOEXEC		= 0;
-	S_IFMT			= 0xf000;
-	S_IFIFO			= 0x1000;
-	S_IFCHR			= 0x2000;
-	S_IFDIR			= 0x4000;
-	S_IFBLK			= 0x6000;
-	S_IFREG			= 0x8000;
-	S_IFLNK			= 0xa000;
-	S_IFSOCK		= 0xc000;
-	S_ISUID			= 0x800;
-	S_ISGID			= 0x400;
-	S_ISVTX			= 0x200;
-	S_IRUSR			= 0x100;
-	S_IWUSR			= 0x80;
-	S_IXUSR			= 0x40;
-	SizeofSockaddrInet4	= 0x10;
-	SizeofSockaddrInet6	= 0x1c;
-	SizeofSockaddrAny	= 0x6c;
-	SizeofSockaddrUnix	= 0x6a;
-	SizeofLinger		= 0x8;
-	SizeofMsghdr		= 0x1c;
-	SizeofCmsghdr		= 0xc;
-	PTRACE_TRACEME		= 0;
-	PTRACE_CONT		= 0x7;
-	PTRACE_KILL		= 0x8;
+	sizeofPtr           = 0x4
+	sizeofShort         = 0x2
+	sizeofInt           = 0x4
+	sizeofLong          = 0x4
+	sizeofLongLong      = 0x8
+	O_CLOEXEC           = 0
+	S_IFMT              = 0xf000
+	S_IFIFO             = 0x1000
+	S_IFCHR             = 0x2000
+	S_IFDIR             = 0x4000
+	S_IFBLK             = 0x6000
+	S_IFREG             = 0x8000
+	S_IFLNK             = 0xa000
+	S_IFSOCK            = 0xc000
+	S_ISUID             = 0x800
+	S_ISGID             = 0x400
+	S_ISVTX             = 0x200
+	S_IRUSR             = 0x100
+	S_IWUSR             = 0x80
+	S_IXUSR             = 0x40
+	SizeofSockaddrInet4 = 0x10
+	SizeofSockaddrInet6 = 0x1c
+	SizeofSockaddrAny   = 0x6c
+	SizeofSockaddrUnix  = 0x6a
+	SizeofLinger        = 0x8
+	SizeofMsghdr        = 0x1c
+	SizeofCmsghdr       = 0xc
+	PTRACE_TRACEME      = 0
+	PTRACE_CONT         = 0x7
+	PTRACE_KILL         = 0x8
 )
 
 // Types
@@ -49,176 +49,176 @@ type _C_long int32
 type _C_long_long int64
 
 type Timespec struct {
-	Sec	int32;
-	Nsec	int32;
+	Sec  int32
+	Nsec int32
 }
 
 type Timeval struct {
-	Sec	int32;
-	Usec	int32;
+	Sec  int32
+	Usec int32
 }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int32;
-	Ixrss		int32;
-	Idrss		int32;
-	Isrss		int32;
-	Minflt		int32;
-	Majflt		int32;
-	Nswap		int32;
-	Inblock		int32;
-	Oublock		int32;
-	Msgsnd		int32;
-	Msgrcv		int32;
-	Nsignals	int32;
-	Nvcsw		int32;
-	Nivcsw		int32;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
 }
 
 type Rlimit struct {
-	Cur	int64;
-	Max	int64;
+	Cur int64
+	Max int64
 }
 
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		uint32;
-	Ino		uint32;
-	Mode		uint16;
-	Nlink		uint16;
-	Uid		uint32;
-	Gid		uint32;
-	Rdev		uint32;
-	Atimespec	Timespec;
-	Mtimespec	Timespec;
-	Ctimespec	Timespec;
-	Size		int64;
-	Blocks		int64;
-	Blksize		uint32;
-	Flags		uint32;
-	Gen		uint32;
-	Lspare		int32;
-	Birthtimespec	Timespec;
-	Pad0		uint32;
-	Pad1		uint32;
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+	Pad0          uint32
+	Pad1          uint32
 }
 
 type Statfs_t struct {
-	Version		uint32;
-	Type		uint32;
-	Flags		uint64;
-	Bsize		uint64;
-	Iosize		uint64;
-	Blocks		uint64;
-	Bfree		uint64;
-	Bavail		int64;
-	Files		uint64;
-	Ffree		int64;
-	Syncwrites	uint64;
-	Asyncwrites	uint64;
-	Syncreads	uint64;
-	Asyncreads	uint64;
-	Spare		[10]uint64;
-	Namemax		uint32;
-	Owner		uint32;
-	Fsid		[8]byte;	/* fsid */
-	Charspare	[80]int8;
-	Fstypename	[16]int8;
-	Mntfromname	[88]int8;
-	Mntonname	[88]int8;
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        [8]byte /* fsid */
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
 }
 
 type Flock_t struct {
-	Start	int64;
-	Len	int64;
-	Pid	int32;
-	Type	int16;
-	Whence	int16;
-	Sysid	int32;
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+	Sysid  int32
 }
 
 type Dirent struct {
-	Fileno	uint32;
-	Reclen	uint16;
-	Type	uint8;
-	Namlen	uint8;
-	Name	[256]int8;
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
 }
 
 type RawSockaddrInet4 struct {
-	Len	uint8;
-	Family	uint8;
-	Port	uint16;
-	Addr	[4]byte;	/* in_addr */
-	Zero	[8]int8;
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
 }
 
 type RawSockaddrInet6 struct {
-	Len		uint8;
-	Family		uint8;
-	Port		uint16;
-	Flowinfo	uint32;
-	Addr		[16]byte;	/* in6_addr */
-	Scope_id	uint32;
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
 }
 
 type RawSockaddrUnix struct {
-	Len	uint8;
-	Family	uint8;
-	Path	[104]int8;
+	Len    uint8
+	Family uint8
+	Path   [104]int8
 }
 
 type RawSockaddr struct {
-	Len	uint8;
-	Family	uint8;
-	Data	[14]int8;
+	Len    uint8
+	Family uint8
+	Data   [14]int8
 }
 
 type RawSockaddrAny struct {
-	Addr	RawSockaddr;
-	Pad	[92]int8;
+	Addr RawSockaddr
+	Pad  [92]int8
 }
 
 type _Socklen uint32
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 type Iovec struct {
-	Base	*byte;
-	Len	uint32;
+	Base *byte
+	Len  uint32
 }
 
 type Msghdr struct {
-	Name		*byte;
-	Namelen		uint32;
-	Iov		*Iovec;
-	Iovlen		int32;
-	Control		*byte;
-	Controllen	uint32;
-	Flags		int32;
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
 }
 
 type Cmsghdr struct {
-	Len	uint32;
-	Level	int32;
-	Type	int32;
+	Len   uint32
+	Level int32
+	Type  int32
 }
 
 type Kevent_t struct {
-	Ident	uint32;
-	Filter	int16;
-	Flags	uint16;
-	Fflags	uint32;
-	Data	int32;
-	Udata	*byte;
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
 }
 
 type FdSet struct {
-	X__fds_bits [32]uint32;
+	X__fds_bits [32]uint32
 }
diff --git a/src/pkg/syscall/ztypes_freebsd_amd64.go b/src/pkg/syscall/ztypes_freebsd_amd64.go
index 076acc698..eea7a0517 100644
--- a/src/pkg/syscall/ztypes_freebsd_amd64.go
+++ b/src/pkg/syscall/ztypes_freebsd_amd64.go
@@ -6,36 +6,36 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr		= 0x8;
-	sizeofShort		= 0x2;
-	sizeofInt		= 0x4;
-	sizeofLong		= 0x8;
-	sizeofLongLong		= 0x8;
-	O_CLOEXEC		= 0;
-	S_IFMT			= 0xf000;
-	S_IFIFO			= 0x1000;
-	S_IFCHR			= 0x2000;
-	S_IFDIR			= 0x4000;
-	S_IFBLK			= 0x6000;
-	S_IFREG			= 0x8000;
-	S_IFLNK			= 0xa000;
-	S_IFSOCK		= 0xc000;
-	S_ISUID			= 0x800;
-	S_ISGID			= 0x400;
-	S_ISVTX			= 0x200;
-	S_IRUSR			= 0x100;
-	S_IWUSR			= 0x80;
-	S_IXUSR			= 0x40;
-	SizeofSockaddrInet4	= 0x10;
-	SizeofSockaddrInet6	= 0x1c;
-	SizeofSockaddrAny	= 0x6c;
-	SizeofSockaddrUnix	= 0x6a;
-	SizeofLinger		= 0x8;
-	SizeofMsghdr		= 0x30;
-	SizeofCmsghdr		= 0xc;
-	PTRACE_TRACEME		= 0;
-	PTRACE_CONT		= 0x7;
-	PTRACE_KILL		= 0x8;
+	sizeofPtr           = 0x8
+	sizeofShort         = 0x2
+	sizeofInt           = 0x4
+	sizeofLong          = 0x8
+	sizeofLongLong      = 0x8
+	O_CLOEXEC           = 0
+	S_IFMT              = 0xf000
+	S_IFIFO             = 0x1000
+	S_IFCHR             = 0x2000
+	S_IFDIR             = 0x4000
+	S_IFBLK             = 0x6000
+	S_IFREG             = 0x8000
+	S_IFLNK             = 0xa000
+	S_IFSOCK            = 0xc000
+	S_ISUID             = 0x800
+	S_ISGID             = 0x400
+	S_ISVTX             = 0x200
+	S_IRUSR             = 0x100
+	S_IWUSR             = 0x80
+	S_IXUSR             = 0x40
+	SizeofSockaddrInet4 = 0x10
+	SizeofSockaddrInet6 = 0x1c
+	SizeofSockaddrAny   = 0x6c
+	SizeofSockaddrUnix  = 0x6a
+	SizeofLinger        = 0x8
+	SizeofMsghdr        = 0x30
+	SizeofCmsghdr       = 0xc
+	PTRACE_TRACEME      = 0
+	PTRACE_CONT         = 0x7
+	PTRACE_KILL         = 0x8
 )
 
 // Types
@@ -49,179 +49,179 @@ type _C_long int64
 type _C_long_long int64
 
 type Timespec struct {
-	Sec	int64;
-	Nsec	int64;
+	Sec  int64
+	Nsec int64
 }
 
 type Timeval struct {
-	Sec	int64;
-	Usec	int64;
+	Sec  int64
+	Usec int64
 }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int64;
-	Ixrss		int64;
-	Idrss		int64;
-	Isrss		int64;
-	Minflt		int64;
-	Majflt		int64;
-	Nswap		int64;
-	Inblock		int64;
-	Oublock		int64;
-	Msgsnd		int64;
-	Msgrcv		int64;
-	Nsignals	int64;
-	Nvcsw		int64;
-	Nivcsw		int64;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
 }
 
 type Rlimit struct {
-	Cur	int64;
-	Max	int64;
+	Cur int64
+	Max int64
 }
 
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		uint32;
-	Ino		uint32;
-	Mode		uint16;
-	Nlink		uint16;
-	Uid		uint32;
-	Gid		uint32;
-	Rdev		uint32;
-	Atimespec	Timespec;
-	Mtimespec	Timespec;
-	Ctimespec	Timespec;
-	Size		int64;
-	Blocks		int64;
-	Blksize		uint32;
-	Flags		uint32;
-	Gen		uint32;
-	Lspare		int32;
-	Birthtimespec	Timespec;
-	Pad0		uint8;
-	Pad1		uint8;
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+	Pad0          uint8
+	Pad1          uint8
 }
 
 type Statfs_t struct {
-	Version		uint32;
-	Type		uint32;
-	Flags		uint64;
-	Bsize		uint64;
-	Iosize		uint64;
-	Blocks		uint64;
-	Bfree		uint64;
-	Bavail		int64;
-	Files		uint64;
-	Ffree		int64;
-	Syncwrites	uint64;
-	Asyncwrites	uint64;
-	Syncreads	uint64;
-	Asyncreads	uint64;
-	Spare		[10]uint64;
-	Namemax		uint32;
-	Owner		uint32;
-	Fsid		[8]byte;	/* fsid */
-	Charspare	[80]int8;
-	Fstypename	[16]int8;
-	Mntfromname	[88]int8;
-	Mntonname	[88]int8;
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        [8]byte /* fsid */
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
 }
 
 type Flock_t struct {
-	Start	int64;
-	Len	int64;
-	Pid	int32;
-	Type	int16;
-	Whence	int16;
-	Sysid	int32;
-	Pad0	[4]byte;
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+	Sysid  int32
+	Pad0   [4]byte
 }
 
 type Dirent struct {
-	Fileno	uint32;
-	Reclen	uint16;
-	Type	uint8;
-	Namlen	uint8;
-	Name	[256]int8;
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
 }
 
 type RawSockaddrInet4 struct {
-	Len	uint8;
-	Family	uint8;
-	Port	uint16;
-	Addr	[4]byte;	/* in_addr */
-	Zero	[8]int8;
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
 }
 
 type RawSockaddrInet6 struct {
-	Len		uint8;
-	Family		uint8;
-	Port		uint16;
-	Flowinfo	uint32;
-	Addr		[16]byte;	/* in6_addr */
-	Scope_id	uint32;
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
 }
 
 type RawSockaddrUnix struct {
-	Len	uint8;
-	Family	uint8;
-	Path	[104]int8;
+	Len    uint8
+	Family uint8
+	Path   [104]int8
 }
 
 type RawSockaddr struct {
-	Len	uint8;
-	Family	uint8;
-	Data	[14]int8;
+	Len    uint8
+	Family uint8
+	Data   [14]int8
 }
 
 type RawSockaddrAny struct {
-	Addr	RawSockaddr;
-	Pad	[92]int8;
+	Addr RawSockaddr
+	Pad  [92]int8
 }
 
 type _Socklen uint32
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 type Iovec struct {
-	Base	*byte;
-	Len	uint64;
+	Base *byte
+	Len  uint64
 }
 
 type Msghdr struct {
-	Name		*byte;
-	Namelen		uint32;
-	Pad0		[4]byte;
-	Iov		*Iovec;
-	Iovlen		int32;
-	Pad1		[4]byte;
-	Control		*byte;
-	Controllen	uint32;
-	Flags		int32;
+	Name       *byte
+	Namelen    uint32
+	Pad0       [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad1       [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
 }
 
 type Cmsghdr struct {
-	Len	uint32;
-	Level	int32;
-	Type	int32;
+	Len   uint32
+	Level int32
+	Type  int32
 }
 
 type Kevent_t struct {
-	Ident	uint64;
-	Filter	int16;
-	Flags	uint16;
-	Fflags	uint32;
-	Data	int64;
-	Udata	*byte;
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
 }
 
 type FdSet struct {
-	X__fds_bits [16]uint64;
+	X__fds_bits [16]uint64
 }
diff --git a/src/pkg/syscall/ztypes_linux_386.go b/src/pkg/syscall/ztypes_linux_386.go
index 68f2032b8..866c11959 100644
--- a/src/pkg/syscall/ztypes_linux_386.go
+++ b/src/pkg/syscall/ztypes_linux_386.go
@@ -6,19 +6,19 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr		= 0x4;
-	sizeofShort		= 0x2;
-	sizeofInt		= 0x4;
-	sizeofLong		= 0x4;
-	sizeofLongLong		= 0x8;
-	PathMax			= 0x1000;
-	SizeofSockaddrInet4	= 0x10;
-	SizeofSockaddrInet6	= 0x1c;
-	SizeofSockaddrAny	= 0x70;
-	SizeofSockaddrUnix	= 0x6e;
-	SizeofLinger		= 0x8;
-	SizeofMsghdr		= 0x1c;
-	SizeofCmsghdr		= 0xc;
+	sizeofPtr           = 0x4
+	sizeofShort         = 0x2
+	sizeofInt           = 0x4
+	sizeofLong          = 0x4
+	sizeofLongLong      = 0x8
+	PathMax             = 0x1000
+	SizeofSockaddrInet4 = 0x10
+	SizeofSockaddrInet6 = 0x1c
+	SizeofSockaddrAny   = 0x70
+	SizeofSockaddrUnix  = 0x6e
+	SizeofLinger        = 0x8
+	SizeofMsghdr        = 0x1c
+	SizeofCmsghdr       = 0xc
 )
 
 // Types
@@ -32,256 +32,256 @@ type _C_long int32
 type _C_long_long int64
 
 type Timespec struct {
-	Sec	int32;
-	Nsec	int32;
+	Sec  int32
+	Nsec int32
 }
 
 type Timeval struct {
-	Sec	int32;
-	Usec	int32;
+	Sec  int32
+	Usec int32
 }
 
 type Timex struct {
-	Modes		uint32;
-	Offset		int32;
-	Freq		int32;
-	Maxerror	int32;
-	Esterror	int32;
-	Status		int32;
-	Constant	int32;
-	Precision	int32;
-	Tolerance	int32;
-	Time		Timeval;
-	Tick		int32;
-	Ppsfreq		int32;
-	Jitter		int32;
-	Shift		int32;
-	Stabil		int32;
-	Jitcnt		int32;
-	Calcnt		int32;
-	Errcnt		int32;
-	Stbcnt		int32;
-	Pad0		int32;
-	Pad1		int32;
-	Pad2		int32;
-	Pad3		int32;
-	Pad4		int32;
-	Pad5		int32;
-	Pad6		int32;
-	Pad7		int32;
-	Pad8		int32;
-	Pad9		int32;
-	Pad10		int32;
-	Pad11		int32;
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Pad0      int32
+	Pad1      int32
+	Pad2      int32
+	Pad3      int32
+	Pad4      int32
+	Pad5      int32
+	Pad6      int32
+	Pad7      int32
+	Pad8      int32
+	Pad9      int32
+	Pad10     int32
+	Pad11     int32
 }
 
 type Time_t int32
 
 type Tms struct {
-	Utime	int32;
-	Stime	int32;
-	Cutime	int32;
-	Cstime	int32;
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
 }
 
 type Utimbuf struct {
-	Actime	int32;
-	Modtime	int32;
+	Actime  int32
+	Modtime int32
 }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int32;
-	Ixrss		int32;
-	Idrss		int32;
-	Isrss		int32;
-	Minflt		int32;
-	Majflt		int32;
-	Nswap		int32;
-	Inblock		int32;
-	Oublock		int32;
-	Msgsnd		int32;
-	Msgrcv		int32;
-	Nsignals	int32;
-	Nvcsw		int32;
-	Nivcsw		int32;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
 }
 
 type Rlimit struct {
-	Cur	uint64;
-	Max	uint64;
+	Cur uint64
+	Max uint64
 }
 
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		uint64;
-	X__pad1		uint16;
-	Pad0		[2]byte;
-	X__st_ino	uint32;
-	Mode		uint32;
-	Nlink		uint32;
-	Uid		uint32;
-	Gid		uint32;
-	Rdev		uint64;
-	X__pad2		uint16;
-	Pad1		[2]byte;
-	Size		int64;
-	Blksize		int32;
-	Blocks		int64;
-	Atim		Timespec;
-	Mtim		Timespec;
-	Ctim		Timespec;
-	Ino		uint64;
+	Dev       uint64
+	X__pad1   uint16
+	Pad0      [2]byte
+	X__st_ino uint32
+	Mode      uint32
+	Nlink     uint32
+	Uid       uint32
+	Gid       uint32
+	Rdev      uint64
+	X__pad2   uint16
+	Pad1      [2]byte
+	Size      int64
+	Blksize   int32
+	Blocks    int64
+	Atim      Timespec
+	Mtim      Timespec
+	Ctim      Timespec
+	Ino       uint64
 }
 
 type Statfs_t struct {
-	Type	int32;
-	Bsize	int32;
-	Blocks	uint64;
-	Bfree	uint64;
-	Bavail	uint64;
-	Files	uint64;
-	Ffree	uint64;
-	Fsid	[8]byte;	/* __fsid_t */
-	Namelen	int32;
-	Frsize	int32;
-	Spare	[5]int32;
+	Type    int32
+	Bsize   int32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    [8]byte /* __fsid_t */
+	Namelen int32
+	Frsize  int32
+	Spare   [5]int32
 }
 
 type Dirent struct {
-	Ino	uint64;
-	Off	int64;
-	Reclen	uint16;
-	Type	uint8;
-	Name	[256]int8;
-	Pad0	[1]byte;
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	Pad0   [1]byte
 }
 
 type RawSockaddrInet4 struct {
-	Family	uint16;
-	Port	uint16;
-	Addr	[4]byte;	/* in_addr */
-	Zero	[8]uint8;
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
 }
 
 type RawSockaddrInet6 struct {
-	Family		uint16;
-	Port		uint16;
-	Flowinfo	uint32;
-	Addr		[16]byte;	/* in6_addr */
-	Scope_id	uint32;
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
 }
 
 type RawSockaddrUnix struct {
-	Family	uint16;
-	Path	[108]int8;
+	Family uint16
+	Path   [108]int8
 }
 
 type RawSockaddr struct {
-	Family	uint16;
-	Data	[14]int8;
+	Family uint16
+	Data   [14]int8
 }
 
 type RawSockaddrAny struct {
-	Addr	RawSockaddr;
-	Pad	[96]int8;
+	Addr RawSockaddr
+	Pad  [96]int8
 }
 
 type _Socklen uint32
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 type Iovec struct {
-	Base	*byte;
-	Len	uint32;
+	Base *byte
+	Len  uint32
 }
 
 type Msghdr struct {
-	Name		*byte;
-	Namelen		uint32;
-	Iov		*Iovec;
-	Iovlen		uint32;
-	Control		*byte;
-	Controllen	uint32;
-	Flags		int32;
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
 }
 
 type Cmsghdr struct {
-	Len	uint32;
-	Level	int32;
-	Type	int32;
+	Len   uint32
+	Level int32
+	Type  int32
 }
 
 type PtraceRegs struct {
-	Ebx		int32;
-	Ecx		int32;
-	Edx		int32;
-	Esi		int32;
-	Edi		int32;
-	Ebp		int32;
-	Eax		int32;
-	Ds		uint16;
-	X__ds		uint16;
-	Es		uint16;
-	X__es		uint16;
-	Fs		uint16;
-	X__fs		uint16;
-	Gs		uint16;
-	X__gs		uint16;
-	Orig_eax	int32;
-	Eip		int32;
-	Cs		uint16;
-	X__cs		uint16;
-	Eflags		int32;
-	Esp		int32;
-	Ss		uint16;
-	X__ss		uint16;
+	Ebx      int32
+	Ecx      int32
+	Edx      int32
+	Esi      int32
+	Edi      int32
+	Ebp      int32
+	Eax      int32
+	Ds       uint16
+	X__ds    uint16
+	Es       uint16
+	X__es    uint16
+	Fs       uint16
+	X__fs    uint16
+	Gs       uint16
+	X__gs    uint16
+	Orig_eax int32
+	Eip      int32
+	Cs       uint16
+	X__cs    uint16
+	Eflags   int32
+	Esp      int32
+	Ss       uint16
+	X__ss    uint16
 }
 
 type FdSet struct {
-	Bits [32]int32;
+	Bits [32]int32
 }
 
 type Sysinfo_t struct {
-	Uptime		int32;
-	Loads		[3]uint32;
-	Totalram	uint32;
-	Freeram		uint32;
-	Sharedram	uint32;
-	Bufferram	uint32;
-	Totalswap	uint32;
-	Freeswap	uint32;
-	Procs		uint16;
-	Pad		uint16;
-	Totalhigh	uint32;
-	Freehigh	uint32;
-	Unit		uint32;
-	X_f		[8]int8;
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	X_f       [8]int8
 }
 
 type Utsname struct {
-	Sysname		[65]int8;
-	Nodename	[65]int8;
-	Release		[65]int8;
-	Version		[65]int8;
-	Machine		[65]int8;
-	Domainname	[65]int8;
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
 }
 
 type Ustat_t struct {
-	Tfree	int32;
-	Tinode	uint32;
-	Fname	[6]int8;
-	Fpack	[6]int8;
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]int8
+	Fpack  [6]int8
 }
 
 type EpollEvent struct {
-	Events	uint32;
-	Fd	int32;
-	Pad	int32;
+	Events uint32
+	Fd     int32
+	Pad    int32
 }
diff --git a/src/pkg/syscall/ztypes_linux_amd64.go b/src/pkg/syscall/ztypes_linux_amd64.go
index 74e9750f9..a5fc0ab53 100644
--- a/src/pkg/syscall/ztypes_linux_amd64.go
+++ b/src/pkg/syscall/ztypes_linux_amd64.go
@@ -6,19 +6,19 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr		= 0x8;
-	sizeofShort		= 0x2;
-	sizeofInt		= 0x4;
-	sizeofLong		= 0x8;
-	sizeofLongLong		= 0x8;
-	PathMax			= 0x1000;
-	SizeofSockaddrInet4	= 0x10;
-	SizeofSockaddrInet6	= 0x1c;
-	SizeofSockaddrAny	= 0x70;
-	SizeofSockaddrUnix	= 0x6e;
-	SizeofLinger		= 0x8;
-	SizeofMsghdr		= 0x38;
-	SizeofCmsghdr		= 0x10;
+	sizeofPtr           = 0x8
+	sizeofShort         = 0x2
+	sizeofInt           = 0x4
+	sizeofLong          = 0x8
+	sizeofLongLong      = 0x8
+	PathMax             = 0x1000
+	SizeofSockaddrInet4 = 0x10
+	SizeofSockaddrInet6 = 0x1c
+	SizeofSockaddrAny   = 0x70
+	SizeofSockaddrUnix  = 0x6e
+	SizeofLinger        = 0x8
+	SizeofMsghdr        = 0x38
+	SizeofCmsghdr       = 0x10
 )
 
 // Types
@@ -32,266 +32,266 @@ type _C_long int64
 type _C_long_long int64
 
 type Timespec struct {
-	Sec	int64;
-	Nsec	int64;
+	Sec  int64
+	Nsec int64
 }
 
 type Timeval struct {
-	Sec	int64;
-	Usec	int64;
+	Sec  int64
+	Usec int64
 }
 
 type Timex struct {
-	Modes		uint32;
-	Pad0		[4]byte;
-	Offset		int64;
-	Freq		int64;
-	Maxerror	int64;
-	Esterror	int64;
-	Status		int32;
-	Pad1		[4]byte;
-	Constant	int64;
-	Precision	int64;
-	Tolerance	int64;
-	Time		Timeval;
-	Tick		int64;
-	Ppsfreq		int64;
-	Jitter		int64;
-	Shift		int32;
-	Pad2		[4]byte;
-	Stabil		int64;
-	Jitcnt		int64;
-	Calcnt		int64;
-	Errcnt		int64;
-	Stbcnt		int64;
-	Pad3		int32;
-	Pad4		int32;
-	Pad5		int32;
-	Pad6		int32;
-	Pad7		int32;
-	Pad8		int32;
-	Pad9		int32;
-	Pad10		int32;
-	Pad11		int32;
-	Pad12		int32;
-	Pad13		int32;
-	Pad14		int32;
+	Modes     uint32
+	Pad0      [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad1      [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad2      [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Pad3      int32
+	Pad4      int32
+	Pad5      int32
+	Pad6      int32
+	Pad7      int32
+	Pad8      int32
+	Pad9      int32
+	Pad10     int32
+	Pad11     int32
+	Pad12     int32
+	Pad13     int32
+	Pad14     int32
 }
 
 type Time_t int64
 
 type Tms struct {
-	Utime	int64;
-	Stime	int64;
-	Cutime	int64;
-	Cstime	int64;
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
 }
 
 type Utimbuf struct {
-	Actime	int64;
-	Modtime	int64;
+	Actime  int64
+	Modtime int64
 }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int64;
-	Ixrss		int64;
-	Idrss		int64;
-	Isrss		int64;
-	Minflt		int64;
-	Majflt		int64;
-	Nswap		int64;
-	Inblock		int64;
-	Oublock		int64;
-	Msgsnd		int64;
-	Msgrcv		int64;
-	Nsignals	int64;
-	Nvcsw		int64;
-	Nivcsw		int64;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
 }
 
 type Rlimit struct {
-	Cur	uint64;
-	Max	uint64;
+	Cur uint64
+	Max uint64
 }
 
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		uint64;
-	Ino		uint64;
-	Nlink		uint64;
-	Mode		uint32;
-	Uid		uint32;
-	Gid		uint32;
-	Pad0		int32;
-	Rdev		uint64;
-	Size		int64;
-	Blksize		int64;
-	Blocks		int64;
-	Atim		Timespec;
-	Mtim		Timespec;
-	Ctim		Timespec;
-	__unused	[3]int64;
+	Dev      uint64
+	Ino      uint64
+	Nlink    uint64
+	Mode     uint32
+	Uid      uint32
+	Gid      uint32
+	Pad0     int32
+	Rdev     uint64
+	Size     int64
+	Blksize  int64
+	Blocks   int64
+	Atim     Timespec
+	Mtim     Timespec
+	Ctim     Timespec
+	__unused [3]int64
 }
 
 type Statfs_t struct {
-	Type	int64;
-	Bsize	int64;
-	Blocks	uint64;
-	Bfree	uint64;
-	Bavail	uint64;
-	Files	uint64;
-	Ffree	uint64;
-	Fsid	[8]byte;	/* __fsid_t */
-	Namelen	int64;
-	Frsize	int64;
-	Spare	[5]int64;
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    [8]byte /* __fsid_t */
+	Namelen int64
+	Frsize  int64
+	Spare   [5]int64
 }
 
 type Dirent struct {
-	Ino	uint64;
-	Off	int64;
-	Reclen	uint16;
-	Type	uint8;
-	Name	[256]int8;
-	Pad0	[5]byte;
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	Pad0   [5]byte
 }
 
 type RawSockaddrInet4 struct {
-	Family	uint16;
-	Port	uint16;
-	Addr	[4]byte;	/* in_addr */
-	Zero	[8]uint8;
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
 }
 
 type RawSockaddrInet6 struct {
-	Family		uint16;
-	Port		uint16;
-	Flowinfo	uint32;
-	Addr		[16]byte;	/* in6_addr */
-	Scope_id	uint32;
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
 }
 
 type RawSockaddrUnix struct {
-	Family	uint16;
-	Path	[108]int8;
+	Family uint16
+	Path   [108]int8
 }
 
 type RawSockaddr struct {
-	Family	uint16;
-	Data	[14]int8;
+	Family uint16
+	Data   [14]int8
 }
 
 type RawSockaddrAny struct {
-	Addr	RawSockaddr;
-	Pad	[96]int8;
+	Addr RawSockaddr
+	Pad  [96]int8
 }
 
 type _Socklen uint32
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 type Iovec struct {
-	Base	*byte;
-	Len	uint64;
+	Base *byte
+	Len  uint64
 }
 
 type Msghdr struct {
-	Name		*byte;
-	Namelen		uint32;
-	Pad0		[4]byte;
-	Iov		*Iovec;
-	Iovlen		uint64;
-	Control		*byte;
-	Controllen	uint64;
-	Flags		int32;
-	Pad1		[4]byte;
+	Name       *byte
+	Namelen    uint32
+	Pad0       [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad1       [4]byte
 }
 
 type Cmsghdr struct {
-	Len	uint64;
-	Level	int32;
-	Type	int32;
+	Len   uint64
+	Level int32
+	Type  int32
 }
 
 type PtraceRegs struct {
-	R15		uint64;
-	R14		uint64;
-	R13		uint64;
-	R12		uint64;
-	Rbp		uint64;
-	Rbx		uint64;
-	R11		uint64;
-	R10		uint64;
-	R9		uint64;
-	R8		uint64;
-	Rax		uint64;
-	Rcx		uint64;
-	Rdx		uint64;
-	Rsi		uint64;
-	Rdi		uint64;
-	Orig_rax	uint64;
-	Rip		uint64;
-	Cs		uint64;
-	Eflags		uint64;
-	Rsp		uint64;
-	Ss		uint64;
-	Fs_base		uint64;
-	Gs_base		uint64;
-	Ds		uint64;
-	Es		uint64;
-	Fs		uint64;
-	Gs		uint64;
+	R15      uint64
+	R14      uint64
+	R13      uint64
+	R12      uint64
+	Rbp      uint64
+	Rbx      uint64
+	R11      uint64
+	R10      uint64
+	R9       uint64
+	R8       uint64
+	Rax      uint64
+	Rcx      uint64
+	Rdx      uint64
+	Rsi      uint64
+	Rdi      uint64
+	Orig_rax uint64
+	Rip      uint64
+	Cs       uint64
+	Eflags   uint64
+	Rsp      uint64
+	Ss       uint64
+	Fs_base  uint64
+	Gs_base  uint64
+	Ds       uint64
+	Es       uint64
+	Fs       uint64
+	Gs       uint64
 }
 
 type FdSet struct {
-	Bits [16]int64;
+	Bits [16]int64
 }
 
 type Sysinfo_t struct {
-	Uptime		int64;
-	Loads		[3]uint64;
-	Totalram	uint64;
-	Freeram		uint64;
-	Sharedram	uint64;
-	Bufferram	uint64;
-	Totalswap	uint64;
-	Freeswap	uint64;
-	Procs		uint16;
-	Pad		uint16;
-	Pad0		[4]byte;
-	Totalhigh	uint64;
-	Freehigh	uint64;
-	Unit		uint32;
-	_f		[2]int8;
-	Pad1		[4]byte;
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad0      [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_f        [2]int8
+	Pad1      [4]byte
 }
 
 type Utsname struct {
-	Sysname		[65]int8;
-	Nodename	[65]int8;
-	Release		[65]int8;
-	Version		[65]int8;
-	Machine		[65]int8;
-	Domainname	[65]int8;
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
 }
 
 type Ustat_t struct {
-	Tfree	int32;
-	Pad0	[4]byte;
-	Tinode	uint64;
-	Fname	[6]int8;
-	Fpack	[6]int8;
-	Pad1	[4]byte;
+	Tfree  int32
+	Pad0   [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	Pad1   [4]byte
 }
 
 type EpollEvent struct {
-	Events	uint32;
-	Fd	int32;
-	Pad	int32;
+	Events uint32
+	Fd     int32
+	Pad    int32
 }
diff --git a/src/pkg/syscall/ztypes_linux_arm.go b/src/pkg/syscall/ztypes_linux_arm.go
index 536b08bfa..ffac446ae 100644
--- a/src/pkg/syscall/ztypes_linux_arm.go
+++ b/src/pkg/syscall/ztypes_linux_arm.go
@@ -6,121 +6,121 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr		= 0x4;
-	sizeofShort		= 0x2;
-	sizeofInt		= 0x4;
-	sizeofLong		= 0x4;
-	sizeofLongLong		= 0x8;
-	PathMax			= 0x1000;
-	O_RDONLY		= 0;
-	O_WRONLY		= 0x1;
-	O_RDWR			= 0x2;
-	O_APPEND		= 0x400;
-	O_ASYNC			= 0x2000;
-	O_CREAT			= 0x40;
-	O_NOCTTY		= 0x100;
-	O_NONBLOCK		= 0x800;
-	O_SYNC			= 0x1000;
-	O_TRUNC			= 0x200;
-	O_CLOEXEC		= 0;
-	F_GETFD			= 0x1;
-	F_SETFD			= 0x2;
-	F_GETFL			= 0x3;
-	F_SETFL			= 0x4;
-	FD_CLOEXEC		= 0x1;
-	NAME_MAX		= 0xff;
-	S_IFMT			= 0xf000;
-	S_IFIFO			= 0x1000;
-	S_IFCHR			= 0x2000;
-	S_IFDIR			= 0x4000;
-	S_IFBLK			= 0x6000;
-	S_IFREG			= 0x8000;
-	S_IFLNK			= 0xa000;
-	S_IFSOCK		= 0xc000;
-	S_ISUID			= 0x800;
-	S_ISGID			= 0x400;
-	S_ISVTX			= 0x200;
-	S_IRUSR			= 0x100;
-	S_IWUSR			= 0x80;
-	S_IXUSR			= 0x40;
-	WNOHANG			= 0x1;
-	WUNTRACED		= 0x2;
-	WEXITED			= 0x4;
-	WSTOPPED		= 0x2;
-	WCONTINUED		= 0x8;
-	WNOWAIT			= 0x1000000;
-	WCLONE			= 0x80000000;
-	WALL			= 0x40000000;
-	WNOTHREAD		= 0x20000000;
-	AF_UNIX			= 0x1;
-	AF_INET			= 0x2;
-	AF_INET6		= 0xa;
-	SOCK_STREAM		= 0x1;
-	SOCK_DGRAM		= 0x2;
-	SOCK_RAW		= 0x3;
-	SOCK_SEQPACKET		= 0x5;
-	SOL_SOCKET		= 0x1;
-	SO_REUSEADDR		= 0x2;
-	SO_KEEPALIVE		= 0x9;
-	SO_DONTROUTE		= 0x5;
-	SO_BROADCAST		= 0x6;
-	SO_LINGER		= 0xd;
-	SO_SNDBUF		= 0x7;
-	SO_RCVBUF		= 0x8;
-	SO_SNDTIMEO		= 0x15;
-	SO_RCVTIMEO		= 0x14;
-	IPPROTO_TCP		= 0x6;
-	IPPROTO_UDP		= 0x11;
-	TCP_NODELAY		= 0x1;
-	SOMAXCONN		= 0x80;
-	SizeofSockaddrInet4	= 0x10;
-	SizeofSockaddrInet6	= 0x1c;
-	SizeofSockaddrAny	= 0x1c;
-	SizeofSockaddrUnix	= 0x6e;
-	PTRACE_TRACEME		= 0;
-	PTRACE_PEEKTEXT		= 0x1;
-	PTRACE_PEEKDATA		= 0x2;
-	PTRACE_PEEKUSER		= 0x3;
-	PTRACE_POKETEXT		= 0x4;
-	PTRACE_POKEDATA		= 0x5;
-	PTRACE_POKEUSER		= 0x6;
-	PTRACE_CONT		= 0x7;
-	PTRACE_KILL		= 0x8;
-	PTRACE_SINGLESTEP	= 0x9;
-	PTRACE_GETREGS		= 0xc;
-	PTRACE_SETREGS		= 0xd;
-	PTRACE_GETFPREGS	= 0xe;
-	PTRACE_SETFPREGS	= 0xf;
-	PTRACE_ATTACH		= 0x10;
-	PTRACE_DETACH		= 0x11;
-	PTRACE_GETFPXREGS	= 0x12;
-	PTRACE_SETFPXREGS	= 0x13;
-	PTRACE_SYSCALL		= 0x18;
-	PTRACE_SETOPTIONS	= 0x4200;
-	PTRACE_GETEVENTMSG	= 0x4201;
-	PTRACE_GETSIGINFO	= 0x4202;
-	PTRACE_SETSIGINFO	= 0x4203;
-	PTRACE_O_TRACESYSGOOD	= 0x1;
-	PTRACE_O_TRACEFORK	= 0x2;
-	PTRACE_O_TRACEVFORK	= 0x4;
-	PTRACE_O_TRACECLONE	= 0x8;
-	PTRACE_O_TRACEEXEC	= 0x10;
-	PTRACE_O_TRACEVFORKDONE	= 0x20;
-	PTRACE_O_TRACEEXIT	= 0x40;
-	PTRACE_O_MASK		= 0x7f;
-	PTRACE_EVENT_FORK	= 0x1;
-	PTRACE_EVENT_VFORK	= 0x2;
-	PTRACE_EVENT_CLONE	= 0x3;
-	PTRACE_EVENT_EXEC	= 0x4;
-	PTRACE_EVENT_VFORK_DONE	= 0x5;
-	PTRACE_EVENT_EXIT	= 0x6;
-	EPOLLIN			= 0x1;
-	EPOLLRDHUP		= 0x2000;
-	EPOLLOUT		= 0x4;
-	EPOLLONESHOT		= 0x40000000;
-	EPOLL_CTL_MOD		= 0x3;
-	EPOLL_CTL_ADD		= 0x1;
-	EPOLL_CTL_DEL		= 0x2;
+	sizeofPtr               = 0x4
+	sizeofShort             = 0x2
+	sizeofInt               = 0x4
+	sizeofLong              = 0x4
+	sizeofLongLong          = 0x8
+	PathMax                 = 0x1000
+	O_RDONLY                = 0
+	O_WRONLY                = 0x1
+	O_RDWR                  = 0x2
+	O_APPEND                = 0x400
+	O_ASYNC                 = 0x2000
+	O_CREAT                 = 0x40
+	O_NOCTTY                = 0x100
+	O_NONBLOCK              = 0x800
+	O_SYNC                  = 0x1000
+	O_TRUNC                 = 0x200
+	O_CLOEXEC               = 0
+	F_GETFD                 = 0x1
+	F_SETFD                 = 0x2
+	F_GETFL                 = 0x3
+	F_SETFL                 = 0x4
+	FD_CLOEXEC              = 0x1
+	NAME_MAX                = 0xff
+	S_IFMT                  = 0xf000
+	S_IFIFO                 = 0x1000
+	S_IFCHR                 = 0x2000
+	S_IFDIR                 = 0x4000
+	S_IFBLK                 = 0x6000
+	S_IFREG                 = 0x8000
+	S_IFLNK                 = 0xa000
+	S_IFSOCK                = 0xc000
+	S_ISUID                 = 0x800
+	S_ISGID                 = 0x400
+	S_ISVTX                 = 0x200
+	S_IRUSR                 = 0x100
+	S_IWUSR                 = 0x80
+	S_IXUSR                 = 0x40
+	WNOHANG                 = 0x1
+	WUNTRACED               = 0x2
+	WEXITED                 = 0x4
+	WSTOPPED                = 0x2
+	WCONTINUED              = 0x8
+	WNOWAIT                 = 0x1000000
+	WCLONE                  = 0x80000000
+	WALL                    = 0x40000000
+	WNOTHREAD               = 0x20000000
+	AF_UNIX                 = 0x1
+	AF_INET                 = 0x2
+	AF_INET6                = 0xa
+	SOCK_STREAM             = 0x1
+	SOCK_DGRAM              = 0x2
+	SOCK_RAW                = 0x3
+	SOCK_SEQPACKET          = 0x5
+	SOL_SOCKET              = 0x1
+	SO_REUSEADDR            = 0x2
+	SO_KEEPALIVE            = 0x9
+	SO_DONTROUTE            = 0x5
+	SO_BROADCAST            = 0x6
+	SO_LINGER               = 0xd
+	SO_SNDBUF               = 0x7
+	SO_RCVBUF               = 0x8
+	SO_SNDTIMEO             = 0x15
+	SO_RCVTIMEO             = 0x14
+	IPPROTO_TCP             = 0x6
+	IPPROTO_UDP             = 0x11
+	TCP_NODELAY             = 0x1
+	SOMAXCONN               = 0x80
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x1c
+	SizeofSockaddrUnix      = 0x6e
+	PTRACE_TRACEME          = 0
+	PTRACE_PEEKTEXT         = 0x1
+	PTRACE_PEEKDATA         = 0x2
+	PTRACE_PEEKUSER         = 0x3
+	PTRACE_POKETEXT         = 0x4
+	PTRACE_POKEDATA         = 0x5
+	PTRACE_POKEUSER         = 0x6
+	PTRACE_CONT             = 0x7
+	PTRACE_KILL             = 0x8
+	PTRACE_SINGLESTEP       = 0x9
+	PTRACE_GETREGS          = 0xc
+	PTRACE_SETREGS          = 0xd
+	PTRACE_GETFPREGS        = 0xe
+	PTRACE_SETFPREGS        = 0xf
+	PTRACE_ATTACH           = 0x10
+	PTRACE_DETACH           = 0x11
+	PTRACE_GETFPXREGS       = 0x12
+	PTRACE_SETFPXREGS       = 0x13
+	PTRACE_SYSCALL          = 0x18
+	PTRACE_SETOPTIONS       = 0x4200
+	PTRACE_GETEVENTMSG      = 0x4201
+	PTRACE_GETSIGINFO       = 0x4202
+	PTRACE_SETSIGINFO       = 0x4203
+	PTRACE_O_TRACESYSGOOD   = 0x1
+	PTRACE_O_TRACEFORK      = 0x2
+	PTRACE_O_TRACEVFORK     = 0x4
+	PTRACE_O_TRACECLONE     = 0x8
+	PTRACE_O_TRACEEXEC      = 0x10
+	PTRACE_O_TRACEVFORKDONE = 0x20
+	PTRACE_O_TRACEEXIT      = 0x40
+	PTRACE_O_MASK           = 0x7f
+	PTRACE_EVENT_FORK       = 0x1
+	PTRACE_EVENT_VFORK      = 0x2
+	PTRACE_EVENT_CLONE      = 0x3
+	PTRACE_EVENT_EXEC       = 0x4
+	PTRACE_EVENT_VFORK_DONE = 0x5
+	PTRACE_EVENT_EXIT       = 0x6
+	EPOLLIN                 = 0x1
+	EPOLLRDHUP              = 0x2000
+	EPOLLOUT                = 0x4
+	EPOLLONESHOT            = 0x40000000
+	EPOLL_CTL_MOD           = 0x3
+	EPOLL_CTL_ADD           = 0x1
+	EPOLL_CTL_DEL           = 0x2
 )
 
 // Types
@@ -134,235 +134,235 @@ type _C_long int32
 type _C_long_long int64
 
 type Timespec struct {
-	Sec	int32;
-	Nsec	int32;
+	Sec  int32
+	Nsec int32
 }
 
 type Timeval struct {
-	Sec	int32;
-	Usec	int32;
+	Sec  int32
+	Usec int32
 }
 
 type Timex struct {
-	Modes		uint32;
-	Offset		int32;
-	Freq		int32;
-	Maxerror	int32;
-	Esterror	int32;
-	Status		int32;
-	Constant	int32;
-	Precision	int32;
-	Tolerance	int32;
-	Time		Timeval;
-	Tick		int32;
-	Ppsfreq		int32;
-	Jitter		int32;
-	Shift		int32;
-	Stabil		int32;
-	Jitcnt		int32;
-	Calcnt		int32;
-	Errcnt		int32;
-	Stbcnt		int32;
-	Pad0		int32;
-	Pad1		int32;
-	Pad2		int32;
-	Pad3		int32;
-	Pad4		int32;
-	Pad5		int32;
-	Pad6		int32;
-	Pad7		int32;
-	Pad8		int32;
-	Pad9		int32;
-	Pad10		int32;
-	Pad11		int32;
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Pad0      int32
+	Pad1      int32
+	Pad2      int32
+	Pad3      int32
+	Pad4      int32
+	Pad5      int32
+	Pad6      int32
+	Pad7      int32
+	Pad8      int32
+	Pad9      int32
+	Pad10     int32
+	Pad11     int32
 }
 
 type Time_t int32
 
 type Tms struct {
-	Utime	int32;
-	Stime	int32;
-	Cutime	int32;
-	Cstime	int32;
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
 }
 
 type Utimbuf struct {
-	Actime	int32;
-	Modtime	int32;
+	Actime  int32
+	Modtime int32
 }
 
 type Rusage struct {
-	Utime		Timeval;
-	Stime		Timeval;
-	Maxrss		int32;
-	Ixrss		int32;
-	Idrss		int32;
-	Isrss		int32;
-	Minflt		int32;
-	Majflt		int32;
-	Nswap		int32;
-	Inblock		int32;
-	Oublock		int32;
-	Msgsnd		int32;
-	Msgrcv		int32;
-	Nsignals	int32;
-	Nvcsw		int32;
-	Nivcsw		int32;
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
 }
 
 type Rlimit struct {
-	Cur	uint64;
-	Max	uint64;
+	Cur uint64
+	Max uint64
 }
 
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		uint64;
-	__pad1		uint16;
-	Pad0		[2]byte;
-	__st_ino	uint32;
-	Mode		uint32;
-	Nlink		uint32;
-	Uid		uint32;
-	Gid		uint32;
-	Rdev		uint64;
-	__pad2		uint16;
-	Pad1		[2]byte;
-	Size		int64;
-	Blksize		int32;
-	Blocks		int64;
-	Atim		Timespec;
-	Mtim		Timespec;
-	Ctim		Timespec;
-	Ino		uint64;
+	Dev      uint64
+	__pad1   uint16
+	Pad0     [2]byte
+	__st_ino uint32
+	Mode     uint32
+	Nlink    uint32
+	Uid      uint32
+	Gid      uint32
+	Rdev     uint64
+	__pad2   uint16
+	Pad1     [2]byte
+	Size     int64
+	Blksize  int32
+	Blocks   int64
+	Atim     Timespec
+	Mtim     Timespec
+	Ctim     Timespec
+	Ino      uint64
 }
 
 type Statfs_t struct {
-	Type	int32;
-	Bsize	int32;
-	Blocks	uint64;
-	Bfree	uint64;
-	Bavail	uint64;
-	Files	uint64;
-	Ffree	uint64;
-	Fsid	[8]byte;	/* __fsid_t */
-	Namelen	int32;
-	Frsize	int32;
-	Spare	[5]int32;
+	Type    int32
+	Bsize   int32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    [8]byte /* __fsid_t */
+	Namelen int32
+	Frsize  int32
+	Spare   [5]int32
 }
 
 type Dirent struct {
-	Ino	uint64;
-	Off	int64;
-	Reclen	uint16;
-	Type	uint8;
-	Name	[256]int8;
-	Pad0	[1]byte;
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	Pad0   [1]byte
 }
 
 type RawSockaddrInet4 struct {
-	Family	uint16;
-	Port	uint16;
-	Addr	[4]byte;	/* in_addr */
-	Zero	[8]uint8;
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
 }
 
 type RawSockaddrInet6 struct {
-	Family		uint16;
-	Port		uint16;
-	Flowinfo	uint32;
-	Addr		[16]byte;	/* in6_addr */
-	Scope_id	uint32;
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
 }
 
 type RawSockaddrUnix struct {
-	Family	uint16;
-	Path	[108]int8;
+	Family uint16
+	Path   [108]int8
 }
 
 type RawSockaddr struct {
-	Family	uint16;
-	Data	[14]int8;
+	Family uint16
+	Data   [14]int8
 }
 
 type RawSockaddrAny struct {
-	Addr	RawSockaddr;
-	Pad	[12]int8;
+	Addr RawSockaddr
+	Pad  [12]int8
 }
 
 type _Socklen uint32
 
 type Linger struct {
-	Onoff	int32;
-	Linger	int32;
+	Onoff  int32
+	Linger int32
 }
 
 type PtraceRegs struct {
-	Ebx		int32;
-	Ecx		int32;
-	Edx		int32;
-	Esi		int32;
-	Edi		int32;
-	Ebp		int32;
-	Eax		int32;
-	Ds		uint16;
-	__ds		uint16;
-	Es		uint16;
-	__es		uint16;
-	Fs		uint16;
-	__fs		uint16;
-	Gs		uint16;
-	__gs		uint16;
-	Orig_eax	int32;
-	Eip		int32;
-	Cs		uint16;
-	__cs		uint16;
-	Eflags		int32;
-	Esp		int32;
-	Ss		uint16;
-	__ss		uint16;
+	Ebx      int32
+	Ecx      int32
+	Edx      int32
+	Esi      int32
+	Edi      int32
+	Ebp      int32
+	Eax      int32
+	Ds       uint16
+	__ds     uint16
+	Es       uint16
+	__es     uint16
+	Fs       uint16
+	__fs     uint16
+	Gs       uint16
+	__gs     uint16
+	Orig_eax int32
+	Eip      int32
+	Cs       uint16
+	__cs     uint16
+	Eflags   int32
+	Esp      int32
+	Ss       uint16
+	__ss     uint16
 }
 
 type FdSet struct {
-	Bits [32]int32;
+	Bits [32]int32
 }
 
 type Sysinfo_t struct {
-	Uptime		int32;
-	Loads		[3]uint32;
-	Totalram	uint32;
-	Freeram		uint32;
-	Sharedram	uint32;
-	Bufferram	uint32;
-	Totalswap	uint32;
-	Freeswap	uint32;
-	Procs		uint16;
-	Pad		uint16;
-	Totalhigh	uint32;
-	Freehigh	uint32;
-	Unit		uint32;
-	_f		[8]int8;
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	_f        [8]int8
 }
 
 type Utsname struct {
-	Sysname		[65]int8;
-	Nodename	[65]int8;
-	Release		[65]int8;
-	Version		[65]int8;
-	Machine		[65]int8;
-	Domainname	[65]int8;
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
 }
 
 type Ustat_t struct {
-	Tfree	int32;
-	Tinode	uint32;
-	Fname	[6]int8;
-	Fpack	[6]int8;
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]int8
+	Fpack  [6]int8
 }
 
 type EpollEvent struct {
-	Events	uint32;
-	Fd	int32;
-	Pad	int32;
+	Events uint32
+	Fd     int32
+	Pad    int32
 }
diff --git a/src/pkg/syscall/ztypes_nacl_386.go b/src/pkg/syscall/ztypes_nacl_386.go
index 27bcc43bf..524a196f9 100644
--- a/src/pkg/syscall/ztypes_nacl_386.go
+++ b/src/pkg/syscall/ztypes_nacl_386.go
@@ -6,51 +6,51 @@ package syscall
 
 // Constants
 const (
-	sizeofPtr	= 0x4;
-	sizeofShort	= 0x2;
-	sizeofInt	= 0x4;
-	sizeofLong	= 0x4;
-	sizeofLongLong	= 0x8;
-	PROT_READ	= 0x1;
-	PROT_WRITE	= 0x2;
-	MAP_SHARED	= 0x1;
-	SYS_FORK	= 0;
-	SYS_PTRACE	= 0;
-	SYS_CHDIR	= 0;
-	SYS_DUP2	= 0;
-	SYS_FCNTL	= 0;
-	SYS_EXECVE	= 0;
-	O_RDONLY	= 0;
-	O_WRONLY	= 0x1;
-	O_RDWR		= 0x2;
-	O_APPEND	= 0x400;
-	O_ASYNC		= 0x2000;
-	O_CREAT		= 0x40;
-	O_NOCTTY	= 0;
-	O_NONBLOCK	= 0x800;
-	O_SYNC		= 0x1000;
-	O_TRUNC		= 0x200;
-	O_CLOEXEC	= 0;
-	O_EXCL		= 0;
-	F_GETFD		= 0x1;
-	F_SETFD		= 0x2;
-	F_GETFL		= 0x3;
-	F_SETFL		= 0x4;
-	FD_CLOEXEC	= 0;
-	S_IFMT		= 0x1f000;
-	S_IFIFO		= 0x1000;
-	S_IFCHR		= 0x2000;
-	S_IFDIR		= 0x4000;
-	S_IFBLK		= 0x6000;
-	S_IFREG		= 0x8000;
-	S_IFLNK		= 0xa000;
-	S_IFSOCK	= 0xc000;
-	S_ISUID		= 0x800;
-	S_ISGID		= 0x400;
-	S_ISVTX		= 0x200;
-	S_IRUSR		= 0x100;
-	S_IWUSR		= 0x80;
-	S_IXUSR		= 0x40;
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	PROT_READ      = 0x1
+	PROT_WRITE     = 0x2
+	MAP_SHARED     = 0x1
+	SYS_FORK       = 0
+	SYS_PTRACE     = 0
+	SYS_CHDIR      = 0
+	SYS_DUP2       = 0
+	SYS_FCNTL      = 0
+	SYS_EXECVE     = 0
+	O_RDONLY       = 0
+	O_WRONLY       = 0x1
+	O_RDWR         = 0x2
+	O_APPEND       = 0x400
+	O_ASYNC        = 0x2000
+	O_CREAT        = 0x40
+	O_NOCTTY       = 0
+	O_NONBLOCK     = 0x800
+	O_SYNC         = 0x1000
+	O_TRUNC        = 0x200
+	O_CLOEXEC      = 0
+	O_EXCL         = 0
+	F_GETFD        = 0x1
+	F_SETFD        = 0x2
+	F_GETFL        = 0x3
+	F_SETFL        = 0x4
+	FD_CLOEXEC     = 0
+	S_IFMT         = 0x1f000
+	S_IFIFO        = 0x1000
+	S_IFCHR        = 0x2000
+	S_IFDIR        = 0x4000
+	S_IFBLK        = 0x6000
+	S_IFREG        = 0x8000
+	S_IFLNK        = 0xa000
+	S_IFSOCK       = 0xc000
+	S_ISUID        = 0x800
+	S_ISGID        = 0x400
+	S_ISVTX        = 0x200
+	S_IRUSR        = 0x100
+	S_IWUSR        = 0x80
+	S_IXUSR        = 0x40
 )
 
 // Types
@@ -66,13 +66,13 @@ type _C_long_long int64
 type _C_off_t int32
 
 type Timespec struct {
-	Sec	int32;
-	Nsec	int32;
+	Sec  int32
+	Nsec int32
 }
 
 type Timeval struct {
-	Sec	int32;
-	Usec	int32;
+	Sec  int32
+	Usec int32
 }
 
 type Time_t int32
@@ -80,26 +80,26 @@ type Time_t int32
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev		int64;
-	Ino		uint32;
-	Mode		uint32;
-	Nlink		uint32;
-	Uid		uint32;
-	Gid		uint32;
-	__padding	int32;
-	Rdev		int64;
-	Size		int32;
-	Blksize		int32;
-	Blocks		int32;
-	Atime		int32;
-	Mtime		int32;
-	Ctime		int32;
+	Dev       int64
+	Ino       uint32
+	Mode      uint32
+	Nlink     uint32
+	Uid       uint32
+	Gid       uint32
+	__padding int32
+	Rdev      int64
+	Size      int32
+	Blksize   int32
+	Blocks    int32
+	Atime     int32
+	Mtime     int32
+	Ctime     int32
 }
 
 type Dirent struct {
-	Ino	uint32;
-	Off	int32;
-	Reclen	uint16;
-	Name	[256]int8;
-	Pad0	[2]byte;
+	Ino    uint32
+	Off    int32
+	Reclen uint16
+	Name   [256]int8
+	Pad0   [2]byte
 }