diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-11 15:19:04 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-11 15:19:04 +0000 |
commit | d27a9785d5290a54b1400c85d70e92c2b6106098 (patch) | |
tree | 40d49c1dac6f6d488422bfcdcbd1860a006b037d | |
parent | 98ee2f93a53b91abe46c7afddb60ed2d8a0ee7bb (diff) | |
download | external_llvm-d27a9785d5290a54b1400c85d70e92c2b6106098.zip external_llvm-d27a9785d5290a54b1400c85d70e92c2b6106098.tar.gz external_llvm-d27a9785d5290a54b1400c85d70e92c2b6106098.tar.bz2 |
Convert another use of sys::identifyFileType.
No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183747 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Object/ObjectFile.cpp | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index c64af84..b5f666f 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -14,8 +14,8 @@ #include "llvm/Object/ObjectFile.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/Path.h" #include "llvm/Support/system_error.h" using namespace llvm; @@ -40,31 +40,32 @@ section_iterator ObjectFile::getRelocatedSection(DataRefImpl Sec) const { ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { if (!Object || Object->getBufferSize() < 64) return 0; - sys::LLVMFileType type = sys::identifyFileType(Object->getBuffer()); - switch (type) { - case sys::Unknown_FileType: - return 0; - case sys::ELF_Relocatable_FileType: - case sys::ELF_Executable_FileType: - case sys::ELF_SharedObject_FileType: - case sys::ELF_Core_FileType: - return createELFObjectFile(Object); - case sys::Mach_O_Object_FileType: - case sys::Mach_O_Executable_FileType: - case sys::Mach_O_FixedVirtualMemorySharedLib_FileType: - case sys::Mach_O_Core_FileType: - case sys::Mach_O_PreloadExecutable_FileType: - case sys::Mach_O_DynamicallyLinkedSharedLib_FileType: - case sys::Mach_O_DynamicLinker_FileType: - case sys::Mach_O_Bundle_FileType: - case sys::Mach_O_DynamicallyLinkedSharedLibStub_FileType: - case sys::Mach_O_DSYMCompanion_FileType: - return createMachOObjectFile(Object); - case sys::COFF_FileType: - return createCOFFObjectFile(Object); - default: - llvm_unreachable("Unexpected Object File Type"); + + sys::fs::file_magic Type = sys::fs::identify_magic(Object->getBuffer()); + switch (Type) { + case sys::fs::file_magic::unknown: + return 0; + case sys::fs::file_magic::elf_relocatable: + case sys::fs::file_magic::elf_executable: + case sys::fs::file_magic::elf_shared_object: + case sys::fs::file_magic::elf_core: + return createELFObjectFile(Object); + case sys::fs::file_magic::macho_object: + case sys::fs::file_magic::macho_executable: + case sys::fs::file_magic::macho_fixed_virtual_memory_shared_lib: + case sys::fs::file_magic::macho_core: + case sys::fs::file_magic::macho_preload_executable: + case sys::fs::file_magic::macho_dynamically_linked_shared_lib: + case sys::fs::file_magic::macho_dynamic_linker: + case sys::fs::file_magic::macho_bundle: + case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub: + case sys::fs::file_magic::macho_dsym_companion: + return createMachOObjectFile(Object); + case sys::fs::file_magic::coff_object: + case sys::fs::file_magic::pecoff_executable: + return createCOFFObjectFile(Object); } + llvm_unreachable("Unexpected Object File Type"); } ObjectFile *ObjectFile::createObjectFile(StringRef ObjectPath) { |