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

[George Rimar via llvm-commits]

grimar created this revision.
grimar added reviewers: ruiu, rafael.
grimar added subscribers: davide, emaste, llvm-commits, grimar, evgeny777.

Found this when tried to link lang/ccl FreeBSD port.
Issue is very close to https://reviews.llvm.org/D23201.

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

This is the reason of lang/ccl port link fail:

  ===>  Building for ccl-1.11
  m4 -DFREEBSD -DX86 -DX8664 -DHAVE_TLS -I../ ../x86-spjump64.s | as  --64 -o x86-spjump64.o
  cc -m64 -g  -Wl,--export-dynamic    -o ../../fx86cl64  pad.o x86-spjump64.o x86-spentry64.o x86-subprims64.o pmcl-kernel.o gc-common.o  x86-gc.o bits.o  x86-exceptions.o  x86-utils.o  image.o thread_manager.o lisp-debug.o memory.o unix-calls.o x86-asmutils64.o  imports.o lispdcmd.o plprint.o plsym.o xlbt.o x86_print.o -lm -lthr
  /usr/bin/ld: error: x86-spjump64.o: invalid section index: 9
  cc: error: linker command failed with exit code 1 (use -v to see invocation)
  *** Error code 1

Patch fixes the issue.


https://reviews.llvm.org/D26613

Files:
  ELF/InputFiles.cpp
  test/ELF/invalid/symtab-symbols.test


Index: test/ELF/invalid/symtab-symbols.test
===================================================================
--- test/ELF/invalid/symtab-symbols.test
+++ 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
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -417,13 +417,14 @@
     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));
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26613.77814.patch
Type: text/x-patch
Size: 2010 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161114/b2353058/attachment.bin>