[llvm-objdump] --syms: print "%016" PRIx64 instead of "%08" PRIx64 for 64-bit objects

[MaskRay]

Summary

This is GNU objdump's behavior and it is reasonable to match.

[grimar]

LGTM with ELF32 and ELF64.

llvm/test/tools/llvm-objdump/symbol-table-elf.test

4

Lets use ELF32 and ELF64 as it is more common?

19

I guess it is fine for this patch.

But FTR, it seems this test might be improved. Probably 64 bit values also should be used
to demonstrate we can dump them. And testing of symbol sizes would also probably be not harmful.

[MaskRay]

I will fix/improve the lld/test/ELF tests. Some should use llvm-readelf -s instead of llvm-objdump -t. The BFD flags (g and l) in llvm-objdump output may cause another change. The llvm-readelf -s output is stable.

[MaskRay]

Fix lld/test/ELF tests

llvm/test/MC/AArch64/inst-directive.s

 // CHECK-ASM:        .inst   0x5e104020
 
 // CHECK-OBJ: Section {
 // CHECK-OBJ:   Name: .inst.aarch64_inst
 // CHECK-OBJ:   SectionData (
 // CHECK-OBJ-NEXT: 0000: 2040105E
 // CHECK-OBJ-NEXT: )
 
-// CHECK-SYMS-NOT: 0000000000000000         .inst.aarch64_inst              00000000 $d
-// CHECK-SYMS:     0000000000000000         .inst.aarch64_inst              00000000 $x
-// CHECK-SYMS-NOT: 0000000000000000         .inst.aarch64_inst              00000000 $d
+// CHECK-SYMS-NOT: 0000000000000000 .inst.aarch64_inst 0000000000000000 $d
+// CHECK-SYMS:     0000000000000000 .inst.aarch64_inst 0000000000000000 $x
+// CHECK-SYMS-NOT: 0000000000000000 .inst.aarch64_inst 0000000000000000 $d

llvm/test/MC/AArch64/mapping-across-sections.s

// Changing back to .text should not emit a redundant $x
         add w0, w0, w0
 
 // With all those constraints, we want:
 //   + .text to have $x at 0 and no others
 //   + .wibble to have $x at 0
 //   + .starts_data to have $d at 0
 
 
-// CHECK: 00000000 .starts_data 00000000 $d
-// CHECK-NEXT: 00000000 .text 00000000 $x
-// CHECK-NEXT: 00000000 .wibble 00000000 $x
+// CHECK:      0000000000000000 .starts_data 0000000000000000 $d
+// CHECK-NEXT: 0000000000000000 .text        0000000000000000 $x
+// CHECK-NEXT: 0000000000000000 .wibble      0000000000000000 $x
 // CHECK-NOT: ${{[adtx]}}
 

llvm/test/tools/llvm-objdump/X86/adjust-vma.test

 # ADJUST-NEXT:    3 .rela.debug_str 00000018 0000000000000000
 # ADJUST-NEXT:    4 .data           00000004 0000000000123000 DATA
 # ADJUST-NEXT:    5 .rela.data      00000018 0000000000000000
 # ADJUST-NEXT:    6 .symtab         00000060 0000000000000000
 # ADJUST-NEXT:    7 .strtab         00000010 0000000000000000
 # ADJUST-NEXT:    8 .shstrtab       0000003c 0000000000000000
 
 # COMMON:      SYMBOL TABLE:
-# COMMON-NEXT:  0000000000000001  l F .text 00000000 func
-# COMMON-NEXT:  0000000000000000      .text 00000000 sym
-# COMMON-NEXT:  0000000000000000  l d .text 00000000 .text
+# COMMON-NEXT:  0000000000000001  l F .text 0000000000000000 func
+# COMMON-NEXT:  0000000000000000      .text 0000000000000000 sym
+# COMMON-NEXT:  0000000000000000  l d .text 0000000000000000 .text
 
 # NOADJUST:      0000000000000000 sym:
 # NOADJUST-NEXT:   0: {{.*}}  nop
 # NOADJUST:      0000000000000001 func:
 # NOADJUST-NEXT:   1: {{.*}}  retq
 
 # ADJUST:        0000000000123000 sym:
 # ADJUST-NEXT:     123000: {{.*}} nop

