From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 17 Jul 2013 23:15:46 +0000 (-0700)
Subject: runtime: disable preemption again to fix linux build
X-Git-Tag: go1.2rc2~1018
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1da96a30395b20cb4e2059c49bee05540e36aac6;p=gostls13.git

runtime: disable preemption again to fix linux build

Otherwise the tests in pkg/runtime fail:

runtime: unknown argument frame size for runtime.deferreturn called from 0x48657b [runtime_test.func·022]
fatal error: invalid stack
...

R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/11483043
---

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index 74e92a63fa..3ce281fc77 100644
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -2175,6 +2175,12 @@ preemptone(P *p)
 	M *mp;
 	G *gp;
 
+// Preemption requires more robust traceback routines.
+// For now, disable.
+// The if(1) silences a compiler warning about the rest of the
+// function being unreachable.
+if(1) return;
+
 	mp = p->m;
 	if(mp == nil || mp == m)
 		return;