Skip to content

Commit f78dc1d

Browse files
mwhudsonianlancetaylor
authored andcommitted
runtime: rename ·main·f to ·mainPC to avoid duplicate symbol
runtime·main·f is normalized by the linker to runtime.main.f, as is the compiler-generated symbol runtime.main·f. Change the former to runtime·mainPC instead. Fixes issue #9934 Change-Id: I656a6fa6422d45385fa2cc55bd036c6affa1abfe Reviewed-on: https://go-review.googlesource.com/8234 Run-TryBot: Ian Lance Taylor <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent b841785 commit f78dc1d

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

src/runtime/asm_386.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ ok:
114114
CALL runtime·schedinit(SB)
115115

116116
// create a new goroutine to start program
117-
PUSHL $runtime·main·f(SB) // entry
117+
PUSHL $runtime·mainPC(SB) // entry
118118
PUSHL $0 // arg size
119119
CALL runtime·newproc(SB)
120120
POPL AX
@@ -126,8 +126,8 @@ ok:
126126
INT $3
127127
RET
128128

129-
DATA runtime·main·f+0(SB)/4,$runtime·main(SB)
130-
GLOBL runtime·main·f(SB),RODATA,$4
129+
DATA runtime·mainPC+0(SB)/4,$runtime·main(SB)
130+
GLOBL runtime·mainPC(SB),RODATA,$4
131131

132132
TEXT runtime·breakpoint(SB),NOSPLIT,$0-0
133133
INT $3

src/runtime/asm_amd64.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ok:
109109
CALL runtime·schedinit(SB)
110110

111111
// create a new goroutine to start program
112-
MOVQ $runtime·main·f(SB), AX // entry
112+
MOVQ $runtime·mainPC(SB), AX // entry
113113
PUSHQ AX
114114
PUSHQ $0 // arg size
115115
CALL runtime·newproc(SB)
@@ -122,8 +122,8 @@ ok:
122122
MOVL $0xf1, 0xf1 // crash
123123
RET
124124

125-
DATA runtime·main·f+0(SB)/8,$runtime·main(SB)
126-
GLOBL runtime·main·f(SB),RODATA,$8
125+
DATA runtime·mainPC+0(SB)/8,$runtime·main(SB)
126+
GLOBL runtime·mainPC(SB),RODATA,$8
127127

128128
TEXT runtime·breakpoint(SB),NOSPLIT,$0-0
129129
BYTE $0xcc

src/runtime/asm_amd64p32.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ok:
7373
CALL runtime·schedinit(SB)
7474

7575
// create a new goroutine to start program
76-
MOVL $runtime·main·f(SB), AX // entry
76+
MOVL $runtime·mainPC(SB), AX // entry
7777
MOVL $0, 0(SP)
7878
MOVL AX, 4(SP)
7979
CALL runtime·newproc(SB)
@@ -84,8 +84,8 @@ ok:
8484
MOVL $0xf1, 0xf1 // crash
8585
RET
8686

87-
DATA runtime·main·f+0(SB)/4,$runtime·main(SB)
88-
GLOBL runtime·main·f(SB),RODATA,$4
87+
DATA runtime·mainPC+0(SB)/4,$runtime·main(SB)
88+
GLOBL runtime·mainPC(SB),RODATA,$4
8989

9090
TEXT runtime·breakpoint(SB),NOSPLIT,$0-0
9191
INT $3

src/runtime/asm_arm.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ TEXT runtime·rt0_go(SB),NOSPLIT,$-4
6060
BL runtime·schedinit(SB)
6161

6262
// create a new goroutine to start program
63-
MOVW $runtime·main·f(SB), R0
63+
MOVW $runtime·mainPC(SB), R0
6464
MOVW.W R0, -4(R13)
6565
MOVW $8, R0
6666
MOVW.W R0, -4(R13)
@@ -76,8 +76,8 @@ TEXT runtime·rt0_go(SB),NOSPLIT,$-4
7676
MOVW $1000, R1
7777
MOVW R0, (R1) // fail hard
7878

79-
DATA runtime·main·f+0(SB)/4,$runtime·main(SB)
80-
GLOBL runtime·main·f(SB),RODATA,$4
79+
DATA runtime·mainPC+0(SB)/4,$runtime·main(SB)
80+
GLOBL runtime·mainPC(SB),RODATA,$4
8181

8282
TEXT runtime·breakpoint(SB),NOSPLIT,$0-0
8383
// gdb won't skip this breakpoint instruction automatically,

src/runtime/asm_arm64.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ nocgo:
6060
BL runtime·schedinit(SB)
6161

6262
// create a new goroutine to start program
63-
MOVD $runtime·main·f(SB), R0 // entry
63+
MOVD $runtime·mainPC(SB), R0 // entry
6464
MOVD RSP, R7
6565
MOVD.W $0, -8(R7)
6666
MOVD.W R0, -8(R7)
@@ -77,8 +77,8 @@ nocgo:
7777
MOVD R0, (R0) // boom
7878
UNDEF
7979

80-
DATA runtime·main·f+0(SB)/8,$runtime·main(SB)
81-
GLOBL runtime·main·f(SB),RODATA,$8
80+
DATA runtime·mainPC+0(SB)/8,$runtime·main(SB)
81+
GLOBL runtime·mainPC(SB),RODATA,$8
8282

8383
TEXT runtime·breakpoint(SB),NOSPLIT,$-8-0
8484
BRK

src/runtime/asm_ppc64x.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ nocgo:
6969
BL runtime·schedinit(SB)
7070

7171
// create a new goroutine to start program
72-
MOVD $runtime·main·f(SB), R3 // entry
72+
MOVD $runtime·mainPC(SB), R3 // entry
7373
MOVDU R3, -8(R1)
7474
MOVDU R0, -8(R1)
7575
MOVDU R0, -8(R1)
@@ -82,8 +82,8 @@ nocgo:
8282
MOVD R0, 1(R0)
8383
RETURN
8484

85-
DATA runtime·main·f+0(SB)/8,$runtime·main(SB)
86-
GLOBL runtime·main·f(SB),RODATA,$8
85+
DATA runtime·mainPC+0(SB)/8,$runtime·main(SB)
86+
GLOBL runtime·mainPC(SB),RODATA,$8
8787

8888
TEXT runtime·breakpoint(SB),NOSPLIT,$-8-0
8989
MOVD R0, 2(R0) // TODO: TD

0 commit comments

Comments
 (0)