diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-05-24 21:43:12 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-05-24 21:43:12 +0000 |
| commit | d14a6437c37fc21070bcc6c2602bd7a0cc93f84e (patch) | |
| tree | eaf40bcf40b584868708e8bad126793670271d80 /libgo | |
| parent | 85fe6408f42f51d9ce76b99893872800d17832aa (diff) | |
| download | gcc-d14a6437c37fc21070bcc6c2602bd7a0cc93f84e.zip gcc-d14a6437c37fc21070bcc6c2602bd7a0cc93f84e.tar.gz gcc-d14a6437c37fc21070bcc6c2602bd7a0cc93f84e.tar.bz2 | |
libgo: Solaris/Irix portability fixes.
From Rainer Orth.
From-SVN: r174144
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/Makefile.am | 10 | ||||
| -rw-r--r-- | libgo/Makefile.in | 8 | ||||
| -rw-r--r-- | libgo/go/net/cgo_bsd.go | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index ae6848f..c98a176 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -669,9 +669,19 @@ if LIBGO_IS_LINUX go_net_cgo_file = go/net/cgo_linux.go go_net_sock_file = go/net/sock_linux.go else +if LIBGO_IS_IRIX +go_net_cgo_file = go/net/cgo_linux.go +go_net_sock_file = go/net/sock_linux.go +else +if LIBGO_IS_SOLARIS +go_net_cgo_file = go/net/cgo_linux.go +go_net_sock_file = go/net/sock_linux.go +else go_net_cgo_file = go/net/cgo_bsd.go go_net_sock_file = go/net/sock_bsd.go endif +endif +endif go_net_files = \ go/net/cgo_unix.go \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 10d0a4e..ac5de78 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1052,9 +1052,13 @@ go_mime_files = \ @LIBGO_IS_LINUX_FALSE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go @LIBGO_IS_LINUX_TRUE@@LIBGO_IS_RTEMS_FALSE@go_net_newpollserver_file = go/net/newpollserver.go @LIBGO_IS_RTEMS_TRUE@go_net_newpollserver_file = go/net/newpollserver_rtems.go -@LIBGO_IS_LINUX_FALSE@go_net_cgo_file = go/net/cgo_bsd.go +@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_cgo_file = go/net/cgo_bsd.go +@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_cgo_file = go/net/cgo_linux.go +@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_cgo_file = go/net/cgo_linux.go @LIBGO_IS_LINUX_TRUE@go_net_cgo_file = go/net/cgo_linux.go -@LIBGO_IS_LINUX_FALSE@go_net_sock_file = go/net/sock_bsd.go +@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_sock_file = go/net/sock_bsd.go +@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_sock_file = go/net/sock_linux.go +@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@go_net_sock_file = go/net/sock_linux.go @LIBGO_IS_LINUX_TRUE@go_net_sock_file = go/net/sock_linux.go go_net_files = \ go/net/cgo_unix.go \ diff --git a/libgo/go/net/cgo_bsd.go b/libgo/go/net/cgo_bsd.go index d9fef45..3951d84 100644 --- a/libgo/go/net/cgo_bsd.go +++ b/libgo/go/net/cgo_bsd.go @@ -10,6 +10,6 @@ package net import "syscall" -func cgoAddrInfoMask() C.int { +func cgoAddrInfoMask() int { return syscall.AI_MASK } |