aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2020-07-24 00:05:55 +0300
committerMartin Storsjö <martin@martin.st>2020-07-24 22:15:08 +0300
commit4d09ed953b5b8c70d9ca0aeaed8f26a237b612c6 (patch)
tree913b5e7e5683ae55fc71a376f6b339f50a4d23fc /llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
parent9bb6ce78bec79295a5ad2f0ef96bfde4cb3f714c (diff)
downloadllvm-4d09ed953b5b8c70d9ca0aeaed8f26a237b612c6.zip
llvm-4d09ed953b5b8c70d9ca0aeaed8f26a237b612c6.tar.gz
llvm-4d09ed953b5b8c70d9ca0aeaed8f26a237b612c6.tar.bz2
[llvm-lib] Support adding short import library objects with llvm-lib
This fixes PR 42837. Differential Revision: https://reviews.llvm.org/D84465
Diffstat (limited to 'llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp')
-rw-r--r--llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
index c409012..cd39428 100644
--- a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
+++ b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
@@ -191,9 +191,11 @@ static void appendFile(std::vector<NewArchiveMember> &Members,
file_magic Magic = identify_magic(MB.getBuffer());
if (Magic != file_magic::coff_object && Magic != file_magic::bitcode &&
- Magic != file_magic::archive && Magic != file_magic::windows_resource) {
+ Magic != file_magic::archive && Magic != file_magic::windows_resource &&
+ Magic != file_magic::coff_import_library) {
llvm::errs() << MB.getBufferIdentifier()
- << ": not a COFF object, bitcode, archive or resource file\n";
+ << ": not a COFF object, bitcode, archive, import library or "
+ "resource file\n";
exit(1);
}