aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-10-18 13:01:10 -0400
committerRuss Cox <rsc@golang.org>2010-10-18 13:01:10 -0400
commit9cc8e9ef48d17bd7e8bb2c1c41406f51366a7925 (patch)
tree22897c9ac9f5c705b9cadeb78ab517f4435e2e64
parent99a10eff16b79cfb8ccf36e586532a40b17a203c (diff)
downloadgo-9cc8e9ef48d17bd7e8bb2c1c41406f51366a7925.tar.gz
go-9cc8e9ef48d17bd7e8bb2c1c41406f51366a7925.zip
runtime: fix amd64 build (broke by 386 support for Plan 9)
TBR=r CC=golang-dev https://golang.org/cl/2556041
-rw-r--r--src/pkg/runtime/386/asm.s1
-rw-r--r--src/pkg/runtime/runtime.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/pkg/runtime/386/asm.s b/src/pkg/runtime/386/asm.s
index 5f0d0ed468..bf4c97ba61 100644
--- a/src/pkg/runtime/386/asm.s
+++ b/src/pkg/runtime/386/asm.s
@@ -416,4 +416,3 @@ GLOBL m0(SB), $1024
GLOBL g0(SB), $1024
GLOBL tls0(SB), $32
GLOBL initcgo(SB), $4
-GLOBL isplan9(SB), $4
diff --git a/src/pkg/runtime/runtime.c b/src/pkg/runtime/runtime.c
index a8f8177331..9b874cec8d 100644
--- a/src/pkg/runtime/runtime.c
+++ b/src/pkg/runtime/runtime.c
@@ -147,7 +147,7 @@ args(int32 c, uint8 **v)
argv = v;
}
-extern int32 isplan9;
+int32 isplan9;
void
goargs(void)