diff options
author | Russ Cox <rsc@golang.org> | 2014-09-04 01:38:49 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2014-09-04 01:38:49 -0400 |
commit | 9e842d4ca4e7e3930691fe3fd671025ed3b2d531 (patch) | |
tree | b92de9fda9418fd35c4762fe1c51abe7eca649d9 /src/pkg | |
parent | 5d32001d54ac41338d8b7be7cbc8849671cecaed (diff) | |
download | go-9e842d4ca4e7e3930691fe3fd671025ed3b2d531.tar.gz |
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://codereview.appspot.com/138000045
Diffstat (limited to 'src/pkg')
-rw-r--r-- | src/pkg/runtime/os_darwin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pkg/runtime/os_darwin.c b/src/pkg/runtime/os_darwin.c index 19181d60d..d3890eee5 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; |