OSDN Git Service

libgo: Fix merge errors shown on Solaris.
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 27 Jan 2012 22:34:53 +0000 (22:34 +0000)
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 27 Jan 2012 22:34:53 +0000 (22:34 +0000)
commit79cb6e627277c4fda6d1d7d7d50cada3f96c2765
tree149a42f0bddeff40c4a94a4b7a752b94f2c612dd
parentc307f1064fa0315692c3dcdd800435d5895b234d
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
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