commit d5bfa6cebb19a154cbfbc53f6e647d2ca7adef68
author Ian Lance Taylor <iant@golang.org> Thu May 11 17:54:14 2017 -0700
committer Ian Lance Taylor <iant@golang.org> Fri May 12 12:48:54 2017 +0000
tree 022a1cc45ab2e9dc5f73d02afc352e68109c3a68
parent 3c1258156a2ae483c5cc523cb7a3c3374cbe7c2c

runtime: fix build for non-split-stack systems

Change memory allocation accounting for stacks to use stacks_sys,
since that seems to be what it is for.

Change-Id: I9875af55e00f20e629aba2b321a3f12071e95fc6
Reviewed-on: https://go-review.googlesource.com/43297
Reviewed-by: Than McIntosh <thanm@google.com>

libgo/go/runtime/runtime2.go

diff --git a/libgo/go/runtime/runtime2.go b/libgo/go/runtime/runtime2.go
index 8deb620..8bfdcbc 100644
--- a/libgo/go/runtime/runtime2.go
+++ b/libgo/go/runtime/runtime2.go
@@ -793,3 +793,10 @@
 // sigset is the Go version of the C type sigset_t.
 // _sigset_t is defined by the Makefile from <signal.h>.
 type sigset _sigset_t
+
+// getMemstats returns a pointer to the internal memstats variable,
+// for C code.
+//go:linkname getMemstats runtime.getMemstats
+func getMemstats() *mstats {
+	return &memstats
+}

libgo/runtime/proc.c

diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
index cc56642..14ee673 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -406,6 +406,8 @@
   __asm__(GOSYM_PREFIX "runtime.globrunqput");
 extern P* pidleget(void)
   __asm__(GOSYM_PREFIX "runtime.pidleget");
+extern struct mstats* getMemstats(void)
+  __asm__(GOSYM_PREFIX "runtime.getMemstats");
 
 bool runtime_isstarted;
 
@@ -726,7 +728,7 @@
                 // 32-bit mode, the Go allocation space is all of
                 // memory anyhow.
 		if(sizeof(void*) == 8) {
-			void *p = runtime_sysAlloc(stacksize, &mstats()->other_sys);
+			void *p = runtime_sysAlloc(stacksize, &getMemstats()->stacks_sys);
 			if(p == nil)
 				runtime_throw("runtime: cannot allocate memory for goroutine stack");
 			*ret_stack = (byte*)p;

libgo/runtime/stack.c

diff --git a/libgo/runtime/stack.c b/libgo/runtime/stack.c
index 98f98fe..1ce30db 100644
--- a/libgo/runtime/stack.c
+++ b/libgo/runtime/stack.c
@@ -80,7 +80,6 @@
 			scanstackblock(sp, (uintptr)(spsize), gcw);
 	}
 #else
-	M *mp;
 	byte* bottom;
 	byte* top;