Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.link] cmd/link: fix macho host objects

Browse source 
Small updates to macho loader, fixing some misunderstandings I had about
using the new object file format.

Change-Id: I9224b01ca327e3a087ebfa36800bd6eef6abcc80
Reviewed-on: https://go-review.googlesource.com/c/go/+/204097
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
Jeremy Faller 2019-10-29 10:52:20 -04:00
parent 931845aee3
commit 396a9b98ba
4 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/link/internal/ld/config.go
View file

@ -168,7 +168,7 @@ func canLinkHostObj(ctxt *Link) bool {
if !*flagNewobj { if !*flagNewobj {
return true return true
} }
return ctxt.IsELF return ctxt.IsELF || objabi.GOOS == "darwin"
} }
// mustLinkExternal reports whether the program being linked requires // mustLinkExternal reports whether the program being linked requires

3
src/cmd/link/internal/ld/lib.go
View file

@ -1653,11 +1653,12 @@ func ldobj(ctxt *Link, f *bio.Reader, lib *sym.Library, length int64, pn string,
if magic&^1 == 0xfeedface || magic&^0x01000000 == 0xcefaedfe { if magic&^1 == 0xfeedface || magic&^0x01000000 == 0xcefaedfe {
if *flagNewobj { if *flagNewobj {
ldmacho := func(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ldmacho := func(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
err := loadmacho.Load(ctxt.loader, ctxt.Arch, ctxt.Syms, f, pkg, length, pn) textp, err := loadmacho.Load(ctxt.loader, ctxt.Arch, ctxt.Syms, f, pkg, length, pn)
if err != nil { if err != nil {
Errorf(nil, "%v", err) Errorf(nil, "%v", err)
return return
} }
ctxt.Textp = append(ctxt.Textp, textp...)
} }
return ldhostobj(ldmacho, ctxt.HeadType, f, pkg, length, pn, file) return ldhostobj(ldmacho, ctxt.HeadType, f, pkg, length, pn, file)
} else { } else {

2
src/cmd/link/internal/loader/loader.go
View file

@ -511,7 +511,7 @@ func (l *Loader) OuterSym(i Sym) Sym {
return 0 return 0
} }
// SubSym gets sub symbols for a previously loaded host object symbol. // SubSym gets the subsymbol for host object loaded symbols.
func (l *Loader) SubSym(i Sym) Sym { func (l *Loader) SubSym(i Sym) Sym {
sym := l.Syms[i] sym := l.Syms[i]
if sym != nil && sym.Sub != nil { if sym != nil && sym.Sub != nil {

25
src/cmd/link/internal/loadmacho/ldmacho.go
View file

@ -424,31 +424,24 @@ func macholoadsym(m *ldMachoObj, symtab *ldMachoSymtab) int {
return 0 return 0
} }
func Load(l *loader.Loader, arch *sys.Arch, syms *sym.Symbols, f *bio.Reader, pkg string, length int64, pn string) error { func Load(l *loader.Loader, arch *sys.Arch, syms *sym.Symbols, f *bio.Reader, pkg string, length int64, pn string) ([]*sym.Symbol, error) {
lookup := func(name string, version int) *sym.Symbol { newSym := func(name string, version int) *sym.Symbol {
// Check to see if we've already defined the symbol. i := l.Lookup(name, version)
if i := l.Lookup(name, version); i != 0 { if i != 0 {
return l.Syms[i] return l.LoadSymbol(name, version, syms)
} }
// Not defined, let's make one. if i = l.AddExtSym(name, version); i == 0 {
if s := l.AddExtSym(name, version); s == 0 {
panic("AddExtSym returned bad index") panic("AddExtSym returned bad index")
} else if int(s) != len(l.Syms) {
panic("unexpected length of loaded symbols")
} }
newSym := syms.Newsym(name, version) newSym := syms.Newsym(name, version)
l.Syms = append(l.Syms, newSym) l.Syms[i] = newSym
return newSym return newSym
} }
_, err := load(arch, syms.IncVersion(), lookup, f, pkg, length, pn) return load(arch, syms.IncVersion(), newSym, f, pkg, length, pn)
return err
} }
func LoadOld(arch *sys.Arch, syms *sym.Symbols, f *bio.Reader, pkg string, length int64, pn string) (textp []*sym.Symbol, err error) { func LoadOld(arch *sys.Arch, syms *sym.Symbols, f *bio.Reader, pkg string, length int64, pn string) (textp []*sym.Symbol, err error) {
lookup := func(name string, version int) *sym.Symbol { return load(arch, syms.IncVersion(), syms.Lookup, f, pkg, length, pn)
return syms.Lookup(name, version)
}
return load(arch, syms.IncVersion(), lookup, f, pkg, length, pn)
} }
// load the Mach-O file pn from f. // load the Mach-O file pn from f.