[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 7e959770..3ac10b0 100644
--- a/src/runtime/defs_dragonfly_amd64.go
+++ b/src/runtime/defs_dragonfly_amd64.go
@@ -180,8 +180,8 @@
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 2cb3a8f..6938c18 100644
--- a/src/runtime/defs_freebsd_386.go
+++ b/src/runtime/defs_freebsd_386.go
@@ -185,8 +185,8 @@
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 a2646fb..de98e7a 100644
--- a/src/runtime/defs_freebsd_amd64.go
+++ b/src/runtime/defs_freebsd_amd64.go
@@ -196,8 +196,8 @@
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 e86ce45..744330f 100644
--- a/src/runtime/defs_freebsd_arm.go
+++ b/src/runtime/defs_freebsd_arm.go
@@ -157,8 +157,8 @@
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 a468f60..ddf592c 100644
--- a/src/runtime/defs_linux_386.go
+++ b/src/runtime/defs_linux_386.go
@@ -130,8 +130,8 @@
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 7a1caea..7f8f581 100644
--- a/src/runtime/defs_linux_amd64.go
+++ b/src/runtime/defs_linux_amd64.go
@@ -92,8 +92,8 @@
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 7f83002..a874b15 100644
--- a/src/runtime/defs_linux_arm.go
+++ b/src/runtime/defs_linux_arm.go
@@ -84,8 +84,8 @@
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 d7cdbd2..4b60158 100644
--- a/src/runtime/defs_openbsd_386.go
+++ b/src/runtime/defs_openbsd_386.go
@@ -138,8 +138,8 @@
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 122f46c..3c27c91 100644
--- a/src/runtime/defs_openbsd_amd64.go
+++ b/src/runtime/defs_openbsd_amd64.go
@@ -149,8 +149,8 @@
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 dd22b61..2cacfba 100644
--- a/src/runtime/os1_freebsd.go
+++ b/src/runtime/os1_freebsd.go
@@ -42,7 +42,7 @@
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 0d24c5e..67fa639 100644
--- a/src/runtime/os1_linux.go
+++ b/src/runtime/os1_linux.go
@@ -48,11 +48,11 @@
// 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 5c6ea74..d5ffe10 100644
--- a/src/runtime/os1_openbsd.go
+++ b/src/runtime/os1_openbsd.go
@@ -56,7 +56,7 @@
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
}
