From f69a29b23a116a3520f185054290c445abf9aa62 Mon Sep 17 00:00:00 2001 From: Charles Davis Date: Tue, 27 Aug 2013 05:38:30 +0000 Subject: 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 --- tools/llvm-readobj/MachODumper.cpp | 66 +++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'tools/llvm-readobj') diff --git a/tools/llvm-readobj/MachODumper.cpp b/tools/llvm-readobj/MachODumper.cpp index e27a58aaa4..8df6fd6457 100644 --- a/tools/llvm-readobj/MachODumper.cpp +++ b/tools/llvm-readobj/MachODumper.cpp @@ -166,28 +166,28 @@ static void getSection(const MachOObjectFile *Obj, DataRefImpl Sec, MachOSection &Section) { if (!Obj->is64Bit()) { - MachO::section Sect = Obj->getSection(Sec); - Section.Address = Sect.addr; - Section.Size = Sect.size; - Section.Offset = Sect.offset; - Section.Alignment = Sect.align; - Section.RelocationTableOffset = Sect.reloff; - Section.NumRelocationTableEntries = Sect.nreloc; - Section.Flags = Sect.flags; - Section.Reserved1 = Sect.reserved1; - Section.Reserved2 = Sect.reserved2; + macho::Section Sect = Obj->getSection(Sec); + Section.Address = Sect.Address; + Section.Size = Sect.Size; + Section.Offset = Sect.Offset; + Section.Alignment = Sect.Align; + Section.RelocationTableOffset = Sect.RelocationTableOffset; + Section.NumRelocationTableEntries = Sect.NumRelocationTableEntries; + Section.Flags = Sect.Flags; + Section.Reserved1 = Sect.Reserved1; + Section.Reserved2 = Sect.Reserved2; return; } - MachO::section_64 Sect = Obj->getSection64(Sec); - Section.Address = Sect.addr; - Section.Size = Sect.size; - Section.Offset = Sect.offset; - Section.Alignment = Sect.align; - Section.RelocationTableOffset = Sect.reloff; - Section.NumRelocationTableEntries = Sect.nreloc; - Section.Flags = Sect.flags; - Section.Reserved1 = Sect.reserved1; - Section.Reserved2 = Sect.reserved2; + macho::Section64 Sect = Obj->getSection64(Sec); + Section.Address = Sect.Address; + Section.Size = Sect.Size; + Section.Offset = Sect.Offset; + Section.Alignment = Sect.Align; + Section.RelocationTableOffset = Sect.RelocationTableOffset; + Section.NumRelocationTableEntries = Sect.NumRelocationTableEntries; + Section.Flags = Sect.Flags; + Section.Reserved1 = Sect.Reserved1; + Section.Reserved2 = Sect.Reserved2; } @@ -195,20 +195,20 @@ static void getSymbol(const MachOObjectFile *Obj, DataRefImpl DRI, MachOSymbol &Symbol) { if (!Obj->is64Bit()) { - MachO::nlist Entry = Obj->getSymbolTableEntry(DRI); - Symbol.StringIndex = Entry.n_strx; - Symbol.Type = Entry.n_type; - Symbol.SectionIndex = Entry.n_sect; - Symbol.Flags = Entry.n_desc; - Symbol.Value = Entry.n_value; + macho::SymbolTableEntry Entry = Obj->getSymbolTableEntry(DRI); + Symbol.StringIndex = Entry.StringIndex; + Symbol.Type = Entry.Type; + Symbol.SectionIndex = Entry.SectionIndex; + Symbol.Flags = Entry.Flags; + Symbol.Value = Entry.Value; return; } - MachO::nlist_64 Entry = Obj->getSymbol64TableEntry(DRI); - Symbol.StringIndex = Entry.n_strx; - Symbol.Type = Entry.n_type; - Symbol.SectionIndex = Entry.n_sect; - Symbol.Flags = Entry.n_desc; - Symbol.Value = Entry.n_value; + macho::Symbol64TableEntry Entry = Obj->getSymbol64TableEntry(DRI); + Symbol.StringIndex = Entry.StringIndex; + Symbol.Type = Entry.Type; + Symbol.SectionIndex = Entry.SectionIndex; + Symbol.Flags = Entry.Flags; + Symbol.Value = Entry.Value; } void MachODumper::printFileHeaders() { @@ -349,7 +349,7 @@ void MachODumper::printRelocation(const MachOObjectFile *Obj, return; DataRefImpl DR = RelI->getRawDataRefImpl(); - MachO::any_relocation_info RE = Obj->getRelocation(DR); + macho::RelocationEntry RE = Obj->getRelocation(DR); bool IsScattered = Obj->isRelocationScattered(RE); if (opts::ExpandRelocs) { -- cgit v1.2.3