diff --git a/llvm/test/MC/AArch64/inst-directive.s b/llvm/test/MC/AArch64/inst-directive.s
--- a/llvm/test/MC/AArch64/inst-directive.s
+++ b/llvm/test/MC/AArch64/inst-directive.s
@@ -30,6 +30,6 @@
 // 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
diff --git a/llvm/test/MC/AArch64/mapping-across-sections.s b/llvm/test/MC/AArch64/mapping-across-sections.s
--- a/llvm/test/MC/AArch64/mapping-across-sections.s
+++ b/llvm/test/MC/AArch64/mapping-across-sections.s
@@ -21,8 +21,8 @@
 //   + .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]}}
 
diff --git a/llvm/test/tools/llvm-objdump/X86/adjust-vma.test b/llvm/test/tools/llvm-objdump/X86/adjust-vma.test
--- a/llvm/test/tools/llvm-objdump/X86/adjust-vma.test
+++ b/llvm/test/tools/llvm-objdump/X86/adjust-vma.test
@@ -28,9 +28,9 @@
 # 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
diff --git a/llvm/test/tools/llvm-objdump/X86/demangle.s b/llvm/test/tools/llvm-objdump/X86/demangle.s
--- a/llvm/test/tools/llvm-objdump/X86/demangle.s
+++ b/llvm/test/tools/llvm-objdump/X86/demangle.s
@@ -3,7 +3,7 @@
 
 ## 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
diff --git a/llvm/test/tools/llvm-objdump/symbol-table-elf.test b/llvm/test/tools/llvm-objdump/symbol-table-elf.test
--- a/llvm/test/tools/llvm-objdump/symbol-table-elf.test
+++ b/llvm/test/tools/llvm-objdump/symbol-table-elf.test
@@ -1,18 +1,26 @@
-# 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
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -1943,7 +1943,7 @@
     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)) {