Skip to content

Commit a2f72cc

Browse files
tklausertklauser
committed
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 golang#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>
1 parent 72ce047 commit a2f72cc

File tree

5 files changed

+62
-32
lines changed

5 files changed

+62
-32
lines changed

‎src/syscall/mkall.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,36 @@ linux_arm64)
189189
# API consistent between platforms.
190190
mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
191191
;;
192+
linux_mips)
193+
GOOSARCH_in=syscall_linux_mipsx.go
194+
unistd_h=/usr/include/asm/unistd.h
195+
mksyscall="./mksyscall.pl -b32 -arm"
196+
mkerrors="$mkerrors"
197+
mksysnum="./mksysnum_linux.pl $unistd_h"
198+
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
199+
;;
200+
linux_mipsle)
201+
GOOSARCH_in=syscall_linux_mipsx.go
202+
unistd_h=/usr/include/asm/unistd.h
203+
mksyscall="./mksyscall.pl -l32 -arm"
204+
mkerrors="$mkerrors"
205+
mksysnum="./mksysnum_linux.pl $unistd_h"
206+
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
207+
;;
208+
linux_mips64)
209+
GOOSARCH_in=syscall_linux_mips64x.go
210+
unistd_h=/usr/include/asm/unistd.h
211+
mkerrors="$mkerrors -m64"
212+
mksysnum="./mksysnum_linux.pl $unistd_h"
213+
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
214+
;;
215+
linux_mips64le)
216+
GOOSARCH_in=syscall_linux_mips64x.go
217+
unistd_h=/usr/include/asm/unistd.h
218+
mkerrors="$mkerrors -m64"
219+
mksysnum="./mksysnum_linux.pl $unistd_h"
220+
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
221+
;;
192222
linux_ppc64)
193223
GOOSARCH_in=syscall_linux_ppc64x.go
194224
unistd_h=/usr/include/asm/unistd.h

