diff mbox

Go patch committed: Multiplex goroutines onto OS threads

Message ID ydd1us8qpfs.fsf@manam.CeBiTec.Uni-Bielefeld.DE
State New
Headers show

Commit Message

Rainer Orth Dec. 13, 2011, 6:47 p.m. UTC 
Ian Lance Taylor <iant@google.com> writes:

> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:
>
>> Ian Lance Taylor <iant@google.com> writes:
>>
>>> Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu.  Tested
>>> both with and without -fsplit-stack support.  Committed to mainline.
>>
>> Once Go bootstrap works again on Solaris, I notice that there are many
>> 64-bit testsuite failures, which have been introduced between 20111125
>> (r181724) and 20111130 (r181837), so this patch is the obvious culprit.
>
> I just committed another libgo update, which will no doubt lead to
> further problems.

Only a few minor compilation problems, fixed with the following patch.

	Rainer

Comments

Ian Lance Taylor Dec. 13, 2011, 7:18 p.m. UTC | #1 
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> Only a few minor compilation problems, fixed with the following patch.

Thanks.  Committed.

Ian
diff mbox

Patch

diff --git a/libgo/go/net/fd_select.go b/libgo/go/net/fd_select.go
--- a/libgo/go/net/fd_select.go
+++ b/libgo/go/net/fd_select.go
@@ -85,7 +85,8 @@  func (p *pollster) WaitFD(s *pollServer,
 			timeout = &tv
 		}
 
-		var n, e int
+		var n int
+		var e error
 		var tmpReadFds, tmpWriteFds syscall.FdSet
 		for {
 			// Temporary syscall.FdSet's into which the values are copied
@@ -101,7 +102,7 @@  func (p *pollster) WaitFD(s *pollServer,
 				break
 			}
 		}
-		if e != 0 {
+		if e != nil {
 			return -1, 0, os.NewSyscallError("select", e)
 		}
 		if n == 0 {
diff --git a/libgo/go/os/sys_uname.go b/libgo/go/os/sys_uname.go
--- a/libgo/go/os/sys_uname.go
+++ b/libgo/go/os/sys_uname.go
@@ -10,7 +10,7 @@  import "syscall"
 
 func Hostname() (name string, err error) {
 	var u syscall.Utsname
-	if errno := syscall.Uname(&u); errno != 0 {
+	if errno := syscall.Uname(&u); errno != nil {
 		return "", NewSyscallError("uname", errno)
 	}
 	b := make([]byte, len(u.Nodename))