From 51677e03380ffa8b7325c61bed33cbaa659a9a5f Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 28 Jan 2011 01:44:55 +0000
Subject: [PATCH] Add Solaris version of os.Hostname.

From-SVN: r169350
---
 libgo/Makefile.am        | 16 +++++++++++++++-
 libgo/Makefile.in        |  6 +++++-
 libgo/go/os/sys_uname.go | 25 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 libgo/go/os/sys_uname.go

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index dd17fffc9ab..2faabfc41be 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -657,6 +657,20 @@ go_netchan_files = \
 	go/netchan/export.go \
 	go/netchan/import.go
 
+if LIBGO_IS_LINUX
+go_os_sys_file = go/os/sys_linux.go
+else
+if LIBGO_IS_SOLARIS
+go_os_sys_file = go/os/sys_uname.go
+else
+if LIBGO_IS_RTEMS
+go_os_sys_file = go/os/sys_uname.go
+else
+go_os_sys_file = go/os/sys_bsd.go
+endif
+endif
+endif
+
 go_os_files = \
 	go/os/dir.go \
 	go/os/env.go \
@@ -669,7 +683,7 @@ go_os_files = \
 	go/os/path.go \
 	go/os/proc.go \
 	go/os/stat.go \
-	go/os/sys_linux.go \
+	$(go_os_sys_file) \
 	go/os/time.go \
 	go/os/types.go
 
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 238d0d3553b..ea42227a422 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1037,6 +1037,10 @@ go_netchan_files = \
 	go/netchan/export.go \
 	go/netchan/import.go
 
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_os_sys_file = go/os/sys_bsd.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_TRUE@@LIBGO_IS_SOLARIS_FALSE@go_os_sys_file = go/os/sys_uname.go
+@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_os_sys_file = go/os/sys_uname.go
+@LIBGO_IS_LINUX_TRUE@go_os_sys_file = go/os/sys_linux.go
 go_os_files = \
 	go/os/dir.go \
 	go/os/env.go \
@@ -1049,7 +1053,7 @@ go_os_files = \
 	go/os/path.go \
 	go/os/proc.go \
 	go/os/stat.go \
-	go/os/sys_linux.go \
+	$(go_os_sys_file) \
 	go/os/time.go \
 	go/os/types.go
 
diff --git a/libgo/go/os/sys_uname.go b/libgo/go/os/sys_uname.go
new file mode 100644
index 00000000000..ea46ad01e63
--- /dev/null
+++ b/libgo/go/os/sys_uname.go
@@ -0,0 +1,25 @@
+// Copyright 2011 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.
+
+// For systems which only store the hostname in uname (Solaris).
+
+package os
+
+import "syscall"
+
+func Hostname() (name string, err Error) {
+	var u syscall.Utsname
+	if errno := syscall.Uname(&u); errno != 0 {
+		return "", NewSyscallError("uname", errno)
+	}
+	b := make([]byte, len(u.Nodename))
+	i := 0
+	for ; i < len(u.Nodename); i++ {
+		if u.Nodename[i] == 0 {
+			break
+		}
+		b[i] = byte(u.Nodename[i])
+	}
+	return string(b[:i]), nil
+}