libgo: Fix merge errors shown on Solaris.
authorIan Lance Taylor <ian@gcc.gnu.org>
Fri, 27 Jan 2012 22:34:53 +0000 (22:34 +0000)
committerIan Lance Taylor <ian@gcc.gnu.org>
Fri, 27 Jan 2012 22:34:53 +0000 (22:34 +0000)
commiteb6a1fe0972a0fec1a6b7f0040ccd99448202eb8
tree149a42f0bddeff40c4a94a4b7a752b94f2c612dd
parent183dd1301c72cacee121b79651fb0dbe2f8cc864
libgo: Fix merge errors shown on Solaris.

From Rainer Orth.

From-SVN: r183651
libgo/go/os/sys_uname.go
libgo/go/syscall/exec_bsd.go
libgo/mksysinfo.sh
libgo/runtime/go-print.c
libgo/runtime/thread-sema.c