runtime: rename walltime1 to walltime

Change-Id: Iec9de5ca56eb68d524bbaa0668515dbd09ad38a1
Reviewed-on: https://go-review.googlesource.com/c/go/+/314770
Trust: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Michael Knyszek <mknyszek@google.com>

diff --git a/misc/wasm/wasm_exec.js b/misc/wasm/wasm_exec.js
index 82041e6bb901bde57c43e689984e60a499573aca..3e41e628ef9de482d2d137a1631edc09d58f80fa 100644 (file)
--- a/misc/wasm/wasm_exec.js
+++ b/misc/wasm/wasm_exec.js
@@ -296,8 +296,8 @@
                                                setInt64(sp + 8, (timeOrigin + performance.now()) * 1000000);
                                        },
 
-                                       // func walltime1() (sec int64, nsec int32)
-                                       "runtime.walltime1": (sp) => {
+                                       // func walltime() (sec int64, nsec int32)
+                                       "runtime.walltime": (sp) => {
                                                sp >>>= 0;
                                                const msec = (new Date).getTime();
                                                setInt64(sp + 8, msec / 1000);

diff --git a/src/runtime/os3_solaris.go b/src/runtime/os3_solaris.go
index 4b65139eb81075c543e7bc867ff84dc41ebfef3c..39ef831acfef8723bd1fd3ab4826ca166a46984b 100644 (file)
--- a/src/runtime/os3_solaris.go
+++ b/src/runtime/os3_solaris.go
@@ -531,7 +531,7 @@ func usleep(µs uint32) {
        usleep1(µs)
 }
 
-func walltime1() (sec int64, nsec int32) {
+func walltime() (sec int64, nsec int32) {
        var ts mts
        sysvicall2(&libc_clock_gettime, _CLOCK_REALTIME, uintptr(unsafe.Pointer(&ts)))
        return ts.tv_sec, int32(ts.tv_nsec)

diff --git a/src/runtime/os_aix.go b/src/runtime/os_aix.go
index 557b17cc75e426e5a262bd503dc0792eef120538..4fb1c8e845c87c5793a77c0f0bab6cca8b2e55fb 100644 (file)
--- a/src/runtime/os_aix.go
+++ b/src/runtime/os_aix.go
@@ -336,7 +336,7 @@ func nanotime1() int64 {
        return tp.tv_sec*1000000000 + tp.tv_nsec
 }
 
-func walltime1() (sec int64, nsec int32) {
+func walltime() (sec int64, nsec int32) {
        ts := &timespec{}
        if clock_gettime(_CLOCK_REALTIME, ts) != 0 {
                throw("syscall clock_gettime failed")

diff --git a/src/runtime/os_openbsd_syscall2.go b/src/runtime/os_openbsd_syscall2.go
index 3b1707126bd57c7c54ed6c0c271ab88b0a4ca0b2..e16f9420db845a93369fab41defdd7c95165266d 100644 (file)
--- a/src/runtime/os_openbsd_syscall2.go
+++ b/src/runtime/os_openbsd_syscall2.go
@@ -98,4 +98,4 @@ func sigaltstack(new, old *stackt)
 func closeonexec(fd int32)
 func setNonblock(fd int32)
 
-func walltime1() (sec int64, nsec int32)
+func walltime() (sec int64, nsec int32)

diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
index 36182f4e9a11eea5ea30eab40bdfb6a60bff222f..f0935264ac6604b852960f2fea4164fc23e90173 100644 (file)
--- a/src/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
@@ -804,9 +804,6 @@ func writeConsoleUTF16(handle uintptr, b []uint16) {
        return
 }
 
-// walltime1 isn't implemented on Windows, but will never be called.
-func walltime1() (sec int64, nsec int32)
-
 //go:nosplit
 func semasleep(ns int64) int32 {
        const (

diff --git a/src/runtime/sys_darwin.go b/src/runtime/sys_darwin.go
index 6d7460fae2afc8e4c5c9b0d37dcb3110eb822770..0f91685d6ca14d18433959f511ac18259273be1c 100644 (file)
--- a/src/runtime/sys_darwin.go
+++ b/src/runtime/sys_darwin.go
@@ -274,7 +274,7 @@ func nanotime_trampoline()
 
 //go:nosplit
 //go:cgo_unsafe_args
-func walltime1() (int64, int32) {
+func walltime() (int64, int32) {
        var t timespec
        libcCall(unsafe.Pointer(abi.FuncPCABI0(walltime_trampoline)), unsafe.Pointer(&t))
        return t.tv_sec, int32(t.tv_nsec)

diff --git a/src/runtime/sys_dragonfly_amd64.s b/src/runtime/sys_dragonfly_amd64.s
index 43f864194d5fabe168b2414d736b79eaa70a79b9..d57bc2a7a4ee8591a5e2c58cde77772668f6aaa0 100644 (file)
--- a/src/runtime/sys_dragonfly_amd64.s
+++ b/src/runtime/sys_dragonfly_amd64.s
@@ -184,8 +184,8 @@ TEXT runtime·setitimer(SB), NOSPLIT, $-8
        SYSCALL
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVL    $232, AX // clock_gettime
        MOVQ    $0, DI          // CLOCK_REALTIME
        LEAQ    8(SP), SI

diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index 6e7737e89f428f745147b6c09c00d179adeb70f5..3ae5a9099f096aaa01f10b676dc41bad1437f7dc 100644 (file)
--- a/src/runtime/sys_linux_386.s
+++ b/src/runtime/sys_linux_386.s
@@ -219,8 +219,8 @@ TEXT runtime·mincore(SB),NOSPLIT,$0-16
        MOVL    AX, ret+12(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $8-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $8-12
        // We don't know how much stack space the VDSO code will need,
        // so switch to g0.
 

diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
index da8a1f766330a228320dc84be46870a08aad19a2..ee587de80561fc7aad1739cf561bf6f137c9fd8a 100644 (file)
--- a/src/runtime/sys_linux_amd64.s
+++ b/src/runtime/sys_linux_amd64.s
@@ -204,9 +204,9 @@ TEXT runtime·mincore(SB),NOSPLIT,$0-28
        MOVL    AX, ret+24(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
+// func walltime() (sec int64, nsec int32)
 // non-zero frame-size means bp is saved and restored
-TEXT runtime·walltime1(SB),NOSPLIT,$16-12
+TEXT runtime·walltime(SB),NOSPLIT,$16-12
        // We don't know how much stack space the VDSO code will need,
        // so switch to g0.
        // In particular, a kernel configured with CONFIG_OPTIMIZE_INLINING=n

diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
index 475f52344c7e9b3113af1e4cd0a549aa09b5d35b..02a5d4a6427402cdc0981364caf157bcd82d77a0 100644 (file)
--- a/src/runtime/sys_linux_arm.s
+++ b/src/runtime/sys_linux_arm.s
@@ -242,7 +242,7 @@ TEXT runtime·mincore(SB),NOSPLIT,$0
        MOVW    R0, ret+12(FP)
        RET
 
-TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+TEXT runtime·walltime(SB),NOSPLIT,$8-12
        // We don't know how much stack space the VDSO code will need,
        // so switch to g0.
 

diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s
index 198a5bacefbb70725b1020b1628a8f9bfd1db9a2..69ac16027800f3df0e61100b3278ee6357ed9f82 100644 (file)
--- a/src/runtime/sys_linux_arm64.s
+++ b/src/runtime/sys_linux_arm64.s
@@ -206,8 +206,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R0, ret+24(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$24-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$24-12
        MOVD    RSP, R20        // R20 is unchanged by C code
        MOVD    RSP, R1
 

diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
index c3e9f37694578e140cd38c7300b60bdc4b148db0..0206cb88bd463bf64849586ea3295351b974253e 100644 (file)
--- a/src/runtime/sys_linux_mips64x.s
+++ b/src/runtime/sys_linux_mips64x.s
@@ -213,8 +213,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R2, ret+24(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$16-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$16-12
        MOVV    R29, R16        // R16 is unchanged by C code
        MOVV    R29, R1
 
@@ -319,7 +319,7 @@ noswitch:
        BEQ     R25, fallback
 
        JAL     (R25)
-       // see walltime1 for detail
+       // see walltime for detail
        BEQ     R2, R0, finish
        MOVV    R0, runtime·vdsoClockgettimeSym(SB)
        MOVW    $1, R4 // CLOCK_MONOTONIC

diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
index fab2ab3892d7a01c80da81faa27722171f28d7f6..d5317d39570b32b52b40d6c6f1f4b67f6d70263c 100644 (file)
--- a/src/runtime/sys_linux_mipsx.s
+++ b/src/runtime/sys_linux_mipsx.s
@@ -218,8 +218,8 @@ TEXT runtime·mincore(SB),NOSPLIT,$0-16
        MOVW    R2, ret+12(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$8-12
        MOVW    $0, R4  // CLOCK_REALTIME
        MOVW    $4(R29), R5
        MOVW    $SYS_clock_gettime, R2

diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
index fd69ee70a5ccde10f2f03874f0dca85c9a4fedd6..75da130357a4d5c3aa5da39a19579022b8b737c4 100644 (file)
--- a/src/runtime/sys_linux_ppc64x.s
+++ b/src/runtime/sys_linux_ppc64x.s
@@ -184,8 +184,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R3, ret+24(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$16-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$16-12
        MOVD    R1, R15         // R15 is unchanged by C code
        MOVD    g_m(g), R21     // R21 = m
 

diff --git a/src/runtime/sys_linux_riscv64.s b/src/runtime/sys_linux_riscv64.s
index 626ab3912cbf749dcad8b095478ce39e86049c20..2389f1cc182489971fb050fcc9209fbbd470e474 100644 (file)
--- a/src/runtime/sys_linux_riscv64.s
+++ b/src/runtime/sys_linux_riscv64.s
@@ -219,8 +219,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    A0, ret+24(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$24-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$24-12
        MOV     $0, A0 // CLOCK_REALTIME
        MOV     $8(X2), A1
        MOV     $SYS_clock_gettime, A7

diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
index c15a1d5364b982e84d3b356e19d20711218aec08..916dfada8d58e68d6f91d5097d53d80d3b76bacb 100644 (file)
--- a/src/runtime/sys_linux_s390x.s
+++ b/src/runtime/sys_linux_s390x.s
@@ -194,8 +194,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R2, ret+24(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$16
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$16
        MOVW    $0, R2 // CLOCK_REALTIME
        MOVD    $tp-16(SP), R3
        MOVW    $SYS_clock_gettime, R1

diff --git a/src/runtime/sys_netbsd_386.s b/src/runtime/sys_netbsd_386.s
index d3f22454a40d746669181d79278230d6bf786022..8a33894892f1f1e0ca8b1b9612b470984aee89a9 100644 (file)
--- a/src/runtime/sys_netbsd_386.s
+++ b/src/runtime/sys_netbsd_386.s
@@ -206,8 +206,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-4
        INT     $0x80
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        LEAL    12(SP), BX
        MOVL    $CLOCK_REALTIME, 4(SP)  // arg 1 - clock_id
        MOVL    BX, 8(SP)               // arg 2 - tp

diff --git a/src/runtime/sys_netbsd_amd64.s b/src/runtime/sys_netbsd_amd64.s
index db76e86d1df011bbfa290815060d384d7da0fa47..02f5b4ba3b71c386ee2beb37db3e8c332e3aff34 100644 (file)
--- a/src/runtime/sys_netbsd_amd64.s
+++ b/src/runtime/sys_netbsd_amd64.s
@@ -238,8 +238,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-8
        SYSCALL
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVQ    $CLOCK_REALTIME, DI     // arg 1 - clock_id
        LEAQ    8(SP), SI               // arg 2 - tp
        MOVL    $SYS___clock_gettime50, AX

diff --git a/src/runtime/sys_netbsd_arm.s b/src/runtime/sys_netbsd_arm.s
index 82f9d2161e4639fec71fd1ded5acc4cc29067365..3a763b2a6a7730035488b5323ff32023c129f50e 100644 (file)
--- a/src/runtime/sys_netbsd_arm.s
+++ b/src/runtime/sys_netbsd_arm.s
@@ -216,8 +216,8 @@ TEXT runtime·setitimer(SB),NOSPLIT|NOFRAME,$0
        SWI $SYS___setitimer50
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVW $0, R0     // CLOCK_REALTIME
        MOVW $8(R13), R1
        SWI $SYS___clock_gettime50

diff --git a/src/runtime/sys_netbsd_arm64.s b/src/runtime/sys_netbsd_arm64.s
index 1446a27f4c8d77c8db9b66cb741315d980808d81..2d0b894d47f6f2037057d6357c853f4ee8acc507 100644 (file)
--- a/src/runtime/sys_netbsd_arm64.s
+++ b/src/runtime/sys_netbsd_arm64.s
@@ -224,8 +224,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-8
        SVC     $SYS___setitimer50
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVW    $CLOCK_REALTIME, R0     // arg 1 - clock_id
        MOVD    $8(RSP), R1             // arg 2 - tp
        SVC     $SYS___clock_gettime50

diff --git a/src/runtime/sys_openbsd2.go b/src/runtime/sys_openbsd2.go
index 73157043beabb6775ca401c0e12b65cc0e819239..16a518df173b4f45dd759ec8e56ccc52ffdee9e8 100644 (file)
--- a/src/runtime/sys_openbsd2.go
+++ b/src/runtime/sys_openbsd2.go
@@ -162,7 +162,7 @@ func nanotime1() int64 {
 func clock_gettime_trampoline()
 
 //go:nosplit
-func walltime1() (int64, int32) {
+func walltime() (int64, int32) {
        var ts timespec
        args := struct {
                clock_id int32

diff --git a/src/runtime/sys_openbsd_386.s b/src/runtime/sys_openbsd_386.s
index 24fbfd6266e1961a071b927667a0714e6811f227..0f7895aef8164730c65aee2334d104142f8367bc 100644 (file)
--- a/src/runtime/sys_openbsd_386.s
+++ b/src/runtime/sys_openbsd_386.s
@@ -170,8 +170,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-4
        INT     $0x80
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        LEAL    12(SP), BX
        MOVL    $0, 4(SP)               // arg 1 - clock_id
        MOVL    BX, 8(SP)               // arg 2 - tp

diff --git a/src/runtime/sys_openbsd_arm.s b/src/runtime/sys_openbsd_arm.s
index 9e18ce0e160ca2272865717b956a9b7287a8fda5..45d69a312a8cedf2fb9fa37d8bcb757bc2c7c1f0 100644 (file)
--- a/src/runtime/sys_openbsd_arm.s
+++ b/src/runtime/sys_openbsd_arm.s
@@ -188,8 +188,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$0
        INVOKE_SYSCALL
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVW    CLOCK_REALTIME, R0      // arg 1 - clock_id
        MOVW    $8(R13), R1             // arg 2 - tp
        MOVW    $87, R12                // sys_clock_gettime

diff --git a/src/runtime/sys_openbsd_mips64.s b/src/runtime/sys_openbsd_mips64.s
index 3e4d209081c6402b8a39cd9ba0493140b262ff5f..f8ae8e7c3014b7eb8a0ff28a5d517354ded709fc 100644 (file)
--- a/src/runtime/sys_openbsd_mips64.s
+++ b/src/runtime/sys_openbsd_mips64.s
@@ -186,8 +186,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$0
        SYSCALL
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB), NOSPLIT, $32
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVW    CLOCK_REALTIME, R4      // arg 1 - clock_id
        MOVV    $8(R29), R5             // arg 2 - tp
        MOVV    $87, R2                 // sys_clock_gettime

diff --git a/src/runtime/sys_plan9_386.s b/src/runtime/sys_plan9_386.s
index f9969f6d1001b19e3e23c73d1695eef7d99bba80..b3d2f1376d624c8b97e9e37ab95e53ee74fcf84e 100644 (file)
--- a/src/runtime/sys_plan9_386.s
+++ b/src/runtime/sys_plan9_386.s
@@ -102,8 +102,8 @@ TEXT runtime·nsec(SB),NOSPLIT,$8
        MOVL    $-1, ret_hi+8(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$8-12
        CALL    runtime·nanotime1(SB)
        MOVL    0(SP), AX
        MOVL    4(SP), DX

diff --git a/src/runtime/sys_plan9_amd64.s b/src/runtime/sys_plan9_amd64.s
index 383622b5a6cc77c662e9ae199f473c6d836d1ea6..731306ab448463217fd5a8dd1a5ab273d081e386 100644 (file)
--- a/src/runtime/sys_plan9_amd64.s
+++ b/src/runtime/sys_plan9_amd64.s
@@ -88,8 +88,8 @@ TEXT runtime·nsec(SB),NOSPLIT,$0
        MOVQ    AX, ret+8(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$8-12
        CALL    runtime·nanotime1(SB)
        MOVQ    0(SP), AX
 

diff --git a/src/runtime/sys_plan9_arm.s b/src/runtime/sys_plan9_arm.s
index 9fbe30536dc2d3875b91a21c54ce1d51012931a5..53430857437793c2877c9f7cecf1d97c573dc09c 100644 (file)
--- a/src/runtime/sys_plan9_arm.s
+++ b/src/runtime/sys_plan9_arm.s
@@ -138,8 +138,8 @@ TEXT runtime·nsec(SB),NOSPLIT|NOFRAME,$0-12
        MOVW    R0, ret_hi+8(FP)
        RET
 
-// func walltime1() (sec int64, nsec int32)
-TEXT runtime·walltime1(SB),NOSPLIT,$12-12
+// func walltime() (sec int64, nsec int32)
+TEXT runtime·walltime(SB),NOSPLIT,$12-12
        // use nsec system call to get current time in nanoseconds
        MOVW    $sysnsec_lo-8(SP), R0   // destination addr
        MOVW    R0,res-12(SP)

diff --git a/src/runtime/sys_wasm.s b/src/runtime/sys_wasm.s
index e7a657009538c987c7441d2f13f724952ce79804..164dd16ec9ff13a88a0abbf59bbc4e7803d0aca6 100644 (file)
--- a/src/runtime/sys_wasm.s
+++ b/src/runtime/sys_wasm.s
@@ -185,7 +185,7 @@ TEXT ·nanotime1(SB), NOSPLIT, $0
        CallImport
        RET
 
-TEXT ·walltime1(SB), NOSPLIT, $0
+TEXT ·walltime(SB), NOSPLIT, $0
        CallImport
        RET
 

diff --git a/src/runtime/timestub.go b/src/runtime/timestub.go
index 44e65845cb95dfbcd8acb3fdbdc0465a29c1d1ba..6f16c70b8160b18a0d1131230914c6a63a5ea88a 100644 (file)
--- a/src/runtime/timestub.go
+++ b/src/runtime/timestub.go
@@ -16,6 +16,6 @@ import _ "unsafe" // for go:linkname
 
 //go:linkname time_now time.now
 func time_now() (sec int64, nsec int32, mono int64) {
-       sec, nsec = walltime1()
+       sec, nsec = walltime()
        return sec, nsec, nanotime()
 }

diff --git a/src/runtime/timestub2.go b/src/runtime/timestub2.go
index 53b10885afc9a609190f120c354b36393c6804a0..d66579440ec7fbfdb7a8c80b6ffe75d8136fa734 100644 (file)
--- a/src/runtime/timestub2.go
+++ b/src/runtime/timestub2.go
@@ -7,4 +7,4 @@
 
 package runtime
 
-func walltime1() (sec int64, nsec int32)
+func walltime() (sec int64, nsec int32)

diff --git a/src/runtime/vdso_freebsd.go b/src/runtime/vdso_freebsd.go
index 74b2f1435a192f4d9d8e785f6ed5272a34228c65..7ca7b2810bf0de4920f35cec583e14061dcd9452 100644 (file)
--- a/src/runtime/vdso_freebsd.go
+++ b/src/runtime/vdso_freebsd.go
@@ -106,7 +106,7 @@ func nanotime1() int64 {
        return int64((1e9 * uint64(bt.sec)) + ((1e9 * uint64(bt.frac>>32)) >> 32))
 }
 
-func walltime1() (sec int64, nsec int32) {
+func walltime() (sec int64, nsec int32) {
        bt := vdsoClockGettime(_CLOCK_REALTIME)
        if bt == zeroBintime {
                return fallback_walltime()