From: Dmitriy Vyukov <dvyukov@google.com>
Date: Thu, 1 Aug 2013 11:19:45 +0000 (+0400)
Subject: runtime: fix netbsd/arm build
X-Git-Tag: go1.2rc2~839
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=21315c34281998be4f66fd6fae1d29c418f9b522;p=gostls13.git

runtime: fix netbsd/arm build
Currently fails with:
fatal error: runtime: stack split during syscall
goroutine 2 [stack split]:
_vasop(0x3ac4a0, 0x505f8f00, 0x7a5a8, 0x7, 0x1ed3797f, ...)
        src/pkg/runtime/vlrt_arm.c:513 fp=0x505f8ecc
runtime.semasleep(0xf8475800, 0xd)
        src/pkg/runtime/os_netbsd.c:97 +0x178 fp=0x505f8efc

R=rsc
CC=golang-dev
https://golang.org/cl/12246043
---

diff --git a/src/pkg/runtime/os_netbsd.c b/src/pkg/runtime/os_netbsd.c
index 9c0511d4c0..95c1070d1b 100644
--- a/src/pkg/runtime/os_netbsd.c
+++ b/src/pkg/runtime/os_netbsd.c
@@ -94,7 +94,7 @@ runtime·semasleep(int64 ns)
 				runtime·atomicstore(&m->waitsemalock, 0);
 				runtime·lwp_park(nil, 0, &m->waitsemacount, nil);
 			} else {
-				ns += runtime·nanotime();
+				ns = ns + runtime·nanotime();
 				// NOTE: tv_nsec is int64 on amd64, so this assumes a little-endian system.
 				ts.tv_nsec = 0;
 				ts.tv_sec = runtime·timediv(ns, 1000000000, (int32*)&ts.tv_nsec);