From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 27 Jan 2012 22:34:53 +0000 (+0000)
Subject: libgo: Fix merge errors shown on Solaris.
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=79cb6e627277c4fda6d1d7d7d50cada3f96c2765

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

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
 		}
diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index a10e42391e9..a3864fc0cd3 100755
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -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
diff --git a/libgo/runtime/go-print.c b/libgo/runtime/go-print.c
index e4981c042df..03cfd01869c 100644
--- a/libgo/runtime/go-print.c
+++ b/libgo/runtime/go-print.c
@@ -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);
diff --git a/libgo/runtime/thread-sema.c b/libgo/runtime/thread-sema.c
index 71555d09725..7d0acfb1ce1 100644
--- a/libgo/runtime/thread-sema.c
+++ b/libgo/runtime/thread-sema.c
@@ -136,6 +136,12 @@ runtime_semawakeup (M *mp)
 }
 
 void
-runtime_osinit(void)
+runtime_osinit (void)
 {
 }
+
+void
+runtime_goenvs (void)
+{
+  runtime_goenvs_unix ();
+}