diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
| commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
| tree | ba71646a10b518372d110532d86fcf0b98edc14f /src/pkg/runtime/sys_dragonfly_386.s | |
| parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
| parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
| download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz | |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'src/pkg/runtime/sys_dragonfly_386.s')
| -rw-r--r-- | src/pkg/runtime/sys_dragonfly_386.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pkg/runtime/sys_dragonfly_386.s b/src/pkg/runtime/sys_dragonfly_386.s index 9085ded6f..20e699966 100644 --- a/src/pkg/runtime/sys_dragonfly_386.s +++ b/src/pkg/runtime/sys_dragonfly_386.s @@ -155,7 +155,7 @@ TEXT runtime·setitimer(SB), NOSPLIT, $-4 TEXT time·now(SB), NOSPLIT, $32 MOVL $232, AX LEAL 12(SP), BX - MOVL $0, 4(SP) + MOVL $0, 4(SP) // CLOCK_REALTIME MOVL BX, 8(SP) INT $0x80 MOVL 12(SP), AX // sec @@ -172,7 +172,7 @@ TEXT time·now(SB), NOSPLIT, $32 TEXT runtime·nanotime(SB), NOSPLIT, $32 MOVL $232, AX LEAL 12(SP), BX - MOVL $0, 4(SP) + MOVL $4, 4(SP) // CLOCK_MONOTONIC MOVL BX, 8(SP) INT $0x80 MOVL 12(SP), AX // sec |