[llvm-objdump] Print st_other

[MaskRay]

Summary

Add support for ".hidden" ".internal" ".protected" and " 0x%02x" for
other st_other bits on some architectures.

[MaskRay]

Add a missed test

[MaskRay]

.

[jhenderson]

llvm/test/tools/llvm-objdump/elf-symbol-visibility.s

1 ↗

(On Diff #198765)

I think it's more normal to put a test with such a requirement inside a PowerPC/X86 subdirectory for llvm-objdump tests, but does this need to be assembly? Can it not be built with yaml2obj?

[MaskRay]

Use yaml2obj

[MaskRay]

Actually use yaml2obj

(I don't use monorepo often..)

[MaskRay]

llvm/test/tools/llvm-objdump/elf-symbol-visibility.s

1 ↗

(On Diff #198765)

Changed to yaml2obj. Its st_other mapping is currently a bit clumsy to use. So I switched from ppc64 to mips... I may take a look how to improve that.

[sfertile]

LGTM.

lld/trunk/test/ELF/gc-sections-metadata-startstop.s

 # REQUIRES: x86
 # LINK_ORDER cnamed sections are not kept alive by the __start_* reference.
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --gc-sections %t.o -o %t
 # RUN: llvm-objdump -section-headers -t %t | FileCheck  %s
 
 # CHECK: Sections:
 # CHECK-NOT: yy
 # CHECK: xx {{.*}} DATA
 # CHECK-NOT: yy
 
 # CHECK: SYMBOL TABLE:
-# CHECK: xx 00000000 __start_xx
+# CHECK:   xx    00000000 .protected __start_xx
 # CHECK: w *UND* 00000000 __start_yy
 
 .weak __start_xx
 .weak __start_yy
 
 .global _start
 _start:
 .quad __start_xx

lld/trunk/test/ELF/mips-micro-relocs.s

 # EL-NEXT:      2002c:       00 94 e8 ff     b       -44
 
 # EL:      Contents of section .data:
 # EL-NEXT:  30000 1180feff
 
 # EL:      Contents of section .debug_info
 # EL-NEXT:  0000 11000200
 
-# SYM: 00038000         .got            00000000 .hidden _gp
-# SYM: 00020000 g F     .text           00000000 foo
-# SYM: 00020010         .text           00000000 __start
+# SYM: 00038000         .got   00000000 .hidden _gp
+# SYM: 00020000 g F     .text  00000000 0x80 foo
+# SYM: 00020010         .text  00000000 0x80 __start
 
 # ELF: ElfHeader {
 # ELF:   Entry: 0x20011
 
   .text
   .set micromips
   .global __start
 __start:

lld/trunk/test/ELF/mips-micror6-relocs.s

 # EB-NEXT:    20014:  80 7f ff f6  beqzc  $3, -36
 # EB-NEXT:    20018:  b7 ff ff f4  balc   -24 <foo>
 
 # EL:      __start:
 # EL-NEXT:    20010:  47 78 fd ff  lapc   $2, -12
 # EL-NEXT:    20014:  7f 80 f6 ff  beqzc  $3, -36
 # EL-NEXT:    20018:  ff b7 f4 ff  balc   -24 <foo>
 
-# SYM: 00020000 g F     .text           00000000 foo
-# SYM: 00020010         .text           00000000 __start
+# SYM: 00020000 g F     .text  00000000 0x80 foo
+# SYM: 00020010         .text  00000000 0x80 __start
 
   .text
   .set micromips
   .global __start
 __start:
   addiupc $2, foo+4   # R_MICROMIPS_PC19_S2
   beqzc   $3, foo+4   # R_MICROMIPS_PC21_S1
   balc    foo+4       # R_MICROMIPS_PC26_S1

llvm/trunk/test/tools/llvm-objdump/elf-symbol-visibility.test

+# RUN: yaml2obj %s -o %t
+# RUN: llvm-objdump --syms %t | FileCheck %s
+
+# CHECK:      SYMBOL TABLE:
+# CHECK-NEXT: .text  00000000 default
+# CHECK-NEXT: .text  00000000 .internal internal
+# CHECK-NEXT: .text  00000000 .hidden hidden
+# CHECK-NEXT: .text  00000000 .protected protected
+# CHECK-NEXT: .text  00000000 0x20 mips_pic
+
+!ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_MIPS
+  Flags:   [ EF_MIPS_ABI_O32, EF_MIPS_ARCH_32 ]
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+    Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+Symbols:
+  - Name:    default
+    Section: .text
+  - Name:    internal
+    Visibility: STV_INTERNAL
+    Section: .text
+  - Name:    hidden
+    Visibility: STV_HIDDEN
+    Section: .text
+  - Name:    protected
+    Visibility: STV_PROTECTED
+    Section: .text
+  - Name:    mips_pic
+    Other:   [ STO_MIPS_PIC ]
+    Section: .text

llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp

if (Absolute) {
         StringRef SegmentName = MachO->getSectionFinalSegmentName(DR);
         outs() << SegmentName << ",";
       }
       StringRef SectionName;
       error(Section->getName(SectionName));
       outs() << SectionName;
     }
 
-    outs() << '\t';
     if (Common || isa<ELFObjectFileBase>(O)) {
       uint64_t Val =
           Common ? Symbol.getAlignment() : ELFSymbolRef(Symbol).getSize();
-      outs() << format("\t %08" PRIx64 " ", Val);
+      outs() << format("\t%08" PRIx64, Val);
     }
 
-    if (Hidden)
-      outs() << ".hidden ";
+    if (isa<ELFObjectFileBase>(O)) {
+      uint8_t Other = ELFSymbolRef(Symbol).getOther();
+      switch (Other) {
+      case ELF::STV_DEFAULT:
+        break;
+      case ELF::STV_INTERNAL:
+        outs() << " .internal";
+        break;
+      case ELF::STV_HIDDEN:
+        outs() << " .hidden";
+        break;
+      case ELF::STV_PROTECTED:
+        outs() << " .protected";
+        break;
+      default:
+        outs() << format(" 0x%02x", Other);
+        break;
+      }
+    } else if (Hidden) {
+      outs() << " .hidden";
+    }
 
     if (Demangle)
-      outs() << demangle(Name) << '\n';
+      outs() << ' ' << demangle(Name) << '\n';
     else
-      outs() << Name << '\n';
+      outs() << ' ' << Name << '\n';
   }
 }
 
 static void printUnwindInfo(const ObjectFile *O) {
   outs() << "Unwind info:\n\n";
 
   if (const COFFObjectFile *Coff = dyn_cast<COFFObjectFile>(O))
     printCOFFUnwindInfo(Coff);