From a48ad1333999e2fb483d23096349138af5a51ec6 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 7 Oct 2011 18:25:37 +0000 Subject: Revert 141376 and 141377 due to breaking the build. --- Reverse-merging r141377 into '.': U tools/llvm-objdump/MachODump.cpp --- Reverse-merging r141376 into '.': U include/llvm/Object/COFF.h U include/llvm/Object/ObjectFile.h U include/llvm-c/Object.h U tools/llvm-objdump/llvm-objdump.cpp U lib/Object/MachOObjectFile.cpp U lib/Object/COFFObjectFile.cpp U lib/Object/Object.cpp U lib/Object/ELFObjectFile.cpp git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141379 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-objdump/MachODump.cpp | 6 +++--- tools/llvm-objdump/llvm-objdump.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/llvm-objdump') diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index 955c01c230..b474d5fce7 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -122,7 +122,7 @@ static Symbol copySymbol(const T &STE) { return S; } -// Print additional information about an address, if available. +// Print addtitional information about an address, if available. static void DumpAddress(uint64_t Address, ArrayRef
Sections, MachOObject *MachOObj, raw_ostream &OS) { for (unsigned i = 0; i != Sections.size(); ++i) { @@ -298,7 +298,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) { AsmPrinterVariant, *AsmInfo, *STI)); if (!InstrAnalysis || !AsmInfo || !STI || !DisAsm || !IP) { - errs() << "error: couldn't initialize disassembler for target " + errs() << "error: couldn't initialize disassmbler for target " << TripleName << '\n'; return; } @@ -573,7 +573,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) { IP->printInst(&Inst.Inst, outs(), ""); // Look for relocations inside this instructions, if there is one - // print its target and additional information if available. + // print its target and additional information if availbable. for (unsigned j = 0; j != Relocs.size(); ++j) if (Relocs[j].first >= Sections[SectIdx].Address + Inst.Address && Relocs[j].first < Sections[SectIdx].Address + Inst.Address + diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index bb4a77bc79..78824e9e06 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -155,7 +155,7 @@ void llvm::DisassembleInputLibObject(StringRef Filename) { << ":\tfile format " << Obj->getFileFormatName() << "\n\n"; error_code ec; - for (section_iterator i = Obj->begin_sections(), + for (ObjectFile::section_iterator i = Obj->begin_sections(), e = Obj->end_sections(); i != e; i.increment(ec)) { if (error(ec)) break; @@ -165,7 +165,7 @@ void llvm::DisassembleInputLibObject(StringRef Filename) { // Make a list of all the symbols in this section. std::vector > Symbols; - for (symbol_iterator si = Obj->begin_symbols(), + for (ObjectFile::symbol_iterator si = Obj->begin_symbols(), se = Obj->end_symbols(); si != se; si.increment(ec)) { bool contains; -- cgit v1.2.3