llvm/test/tools/llvm-objdump/X86/demangle.s

 # RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux -o %t
 # RUN: llvm-objdump -t -r --demangle %t | FileCheck %s
 
 ## Check we demangle symbols when printing symbol table.
 # CHECK:      SYMBOL TABLE:
-# CHECK-NEXT: 0000000000000000 g     F .text           00000000 foo()
+# CHECK-NEXT: 0000000000000000 g     F .text           0000000000000000 foo()
 
 ## Check we demangle symbols when printing relocations.
 # CHECK:      000000000000001 R_X86_64_PLT32 foo()-0x4
 
 ## Check the case when relocations are inlined into disassembly.
 # RUN: llvm-objdump -d -r --demangle %t | FileCheck %s --check-prefix=INLINE
 # INLINE:      foo():
 # INLINE-NEXT:  0: {{.*}}  callq   0 <_Z3foov+0x5>
 # INLINE-NEXT:  0000000000000001:  R_X86_64_PLT32 foo()-0x4
 
 .text
 .globl _Z3foov
 .type _Z3foov,@function
 _Z3foov:
  callq _Z3foov@PLT

llvm/test/tools/llvm-objdump/symbol-table-elf.test

-# RUN: yaml2obj %s -o %t
-# RUN: llvm-objdump --syms %t > %t1
-# RUN: llvm-objdump -t     %t > %t2
-# RUN: cmp %t1 %t2
-# RUN: FileCheck %s --input-file=%t1
+# RUN: yaml2obj -D BITS=32 %s -o %t.32
+# RUN: llvm-objdump --syms %t.32 > %t.32.txt
+# RUN: llvm-objdump -t %t.32 | cmp - %t.32.txt
+# RUN: FileCheck --check-prefix=32 %s --input-file=%t.32.txt
 
-# CHECK:      SYMBOL TABLE:
-# CHECK-NEXT: 0000000000001004 l     F .text     00000000 lfoo
-# CHECK-NEXT: 0000000000001008 l     O .text     00000000 lbar
-# CHECK-NEXT: 0000000000001004 g     F .text     00000000 foo
-# CHECK-NEXT: 0000000000001008 g     O .text     00000000 bar
+# RUN: yaml2obj -D BITS=64 %s -o %t.64
+# RUN: llvm-objdump --syms %t.64 | FileCheck --check-prefix=64 %s
+
+# 32:      SYMBOL TABLE:
+# 32-NEXT: 00001004 l     F .text     00000000 lfoo
+# 32-NEXT: 00001008 l     O .text     00000000 lbar
+# 32-NEXT: 00001004 g     F .text     00000000 foo
+# 32-NEXT: 00001008 g     O .text     00000000 bar
+
+# 64:      SYMBOL TABLE:
+# 64-NEXT: 0000000000001004 l     F .text     0000000000000000 lfoo
+# 64-NEXT: 0000000000001008 l     O .text     0000000000000000 lbar
+# 64-NEXT: 0000000000001004 g     F .text     0000000000000000 foo
+# 64-NEXT: 0000000000001008 g     O .text     0000000000000000 bar
 
 !ELF
 FileHeader:
-  Class:           ELFCLASS64
+  Class:           ELFCLASS[[BITS]]
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
   Machine:         EM_X86_64
 Sections:
   - Name:            .bss
     Type:            SHT_NOBITS
     Flags:           [ SHF_ALLOC ]
     AddressAlign:    0x0000000000000010

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

if (Absolute) {
       StringRef SectionName =
           unwrapOrError(Section->getName(), O->getFileName());
       outs() << SectionName;
     }
 
     if (Common || isa<ELFObjectFileBase>(O)) {
       uint64_t Val =
           Common ? Symbol.getAlignment() : ELFSymbolRef(Symbol).getSize();
-      outs() << format("\t%08" PRIx64, Val);
+      outs() << '\t' << format(Fmt, Val);
     }
 
     if (isa<ELFObjectFileBase>(O)) {
       uint8_t Other = ELFSymbolRef(Symbol).getOther();
       switch (Other) {
       case ELF::STV_DEFAULT:
         break;
       case ELF::STV_INTERNAL: