mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[release-branch.go1.8] runtime: use pselect6 for usleep on linux/386 

Commit 4dcba023c6 replaced select with pselect6 on linux/amd64 and
linux/arm, but it turns out the Android emulator uses linux/386. This
makes the equivalent change there, too.

Fixes #20409 more.

Change-Id: If542d6ade06309aab8758d5f5f6edec201ca7670
Reviewed-on: https://go-review.googlesource.com/44011
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
(cherry picked from commit ecad34a40ea390ddf5ba2da8f3c3f2c5f15297c8)
Reviewed-on: https://go-review.googlesource.com/44002
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Chris Broadfoot <cbro@golang.org>
This commit is contained in:
Austin Clements 2017-05-23 17:54:24 -04:00 committed by Brad Fitzpatrick
parent 958c64bbab
commit daf6706f37
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/sys_linux_386.s
View File

@ -98,15 +98,18 @@ TEXT runtime·usleep(SB),NOSPLIT,$8
MOVL $1000000, CX MOVL $1000000, CX
DIVL CX DIVL CX
MOVL AX, 0(SP) MOVL AX, 0(SP)
MOVL $1000, AX // usec to nsec
MULL DX
MOVL DX, 4(SP) MOVL DX, 4(SP)
// select(0, 0, 0, 0, &tv) // pselect6(0, 0, 0, 0, &ts, 0)
MOVL $142, AX MOVL $308, AX
MOVL $0, BX MOVL $0, BX
MOVL $0, CX MOVL $0, CX
MOVL $0, DX MOVL $0, DX
MOVL $0, SI MOVL $0, SI
LEAL 0(SP), DI LEAL 0(SP), DI
MOVL $0, BP
INVOKE_SYSCALL INVOKE_SYSCALL
RET RET