From b0beeb1501a65ff5494c41307058e98d1394be4e Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 7 Mar 2012 15:30:54 -0500 Subject: [PATCH] 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 --- src/pkg/runtime/sys_freebsd_386.s | 2 -- src/pkg/runtime/sys_freebsd_amd64.s | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/pkg/runtime/sys_freebsd_386.s b/src/pkg/runtime/sys_freebsd_386.s index aab4444942e..80a8be8a992 100644 --- 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 3984ef40ea2..6ef8b50453c 100644 --- 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