diff options
| author | Hector Chu <hectorchu@gmail.com> | 2011-10-03 19:08:59 +0100 |
|---|---|---|
| committer | Hector Chu <hectorchu@gmail.com> | 2011-10-03 19:08:59 +0100 |
| commit | 85916146ea0f63fd9a1b8e1c224eae261ff337ba (patch) | |
| tree | 8b527d9be47b4e0ce0e721bc059668ae2403a2fa /src/pkg/runtime/linux | |
| parent | d573ad26719fa6100970dc291ae83ad8ea33bff1 (diff) | |
| download | go-85916146ea0f63fd9a1b8e1c224eae261ff337ba.tar.xz | |
runtime: fix usleep on linux/386 and re-enable parallel gc
R=golang-dev, jsing, alex.brainman, cw, rsc
CC=golang-dev
https://golang.org/cl/5166047
Diffstat (limited to 'src/pkg/runtime/linux')
| -rw-r--r-- | src/pkg/runtime/linux/386/sys.s | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/pkg/runtime/linux/386/sys.s b/src/pkg/runtime/linux/386/sys.s index 7549c04798..1b4f649bd7 100644 --- a/src/pkg/runtime/linux/386/sys.s +++ b/src/pkg/runtime/linux/386/sys.s @@ -52,23 +52,22 @@ TEXT runtime·read(SB),7,$0 CALL *runtime·_vdso(SB) RET -TEXT runtime·usleep(SB),7,$28 +TEXT runtime·usleep(SB),7,$8 MOVL $0, DX MOVL usec+0(FP), AX MOVL $1000000, CX DIVL CX - MOVL AX, 20(SP) - MOVL DX, 24(SP) + MOVL AX, 0(SP) + MOVL DX, 4(SP) // select(0, 0, 0, 0, &tv) - MOVL $0, 0(SP) - MOVL $0, 4(SP) - MOVL $0, 8(SP) - MOVL $0, 12(SP) - LEAL 20(SP), AX - MOVL AX, 16(SP) - MOVL $82, AX - SYSCALL + MOVL $142, AX + MOVL $0, BX + MOVL $0, CX + MOVL $0, DX + MOVL $0, SI + LEAL 0(SP), DI + CALL *runtime·_vdso(SB) RET TEXT runtime·raisesigpipe(SB),7,$12 |