← Back to branch summary

~ubuntu-branches/ubuntu/vivid/golang/vivid

« back to all changes in this revision

Viewing changes to src/pkg/runtime/sys_freebsd_amd64.s

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-11-18 15:12:26 UTC
  • mfrom: (14.2.12 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141118151226-zug7vn93mn3dtiz3
Tags: 2:1.3.2-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - Support co-installability with gccgo-go tool:
    - d/rules,golang-go.install: Rename bin/go -> bin/golang-go
    - d/golang-go.{postinst,prerm}: Install/remove /usr/bin/go using
      alternatives.
  - d/copyright: Amendments for full compiliance with copyright format.
  - d/control: Demote golang-go.tools to Suggests to support Ubuntu MIR.
  - dropped patches (now upstream):
    - d/p/issue27650045_40001_50001.diff
    - d/p/issue28050043_60001_70001.diff
    - d/p/issue54790044_100001_110001.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/runtime/sys_freebsd_amd64.s
144
144
// func now() (sec int64, nsec int32)
145
145
TEXT time·now(SB), NOSPLIT, $32
146
146
        MOVL    $232, AX
147
 
        MOVQ    $0, DI
 
147
        MOVQ    $0, DI          // CLOCK_REALTIME
148
148
        LEAQ    8(SP), SI
149
149
        SYSCALL
150
150
        MOVQ    8(SP), AX       // sec
157
157
 
158
158
TEXT runtime·nanotime(SB), NOSPLIT, $32
159
159
        MOVL    $232, AX
160
 
        MOVQ    $0, DI
 
160
        // We can use CLOCK_MONOTONIC_FAST here when we drop
 
161
        // support for FreeBSD 8-STABLE.
 
162
        MOVQ    $4, DI          // CLOCK_MONOTONIC
161
163
        LEAQ    8(SP), SI
162
164
        SYSCALL
163
165
        MOVQ    8(SP), AX       // sec