[ELF] Uniquify --wrap list.
Summary: For --wrap foo --wrap foo, bfd/gold wrap the symbol only once but LLD would rotate it twice.
Reviewers: ruiu, espindola
Subscribers: emaste, arichardson, mgrang, llvm-commits
Differential Revision: https://reviews.llvm.org/D48298
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@334991 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/ELF/Driver.cpp b/ELF/Driver.cpp
index 0d3e083..31fda76 100644
--- a/ELF/Driver.cpp
+++ b/ELF/Driver.cpp
@@ -1303,8 +1303,11 @@
Symtab->scanVersionScript();
// Create wrapped symbols for -wrap option.
- for (auto *Arg : Args.filtered(OPT_wrap))
- Symtab->addSymbolWrap<ELFT>(Arg->getValue());
+ std::vector<std::string> Wraps = Args.getAllArgValues(OPT_wrap);
+ llvm::sort(Wraps.begin(), Wraps.end());
+ Wraps.erase(std::unique(Wraps.begin(), Wraps.end()), Wraps.end());
+ for (StringRef Name : Wraps)
+ Symtab->addSymbolWrap<ELFT>(Name);
// Do link-time optimization if given files are LLVM bitcode files.
// This compiles bitcode files into real object files.
diff --git a/test/ELF/wrap.s b/test/ELF/wrap.s
index b96917b..a02592e 100644
--- a/test/ELF/wrap.s
+++ b/test/ELF/wrap.s
@@ -6,6 +6,8 @@
// RUN: llvm-objdump -d -print-imm-hex %t3 | FileCheck %s
// RUN: ld.lld -o %t3 %t %t2 --wrap foo -wrap=nosuchsym
// RUN: llvm-objdump -d -print-imm-hex %t3 | FileCheck %s
+// RUN: ld.lld -o %t3 %t %t2 --wrap foo --wrap foo -wrap=nosuchsym
+// RUN: llvm-objdump -d -print-imm-hex %t3 | FileCheck %s
// CHECK: _start:
// CHECK-NEXT: movl $0x11010, %edx
