maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Be a bit more permissive about symbols we don't understand. Just skip them 

rather than throwing an error.

llvm-svn: 131322
This commit is contained in:
Jim Grosbach 2011-05-13 23:11:30 +00:00
parent be7850dd8a
commit f6b1846f39
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
View File

@ -296,11 +296,11 @@ loadSegment32(const MachOObject *Obj,
// FIXME: Check the symbol type and flags.
if (STE->Type != 0xF) // external, defined in this section.
return Error("unexpected symbol type!");
continue;
// Flags == 0x8 marks a thumb function for ARM, which is fine as it
// doesn't require any special handling here.
if (STE->Flags != 0x0 && STE->Flags != 0x8)
return Error("unexpected symbol type!");
continue;
// Remember the symbol.
Symbols.push_back(SymbolEntry(STE->Value, Name));
@ -311,6 +311,10 @@ loadSegment32(const MachOObject *Obj,
// Sort the symbols by address, just in case they didn't come in that way.
array_pod_sort(Symbols.begin(), Symbols.end());
// If there weren't any functions (odd, but just in case...)
if (!Symbols.size())
continue;
// Extract the function data.
uint8_t *Base = (uint8_t*)Obj->getData(SegmentLC->FileOffset,
SegmentLC->FileSize).data();
@ -431,9 +435,9 @@ loadSegment64(const MachOObject *Obj,
// FIXME: Check the symbol type and flags.
if (STE->Type != 0xF) // external, defined in this section.
return Error("unexpected symbol type!");
continue;
if (STE->Flags != 0x0)
return Error("unexpected symbol type!");
continue;
// Remember the symbol.
Symbols.push_back(SymbolEntry(STE->Value, Name));
@ -444,6 +448,10 @@ loadSegment64(const MachOObject *Obj,
// Sort the symbols by address, just in case they didn't come in that way.
array_pod_sort(Symbols.begin(), Symbols.end());
// If there weren't any functions (odd, but just in case...)
if (!Symbols.size())
continue;
// Extract the function data.
uint8_t *Base = (uint8_t*)Obj->getData(Segment64LC->FileOffset,
Segment64LC->FileSize).data();