syscall: support Linux syscalls without error return on mipsx/mips64x

Like on other architectures, use rawSyscallNoError for Linux syscalls
that don't return an error and convert all applicable occurences of
RawSyscall to use it instead.

This was missed in CL 84485 because mkall.sh doesn't support
mipsx/mips64x, so add the corresponding entries as well.

Updates #22924

Change-Id: I762cbee0827140b9890c4a10830e0b4cd33de92f
Reviewed-on: https://go-review.googlesource.com/118655
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/syscall/mkall.sh b/src/syscall/mkall.sh
index cd0783e8764a87c8dd0b8efcd6e74b1ebbb1e65b..b381b93161d8877f42c6d4eb5e3c4e36cb3d607e 100755 (executable)
--- a/src/syscall/mkall.sh
+++ b/src/syscall/mkall.sh
@@ -189,6 +189,36 @@ linux_arm64)
        # API consistent between platforms.
        mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
        ;;
+linux_mips)
+       GOOSARCH_in=syscall_linux_mipsx.go
+       unistd_h=/usr/include/asm/unistd.h
+       mksyscall="./mksyscall.pl -b32 -arm"
+       mkerrors="$mkerrors"
+       mksysnum="./mksysnum_linux.pl $unistd_h"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+       ;;
+linux_mipsle)
+       GOOSARCH_in=syscall_linux_mipsx.go
+       unistd_h=/usr/include/asm/unistd.h
+       mksyscall="./mksyscall.pl -l32 -arm"
+       mkerrors="$mkerrors"
+       mksysnum="./mksysnum_linux.pl $unistd_h"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+       ;;
+linux_mips64)
+       GOOSARCH_in=syscall_linux_mips64x.go
+       unistd_h=/usr/include/asm/unistd.h
+       mkerrors="$mkerrors -m64"
+       mksysnum="./mksysnum_linux.pl $unistd_h"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+       ;;
+linux_mips64le)
+       GOOSARCH_in=syscall_linux_mips64x.go
+       unistd_h=/usr/include/asm/unistd.h
+       mkerrors="$mkerrors -m64"
+       mksysnum="./mksysnum_linux.pl $unistd_h"
+       mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+       ;;
 linux_ppc64)
        GOOSARCH_in=syscall_linux_ppc64x.go
        unistd_h=/usr/include/asm/unistd.h

diff --git a/src/syscall/zsyscall_linux_mips.go b/src/syscall/zsyscall_linux_mips.go
index d304dd784c2b68c52c0ce3d17f8ac909a05f4cd8..df65776170bfd2e2d4d2a7c6805a8e5e46803018 100644 (file)
--- a/src/syscall/zsyscall_linux_mips.go
+++ b/src/syscall/zsyscall_linux_mips.go
@@ -484,7 +484,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-       r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
        pid = int(r0)
        return
 }
@@ -492,7 +492,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-       r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
        ppid = int(r0)
        return
 }
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-       r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
        tid = int(r0)
        return
 }
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-       r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+       r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
        oldmask = int(r0)
        return
 }
@@ -1169,7 +1169,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-       r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
        egid = int(r0)
        return
 }
@@ -1177,7 +1177,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-       r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
        euid = int(r0)
        return
 }
@@ -1185,7 +1185,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-       r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
        gid = int(r0)
        return
 }
@@ -1193,7 +1193,7 @@ func Getgid() (gid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-       r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
        uid = int(r0)
        return
 }

diff --git a/src/syscall/zsyscall_linux_mips64.go b/src/syscall/zsyscall_linux_mips64.go
index 83ad1a028ecc2747a39f7d49400080c44f5423f6..701f39a2525852862ac168a8d3973d5089fbf520 100644 (file)
--- a/src/syscall/zsyscall_linux_mips64.go
+++ b/src/syscall/zsyscall_linux_mips64.go
@@ -484,7 +484,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-       r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
        pid = int(r0)
        return
 }
@@ -492,7 +492,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-       r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
        ppid = int(r0)
        return
 }
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-       r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
        tid = int(r0)
        return
 }
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-       r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+       r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
        oldmask = int(r0)
        return
 }
@@ -1179,7 +1179,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-       r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
        egid = int(r0)
        return
 }
@@ -1187,7 +1187,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-       r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
        euid = int(r0)
        return
 }
@@ -1195,7 +1195,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-       r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
        gid = int(r0)
        return
 }
@@ -1213,7 +1213,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-       r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
        uid = int(r0)
        return
 }

diff --git a/src/syscall/zsyscall_linux_mips64le.go b/src/syscall/zsyscall_linux_mips64le.go
index 331e1c89d6f7159b0e536ace3b94e6aef57bf23a..c7976c9207a7c0877a04f63325708cf6363df8fb 100644 (file)
--- a/src/syscall/zsyscall_linux_mips64le.go
+++ b/src/syscall/zsyscall_linux_mips64le.go
@@ -484,7 +484,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-       r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
        pid = int(r0)
        return
 }
@@ -492,7 +492,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-       r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
        ppid = int(r0)
        return
 }
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-       r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
        tid = int(r0)
        return
 }
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-       r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+       r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
        oldmask = int(r0)
        return
 }
@@ -1179,7 +1179,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-       r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
        egid = int(r0)
        return
 }
@@ -1187,7 +1187,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-       r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
        euid = int(r0)
        return
 }
@@ -1195,7 +1195,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-       r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
        gid = int(r0)
        return
 }
@@ -1213,7 +1213,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-       r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
        uid = int(r0)
        return
 }

diff --git a/src/syscall/zsyscall_linux_mipsle.go b/src/syscall/zsyscall_linux_mipsle.go
index 363e3a734f0a50694f7eacc438b74faa2e94f57e..c3e8d92035c11f5f412fdce4e71e3168c80a1b8c 100644 (file)
--- a/src/syscall/zsyscall_linux_mipsle.go
+++ b/src/syscall/zsyscall_linux_mipsle.go
@@ -484,7 +484,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-       r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
        pid = int(r0)
        return
 }
@@ -492,7 +492,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-       r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
        ppid = int(r0)
        return
 }
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-       r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
        tid = int(r0)
        return
 }
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-       r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+       r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
        oldmask = int(r0)
        return
 }
@@ -1169,7 +1169,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-       r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
        egid = int(r0)
        return
 }
@@ -1177,7 +1177,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-       r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
        euid = int(r0)
        return
 }
@@ -1185,7 +1185,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-       r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
        gid = int(r0)
        return
 }
@@ -1193,7 +1193,7 @@ func Getgid() (gid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-       r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+       r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
        uid = int(r0)
        return
 }