diff options
| author | Ian Lance Taylor <iant@golang.org> | 2013-07-17 16:15:46 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2013-07-17 16:15:46 -0700 |
| commit | 1da96a30395b20cb4e2059c49bee05540e36aac6 (patch) | |
| tree | dadca712cda7fab600158db682b0c1c5a3f038cd /src/pkg/runtime/proc.c | |
| parent | 58ce655fd2efe2270ee852790eede952e179735e (diff) | |
| download | go-1da96a30395b20cb4e2059c49bee05540e36aac6.tar.xz | |
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
Diffstat (limited to 'src/pkg/runtime/proc.c')
| -rw-r--r-- | src/pkg/runtime/proc.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |