commit 20348229812c6592bf72e14cf6f5fa5ff00df157
author Rafael Espindola <rafael.espindola@gmail.com> Mon Aug 24 21:43:25 2015 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Aug 24 21:43:25 2015 +0000
tree ab75a5c7ce603775b5f3740e8db431cbb453e4a5
parent 3cbfb65a529b2826a41f0d0418f540e6ffb3fc42

Add support for reading files with more than 0xff00 sections.

llvm-svn: 245880

lld/ELF/InputFiles.cpp

diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 7db8a25..a58093f 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -46,6 +46,12 @@
     case SHT_SYMTAB:
       Symtab = &Sec;
       break;
+    case SHT_SYMTAB_SHNDX: {
+      ErrorOr<ArrayRef<Elf_Word>> ErrorOrTable = ELFObj->getSHNDXTable(Sec);
+      error(ErrorOrTable);
+      SymtabSHNDX = *ErrorOrTable;
+      break;
+    }
     case SHT_STRTAB:
     case SHT_NULL:
     case SHT_RELA:
@@ -82,7 +88,11 @@
   ErrorOr<StringRef> NameOrErr = Sym->getName(StringTable);
   error(NameOrErr.getError());
   StringRef Name = *NameOrErr;
-  uint16_t SecIndex = Sym->st_shndx;
+
+  uint32_t SecIndex = Sym->st_shndx;
+  if (SecIndex == SHN_XINDEX)
+    SecIndex = ELFObj->getExtendedSymbolTableIndex(Sym, Symtab, SymtabSHNDX);
+
   switch (Sym->getBinding()) {
   default:
     error("unexpected binding");