From 37707fdb30a5b38865cfb95e5aab41707daec7fd Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 2 Feb 2018 14:35:31 +0100 Subject: [PATCH] unix: move gccgo redeclared *SyscallNoError functions to a separate file Same as CL 34379, SyscallNoError and RawSyscallNoError are redeclared for gccgo builds since CL 85756. Thus, move the declarations to a gc specific file. Updates golang/go#18312 Change-Id: Ia8f42b31e61a80530e5e90a44c0af32fd3452612 Reviewed-on: https://go-review.googlesource.com/91615 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- unix/syscall_linux.go | 7 ------- unix/syscall_linux_gc.go | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 unix/syscall_linux_gc.go diff --git a/unix/syscall_linux.go b/unix/syscall_linux.go index b48f77f9..76cf81f5 100644 --- a/unix/syscall_linux.go +++ b/unix/syscall_linux.go @@ -16,13 +16,6 @@ import ( "unsafe" ) -// SyscallNoError may be used instead of Syscall for syscalls that don't fail. -func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) - -// RawSyscallNoError may be used instead of RawSyscall for syscalls that don't -// fail. -func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) - /* * Wrapped */ diff --git a/unix/syscall_linux_gc.go b/unix/syscall_linux_gc.go new file mode 100644 index 00000000..c26e6ec2 --- /dev/null +++ b/unix/syscall_linux_gc.go @@ -0,0 +1,14 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build linux,!gccgo + +package unix + +// SyscallNoError may be used instead of Syscall for syscalls that don't fail. +func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) + +// RawSyscallNoError may be used instead of RawSyscall for syscalls that don't +// fail. +func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)