StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I41d1c3c3,I9de0a0f5

Browse Source 
am: 0c74ad9381

Change-Id: I6f496938039222eedfe42724fa34ba497e98fa15
This commit is contained in:
Colin Cross
2018-02-27 23:06:41 +00:00
committed by android-build-merger
parent aa14355b6a 0c74ad9381
commit 8c5d337c80
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/symbol_inject/macho.go
View File

@@ -18,6 +18,7 @@ import (
"debug/macho" "debug/macho"
"fmt" "fmt"
"io" "io"
"sort"
) )
func findMachoSymbol(r io.ReaderAt, symbolName string) (uint64, uint64, error) { func findMachoSymbol(r io.ReaderAt, symbolName string) (uint64, uint64, error) {
@@ -26,17 +27,25 @@ func findMachoSymbol(r io.ReaderAt, symbolName string) (uint64, uint64, error) {
return maxUint64, maxUint64, cantParseError{err} return maxUint64, maxUint64, cantParseError{err}
} }
// TODO(ccross): why? // symbols in macho files seem to be prefixed with an underscore
symbolName = "_" + symbolName symbolName = "_" + symbolName
for i, symbol := range machoFile.Symtab.Syms { symbols := machoFile.Symtab.Syms
sort.Slice(symbols, func(i, j int) bool {
if symbols[i].Sect != symbols[j].Sect {
return symbols[i].Sect < symbols[j].Sect
}
return symbols[i].Value < symbols[j].Value
})
for i, symbol := range symbols {
if symbol.Sect == 0 { if symbol.Sect == 0 {
continue continue
} }
if symbol.Name == symbolName { if symbol.Name == symbolName {
var nextSymbol *macho.Symbol var nextSymbol *macho.Symbol
if i+1 < len(machoFile.Symtab.Syms) { if i+1 < len(symbols) {
nextSymbol = &machoFile.Symtab.Syms[i+1] nextSymbol = &symbols[i+1]
} }
return calculateMachoSymbolOffset(machoFile, symbol, nextSymbol) return calculateMachoSymbolOffset(machoFile, symbol, nextSymbol)
} }

5
cmd/symbol_inject/pe.go
View File

@@ -27,6 +27,11 @@ func findPESymbol(r io.ReaderAt, symbolName string) (uint64, uint64, error) {
return maxUint64, maxUint64, cantParseError{err} return maxUint64, maxUint64, cantParseError{err}
} }
if peFile.FileHeader.Machine == pe.IMAGE_FILE_MACHINE_I386 {
// symbols in win32 exes seem to be prefixed with an underscore
symbolName = "_" + symbolName
}
sort.Slice(peFile.Symbols, func(i, j int) bool { sort.Slice(peFile.Symbols, func(i, j int) bool {
if peFile.Symbols[i].SectionNumber != peFile.Symbols[j].SectionNumber { if peFile.Symbols[i].SectionNumber != peFile.Symbols[j].SectionNumber {
return peFile.Symbols[i].SectionNumber < peFile.Symbols[j].SectionNumber return peFile.Symbols[i].SectionNumber < peFile.Symbols[j].SectionNumber