llvm.org GIT mirror llvm / bf221f5
lld-link: Reject more than one resource .obj file Users are exepcted to pass all .res files to the linker, which then merges all the resource in all .res files into a tree structure and then converts the final tree structure to a .obj file with .rsrc$01 and .rsrc$02 sections and then links that. If the user instead passes several .obj files containing such resources, the correct thing to do would be to have custom code to merge the trees in the resource sections instead of doing normal section merging -- but link.exe rejects if multiple resource obj files are passed in with LNK4078, so let lld-link do that too instead of silently writing broken .rsrc sections in that case. The only real way to run into this is if users manually convert .res files to .obj files by running cvtres and then handing the resulting .obj files to lld-link instead, which in practice likely never happens. (lld-link is slightly stricter than link.exe now: If link.exe is passed one .obj file created by cvtres, and a .res file, for some reason it just emits a warning instead of an error and outputs strange looking data. lld-link now errors out on mixed input like this.) One way users could accidentally run into this is the following scenario: If a .res file is passed to lib.exe, then lib.exe calls cvtres.exe on the .res file before putting it in the output .lib. (llvm-lib currently doesn't do this.) link.exe's /wholearchive seems to only add obj files referenced from the static library index, but lld-link current really adds all files in the archive. So if lld-link /wholearchive is used with .lib files produced by lib.exe and .res files were among the files handed to lib.exe, we previously silently produced invalid output, but now we error out. link.exe's /wholearchive semantics on the other hand mean that it wouldn't load the resource object files from the .lib file at all. Since this scenario is probably still an unlikely corner case, the difference in behavior here seems fine -- and lld-link might have to change to use link.exe's /wholearchive semantics in the future anyways. Vaguely related to PR42180. Differential Revision: https://reviews.llvm.org/D63109 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@363078 91177308-0d34-0410-b5e6-96231b3b80d8 Nico Weber 2 months ago
2 changed file(s) with 4 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all
441441 Data(Parser.getData()), StringTable(Parser.getStringTable()) {
442442 performFileLayout();
444 OutputBuffer = WritableMemoryBuffer::getNewMemBuffer(FileSize);
444 OutputBuffer = WritableMemoryBuffer::getNewMemBuffer(
445 FileSize, "internal .obj file created from .res files");
445446 }
447448 void WindowsResourceCOFFWriter::performFileLayout() {
520521 Header->NumberOfSections = 2;
521522 Header->TimeDateStamp = TimeDateStamp;
522523 Header->PointerToSymbolTable = SymbolTableOffset;
523 // One symbol for every resource plus 2 for each section and @feat.00
524 // One symbol for every resource plus 2 for each section and 1 for @feat.00
524525 Header->NumberOfSymbols = Data.size() + 5;
525526 Header->SizeOfOptionalHeader = 0;
526527 // cvtres.exe sets 32BIT_MACHINE even for 64-bit machine types. Match it.
8181 "//llvm/tools/llvm-ar:symlinks",
8282 "//llvm/tools/llvm-as",
8383 "//llvm/tools/llvm-bcanalyzer",
84 "//llvm/tools/llvm-cvtres",
8485 "//llvm/tools/llvm-dis",
8586 "//llvm/tools/llvm-dwarfdump",
8687 "//llvm/tools/llvm-mc",