runtime: fix freebsd crash

FreeBSD, alone among our supported operating systems,
required that usleep not be interrupted.  Don't require that.

Fixes #3217.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5781045

diff --git a/src/pkg/runtime/sys_freebsd_386.s b/src/pkg/runtime/sys_freebsd_386.s
index aab4444942ebd1b1d31cef0df53a7eea9c70feeb..80a8be8a9921d1d6ff5a910874840fa4bffdb8be 100644 (file)
--- a/src/pkg/runtime/sys_freebsd_386.s
+++ b/src/pkg/runtime/sys_freebsd_386.s
@@ -220,8 +220,6 @@ TEXT runtime·usleep(SB),7,$20
        MOVL    $0, 8(SP)               // arg 2 - rmtp
        MOVL    $240, AX                // sys_nanosleep
        INT     $0x80
-       JAE     2(PC)
-       CALL    runtime·notok(SB)
        RET
 
 /*

diff --git a/src/pkg/runtime/sys_freebsd_amd64.s b/src/pkg/runtime/sys_freebsd_amd64.s
index 3984ef40ea28509efe39a437d58a141260b03564..6ef8b50453c21a304766774d5ae4eedc4c7944bc 100644 (file)
--- a/src/pkg/runtime/sys_freebsd_amd64.s
+++ b/src/pkg/runtime/sys_freebsd_amd64.s
@@ -205,8 +205,6 @@ TEXT runtime·usleep(SB),7,$16
        MOVQ    $0, SI                  // arg 2 - rmtp
        MOVL    $240, AX                // sys_nanosleep
        SYSCALL
-       JCC     2(PC)
-       CALL    runtime·notok(SB)
        RET
 
 // set tls base to DI