From 5510728d28bb1ee04abc32da3d21b7df12948053 Mon Sep 17 00:00:00 2001 From: Charles Davis Date: Sun, 1 Sep 2013 04:28:48 +0000 Subject: Move everything depending on Object/MachOFormat.h over to Support/MachO.h. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189728 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCObjectSymbolizer.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'lib/MC/MCObjectSymbolizer.cpp') diff --git a/lib/MC/MCObjectSymbolizer.cpp b/lib/MC/MCObjectSymbolizer.cpp index a32e2aeb82..b9131d1ed6 100644 --- a/lib/MC/MCObjectSymbolizer.cpp +++ b/lib/MC/MCObjectSymbolizer.cpp @@ -60,13 +60,13 @@ MCMachObjectSymbolizer(MCContext &Ctx, OwningPtr &RelInfo, if (Name == "__stubs") { SectionRef StubsSec = *SI; if (MOOF->is64Bit()) { - macho::Section64 S = MOOF->getSection64(StubsSec.getRawDataRefImpl()); - StubsIndSymIndex = S.Reserved1; - StubSize = S.Reserved2; + MachO::section_64 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,9 +86,8 @@ StringRef MCMachObjectSymbolizer::findExternalFunctionAt(uint64_t Addr) { if (StubIdx >= StubsCount) return StringRef(); - macho::IndirectSymbolTableEntry ISTE = + uint32_t SymtabIdx = MOOF->getIndirectSymbolTableEntry(MOOF->getDysymtabLoadCommand(), StubIdx); - uint32_t SymtabIdx = ISTE.Index; StringRef SymName; symbol_iterator SI = MOOF->begin_symbols(); -- cgit v1.2.3