diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-27 22:34:53 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-27 22:34:53 +0000 |
| commit | 79cb6e627277c4fda6d1d7d7d50cada3f96c2765 (patch) | |
| tree | 149a42f0bddeff40c4a94a4b7a752b94f2c612dd /libgo/go | |
| parent | c307f1064fa0315692c3dcdd800435d5895b234d (diff) | |
| download | gcc-79cb6e627277c4fda6d1d7d7d50cada3f96c2765.tar.gz | |
libgo: Fix merge errors shown on Solaris.
From Rainer Orth.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183651 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go')
| -rw-r--r-- | libgo/go/os/sys_uname.go | 2 | ||||
| -rw-r--r-- | libgo/go/syscall/exec_bsd.go | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libgo/go/os/sys_uname.go b/libgo/go/os/sys_uname.go index 313ee62aef6..16568b69f4b 100644 --- a/libgo/go/os/sys_uname.go +++ b/libgo/go/os/sys_uname.go @@ -8,7 +8,7 @@ package os import "syscall" -func Hostname() (name string, err error) { +func hostname() (name string, err error) { var u syscall.Utsname if errno := syscall.Uname(&u); errno != nil { return "", NewSyscallError("uname", errno) diff --git a/libgo/go/syscall/exec_bsd.go b/libgo/go/syscall/exec_bsd.go index 7baa3af69cb..9ef3eb00652 100644 --- a/libgo/go/syscall/exec_bsd.go +++ b/libgo/go/syscall/exec_bsd.go @@ -7,7 +7,6 @@ package syscall import ( - "runtime" "unsafe" ) @@ -58,7 +57,7 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr // Enable tracing if requested. if sys.Ptrace { - err1 = raw_trace(_PTRACE_TRACEME, 0, nil, nil) + err1 = raw_ptrace(_PTRACE_TRACEME, 0, nil, nil) if err1 != 0 { goto childerror } @@ -153,7 +152,7 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr err1 = err2.(Errno) goto childerror } - raw_fcntl(nextfd, F_SETFD, F_CLOEXEC) + raw_fcntl(nextfd, F_SETFD, FD_CLOEXEC) fd[i] = nextfd nextfd++ if nextfd == pipe { // don't stomp on pipe @@ -196,7 +195,7 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr // Detach fd 0 from tty if sys.Noctty { - _, err1 = raw_ioctl(0, IOTCNOTTY, 0) + _, err1 = raw_ioctl(0, TIOCNOTTY, 0) if err1 != 0 { goto childerror } @@ -204,7 +203,7 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr // Make fd 0 the tty if sys.Setctty { - _, err1 = raw_ioctl(TIOCSCTTY, 0) + _, err1 = raw_ioctl(0, TIOCSCTTY, 0) if err1 != 0 { goto childerror } |