]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: use pselect6 for usleep on linux/386
authorAustin Clements <austin@google.com>
Tue, 23 May 2017 21:54:24 +0000 (17:54 -0400)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 23 May 2017 22:47:31 +0000 (22:47 +0000)
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>
src/runtime/sys_linux_386.s

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