Skip to content

Commit 4230044

Browse files
committed
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
1 parent 6795687 commit 4230044

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

src/cmd/5l/obj.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@ archinit(void)
9595

9696
// embed goarm to runtime.goarm
9797
s = linklookup(ctxt, "runtime.goarm", 0);
98-
s->dupok = 1;
98+
s->type = SRODATA;
9999
adduint8(ctxt, s, goarm);
100100
}

src/pkg/runtime/asm_arm.s

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ TEXT runtime·breakpoint(SB),NOSPLIT,$0-0
8989
WORD $0xe1200071 // BKPT 0x0001
9090
RET
9191

92-
GLOBL runtime·goarm(SB), $4
93-
9492
TEXT runtime·asminit(SB),NOSPLIT,$0-0
9593
// disable runfast (flush-to-zero) mode of vfp if runtime.goarm > 5
9694
MOVW runtime·goarm(SB), R11

src/pkg/runtime/os_linux_arm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
static uint32 runtime·randomNumber;
1717
uint8 runtime·armArch = 6; // we default to ARMv6
1818
uint32 runtime·hwcap; // set by setup_auxv
19-
uint8 runtime·goarm; // set by 5l
19+
extern uint8 runtime·goarm; // set by 5l
2020

2121
void
2222
runtime·checkgoarm(void)

0 commit comments

Comments
 (0)