maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] - Allow symbols of STT_NOTYPE to be associated with SHT_SYMTAB sections. 

Found this when tried to link lang/ccl FreeBSD port.
Issue is very close to D23201.
This is the reason of lang/ccl port link fail.

GNU assembler 2.17.50 [FreeBSD] 2007-07-03 could generate broken objects,
where notype symbols are associated with symtab:
...
[ 9] .symtab           SYMTAB           0000000000000000  00003c78
     0000000000006858  0000000000000018          10   803     8
...
192: 000000000000000d     0 NOTYPE  LOCAL  DEFAULT    9 _cons_org

Patch allows to handle such objects.

Differential revision: https://reviews.llvm.org/D26613

llvm-svn: 286939
This commit is contained in:
George Rimar 2016-11-15 07:56:28 +00:00
parent b573553424
commit 308752e474
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/InputFiles.cpp
View File

@ -417,13 +417,14 @@ elf::ObjectFile<ELFT>::getSection(const Elf_Sym &Sym) const {
fatal(getFilename(this) + ": invalid section index: " + Twine(Index)); fatal(getFilename(this) + ": invalid section index: " + Twine(Index));
InputSectionBase<ELFT> *S = Sections[Index]; InputSectionBase<ELFT> *S = Sections[Index];
// We found that GNU assembler 2.17.50 [FreeBSD] 2007-07-03 // We found that GNU assembler 2.17.50 [FreeBSD] 2007-07-03 could
// could generate broken objects. STT_SECTION symbols can be // generate broken objects. STT_SECTION/STT_NOTYPE symbols can be
// associated with SHT_REL[A]/SHT_SYMTAB/SHT_STRTAB sections. // associated with SHT_REL[A]/SHT_SYMTAB/SHT_STRTAB sections.
// In this case it is fine for section to be null here as we // In this case it is fine for section to be null here as we do not
// do not allocate sections of these types. // allocate sections of these types.
if (!S) { if (!S) {
if (Index == 0 || Sym.getType() == STT_SECTION) if (Index == 0 || Sym.getType() == STT_SECTION ||
Sym.getType() == STT_NOTYPE)
return nullptr; return nullptr;
fatal(getFilename(this) + ": invalid section index: " + Twine(Index)); fatal(getFilename(this) + ": invalid section index: " + Twine(Index));
} }

25
lld/test/ELF/invalid/symtab-symbols.test Normal file
View File

@ -0,0 +1,25 @@
# RUN: yaml2obj %s -o %t
# RUN: ld.lld -shared %t -o %tout
# GNU assembler 2.17.50 [FreeBSD] 2007-07-03 could generate
# broken objects.
# Verify that lld can handle STT_NOTYPE symbols associated
# with SHT_SYMTAB section.
!ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_FREEBSD
Type: ET_REL
Machine: EM_X86_64
Sections:
- Name: .text
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
AddressAlign: 0x0000000000000010
Content: "00000000"
Symbols:
Local:
- Type: STT_NOTYPE
Section: .symtab