‎src/syscall/zsyscall_linux_mips.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -484,15 +484,15 @@ func Getpgid(pid int) (pgid int, err error) {
484484
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
485485

486486
func Getpid() (pid int) {
487-
r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
487+
r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
488488
pid = int(r0)
489489
return
490490
}
491491

492492
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
493493

494494
func Getppid() (ppid int) {
495-
r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
495+
r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
496496
ppid = int(r0)
497497
return
498498
}
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
521521
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
522522

523523
func Gettid() (tid int) {
524-
r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
524+
r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
525525
tid = int(r0)
526526
return
527527
}
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
928928
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
929929

930930
func Umask(mask int) (oldmask int) {
931-
r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
931+
r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
932932
oldmask = int(r0)
933933
return
934934
}
@@ -1169,31 +1169,31 @@ func Ftruncate(fd int, length int64) (err error) {
11691169
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11701170

11711171
func Getegid() (egid int) {
1172-
r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
1172+
r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
11731173
egid = int(r0)
11741174
return
11751175
}
11761176

11771177
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11781178

11791179
func Geteuid() (euid int) {
1180-
r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
1180+
r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
11811181
euid = int(r0)
11821182
return
11831183
}
11841184

11851185
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11861186

11871187
func Getgid() (gid int) {
1188-
r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
1188+
r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
11891189
gid = int(r0)
11901190
return
11911191
}
11921192

11931193
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11941194

11951195
func Getuid() (uid int) {
1196-
r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
1196+
r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
11971197
uid = int(r0)
11981198
return
11991199
}

‎src/syscall/zsyscall_linux_mips64.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -484,15 +484,15 @@ func Getpgid(pid int) (pgid int, err error) {
484484
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
485485

486486
func Getpid() (pid int) {
487-
r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
487+
r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
488488
pid = int(r0)
489489
return
490490
}
491491

492492
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
493493

494494
func Getppid() (ppid int) {
495-
r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
495+
r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
496496
ppid = int(r0)
497497
return
498498
}
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
521521
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
522522

523523
func Gettid() (tid int) {
524-
r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
524+
r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
525525
tid = int(r0)
526526
return
527527
}
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
928928
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
929929

930930
func Umask(mask int) (oldmask int) {
931-
r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
931+
r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
932932
oldmask = int(r0)
933933
return
934934
}
@@ -1179,23 +1179,23 @@ func Ftruncate(fd int, length int64) (err error) {
11791179
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11801180

11811181
func Getegid() (egid int) {
1182-
r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
1182+
r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
11831183
egid = int(r0)
11841184
return
11851185
}
11861186

11871187
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11881188

11891189
func Geteuid() (euid int) {
1190-
r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
1190+
r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
11911191
euid = int(r0)
11921192
return
11931193
}
11941194

11951195
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11961196

11971197
func Getgid() (gid int) {
1198-
r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
1198+
r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
11991199
gid = int(r0)
12001200
return
12011201
}
@@ -1213,7 +1213,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
12131213
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
12141214

12151215
func Getuid() (uid int) {
1216-
r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
1216+
r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
12171217
uid = int(r0)
12181218
return
12191219
}

‎src/syscall/zsyscall_linux_mips64le.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -484,15 +484,15 @@ func Getpgid(pid int) (pgid int, err error) {
484484
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
485485

486486
func Getpid() (pid int) {
487-
r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
487+
r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
488488
pid = int(r0)
489489
return
490490
}
491491

492492
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
493493

494494
func Getppid() (ppid int) {
495-
r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
495+
r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
496496
ppid = int(r0)
497497
return
498498
}
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
521521
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
522522

523523
func Gettid() (tid int) {
524-
r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
524+
r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
525525
tid = int(r0)
526526
return
527527
}
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
928928
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
929929

930930
func Umask(mask int) (oldmask int) {
931-
r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
931+
r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
932932
oldmask = int(r0)
933933
return
934934
}
@@ -1179,23 +1179,23 @@ func Ftruncate(fd int, length int64) (err error) {
11791179
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11801180

11811181
func Getegid() (egid int) {
1182-
r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
1182+
r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
11831183
egid = int(r0)
11841184
return
11851185
}
11861186

11871187
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11881188

11891189
func Geteuid() (euid int) {
1190-
r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
1190+
r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
11911191
euid = int(r0)
11921192
return
11931193
}
11941194

11951195
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11961196

11971197
func Getgid() (gid int) {
1198-
r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
1198+
r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
11991199
gid = int(r0)
12001200
return
12011201
}
@@ -1213,7 +1213,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
12131213
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
12141214

12151215
func Getuid() (uid int) {
1216-
r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
1216+
r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
12171217
uid = int(r0)
12181218
return
12191219
}

‎src/syscall/zsyscall_linux_mipsle.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -484,15 +484,15 @@ func Getpgid(pid int) (pgid int, err error) {
484484
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
485485

486486
func Getpid() (pid int) {
487-
r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
487+
r0, _ := rawSyscallNoError(SYS_GETPID, 0, 0, 0)
488488
pid = int(r0)
489489
return
490490
}
491491

492492
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
493493

494494
func Getppid() (ppid int) {
495-
r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
495+
r0, _ := rawSyscallNoError(SYS_GETPPID, 0, 0, 0)
496496
ppid = int(r0)
497497
return
498498
}
@@ -521,7 +521,7 @@ func Getrusage(who int, rusage *Rusage) (err error) {
521521
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
522522

523523
func Gettid() (tid int) {
524-
r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
524+
r0, _ := rawSyscallNoError(SYS_GETTID, 0, 0, 0)
525525
tid = int(r0)
526526
return
527527
}
@@ -928,7 +928,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
928928
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
929929

930930
func Umask(mask int) (oldmask int) {
931-
r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
931+
r0, _ := rawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
932932
oldmask = int(r0)
933933
return
934934
}
@@ -1169,31 +1169,31 @@ func Ftruncate(fd int, length int64) (err error) {
11691169
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11701170

11711171
func Getegid() (egid int) {
1172-
r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
1172+
r0, _ := rawSyscallNoError(SYS_GETEGID, 0, 0, 0)
11731173
egid = int(r0)
11741174
return
11751175
}
11761176

11771177
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11781178

11791179
func Geteuid() (euid int) {
1180-
r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
1180+
r0, _ := rawSyscallNoError(SYS_GETEUID, 0, 0, 0)
11811181
euid = int(r0)
11821182
return
11831183
}
11841184

11851185
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11861186

11871187
func Getgid() (gid int) {
1188-
r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
1188+
r0, _ := rawSyscallNoError(SYS_GETGID, 0, 0, 0)
11891189
gid = int(r0)
11901190
return
11911191
}
11921192

11931193
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
11941194

11951195
func Getuid() (uid int) {
1196-
r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
1196+
r0, _ := rawSyscallNoError(SYS_GETUID, 0, 0, 0)
11971197
uid = int(r0)
11981198
return
11991199
}

0 commit comments

Comments
 (0)