COFF: Do not warn on identical /merge options.

llvm-svn: 241397

1 files changed, 6 insertions, 3 deletions

diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp
index 1542256fdefd..875cdd64a877 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -183,9 +183,12 @@ std::error_code parseMerge(StringRef S) {
   }
   auto Pair = Config->Merge.insert(std::make_pair(From, To));
   bool Inserted = Pair.second;
-  if (!Inserted)
-    llvm::errs() << "warning: " << S << ": already merged into "
-                 << Pair.first->second << "\n";
+  if (!Inserted) {
+    StringRef Existing = Pair.first->second;
+    if (Existing != To)
+      llvm::errs() << "warning: " << S << ": already merged into "
+                   << Existing << "\n";
+  }
   return std::error_code();
 }