ELF: Read all dynamic lists specified on the command line.
We were previously only reading the last one.
Fixes PR31939 (which was likely the issue underlying
https://github.com/google/oss-fuzz/issues/295).
Differential Revision: https://reviews.llvm.org/D29861
llvm-svn: 294977
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index c1e342c..176bbe6 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -643,7 +643,7 @@
for (auto *Arg : Args.filtered(OPT_undefined))
Config->Undefined.push_back(Arg->getValue());
- if (auto *Arg = Args.getLastArg(OPT_dynamic_list))
+ for (auto *Arg : Args.filtered(OPT_dynamic_list))
if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
readDynamicList(*Buffer);
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 15acaf0..a0b8530 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -1942,7 +1942,8 @@
if (peek() != "local") {
if (consume("global"))
expect(":");
- Config->VersionScriptGlobals = readSymbols();
+ for (SymbolVersion V : readSymbols())
+ Config->VersionScriptGlobals.push_back(V);
}
readLocals();
expect("}");
diff --git a/lld/test/ELF/dynamic-list.s b/lld/test/ELF/dynamic-list.s
index e2472e7..80e480b 100644
--- a/lld/test/ELF/dynamic-list.s
+++ b/lld/test/ELF/dynamic-list.s
@@ -51,6 +51,10 @@
# RUN: echo "{ foo1; foo2; foo31; };" > %t.list
# RUN: ld.lld --dynamic-list %t.list %t %t2.so -o %t.exe
# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: echo "{ foo1; foo2; };" > %t1.list
+# RUN: echo "{ foo31; };" > %t2.list
+# RUN: ld.lld --dynamic-list %t1.list --dynamic-list %t2.list %t %t2.so -o %t.exe
+# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
# CHECK2: DynamicSymbols [
# CHECK2-NEXT: Symbol {