runtime: remove non-extern decls of runtime.goarm

The linker is in charge of providing the one true declaration.

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

diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 96198f99c08d3023926525dec14b2e9fbc52f2bb..591aef8590543e6872db4856159da49bc76e4f02 100644 (file)
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -95,6 +95,6 @@ archinit(void)
 
        // embed goarm to runtime.goarm
        s = linklookup(ctxt, "runtime.goarm", 0);
-       s->dupok = 1;
+       s->type = SRODATA;
        adduint8(ctxt, s, goarm);
 }

diff --git a/src/pkg/runtime/asm_arm.s b/src/pkg/runtime/asm_arm.s
index f483e6fc8a0b2c5d103b57e0f826a63f307ddf62..a9ccfbe508c51637f799d2cabcb33b4c99473149 100644 (file)
--- a/src/pkg/runtime/asm_arm.s
+++ b/src/pkg/runtime/asm_arm.s
@@ -89,8 +89,6 @@ TEXT runtime·breakpoint(SB),NOSPLIT,$0-0
        WORD    $0xe1200071     // BKPT 0x0001
        RET
 
-GLOBL runtime·goarm(SB), $4
-
 TEXT runtime·asminit(SB),NOSPLIT,$0-0
        // disable runfast (flush-to-zero) mode of vfp if runtime.goarm > 5
        MOVW    runtime·goarm(SB), R11

diff --git a/src/pkg/runtime/os_linux_arm.c b/src/pkg/runtime/os_linux_arm.c
index 570b3f0bee78c225f6f9f1e03a81abad1fe422c0..aad08b989005842bd1bd0660fde81ce29b244b1a 100644 (file)
--- a/src/pkg/runtime/os_linux_arm.c
+++ b/src/pkg/runtime/os_linux_arm.c
@@ -16,7 +16,7 @@
 static uint32 runtime·randomNumber;
 uint8  runtime·armArch = 6;   // we default to ARMv6
 uint32 runtime·hwcap; // set by setup_auxv
-uint8  runtime·goarm; // set by 5l
+extern uint8  runtime·goarm;  // set by 5l
 
 void
 runtime·checkgoarm(void)