[lld] --export-dynamic overrides --dynamic-list.

Fixes PR32573.

--export-dynamic exports everything, even in the presence of a --dynamic-list,
or --export-dynamic-symbol.

llvm-svn: 300002
This commit is contained in:
Evgeniy Stepanov 2017-04-11 22:37:54 +00:00
parent 304ef22e6e
commit 6c973d647f
2 changed files with 62 additions and 0 deletions

View File

@ -713,6 +713,9 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
Config->DefaultSymbolVersion = VER_NDX_LOCAL;
}
if (getArg(Args, OPT_export_dynamic, OPT_no_export_dynamic, false))
Config->DefaultSymbolVersion = VER_NDX_GLOBAL;
if (auto *Arg = Args.getLastArg(OPT_version_script))
if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
readVersionScript(*Buffer);

View File

@ -95,6 +95,65 @@
# CHECK2-NEXT: }
# CHECK2-NEXT: ]
## --export-dynamic overrides --dynamic-list, i.e. --export-dynamic with an
## incomplete dynamic-list still exports everything.
# RUN: echo "{ foo2; };" > %t.list
# RUN: ld.lld --dynamic-list %t.list --export-dynamic %t %t2.so -o %t.exe
# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK3 %s
## The same with --export-dynamic-symbol.
# RUN: ld.lld --export-dynamic-symbol=foo2 --export-dynamic %t %t2.so -o %t.exe
# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK3 %s
# CHECK3: DynamicSymbols [
# CHECK3-NEXT: Symbol {
# CHECK3-NEXT: Name: @
# CHECK3-NEXT: Value: 0x0
# CHECK3-NEXT: Size: 0
# CHECK3-NEXT: Binding: Local
# CHECK3-NEXT: Type: None
# CHECK3-NEXT: Other: 0
# CHECK3-NEXT: Section: Undefined
# CHECK3-NEXT: }
# CHECK3-NEXT: Symbol {
# CHECK3-NEXT: Name: _start@
# CHECK3-NEXT: Value: 0x201003
# CHECK3-NEXT: Size: 0
# CHECK3-NEXT: Binding: Global (0x1)
# CHECK3-NEXT: Type: None (0x0)
# CHECK3-NEXT: Other: 0
# CHECK3-NEXT: Section: .text (0x4)
# CHECK3-NEXT: }
# CHECK3-NEXT: Symbol {
# CHECK3-NEXT: Name: foo1@
# CHECK3-NEXT: Value: 0x201000
# CHECK3-NEXT: Size: 0
# CHECK3-NEXT: Binding: Global (0x1)
# CHECK3-NEXT: Type: None (0x0)
# CHECK3-NEXT: Other: 0
# CHECK3-NEXT: Section: .text (0x4)
# CHECK3-NEXT: }
# CHECK3-NEXT: Symbol {
# CHECK3-NEXT: Name: foo2@
# CHECK3-NEXT: Value: 0x201001
# CHECK3-NEXT: Size: 0
# CHECK3-NEXT: Binding: Global (0x1)
# CHECK3-NEXT: Type: None (0x0)
# CHECK3-NEXT: Other: 0
# CHECK3-NEXT: Section: .text (0x4)
# CHECK3-NEXT: }
# CHECK3-NEXT: Symbol {
# CHECK3-NEXT: Name: foo31@
# CHECK3-NEXT: Value: 0x201002
# CHECK3-NEXT: Size: 0
# CHECK3-NEXT: Binding: Global (0x1)
# CHECK3-NEXT: Type: None (0x0)
# CHECK3-NEXT: Other: 0
# CHECK3-NEXT: Section: .text (0x4)
# CHECK3-NEXT: }
# CHECK3-NEXT: ]
.globl foo1
foo1:
ret