Skip to content

Commit

Permalink
cmd/oldlink: delete darwin/386 host object loading support
Browse files Browse the repository at this point in the history 
In Go 1.15, the darwin/386 port is gone.

Updates #37610.

Change-Id: I11627c03403d4d4a3e0950fdedd0d850ae24b439
Reviewed-on: https://go-review.googlesource.com/c/go/+/227766
Run-TryBot: Cherry Zhang <[email protected]>
Reviewed-by: Austin Clements <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
  • Loading branch information
@cherrymui
cherrymui committed Apr 9, 2020
1 parent a3ef804 commit b191c60
Showing 1 changed file with 3 additions and 100 deletions.
103 changes: 3 additions & 100 deletions src/cmd/oldlink/internal/loadmacho/ldmacho.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,11 +491,6 @@ func load(arch *sys.Arch, localSymVersion int, lookup func(string, int) *sym.Sym
if e != binary.LittleEndian || m.cputype != LdMachoCpuAmd64 {
return errorf("mach-o object but not amd64")
}

case sys.I386:
if e != binary.LittleEndian || m.cputype != LdMachoCpu386 {
return errorf("mach-o object but not 386")
}
}

m.cmd = make([]ldMachoCmd, ncmd)
Expand Down Expand Up @@ -718,91 +713,13 @@ func load(arch *sys.Arch, localSymVersion int, lookup func(string, int) *sym.Sym
}
r := make([]sym.Reloc, sect.nreloc)
rpi := 0
Reloc:
for j := uint32(0); j < sect.nreloc; j++ {
rp := &r[rpi]
rel := &sect.rel[j]
if rel.scattered != 0 {
if arch.Family != sys.I386 {
// mach-o only uses scattered relocation on 32-bit platforms
return errorf("%v: unexpected scattered relocation", s)
}

// on 386, rewrite scattered 4/1 relocation and some
// scattered 2/1 relocation into the pseudo-pc-relative
// reference that it is.
// assume that the second in the pair is in this section
// and use that as the pc-relative base.
if j+1 >= sect.nreloc {
return errorf("unsupported scattered relocation %d", int(rel.type_))
}

if sect.rel[j+1].scattered == 0 || sect.rel[j+1].type_ != 1 || (rel.type_ != 4 && rel.type_ != 2) || uint64(sect.rel[j+1].value) < sect.addr || uint64(sect.rel[j+1].value) >= sect.addr+sect.size {
return errorf("unsupported scattered relocation %d/%d", int(rel.type_), int(sect.rel[j+1].type_))
}

rp.Siz = rel.length
rp.Off = int32(rel.addr)

// NOTE(rsc): I haven't worked out why (really when)
// we should ignore the addend on a
// scattered relocation, but it seems that the
// common case is we ignore it.
// It's likely that this is not strictly correct
// and that the math should look something
// like the non-scattered case below.
rp.Add = 0

// want to make it pc-relative aka relative to rp->off+4
// but the scatter asks for relative to off = sect->rel[j+1].value - sect->addr.
// adjust rp->add accordingly.
rp.Type = objabi.R_PCREL

rp.Add += int64(uint64(int64(rp.Off)+4) - (uint64(sect.rel[j+1].value) - sect.addr))

// now consider the desired symbol.
// find the section where it lives.
for k := 0; uint32(k) < c.seg.nsect; k++ {
ks := &c.seg.sect[k]
if ks.addr <= uint64(rel.value) && uint64(rel.value) < ks.addr+ks.size {
if ks.sym != nil {
rp.Sym = ks.sym
rp.Add += int64(uint64(rel.value) - ks.addr)
} else if ks.segname == "__IMPORT" && ks.name == "__pointers" {
// handle reference to __IMPORT/__pointers.
// how much worse can this get?
// why are we supporting 386 on the mac anyway?
rp.Type = objabi.MachoRelocOffset + MACHO_FAKE_GOTPCREL

// figure out which pointer this is a reference to.
k = int(uint64(ks.res1) + (uint64(rel.value)-ks.addr)/4)

// load indirect table for __pointers
// fetch symbol number
if dsymtab == nil || k < 0 || uint32(k) >= dsymtab.nindirectsyms || dsymtab.indir == nil {
return errorf("invalid scattered relocation: indirect symbol reference out of range")
}

k = int(dsymtab.indir[k])
if k < 0 || uint32(k) >= symtab.nsym {
return errorf("invalid scattered relocation: symbol reference out of range")
}

rp.Sym = symtab.sym[k].sym
} else {
return errorf("unsupported scattered relocation: reference to %s/%s", ks.segname, ks.name)
}

rpi++

// skip #1 of 2 rel; continue skips #2 of 2.
j++

continue Reloc
}
}

return errorf("unsupported scattered relocation: invalid address %#x", rel.addr)
// mach-o only uses scattered relocation on 32-bit platforms,
// which are no longer supported.
return errorf("%v: unexpected scattered relocation", s)
}

rp.Siz = rel.length
Expand Down Expand Up @@ -840,12 +757,6 @@ func load(arch *sys.Arch, localSymVersion int, lookup func(string, int) *sym.Sym
rp.Add -= int64(secaddr)
}

// For i386 Mach-O PC-relative, the addend is written such that
// it *is* the PC being subtracted. Use that to make
// it match our version of PC-relative.
if rel.pcrel != 0 && arch.Family == sys.I386 {
rp.Add += int64(rp.Off) + int64(rp.Siz)
}
if rel.extrn == 0 {
if rel.symnum < 1 || rel.symnum > c.seg.nsect {
return errorf("invalid relocation: section reference out of range %d vs %d", rel.symnum, c.seg.nsect)
Expand All @@ -855,14 +766,6 @@ func load(arch *sys.Arch, localSymVersion int, lookup func(string, int) *sym.Sym
if rp.Sym == nil {
return errorf("invalid relocation: %s", c.seg.sect[rel.symnum-1].name)
}

// References to symbols in other sections
// include that information in the addend.
// We only care about the delta from the
// section base.
if arch.Family == sys.I386 {
rp.Add -= int64(c.seg.sect[rel.symnum-1].addr)
}
} else {
if rel.symnum >= symtab.nsym {
return errorf("invalid relocation: symbol reference out of range")
Expand Down

0 comments on commit b191c60

Please sign in to comment.