Skip to content

Commit e5fc39d

Browse files
committed
cgo: add initial support for ppc64
The patch adds initial cgo support for ppc64. We should be able to build docker after this get applied.
1 parent 8ccafb1 commit e5fc39d

File tree

5 files changed

+39
-9
lines changed

5 files changed

+39
-9
lines changed

src/cmd/link/internal/ppc64/asm.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,12 @@ func adddynrel(ctxt *ld.Link, s *sym.Symbol, r *sym.Reloc) bool {
374374
}
375375

376376
func elfreloc1(ctxt *ld.Link, r *sym.Reloc, sectoff int64) bool {
377+
if r.Type == objabi.R_ADDR || r.Type == objabi.R_POWER_TLS || r.Type == objabi.R_CALLPOWER {
378+
} else {
379+
if ctxt.Arch.ByteOrder == binary.BigEndian {
380+
sectoff += 2
381+
}
382+
}
377383
ctxt.Out.Write64(uint64(sectoff))
378384

379385
elfsym := r.Xsym.ElfsymForReloc()

src/cmd/link/internal/ppc64/obj.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ func archinit(ctxt *ld.Link) {
9393
}
9494

9595
case objabi.Hlinux: /* ppc64 elf */
96-
if ctxt.Arch == sys.ArchPPC64 {
97-
*ld.FlagD = true // TODO(austin): ELF ABI v1 not supported yet
98-
}
9996
ld.Elfinit(ctxt)
10097
ld.HEADR = ld.ELFRESERVE
10198
if *ld.FlagTextAddr == -1 {

src/runtime/asm_ppc64x.s

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ TEXT runtime·rt0_go(SB),NOSPLIT,$0
3636
MOVD _cgo_init(SB), R12
3737
CMP R0, R12
3838
BEQ nocgo
39+
#ifdef GOARCH_ppc64
40+
MOVD 8(R12), R2
41+
MOVD (R12), R12
42+
#endif
3943
MOVD R12, CTR // r12 = "global function entry point"
4044
MOVD R13, R5 // arg 2: TLS base pointer
4145
MOVD $setg_gcc<>(SB), R4 // arg 1: setg
@@ -564,6 +568,11 @@ g0:
564568
MOVD R0, 0(R1) // clear back chain pointer (TODO can we give it real back trace information?)
565569
// This is a "global call", so put the global entry point in r12
566570
MOVD R3, R12
571+
572+
#ifdef GOARCH_ppc64
573+
MOVD 8(R12), R2
574+
MOVD (R12), R12
575+
#endif
567576
MOVD R12, CTR
568577
MOVD R4, R3 // arg in r3
569578
BL (CTR)
@@ -722,9 +731,20 @@ TEXT runtime·setg(SB), NOSPLIT, $0-8
722731
BL runtime·save_g(SB)
723732
RET
724733

734+
#ifdef GOARCH_ppc64
735+
TEXT setg_gcc<>(SB),NOSPLIT|NOFRAME,$0-0
736+
DWORD $_setg_gcc<>(SB)
737+
DWORD $0
738+
DWORD $0
739+
#endif
740+
725741
// void setg_gcc(G*); set g in C TLS.
726742
// Must obey the gcc calling convention.
743+
#ifdef GOARCH_ppc64le
727744
TEXT setg_gcc<>(SB),NOSPLIT|NOFRAME,$0-0
745+
#else
746+
TEXT _setg_gcc<>(SB),NOSPLIT|NOFRAME,$0-0
747+
#endif
728748
// The standard prologue clobbers R31, which is callee-save in
729749
// the C ABI, so we have to use $-8-0 and save LR ourselves.
730750
MOVD LR, R4

src/runtime/rt0_linux_ppc64.s

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,25 @@ TEXT _rt0_ppc64_linux(SB),NOSPLIT,$0
66
DWORD $0
77
DWORD $0
88

9+
TEXT main(SB),NOSPLIT,$0
10+
DWORD $_main<>(SB)
11+
DWORD $0
12+
DWORD $0
13+
914
TEXT _main<>(SB),NOSPLIT,$-8
1015
// In a statically linked binary, the stack contains argc,
1116
// argv as argc string pointers followed by a NULL, envv as a
1217
// sequence of string pointers followed by a NULL, and auxv.
1318
// There is no TLS base pointer.
1419
//
1520
// TODO(austin): Support ABI v1 dynamic linking entry point
16-
MOVD 0(R1), R3 // argc
17-
ADD $8, R1, R4 // argv
18-
BR main(SB)
19-
20-
TEXT main(SB),NOSPLIT,$-8
2121
MOVD $runtime·rt0_go(SB), R12
2222
MOVD R12, CTR
23+
MOVD _cgo_init(SB), R5
24+
CMP R0, R5
25+
BEQ nocgo
26+
BR (CTR)
27+
nocgo:
28+
MOVD 0(R1), R3 // argc
29+
ADD $8, R1, R4 // argv
2330
BR (CTR)

src/runtime/sys_linux_ppc64x.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ TEXT runtime·cgoSigtramp(SB),NOSPLIT|NOFRAME,$0
414414
DWORD $0
415415
DWORD $0
416416
TEXT runtime·_cgoSigtramp(SB),NOSPLIT,$0
417-
JMP runtime·sigtramp(SB)
417+
JMP runtime·_sigtramp(SB)
418418
#endif
419419

420420
TEXT runtime·sigprofNonGoWrapper<>(SB),NOSPLIT,$0

0 commit comments

Comments
 (0)