Skip to content

Commit 5192d41

Browse files
panjf2000gopherbot
authored andcommitted
internal/poll,syscall: drop the fallback for accept4 on linux/arm
For #67001 Change-Id: Ic0b91cd393046c53e41908e8dbbe2ab5fb6b8a74 Reviewed-on: https://go-review.googlesource.com/c/go/+/588216 Reviewed-by: Ian Lance Taylor <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: David Chase <[email protected]> Reviewed-by: Tobias Klauser <[email protected]> Auto-Submit: Tobias Klauser <[email protected]>
1 parent 80746f7 commit 5192d41

7 files changed

+7
-124
lines changed

src/internal/poll/sock_cloexec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// This file implements accept for platforms that provide a fast path for
66
// setting SetNonblock and CloseOnExec.
77

8-
//go:build dragonfly || freebsd || (linux && !arm) || netbsd || openbsd
8+
//go:build dragonfly || freebsd || linux || netbsd || openbsd
99

1010
package poll
1111

src/internal/poll/sock_cloexec_accept.go

-51
This file was deleted.

src/syscall/mkall.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ linux_amd64)
190190
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
191191
;;
192192
linux_arm)
193-
GOOSARCH_in="syscall_linux_arm.go syscall_linux_accept.go"
193+
GOOSARCH_in="syscall_linux_arm.go"
194194
mkerrors="$mkerrors"
195195
mksyscall="./mksyscall.pl -l32 -arm"
196196
mksysnum="curl -s 'http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/arch/arm/include/uapi/asm/unistd.h' | ./mksysnum_linux.pl -"

src/syscall/syscall_linux.go

+4
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,10 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
682682
return nil, EAFNOSUPPORT
683683
}
684684

685+
func Accept(fd int) (nfd int, sa Sockaddr, err error) {
686+
return Accept4(fd, 0)
687+
}
688+
685689
func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
686690
var rsa RawSockaddrAny
687691
var len _Socklen = SizeofSockaddrAny

src/syscall/syscall_linux_accept.go

-34
This file was deleted.

src/syscall/syscall_linux_accept4.go

-25
This file was deleted.

src/syscall/zsyscall_linux_arm.go

+1-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)