aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/runtime
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-09-04 01:38:49 -0400
committerRuss Cox <rsc@golang.org>2014-09-04 01:38:49 -0400
commitb143feb1431b58c02be6edca6bc5f6067b22a14d (patch)
tree767789bbf150216855ff0bb58bd7a6c18f9e1a7e /src/pkg/runtime
parenta915cb47eef8acc8998414cd5f88c13614821e92 (diff)
downloadgo-b143feb1431b58c02be6edca6bc5f6067b22a14d.tar.xz
runtime: fix int64 reconstruction in semasleep
I had this right in one of my clients, but apparently not the one I submitted from. Fixes 386 builds. TBR=dfc CC=golang-codereviews https://golang.org/cl/138000045
Diffstat (limited to 'src/pkg/runtime')
-rw-r--r--src/pkg/runtime/os_darwin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pkg/runtime/os_darwin.c b/src/pkg/runtime/os_darwin.c
index 19181d60df..d3890eee52 100644
--- a/src/pkg/runtime/os_darwin.c
+++ b/src/pkg/runtime/os_darwin.c
@@ -418,7 +418,7 @@ semasleep(void)
int32 r, secs, nsecs;
int64 ns;
- ns = g->m->scalararg[0] | g->m->scalararg[1]<<32;
+ ns = (int64)(uint32)g->m->scalararg[0] | (int64)(uint32)g->m->scalararg[1]<<32;
g->m->scalararg[0] = 0;
g->m->scalararg[1] = 0;