procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgo: Fix merge errors shown on Solaris.

Browse source 
From Rainer Orth.

From-SVN: r183651
This commit is contained in:
Ian Lance Taylor 2012-01-27 22:34:53 +00:00
parent 183dd1301c
commit eb6a1fe097
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libgo/go/os/sys_uname.go
View file

@ -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)

9
libgo/go/syscall/exec_bsd.go
View file

@ -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
}

2
libgo/mksysinfo.sh
View file

@ -192,7 +192,7 @@ grep '^const _SHUT_' gen-sysinfo.go |
sed -e 's/^\(const \)_\(SHUT[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
# The net package requires some const definitions.
for m in IPV6_V6ONLY IPPROTO_IPV6 IPV6_JOIN_GROUP IPV6_LEAVE_GROUP IPV6_TCLASS; do
for m in IP_PKTINFO IPV6_V6ONLY IPPROTO_IPV6 IPV6_JOIN_GROUP IPV6_LEAVE_GROUP IPV6_TCLASS; do
if ! grep "^const $m " ${OUT} >/dev/null 2>&1; then
echo "const $m = 0" >> ${OUT}
fi

2
libgo/runtime/go-print.c
View file

@ -58,7 +58,7 @@ __go_print_double (double v)
fputs ("NaN", stderr);
return;
}
if (isinf (v))
if (__builtin_isinf (v))
{
putc (v < 0 ? '-' : '+', stderr);
fputs ("Inf", stderr);

8
libgo/runtime/thread-sema.c
View file

@ -136,6 +136,12 @@ runtime_semawakeup (M *mp)
}
void
runtime_osinit(void)
runtime_osinit (void)
{
}
void
runtime_goenvs (void)
{
runtime_goenvs_unix ();
}