diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-15 01:57:51 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-15 01:57:51 +0000 |
commit | 8a9f2a6bbd6bdf164ca987edac34ac72447881a5 (patch) | |
tree | 0722c462bd08d8478a0d1861b10b9f966193505e /libgo/go/syscall | |
parent | c8530c410972f09b88bb143e5e5a4910bd72b2ee (diff) | |
download | gcc-8a9f2a6bbd6bdf164ca987edac34ac72447881a5.tar.gz |
compiler, runtime: harmonize types referenced by both C and Go
Compiling with LTO revealed a number of cases in the runtime and
standard library where C and Go disagreed about the type of an object or
function (or where Go and code generated by the compiler disagreed). In
all cases the underlying representation was the same (e.g., uintptr vs.
void*), so this wasn't causing actual problems, but it did result in a
number of annoying warnings when compiling with LTO.
Reviewed-on: https://go-review.googlesource.com/c/160700
From-SVN: r268923
Diffstat (limited to 'libgo/go/syscall')
-rw-r--r-- | libgo/go/syscall/syscall_unix.go | 47 | ||||
-rw-r--r-- | libgo/go/syscall/wait.c | 16 |
2 files changed, 14 insertions, 49 deletions
diff --git a/libgo/go/syscall/syscall_unix.go b/libgo/go/syscall/syscall_unix.go index 450173a1451..b786dc5228b 100644 --- a/libgo/go/syscall/syscall_unix.go +++ b/libgo/go/syscall/syscall_unix.go @@ -19,11 +19,8 @@ var ( Stderr = 2 ) -//extern syscall -func c_syscall32(trap int32, a1, a2, a3, a4, a5, a6 int32) int32 - -//extern syscall -func c_syscall64(trap int64, a1, a2, a3, a4, a5, a6 int64) int64 +//extern __go_syscall6 +func syscall6(trap uintptr, a1, a2, a3, a4, a5, a6 uintptr) uintptr const ( darwin64Bit = runtime.GOOS == "darwin" && sizeofPtr == 8 @@ -38,14 +35,7 @@ const ( func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { Entersyscall() SetErrno(0) - var r uintptr - if unsafe.Sizeof(r) == 4 { - r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), 0, 0, 0) - r = uintptr(r1) - } else { - r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), 0, 0, 0) - r = uintptr(r1) - } + r := syscall6(trap, a1, a2, a3, 0, 0, 0) err = GetErrno() Exitsyscall() return r, 0, err @@ -54,47 +44,22 @@ func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) { Entersyscall() SetErrno(0) - var r uintptr - if unsafe.Sizeof(r) == 4 { - r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), - int32(a4), int32(a5), int32(a6)) - r = uintptr(r1) - } else { - r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), - int64(a4), int64(a5), int64(a6)) - r = uintptr(r1) - } + r := syscall6(trap, a1, a2, a3, a4, a5, a6) err = GetErrno() Exitsyscall() return r, 0, err } func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { - var r uintptr SetErrno(0) - if unsafe.Sizeof(r) == 4 { - r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), 0, 0, 0) - r = uintptr(r1) - } else { - r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), 0, 0, 0) - r = uintptr(r1) - } + r := syscall6(trap, a1, a2, a3, 0, 0, 0) err = GetErrno() return r, 0, err } func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) { - var r uintptr SetErrno(0) - if unsafe.Sizeof(r) == 4 { - r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), - int32(a4), int32(a5), int32(a6)) - r = uintptr(r1) - } else { - r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), - int64(a4), int64(a5), int64(a6)) - r = uintptr(r1) - } + r := syscall6(trap, a1, a2, a3, a4, a5, a6) err = GetErrno() return r, 0, err } diff --git a/libgo/go/syscall/wait.c b/libgo/go/syscall/wait.c index 9555a41b986..0b234d0c35b 100644 --- a/libgo/go/syscall/wait.c +++ b/libgo/go/syscall/wait.c @@ -65,10 +65,10 @@ CoreDump (uint32_t *w) return WCOREDUMP (*w) != 0; } -extern int ExitStatus (uint32_t *w) +extern intgo ExitStatus (uint32_t *w) __asm__ (GOSYM_PREFIX "syscall.WaitStatus.ExitStatus"); -int +intgo ExitStatus (uint32_t *w) { if (!WIFEXITED (*w)) @@ -76,10 +76,10 @@ ExitStatus (uint32_t *w) return WEXITSTATUS (*w); } -extern int Signal (uint32_t *w) +extern intgo Signal (uint32_t *w) __asm__ (GOSYM_PREFIX "syscall.WaitStatus.Signal"); -int +intgo Signal (uint32_t *w) { if (!WIFSIGNALED (*w)) @@ -87,10 +87,10 @@ Signal (uint32_t *w) return WTERMSIG (*w); } -extern int StopSignal (uint32_t *w) +extern intgo StopSignal (uint32_t *w) __asm__ (GOSYM_PREFIX "syscall.WaitStatus.StopSignal"); -int +intgo StopSignal (uint32_t *w) { if (!WIFSTOPPED (*w)) @@ -98,10 +98,10 @@ StopSignal (uint32_t *w) return WSTOPSIG (*w); } -extern int TrapCause (uint32_t *w) +extern intgo TrapCause (uint32_t *w) __asm__ (GOSYM_PREFIX "syscall.WaitStatus.TrapCause"); -int +intgo TrapCause (uint32_t *w __attribute__ ((unused))) { #ifndef __linux__ |