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

llvm-svn: 141379

2 files changed, 5 insertions, 5 deletions

diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 955c01c230f..b474d5fce75 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/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<Section> 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/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index bb4a77bc796..78824e9e067 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/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<std::pair<uint64_t, StringRef> > 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;