From d53422d1a73ba6b9c3fe6e53ff3e1ff7630fb20c Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 9 Mar 2012 20:41:57 +0000 Subject: [Object] Make Binary::TypeID more granular, to distinguish between ELF 32/64 little/big llvm-svn: 152435 --- llvm/lib/Object/Archive.cpp | 2 +- llvm/lib/Object/COFFObjectFile.cpp | 2 +- llvm/lib/Object/MachOObjectFile.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Object') diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp index b67377c6341..c5f15bafcfb 100644 --- a/llvm/lib/Object/Archive.cpp +++ b/llvm/lib/Object/Archive.cpp @@ -174,7 +174,7 @@ error_code Archive::Child::getAsBinary(OwningPtr &Result) const { } Archive::Archive(MemoryBuffer *source, error_code &ec) - : Binary(Binary::isArchive, source) { + : Binary(Binary::ID_Archive, source) { // Check for sufficient magic. if (!source || source->getBufferSize() < (8 + sizeof(ArchiveMemberHeader) + 2) // Smallest archive. diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp index a3fdd5bb6a7..fe222425382 100644 --- a/llvm/lib/Object/COFFObjectFile.cpp +++ b/llvm/lib/Object/COFFObjectFile.cpp @@ -421,7 +421,7 @@ relocation_iterator COFFObjectFile::getSectionRelEnd(DataRefImpl Sec) const { } COFFObjectFile::COFFObjectFile(MemoryBuffer *Object, error_code &ec) - : ObjectFile(Binary::isCOFF, Object, ec) + : ObjectFile(Binary::ID_COFF, Object, ec) , Header(0) , SectionTable(0) , SymbolTable(0) diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 655c40aeda5..819409e3a14 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -30,7 +30,7 @@ namespace object { MachOObjectFile::MachOObjectFile(MemoryBuffer *Object, MachOObject *MOO, error_code &ec) - : ObjectFile(Binary::isMachO, Object, ec), + : ObjectFile(Binary::ID_MachO, Object, ec), MachOObj(MOO), RegisteredStringTable(std::numeric_limits::max()) { DataRefImpl DRI; -- cgit v1.2.3