diff options
| -rw-r--r-- | lld/ELF/Symbols.cpp | 11 | ||||
| -rw-r--r-- | lld/test/ELF/undef-version-script.s | 37 |
2 files changed, 41 insertions, 7 deletions
diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp index 1b8234871b5..5bb6a703383 100644 --- a/lld/ELF/Symbols.cpp +++ b/lld/ELF/Symbols.cpp @@ -123,13 +123,9 @@ bool SymbolBody::isPreemptible() const { if (!Config->Shared) return false; - // Undefined symbols in DSOs can only be preempted if they are strong. - // Weak symbols just resolve to zero. - if (isUndefined()) - return !isWeak(); - // -Bsymbolic means that not even default visibility symbols can be preempted. - if (Config->Bsymbolic || (Config->BsymbolicFunctions && isFunc())) + if ((Config->Bsymbolic || (Config->BsymbolicFunctions && isFunc())) && + isDefined()) return false; // Only default visibility symbols that appear in the dynamic symbol table can @@ -323,7 +319,8 @@ std::string elf::demangle(StringRef Name) { bool Symbol::includeInDynsym() const { if (Visibility != STV_DEFAULT && Visibility != STV_PROTECTED) return false; - return (ExportDynamic && VersionScriptGlobal) || Body->isShared(); + return (ExportDynamic && VersionScriptGlobal) || Body->isShared() || + Body->isUndefined(); } template uint32_t SymbolBody::template getVA<ELF32LE>(uint32_t) const; diff --git a/lld/test/ELF/undef-version-script.s b/lld/test/ELF/undef-version-script.s new file mode 100644 index 00000000000..a942d19b2e8 --- /dev/null +++ b/lld/test/ELF/undef-version-script.s @@ -0,0 +1,37 @@ +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o +# RUN: echo "{ local: *; };" > %t.script +# RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so +# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s + +# CHECK: DynamicSymbols [ +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Name: @ (0) +# CHECK-NEXT: Value: 0x0 +# CHECK-NEXT: Size: 0 +# CHECK-NEXT: Binding: Local (0x0) +# CHECK-NEXT: Type: None (0x0) +# CHECK-NEXT: Other: 0 +# CHECK-NEXT: Section: Undefined (0x0) +# CHECK-NEXT: } +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Name: bar@ (1) +# CHECK-NEXT: Value: 0x0 +# CHECK-NEXT: Size: 0 +# CHECK-NEXT: Binding: Weak (0x2) +# CHECK-NEXT: Type: None (0x0) +# CHECK-NEXT: Other: 0 +# CHECK-NEXT: Section: Undefined (0x0) +# CHECK-NEXT: } +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Name: foo@ (5) +# CHECK-NEXT: Value: 0x0 +# CHECK-NEXT: Size: 0 +# CHECK-NEXT: Binding: Global (0x1) +# CHECK-NEXT: Type: None (0x0) +# CHECK-NEXT: Other: 0 +# CHECK-NEXT: Section: Undefined (0x0) +# CHECK-NEXT: } +# CHECK-NEXT: ] + +.global foo +.weak bar |
