aboutsummaryrefslogtreecommitdiff
path: root/libgo/Makefile.am
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2013-11-14 20:15:04 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2013-11-14 20:15:04 +0000
commit03a231f7521b62a593fd7a4ce7067102288bd28f (patch)
tree8d7245531a5a7415aca8d276ddcd1dde96652404 /libgo/Makefile.am
parent7d608db296739dfbbb9dfa65d796b82691158e53 (diff)
downloadgcc-03a231f7521b62a593fd7a4ce7067102288bd28f.zip
gcc-03a231f7521b62a593fd7a4ce7067102288bd28f.tar.gz
gcc-03a231f7521b62a593fd7a4ce7067102288bd28f.tar.bz2
runtime: Add netpoll code that uses select.
Required for Solaris support. From-SVN: r204817
Diffstat (limited to 'libgo/Makefile.am')
-rw-r--r--libgo/Makefile.am31
1 files changed, 5 insertions, 26 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 489eafd..052cded 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -413,12 +413,12 @@ endif
endif
if LIBGO_IS_LINUX
-runtime_netpoll_files = netpoll.c runtime/netpoll_epoll.c
+runtime_netpoll_files = runtime/netpoll_epoll.c
else
-if LIBGO_IS_DARWIN
-runtime_netpoll_files = netpoll.c runtime/netpoll_kqueue.c
+if LIBGO_IS_SOLARIS
+runtime_netpoll_files = runtime/netpoll_select.c
else
-runtime_netpoll_files = runtime/netpoll_stub.c
+runtime_netpoll_files = runtime/netpoll_kqueue.c
endif
endif
@@ -515,6 +515,7 @@ runtime_files = \
malloc.c \
map.c \
mprof.c \
+ netpoll.c \
reflect.c \
runtime1.c \
sema.c \
@@ -670,26 +671,6 @@ go_mime_files = \
go/mime/type.go \
go/mime/type_unix.go
-if LIBGO_IS_RTEMS
-go_net_fd_os_file = go/net/fd_select.go
-go_net_newpollserver_file = go/net/newpollserver_rtems.go
-else # !LIBGO_IS_RTEMS
-if LIBGO_IS_LINUX
-go_net_fd_os_file =
-go_net_newpollserver_file =
-else # !LIBGO_IS_LINUX && !LIBGO_IS_RTEMS
-if LIBGO_IS_NETBSD
-go_net_fd_os_file =
-go_net_newpollserver_file =
-else # !LIBGO_IS_NETBSD && !LIBGO_IS_LINUX && !LIBGO_IS_RTEMS
-# By default use select with pipes. Most systems should have
-# something better.
-go_net_fd_os_file = go/net/fd_select.go
-go_net_newpollserver_file =
-endif # !LIBGO_IS_NETBSD
-endif # !LIBGO_IS_LINUX
-endif # !LIBGO_IS_RTEMS
-
if LIBGO_IS_LINUX
go_net_cgo_file = go/net/cgo_linux.go
go_net_sock_file = go/net/sock_linux.go
@@ -787,10 +768,8 @@ go_net_files = \
go/net/dnsclient_unix.go \
go/net/dnsconfig_unix.go \
go/net/dnsmsg.go \
- $(go_net_newpollserver_file) \
go/net/fd_mutex.go \
go/net/fd_unix.go \
- $(go_net_fd_os_file) \
go/net/file_unix.go \
go/net/hosts.go \
go/net/interface.go \