summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-11-14 14:50:00 -0500
committerRuss Cox <rsc@golang.org>2014-11-14 14:50:00 -0500
commit307b9d78ce5a9975b2167786a89a7a8e96c2ab57 (patch)
tree4910d3e3c853ef5fbeed6b1375a22ec319d7fd5b
parent0b7f128e76956367ddb4f9ddbee4477d3b462e96 (diff)
downloadgo-307b9d78ce5a9975b2167786a89a7a8e96c2ab57.tar.gz
[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://codereview.appspot.com/177770043
-rw-r--r--src/runtime/defs_dragonfly_amd64.go4
-rw-r--r--src/runtime/defs_freebsd_386.go4
-rw-r--r--src/runtime/defs_freebsd_amd64.go4
-rw-r--r--src/runtime/defs_freebsd_arm.go4
-rw-r--r--src/runtime/defs_linux_386.go4
-rw-r--r--src/runtime/defs_linux_amd64.go4
-rw-r--r--src/runtime/defs_linux_arm.go4
-rw-r--r--src/runtime/defs_openbsd_386.go4
-rw-r--r--src/runtime/defs_openbsd_amd64.go4
-rw-r--r--src/runtime/os1_freebsd.go2
-rw-r--r--src/runtime/os1_linux.go4
-rw-r--r--src/runtime/os1_openbsd.go2
12 files changed, 22 insertions, 22 deletions
diff --git a/src/runtime/defs_dragonfly_amd64.go b/src/runtime/defs_dragonfly_amd64.go
index 7e9597705..3ac10b090 100644
--- 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 2cb3a8fdb..6938c1873 100644
--- 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 a2646fb24..de98e7a3c 100644
--- 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 e86ce45b4..744330f4b 100644
--- 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 a468f60d9..ddf592c91 100644
--- 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 7a1caea74..7f8f5816c 100644
--- 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 7f8300293..a874b1594 100644
--- 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 d7cdbd227..4b6015811 100644
--- 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 122f46cf3..3c27c9144 100644
--- 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 dd22b61d6..2cacfbae6 100644
--- 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 0d24c5edc..67fa6391e 100644
--- 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 5c6ea7412..d5ffe10a8 100644
--- 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
}