From: Russ Cox <rsc@golang.org>
Date: Thu, 4 Sep 2014 05:38:49 +0000 (-0400)
Subject: runtime: fix int64 reconstruction in semasleep
X-Git-Tag: go1.4beta1~546
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b143feb1431b58c02be6edca6bc5f6067b22a14d;p=gostls13.git

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
---

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;