diff options
| author | Stephen Hines <srhines@google.com> | 2013-06-12 13:32:42 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-06-12 13:32:42 -0700 |
| commit | 1878f9a7874b1ff569d745c0269f49d3daf7203d (patch) | |
| tree | 19a8dbaaedf6a056c617e87596b32d3f452af137 /lib/Archive/ArchiveReader.cpp | |
| parent | 7a57f27b857ec4b243d83d392a399f02fc196c0a (diff) | |
| parent | 100fbdd06be7590b23c4707a98cd605bdb519498 (diff) | |
| download | external_llvm-1878f9a7874b1ff569d745c0269f49d3daf7203d.zip external_llvm-1878f9a7874b1ff569d745c0269f49d3daf7203d.tar.gz external_llvm-1878f9a7874b1ff569d745c0269f49d3daf7203d.tar.bz2 | |
Merge commit '100fbdd06be7590b23c4707a98cd605bdb519498' into merge_20130612
Diffstat (limited to 'lib/Archive/ArchiveReader.cpp')
| -rw-r--r-- | lib/Archive/ArchiveReader.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp index 2604fdf..4d17ea8 100644 --- a/lib/Archive/ArchiveReader.cpp +++ b/lib/Archive/ArchiveReader.cpp @@ -17,6 +17,7 @@ #include "llvm/ADT/SmallPtrSet.h" #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/IR/Module.h" +#include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" #include <cctype> #include <cstdio> @@ -206,14 +207,11 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) } // Determine if this is a bitcode file - switch (sys::IdentifyFileType(At, 4)) { - case sys::Bitcode_FileType: - flags |= ArchiveMember::BitcodeFlag; - break; - default: - flags &= ~ArchiveMember::BitcodeFlag; - break; - } + if (sys::fs::identify_magic(StringRef(At, 4)) == + sys::fs::file_magic::bitcode) + flags |= ArchiveMember::BitcodeFlag; + else + flags &= ~ArchiveMember::BitcodeFlag; // Instantiate the ArchiveMember to be filled ArchiveMember* member = new ArchiveMember(this); |