diff options
| author | Charles Davis <cdavis5x@gmail.com> | 2013-08-27 05:38:30 +0000 |
|---|---|---|
| committer | Charles Davis <cdavis5x@gmail.com> | 2013-08-27 05:38:30 +0000 |
| commit | f69a29b23a116a3520f185054290c445abf9aa62 (patch) | |
| tree | c98b02ef136f3b0b7378b2e883faae39c6177679 /lib/MC/MCObjectSymbolizer.cpp | |
| parent | 45fbe98c21d06448d1977e8abc95972f4ad86b26 (diff) | |
| download | external_llvm-f69a29b23a116a3520f185054290c445abf9aa62.zip external_llvm-f69a29b23a116a3520f185054290c445abf9aa62.tar.gz external_llvm-f69a29b23a116a3520f185054290c445abf9aa62.tar.bz2 | |
Revert "Fix the build broken by r189315." and "Move everything depending on Object/MachOFormat.h over to Support/MachO.h."
This reverts commits r189319 and r189315. r189315 broke some tests on what I
believe are big-endian platforms.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189321 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCObjectSymbolizer.cpp')
| -rw-r--r-- | lib/MC/MCObjectSymbolizer.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/MC/MCObjectSymbolizer.cpp b/lib/MC/MCObjectSymbolizer.cpp index b9131d1..a32e2ae 100644 --- a/lib/MC/MCObjectSymbolizer.cpp +++ b/lib/MC/MCObjectSymbolizer.cpp @@ -60,13 +60,13 @@ MCMachObjectSymbolizer(MCContext &Ctx, OwningPtr<MCRelocationInfo> &RelInfo, if (Name == "__stubs") { SectionRef StubsSec = *SI; if (MOOF->is64Bit()) { - MachO::section_64 S = MOOF->getSection64(StubsSec.getRawDataRefImpl()); - StubsIndSymIndex = S.reserved1; - StubSize = S.reserved2; + macho::Section64 S = MOOF->getSection64(StubsSec.getRawDataRefImpl()); + StubsIndSymIndex = S.Reserved1; + StubSize = S.Reserved2; } else { - MachO::section S = MOOF->getSection(StubsSec.getRawDataRefImpl()); - StubsIndSymIndex = S.reserved1; - StubSize = S.reserved2; + macho::Section S = MOOF->getSection(StubsSec.getRawDataRefImpl()); + StubsIndSymIndex = S.Reserved1; + StubSize = S.Reserved2; } assert(StubSize && "Mach-O stub entry size can't be zero!"); StubsSec.getAddress(StubsStart); @@ -86,8 +86,9 @@ StringRef MCMachObjectSymbolizer::findExternalFunctionAt(uint64_t Addr) { if (StubIdx >= StubsCount) return StringRef(); - uint32_t SymtabIdx = + macho::IndirectSymbolTableEntry ISTE = MOOF->getIndirectSymbolTableEntry(MOOF->getDysymtabLoadCommand(), StubIdx); + uint32_t SymtabIdx = ISTE.Index; StringRef SymName; symbol_iterator SI = MOOF->begin_symbols(); |