diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2017-09-26 12:35:54 +1000 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2017-09-27 01:10:05 +0000 |
| commit | 438c8f6b531a1cfcb4a084d3090b631938a9839e (patch) | |
| tree | 7cd0ec8b7f95fe2e374d14f7f550c72e0c26edfc /src/syscall/zsyscall_solaris_amd64.go | |
| parent | 5e42658fc04c8f4ce15f3e2d75f4f5d045640738 (diff) | |
| download | go-git-438c8f6b531a1cfcb4a084d3090b631938a9839e.tar.gz | |
syscall: make Exit call runtime.exit
syscall.Exit and runtime.exit do the same thing.
Why duplicate code?
CL 45115 fixed bug where windows runtime.exit was correct,
but syscall.Exit was broken. So CL 45115 fixed windows
syscall.Exit by calling runtime.exit.
Austin suggested that all OSes should do the same, and
this CL implements his idea.
While making changes, I discovered that nacl syscall.Exit
returned error
func Exit(code int) (err error)
and I changed it into
func Exit(code int)
like all other OSes. I assumed it was a mistake and it
is OK to do because cmd/api does not complain about it.
Also I changed plan9 runtime.exit to accept int32 just
like all other OSes do.
Change-Id: I12f6022ad81406566cf9befcc6edc382eebd413b
Reviewed-on: https://go-review.googlesource.com/66170
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: David du Colombier <0intro@gmail.com>
Diffstat (limited to 'src/syscall/zsyscall_solaris_amd64.go')
| -rw-r--r-- | src/syscall/zsyscall_solaris_amd64.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/syscall/zsyscall_solaris_amd64.go b/src/syscall/zsyscall_solaris_amd64.go index c9a5e8a4dd..4bb8318158 100644 --- a/src/syscall/zsyscall_solaris_amd64.go +++ b/src/syscall/zsyscall_solaris_amd64.go @@ -21,7 +21,6 @@ import "unsafe" //go:cgo_import_dynamic libc_Chroot chroot "libc.so" //go:cgo_import_dynamic libc_Close close "libc.so" //go:cgo_import_dynamic libc_Dup dup "libc.so" -//go:cgo_import_dynamic libc_Exit exit "libc.so" //go:cgo_import_dynamic libc_Fchdir fchdir "libc.so" //go:cgo_import_dynamic libc_Fchmod fchmod "libc.so" //go:cgo_import_dynamic libc_Fchown fchown "libc.so" @@ -106,7 +105,6 @@ import "unsafe" //go:linkname libc_Chroot libc_Chroot //go:linkname libc_Close libc_Close //go:linkname libc_Dup libc_Dup -//go:linkname libc_Exit libc_Exit //go:linkname libc_Fchdir libc_Fchdir //go:linkname libc_Fchmod libc_Fchmod //go:linkname libc_Fchown libc_Fchown @@ -194,7 +192,6 @@ var ( libc_Chroot, libc_Close, libc_Dup, - libc_Exit, libc_Fchdir, libc_Fchmod, libc_Fchown, @@ -413,11 +410,6 @@ func Dup(fd int) (nfd int, err error) { return } -func Exit(code int) { - sysvicall6(uintptr(unsafe.Pointer(&libc_Exit)), 1, uintptr(code), 0, 0, 0, 0, 0) - return -} - func Fchdir(fd int) (err error) { _, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&libc_Fchdir)), 1, uintptr(fd), 0, 0, 0, 0, 0) if e1 != 0 { |