]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: disable preemption again to fix linux build
authorIan Lance Taylor <iant@golang.org>
Wed, 17 Jul 2013 23:15:46 +0000 (16:15 -0700)
committerIan Lance Taylor <iant@golang.org>
Wed, 17 Jul 2013 23:15:46 +0000 (16:15 -0700)
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

src/pkg/runtime/proc.c

index 74e92a63faf216b9c008dd87c28f29775ad7a672..3ce281fc775a0cb4999c961c87b347e0bc9130f3 100644 (file)
@@ -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;