diff options
| author | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
| commit | ce9904c6ea8fd669978a8eefb854b330eb9828ff (patch) | |
| tree | 2418ee2e96ea220977c8fb74959192036ab5b133 /lib/Object/Binary.cpp | |
| parent | c27b10b198c1d9e9b51f2303994313ec2778edd7 (diff) | |
| parent | dbb832b83351cec97b025b61c26536ef50c3181c (diff) | |
| download | external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.zip external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.gz external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.bz2 | |
Merge remote-tracking branch 'upstream/release_34' into merge-20140211
Conflicts:
lib/Linker/LinkModules.cpp
lib/Support/Unix/Signals.inc
Change-Id: Ia54f291fa5dc828052d2412736e8495c1282aa64
Diffstat (limited to 'lib/Object/Binary.cpp')
| -rw-r--r-- | lib/Object/Binary.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp index fd9d3b4..de57b4c 100644 --- a/lib/Object/Binary.cpp +++ b/lib/Object/Binary.cpp @@ -91,6 +91,7 @@ error_code object::createBinary(MemoryBuffer *Source, return object_error::success; } case sys::fs::file_magic::coff_object: + case sys::fs::file_magic::coff_import_library: case sys::fs::file_magic::pecoff_executable: { OwningPtr<Binary> ret( ObjectFile::createCOFFObjectFile(scopedSource.take())); @@ -100,7 +101,8 @@ error_code object::createBinary(MemoryBuffer *Source, return object_error::success; } case sys::fs::file_magic::unknown: - case sys::fs::file_magic::bitcode: { + case sys::fs::file_magic::bitcode: + case sys::fs::file_magic::windows_resource: { // Unrecognized object file format. return object_error::invalid_file_type; } |