Skip to content

Commit 7be9158

Browse files
committed
cmd/link: remove all constants of elf
Use debug/elf instead. Related: CL 252478 CL 265317 Change-Id: If63b0458d9a6e825b40616bfb7a5a2c2e32402b4 Reviewed-on: https://go-review.googlesource.com/c/go/+/265318 Trust: Meng Zhuo <[email protected]> Run-TryBot: Meng Zhuo <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Joel Sing <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 368c401 commit 7be9158

File tree

10 files changed

+455
-789
lines changed

10 files changed

+455
-789
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ func adddynrel(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, s loade
354354
rela := ldr.MakeSymbolUpdater(syms.Rela)
355355
rela.AddAddrPlus(target.Arch, s, int64(r.Off()))
356356
if r.Siz() == 8 {
357-
rela.AddUint64(target.Arch, ld.ELF64_R_INFO(0, uint32(elf.R_X86_64_RELATIVE)))
357+
rela.AddUint64(target.Arch, elf.R_INFO(0, uint32(elf.R_X86_64_RELATIVE)))
358358
} else {
359359
ldr.Errorf(s, "unexpected relocation for dynamic symbol %s", ldr.SymName(targ))
360360
}
@@ -620,7 +620,7 @@ func addpltsym(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, s loade
620620
rela.AddAddrPlus(target.Arch, got.Sym(), got.Size()-8)
621621

622622
sDynid := ldr.SymDynid(s)
623-
rela.AddUint64(target.Arch, ld.ELF64_R_INFO(uint32(sDynid), uint32(elf.R_X86_64_JMP_SLOT)))
623+
rela.AddUint64(target.Arch, elf.R_INFO(uint32(sDynid), uint32(elf.R_X86_64_JMP_SLOT)))
624624
rela.AddUint64(target.Arch, 0)
625625

626626
ldr.SetPlt(s, int32(plt.Size()-16))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func adddynrel(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, s loade
231231
ld.Adddynsym(ldr, target, syms, targ)
232232
rel := ldr.MakeSymbolUpdater(syms.Rel)
233233
rel.AddAddrPlus(target.Arch, s, int64(r.Off()))
234-
rel.AddUint32(target.Arch, ld.ELF32_R_INFO(uint32(ldr.SymDynid(targ)), uint32(elf.R_ARM_GLOB_DAT))) // we need a nil + A dynamic reloc
234+
rel.AddUint32(target.Arch, elf.R_INFO32(uint32(ldr.SymDynid(targ)), uint32(elf.R_ARM_GLOB_DAT))) // we need a nil + A dynamic reloc
235235
su := ldr.MakeSymbolUpdater(s)
236236
su.SetRelocType(rIdx, objabi.R_CONST) // write r->add during relocsym
237237
su.SetRelocSym(rIdx, 0)
@@ -629,7 +629,7 @@ func addpltsym(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, s loade
629629
// rel
630630
rel.AddAddrPlus(target.Arch, got.Sym(), int64(ldr.SymGot(s)))
631631

632-
rel.AddUint32(target.Arch, ld.ELF32_R_INFO(uint32(ldr.SymDynid(s)), uint32(elf.R_ARM_JUMP_SLOT)))
632+
rel.AddUint32(target.Arch, elf.R_INFO32(uint32(ldr.SymDynid(s)), uint32(elf.R_ARM_JUMP_SLOT)))
633633
} else {
634634
ldr.Errorf(s, "addpltsym: unsupported binary format")
635635
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ func adddynrel(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, s loade
381381
rela := ldr.MakeSymbolUpdater(syms.Rela)
382382
rela.AddAddrPlus(target.Arch, s, int64(r.Off()))
383383
if r.Siz() == 8 {
384-
rela.AddUint64(target.Arch, ld.ELF64_R_INFO(0, uint32(elf.R_AARCH64_RELATIVE)))
384+
rela.AddUint64(target.Arch, elf.R_INFO(0, uint32(elf.R_AARCH64_RELATIVE)))
385385
} else {
386386
ldr.Errorf(s, "unexpected relocation for dynamic symbol %s", ldr.SymName(targ))
387387
}
@@ -913,7 +913,7 @@ func addpltsym(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, s loade
913913
rela.AddAddrPlus(target.Arch, gotplt.Sym(), gotplt.Size()-8)
914914
sDynid := ldr.SymDynid(s)
915915

916-
rela.AddUint64(target.Arch, ld.ELF64_R_INFO(uint32(sDynid), uint32(elf.R_AARCH64_JUMP_SLOT)))
916+
rela.AddUint64(target.Arch, elf.R_INFO(uint32(sDynid), uint32(elf.R_AARCH64_JUMP_SLOT)))
917917
rela.AddUint64(target.Arch, 0)
918918

919919
ldr.SetPlt(s, int32(plt.Size()-16))

0 commit comments

Comments
 (0)