From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Tue, 20 Aug 2013 08:02:42 +0000 (+0900)
Subject: net: enable runtime-integrated network pollster on freebsd/arm
X-Git-Tag: go1.2rc2~478
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9b65dac494903780ef2134eb4fd6a8ee97cd7f4e;p=gostls13.git

net: enable runtime-integrated network pollster on freebsd/arm

Fixes #6146.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/12927048
---

diff --git a/src/pkg/net/fd_bsd.go b/src/pkg/net/fd_bsd.go
index 616c2ac775..b2cc824dfa 100644
--- a/src/pkg/net/fd_bsd.go
+++ b/src/pkg/net/fd_bsd.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build freebsd,arm
+// +build ignore
 
 // Waiting for FDs via kqueue/kevent.
 
diff --git a/src/pkg/net/fd_poll_runtime.go b/src/pkg/net/fd_poll_runtime.go
index 8a4d20cff9..97dbcf6f71 100644
--- a/src/pkg/net/fd_poll_runtime.go
+++ b/src/pkg/net/fd_poll_runtime.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin freebsd,amd64 freebsd,386 linux netbsd openbsd windows
+// +build darwin freebsd linux netbsd openbsd windows
 
 package net
 
diff --git a/src/pkg/net/fd_poll_unix.go b/src/pkg/net/fd_poll_unix.go
index 3b34707244..189085e926 100644
--- a/src/pkg/net/fd_poll_unix.go
+++ b/src/pkg/net/fd_poll_unix.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build freebsd,arm
+// +build ignore
 
 package net