diff options
| -rw-r--r-- | lld/ELF/SyntheticSections.cpp | 8 | ||||
| -rw-r--r-- | lld/test/ELF/dynsym-no-rosegment.s | 27 |
2 files changed, 34 insertions, 1 deletions
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp index 558965560fe..c737c0b5fd1 100644 --- a/lld/ELF/SyntheticSections.cpp +++ b/lld/ELF/SyntheticSections.cpp @@ -1386,6 +1386,7 @@ SymbolTableSection<ELFT>::SymbolTableSection(StringTableSection &StrTabSec) // Write the internal symbol table contents to the output symbol table. template <class ELFT> void SymbolTableSection<ELFT>::writeTo(uint8_t *Buf) { // The first entry is a null entry as per the ELF spec. + memset(Buf, 0, sizeof(Elf_Sym)); Buf += sizeof(Elf_Sym); auto *ESym = reinterpret_cast<Elf_Sym *>(Buf); @@ -1394,6 +1395,7 @@ template <class ELFT> void SymbolTableSection<ELFT>::writeTo(uint8_t *Buf) { SymbolBody *Body = Ent.Symbol; // Set st_info and st_other. + ESym->st_other = 0; if (Body->isLocal()) { ESym->setBindingAndType(STB_LOCAL, Body->Type); } else { @@ -1410,13 +1412,17 @@ template <class ELFT> void SymbolTableSection<ELFT>::writeTo(uint8_t *Buf) { ESym->st_shndx = SHN_ABS; else if (isa<DefinedCommon>(Body)) ESym->st_shndx = SHN_COMMON; + else + ESym->st_shndx = SHN_UNDEF; // Copy symbol size if it is a defined symbol. st_size is not significant // for undefined symbols, so whether copying it or not is up to us if that's // the case. We'll leave it as zero because by not setting a value, we can // get the exact same outputs for two sets of input files that differ only // in undefined symbol size in DSOs. - if (ESym->st_shndx != SHN_UNDEF) + if (ESym->st_shndx == SHN_UNDEF) + ESym->st_size = 0; + else ESym->st_size = Body->getSize<ELFT>(); // st_value is usually an address of a symbol, but that has a diff --git a/lld/test/ELF/dynsym-no-rosegment.s b/lld/test/ELF/dynsym-no-rosegment.s new file mode 100644 index 00000000000..947f526e057 --- /dev/null +++ b/lld/test/ELF/dynsym-no-rosegment.s @@ -0,0 +1,27 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o +# RUN: ld.lld -shared --no-rosegment -o %t %t.o +# RUN: llvm-readobj -dyn-symbols -s %t | FileCheck %s + +# CHECK: DynamicSymbols [ +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Name: @ (0) +# CHECK-NEXT: Value: 0x0 +# CHECK-NEXT: Size: 0 +# CHECK-NEXT: Binding: Local +# CHECK-NEXT: Type: None +# CHECK-NEXT: Other: 0 +# CHECK-NEXT: Section: Undefined +# CHECK-NEXT: } +# CHECK-NEXT: Symbol { +# CHECK-NEXT: Name: undef@ +# CHECK-NEXT: Value: 0x0 +# CHECK-NEXT: Size: 0 +# CHECK-NEXT: Binding: Global +# CHECK-NEXT: Type: None +# CHECK-NEXT: Other: 0 +# CHECK-NEXT: Section: Undefined +# CHECK-NEXT: } +# CHECK-NEXT: ] + +callq undef@PLT |
