From 308752e474fa98842a74dc16e171c595b40db651 Mon Sep 17 00:00:00 2001
From: George Rimar <grimar@accesssoftek.com>
Date: Tue, 15 Nov 2016 07:56:28 +0000
Subject: [PATCH] [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
---
 lld/ELF/InputFiles.cpp                   | 11 ++++++-----
 lld/test/ELF/invalid/symtab-symbols.test | 25 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 lld/test/ELF/invalid/symtab-symbols.test

diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 6faef18b0dc0..e5ec606b0b1b 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -417,13 +417,14 @@ elf::ObjectFile<ELFT>::getSection(const Elf_Sym &Sym) const {
     fatal(getFilename(this) + ": invalid section index: " + Twine(Index));
   InputSectionBase<ELFT> *S = Sections[Index];
 
-  // We found that GNU assembler 2.17.50 [FreeBSD] 2007-07-03
-  // could generate broken objects. STT_SECTION symbols can be
+  // We found that GNU assembler 2.17.50 [FreeBSD] 2007-07-03 could
+  // generate broken objects. STT_SECTION/STT_NOTYPE symbols can be
   // associated with SHT_REL[A]/SHT_SYMTAB/SHT_STRTAB sections.
-  // In this case it is fine for section to be null here as we
-  // do not allocate sections of these types.
+  // In this case it is fine for section to be null here as we do not
+  // allocate sections of these types.
   if (!S) {
-    if (Index == 0 || Sym.getType() == STT_SECTION)
+    if (Index == 0 || Sym.getType() == STT_SECTION ||
+        Sym.getType() == STT_NOTYPE)
       return nullptr;
     fatal(getFilename(this) + ": invalid section index: " + Twine(Index));
   }
diff --git a/lld/test/ELF/invalid/symtab-symbols.test b/lld/test/ELF/invalid/symtab-symbols.test
new file mode 100644
index 000000000000..ac9f48c40bda
--- /dev/null
+++ b/lld/test/ELF/invalid/symtab-symbols.test
@@ -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