[dev.cc] runtime: change set_sec to take int64

Fixes build.
Tested that all these systems can make.bash.

TBR=austin
CC=golang-codereviews
https://golang.org/cl/177770043

diff --git a/src/runtime/defs_dragonfly_amd64.go b/src/runtime/defs_dragonfly_amd64.go
index 7e95977054b6120c154d77bcdea42ba97c313e66..3ac10b0904d883e018f93f49cfd94bdc290dc6ed 100644 (file)
--- a/src/runtime/defs_dragonfly_amd64.go
+++ b/src/runtime/defs_dragonfly_amd64.go
@@ -180,8 +180,8 @@ type timespec struct {
        tv_nsec int64
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = int64(x)
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = x
 }
 
 type timeval struct {

diff --git a/src/runtime/defs_freebsd_386.go b/src/runtime/defs_freebsd_386.go
index 2cb3a8fdb3f97f8576adb45b71f46077b4b9ed29..6938c18736ff65034e434ebb673cd7b161e746d3 100644 (file)
--- a/src/runtime/defs_freebsd_386.go
+++ b/src/runtime/defs_freebsd_386.go
@@ -185,8 +185,8 @@ type timespec struct {
        tv_nsec int32
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = x
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = int32(x)
 }
 
 type timeval struct {

diff --git a/src/runtime/defs_freebsd_amd64.go b/src/runtime/defs_freebsd_amd64.go
index a2646fb24d63004f3c6fdea00e2d18a58ddf628a..de98e7a3c13485bf62158819a319dd0290f2a918 100644 (file)
--- a/src/runtime/defs_freebsd_amd64.go
+++ b/src/runtime/defs_freebsd_amd64.go
@@ -196,8 +196,8 @@ type timespec struct {
        tv_nsec int64
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = int64(x)
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = x
 }
 
 type timeval struct {

diff --git a/src/runtime/defs_freebsd_arm.go b/src/runtime/defs_freebsd_arm.go
index e86ce45b4cf5ad1540cd202ea2f3b025c29ae88e..744330f4b3e2bf83e14250ea9d27a52a665f9962 100644 (file)
--- a/src/runtime/defs_freebsd_arm.go
+++ b/src/runtime/defs_freebsd_arm.go
@@ -157,8 +157,8 @@ type timespec struct {
        pad_cgo_0 [4]byte
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = int64(x)
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = x
 }
 
 type timeval struct {

diff --git a/src/runtime/defs_linux_386.go b/src/runtime/defs_linux_386.go
index a468f60d9eb37fb8197bcf6177cda3b7202870f8..ddf592c91bd350193f56a3d7ffbd80d73b150400 100644 (file)
--- a/src/runtime/defs_linux_386.go
+++ b/src/runtime/defs_linux_386.go
@@ -130,8 +130,8 @@ type timespec struct {
        tv_nsec int32
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = x
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = int32(x)
 }
 
 func (ts *timespec) set_nsec(x int32) {

diff --git a/src/runtime/defs_linux_amd64.go b/src/runtime/defs_linux_amd64.go
index 7a1caea74e06ceb33dbaafacb6fb7ae190d858c8..7f8f5816c62b566656e2800f470a527e724d53d3 100644 (file)
--- a/src/runtime/defs_linux_amd64.go
+++ b/src/runtime/defs_linux_amd64.go
@@ -92,8 +92,8 @@ type timespec struct {
        tv_nsec int64
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = int64(x)
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = x
 }
 
 func (ts *timespec) set_nsec(x int32) {

diff --git a/src/runtime/defs_linux_arm.go b/src/runtime/defs_linux_arm.go
index 7f8300293a7478d8cf046190b7f04b7c3df96242..a874b15941310e99d6785711b6f35a5317423dfd 100644 (file)
--- a/src/runtime/defs_linux_arm.go
+++ b/src/runtime/defs_linux_arm.go
@@ -84,8 +84,8 @@ type timespec struct {
        tv_nsec int32
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = x
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = int32(x)
 }
 
 func (ts *timespec) set_nsec(x int32) {

diff --git a/src/runtime/defs_openbsd_386.go b/src/runtime/defs_openbsd_386.go
index d7cdbd2273ee987ce72ff4f96c095a6e2aa29ab0..4b60158115e7e2d3bcad80b5ad495a3eadcda40d 100644 (file)
--- a/src/runtime/defs_openbsd_386.go
+++ b/src/runtime/defs_openbsd_386.go
@@ -138,8 +138,8 @@ type timespec struct {
        tv_nsec int32
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = int64(x)
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = x
 }
 
 func (ts *timespec) set_nsec(x int32) {

diff --git a/src/runtime/defs_openbsd_amd64.go b/src/runtime/defs_openbsd_amd64.go
index 122f46cf33ea6faf759bd56fb716d022aa281935..3c27c9144fc7c384ebafb1716db2b69bfe79f29a 100644 (file)
--- a/src/runtime/defs_openbsd_amd64.go
+++ b/src/runtime/defs_openbsd_amd64.go
@@ -149,8 +149,8 @@ type timespec struct {
        tv_nsec int64
 }
 
-func (ts *timespec) set_sec(x int32) {
-       ts.tv_sec = int64(x)
+func (ts *timespec) set_sec(x int64) {
+       ts.tv_sec = x
 }
 
 func (ts *timespec) set_nsec(x int32) {

diff --git a/src/runtime/os1_freebsd.go b/src/runtime/os1_freebsd.go
index dd22b61d6b78d3829e39781079c3dfe9a6ef58dd..2cacfbae61f1881b5c37055c1c207aa15fa56d35 100644 (file)
--- a/src/runtime/os1_freebsd.go
+++ b/src/runtime/os1_freebsd.go
@@ -42,7 +42,7 @@ func futexsleep1(addr *uint32, val uint32, ns int64) {
        if ns >= 0 {
                var ts timespec
                ts.tv_nsec = 0
-               ts.set_sec(timediv(ns, 1000000000, (*int32)(unsafe.Pointer(&ts.tv_nsec))))
+               ts.set_sec(int64(timediv(ns, 1000000000, (*int32)(unsafe.Pointer(&ts.tv_nsec)))))
                tsp = &ts
        }
        ret := sys_umtx_op(addr, _UMTX_OP_WAIT_UINT_PRIVATE, val, nil, tsp)

diff --git a/src/runtime/os1_linux.go b/src/runtime/os1_linux.go
index 0d24c5edc9dccae0ba19079c6bf96d7013c117fe..67fa6391e1d47c4738ee70ff35b2ed4611f4cb63 100644 (file)
--- a/src/runtime/os1_linux.go
+++ b/src/runtime/os1_linux.go
@@ -48,11 +48,11 @@ func futexsleep(addr *uint32, val uint32, ns int64) {
        // is not, even timediv is too heavy, and we really need to use just an
        // ordinary machine instruction.
        if ptrSize == 8 {
-               ts.set_sec(int32(ns / 1000000000))
+               ts.set_sec(ns / 1000000000)
                ts.set_nsec(int32(ns % 1000000000))
        } else {
                ts.tv_nsec = 0
-               ts.set_sec(timediv(ns, 1000000000, (*int32)(unsafe.Pointer(&ts.tv_nsec))))
+               ts.set_sec(int64(timediv(ns, 1000000000, (*int32)(unsafe.Pointer(&ts.tv_nsec)))))
        }
        futex(unsafe.Pointer(addr), _FUTEX_WAIT, val, unsafe.Pointer(&ts), nil, 0)
 }

diff --git a/src/runtime/os1_openbsd.go b/src/runtime/os1_openbsd.go
index 5c6ea74121d55b97786b6e2727dca14281ce32fb..d5ffe10a8170484c2066ebf09e40f283ef535f6b 100644 (file)
--- a/src/runtime/os1_openbsd.go
+++ b/src/runtime/os1_openbsd.go
@@ -56,7 +56,7 @@ func semasleep(ns int64) int32 {
                var ts timespec
                var nsec int32
                ns += nanotime()
-               ts.set_sec(timediv(ns, 1000000000, &nsec))
+               ts.set_sec(int64(timediv(ns, 1000000000, &nsec)))
                ts.set_nsec(nsec)
                tsp = &ts
        }