diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2019-05-02 21:21:55 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2019-05-02 21:21:55 +0000 |
| commit | 81862f82ee3dd6d7be5c441422734e10615acef8 (patch) | |
| tree | 2ee927e662d8219e12adcbab049cfb34e0b34389 /llvm/tools | |
| parent | 6e9cfee63a7e0a71167f8bff25123bf6b2e9853d (diff) | |
| download | bcm5719-llvm-81862f82ee3dd6d7be5c441422734e10615acef8.tar.gz bcm5719-llvm-81862f82ee3dd6d7be5c441422734e10615acef8.zip | |
lld-link: Add /force:multipleres extension to make dupe resource diag non-fatal
As a side benefit, lld-link now reports more than one duplicate resource
entry before exiting with an error even if the new flag is not passed.
llvm-svn: 359829
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-cvtres/llvm-cvtres.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/tools/llvm-cvtres/llvm-cvtres.cpp b/llvm/tools/llvm-cvtres/llvm-cvtres.cpp index c6dc0e5f972..7ce618a1c0e 100644 --- a/llvm/tools/llvm-cvtres/llvm-cvtres.cpp +++ b/llvm/tools/llvm-cvtres/llvm-cvtres.cpp @@ -183,7 +183,10 @@ int main(int Argc, const char **Argv) { outs() << "Number of resources: " << EntryNumber << "\n"; } - error(Parser.parse(RF)); + std::vector<std::string> Duplicates; + error(Parser.parse(RF, Duplicates)); + for (const auto& DupeDiag : Duplicates) + reportError(DupeDiag); } if (Verbose) { |
