mirror of
https://github.com/RPCS3/llvm.git
synced 2026-07-18 13:16:24 -04:00
LibDriver: Allow resource files to be archive members.
It seems pointless to add a resource to an archive because it won't have any symbols to link against (and link.exe doesn't have an equivalent of --whole-archive), but lib.exe allows it for some reason. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@289859 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -146,8 +146,10 @@ int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) {
|
||||
sys::fs::file_magic Magic =
|
||||
sys::fs::identify_magic(MOrErr->Buf->getBuffer());
|
||||
if (Magic != sys::fs::file_magic::coff_object &&
|
||||
Magic != sys::fs::file_magic::bitcode) {
|
||||
llvm::errs() << Arg->getValue() << ": not a COFF object or bitcode file\n";
|
||||
Magic != sys::fs::file_magic::bitcode &&
|
||||
Magic != sys::fs::file_magic::windows_resource) {
|
||||
llvm::errs() << Arg->getValue()
|
||||
<< ": not a COFF object, bitcode or resource file\n";
|
||||
return 1;
|
||||
}
|
||||
Members.emplace_back(std::move(*MOrErr));
|
||||
|
||||
Binary file not shown.
@@ -1,2 +1,2 @@
|
||||
RUN: not llvm-lib %S/Inputs/cl-gl.obj 2>&1 | FileCheck %s
|
||||
CHECK: not a COFF object or bitcode file
|
||||
CHECK: not a COFF object, bitcode or resource file
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
RUN: llvm-lib /out:%t %S/Inputs/resource.res
|
||||
RUN: llvm-ar t %t | FileCheck %s
|
||||
CHECK: resource.res
|
||||
Reference in New Issue
Block a user