shuffle some Linux system calls around for 386

R=r
DELTA=37  (17 added, 15 deleted, 5 changed)
OCL=30428
CL=30444

diff --git a/src/pkg/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index 1c0a4f5db80c7bae8815e429bb751a2c04894a1f..ae3eee777c2632c236c266105cf91dd509d9fb88 100644 (file)
--- a/src/pkg/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
@@ -427,7 +427,6 @@ func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) {
 //sys  Rename(oldpath string, newpath string) (errno int)
 //sys  Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (errno int)
 //sys  Rmdir(path string) (errno int)
-//sys  Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int)
 //sys  Setdomainname(p []byte) (errno int)
 //sys  Sethostname(p []byte) (errno int)
 //sys  Setpgid(pid int, pgid int) (errno int)

diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go
index b41c60a552f53cd815d6091a93c85d960dab9955..f20ec106149c463e90668a0ec95c7c087d08eb44 100644 (file)
--- a/src/pkg/syscall/syscall_linux_386.go
+++ b/src/pkg/syscall/syscall_linux_386.go
@@ -58,6 +58,8 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 //sys  getgroups(n int, list *_Gid_t) (nn int, errno int) = SYS_GETGROUPS32
 //sys  setgroups(n int, list *_Gid_t) (errno int) = SYS_SETGROUPS32
 
+//sys  Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) = SYS__NEWSELECT
+
 // Underlying system call writes to newoffset via pointer.
 // Implemented in assembly to avoid allocation.
 func Seek(fd int, offset int64, whence int) (newoffset int64, errno int)
@@ -93,7 +95,7 @@ const (
 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(_SOCKET, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0);
+       fd, errno = socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0);
        return;
 }
 

diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/pkg/syscall/syscall_linux_amd64.go
index 1792a098c642afdc19ad7f3262f97011a0c5b5bf..3455184796fa35a08bfd002f859cc422a15f7e58 100644 (file)
--- a/src/pkg/syscall/syscall_linux_amd64.go
+++ b/src/pkg/syscall/syscall_linux_amd64.go
@@ -18,6 +18,7 @@ import "syscall"
 //sys  Listen(s int, n int) (errno int)
 //sys  Lstat(path string, stat *Stat_t) (errno int)
 //sys  Seek(fd int, offset int64, whence int) (off int64, errno int) = SYS_LSEEK
+//sys  Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int)
 //sys  Setfsgid(gid int) (errno int)
 //sys  Setfsuid(uid int) (errno int)
 //sys  Setgid(gid int) (errno int)

diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/pkg/syscall/zsyscall_linux_386.go
index 6e82bbb1bf9458d50a8a7ec410c76a563b66d59c..07629aa6a7dc076db0ae4296f487fc77022a6310 100644 (file)
--- a/src/pkg/syscall/zsyscall_linux_386.go
+++ b/src/pkg/syscall/zsyscall_linux_386.go
@@ -395,13 +395,6 @@ func Rmdir(path string) (errno int) {
        return;
 }
 
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) {
-       r0, r1, 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 Setdomainname(p []byte) (errno int) {
        var _p0 *byte;
        if len(p) > 0 { _p0 = &p[0]; }
@@ -707,5 +700,12 @@ func setgroups(n int, list *_Gid_t) (errno int) {
        return;
 }
 
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) {
+       r0, r1, 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 6d5c753853ddca47ddda3dcfc3cafe5ce9fa5214..0766b8318f6c18f07a09256922129b955e2d3c1e 100644 (file)
--- a/src/pkg/syscall/zsyscall_linux_amd64.go
+++ b/src/pkg/syscall/zsyscall_linux_amd64.go
@@ -395,13 +395,6 @@ func Rmdir(path string) (errno int) {
        return;
 }
 
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) {
-       r0, r1, 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 Setdomainname(p []byte) (errno int) {
        var _p0 *byte;
        if len(p) > 0 { _p0 = &p[0]; }
@@ -655,6 +648,13 @@ func Seek(fd int, offset int64, whence int) (off int64, errno int) {
        return;
 }
 
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) {
+       r0, r1, 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) {
        r0, r1, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0);
        errno = int(e1);

diff --git a/src/pkg/syscall/ztypes_linux_amd64.go b/src/pkg/syscall/ztypes_linux_amd64.go
index f17ebe139787f30b46d5212a039d074d9be07fe9..5733f3e26ea4a6d094384af6e5df9cc453d91025 100644 (file)
--- a/src/pkg/syscall/ztypes_linux_amd64.go
+++ b/src/pkg/syscall/ztypes_linux_amd64.go
@@ -253,7 +253,7 @@ type Linger struct {
 }
 
 type FdSet struct {
-       __fds_bits [16]int64;
+       Bits [16]int64;
 }
 
 type Sysinfo_t struct {
@@ -281,7 +281,7 @@ type Utsname struct {
        Release [65]int8;
        Version [65]int8;
        Machine [65]int8;
-       __domainname [65]int8;
+       Domainname [65]int8;
 }
 
 type Ustat_t struct {