[llvm] r204769 - Create .symtab_shndxr only when needed.

[Rafael Espindola]

Added: llvm/trunk/test/MC/ELF/many-sections.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/many-sections.s?rev=204769&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/many-sections.s (added)
+++ llvm/trunk/test/MC/ELF/many-sections.s Tue Mar 25 18:44:25 2014
@@ -0,0 +1,106 @@
+// RUN:  llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
+// RUN: llvm-readobj -s %t | FileCheck --check-prefix=SECTIONS %s
+// RUN: llvm-readobj -t %t | FileCheck --check-prefix=SYMBOLS %s
+
+// Test that we don't create a .symtab_shndx since we are one section short of
+// SHN_LORESERVE (0xFF00).
+
+// SECTIONS-NOT: Name: .symtab_shndx
+
+// Check the last referenced section.
+
+// SYMBOLS:         Name: dm (0)
+// SYMBOLS-NEXT:    Value: 0x0
+// SYMBOLS-NEXT:    Size: 0
+// SYMBOLS-NEXT:    Binding: Local (0x0)
+// SYMBOLS-NEXT:    Type: Section (0x3)
+// SYMBOLS-NEXT:    Other: 0
+// SYMBOLS-NEXT:    Section: dm (0xFEFF)
+// SYMBOLS-NEXT:  }
+// SYMBOLS-NEXT:]
+
+.macro gen_sections4 x
+        .section a\x
+        .section b\x
+        .section c\x
+        .section d\x
+.endm
+
+.macro gen_sections8 x
+        gen_sections4 a\x
+        gen_sections4 b\x
+.endm
+
+.macro gen_sections16 x
+        gen_sections8 a\x
+        gen_sections8 b\x
+.endm
+
+.macro gen_sections32 x
+        gen_sections16 a\x
+        gen_sections16 b\x
+.endm
+
+.macro gen_sections64 x
+        gen_sections32 a\x
+        gen_sections32 b\x
+.endm
+
+.macro gen_sections128 x
+        gen_sections64 a\x
+        gen_sections64 b\x
+.endm
+
+.macro gen_sections256 x
+        gen_sections128 a\x
+        gen_sections128 b\x
+.endm
+
+.macro gen_sections512 x
+        gen_sections256 a\x
+        gen_sections256 b\x
+.endm
+
+.macro gen_sections1024 x
+        gen_sections512 a\x
+        gen_sections512 b\x
+.endm
+
+.macro gen_sections2048 x
+        gen_sections1024 a\x
+        gen_sections1024 b\x
+.endm
+
+.macro gen_sections4096 x
+        gen_sections2048 a\x
+        gen_sections2048 b\x
+.endm
+
+.macro gen_sections8192 x
+        gen_sections4096 a\x
+        gen_sections4096 b\x
+.endm
+
+.macro gen_sections16384 x
+        gen_sections8192 a\x
+        gen_sections8192 b\x
+.endm
+
+.macro gen_sections32768 x
+        gen_sections16384 a\x
+        gen_sections16384 b\x
+.endm
+
+gen_sections32768 a
+gen_sections16384 b
+gen_sections8192 c
+gen_sections4096 d
+gen_sections2048 e
+gen_sections1024 f
+gen_sections512 g
+gen_sections128 h
+gen_sections64 i
+gen_sections32 j
+gen_sections16 k
+gen_sections8 l
+gen_sections4 m

Modified: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/ELFDumper.cpp?rev=204769&r1=204768&r2=204769&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp Tue Mar 25 18:44:25 2014
@@ -626,7 +626,7 @@ template <class ELFT>
 void ELFDumper<ELFT>::printSymbol(typename ELFO::Elf_Sym_Iter Symbol) {
   StringRef SymbolName = errorOrDefault(Obj->getSymbolName(Symbol));
 
-  unsigned SectionIndex = Obj->getSymbolTableIndex(&*Symbol);
+  unsigned SectionIndex = Symbol->st_shndx;
   StringRef SectionName;
   if (SectionIndex == SHN_UNDEF) {
     SectionName = "Undefined";
@@ -641,6 +641,8 @@ void ELFDumper<ELFT>::printSymbol(typena
   } else if (SectionIndex == SHN_COMMON) {
     SectionName = "Common";
   } else {
+    if (SectionIndex == SHN_XINDEX)
+      SectionIndex = Obj->getSymbolTableIndex(&*Symbol);
     assert(SectionIndex != SHN_XINDEX &&
            "getSymbolTableIndex should handle this");
     const Elf_Shdr *Sec = Obj->getSection(SectionIndex);
@@ -666,7 +668,7 @@ void ELFDumper<ELFT>::printSymbol(typena
                   makeArrayRef(ElfSymbolBindings));
   W.printEnum  ("Type", Symbol->getType(), makeArrayRef(ElfSymbolTypes));
   W.printNumber("Other", Symbol->st_other);
-  W.printHex   ("Section", SectionName, Symbol->st_shndx);
+  W.printHex("Section", SectionName, SectionIndex);
 }
 
 #define LLVM_READOBJ_TYPE_CASE(name) \