[llvm] c72d60d - [llvm-objdump] --syms: print st_size as "%016" PRIx64 instead of "%08" PRIx64 for 64-bit objects
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 4 12:09:37 PST 2020
Author: Fangrui Song
Date: 2020-03-04T12:09:27-08:00
New Revision: c72d60d42f95ffcf7da7cb1762da842a611cc5fa
URL: https://github.com/llvm/llvm-project/commit/c72d60d42f95ffcf7da7cb1762da842a611cc5fa
DIFF: https://github.com/llvm/llvm-project/commit/c72d60d42f95ffcf7da7cb1762da842a611cc5fa.diff
LOG: [llvm-objdump] --syms: print st_size as "%016" PRIx64 instead of "%08" PRIx64 for 64-bit objects
This is GNU objdump's behavior and it is reasonable to match.
Reviewed By: grimar
Differential Revision: https://reviews.llvm.org/D75588
Added:
Modified:
lld/test/ELF/bss-start-common.s
lld/test/ELF/edata-etext.s
lld/test/ELF/edata-no-bss.s
lld/test/ELF/gc-sections-metadata-startstop.s
lld/test/ELF/icf7.s
lld/test/ELF/linkerscript/absolute2.s
lld/test/ELF/linkerscript/align4.test
lld/test/ELF/linkerscript/align5.test
lld/test/ELF/linkerscript/data-commands-gc.s
lld/test/ELF/linkerscript/loadaddr.s
lld/test/ELF/linkerscript/merge-nonalloc.s
lld/test/ELF/linkerscript/symbol-only.test
lld/test/ELF/linkerscript/symbol-reserved.s
lld/test/ELF/linkerscript/symbolreferenced.s
lld/test/ELF/linkerscript/symbols-non-alloc.test
lld/test/ELF/linkerscript/symbols.s
lld/test/ELF/linkerscript/synthetic-symbols1.test
lld/test/ELF/linkerscript/synthetic-symbols3.test
lld/test/ELF/linkerscript/synthetic-symbols4.test
lld/test/ELF/mips-64-got.s
lld/test/ELF/mips-64-rels.s
lld/test/ELF/mips-64.s
lld/test/ELF/mips-tls-64.s
lld/test/ELF/mips-tls-static-64.s
lld/test/ELF/relocation-common.s
lld/test/ELF/sht-group-gold-r.test
lld/test/ELF/wrap-no-real.s
llvm/test/MC/AArch64/inst-directive.s
llvm/test/MC/AArch64/mapping-across-sections.s
llvm/test/tools/llvm-objdump/X86/adjust-vma.test
llvm/test/tools/llvm-objdump/X86/demangle.s
llvm/test/tools/llvm-objdump/symbol-table-elf.test
llvm/tools/llvm-objdump/llvm-objdump.cpp
Removed:
################################################################################
diff --git a/lld/test/ELF/bss-start-common.s b/lld/test/ELF/bss-start-common.s
index 7537cf28e3dc..62b9ead699db 100644
--- a/lld/test/ELF/bss-start-common.s
+++ b/lld/test/ELF/bss-start-common.s
@@ -9,7 +9,7 @@
# CHECK: Idx Name Size VMA Type
# CHECK: 2 .bss 00000004 [[ADDR:[0-za-f]+]] BSS
# CHECK: SYMBOL TABLE:
-# CHECK: [[ADDR]] .bss 00000000 __bss_start
+# CHECK: [[ADDR]] .bss 0000000000000000 __bss_start
.global __bss_start
.text
diff --git a/lld/test/ELF/edata-etext.s b/lld/test/ELF/edata-etext.s
index c559b06398a7..99a571a0cd65 100644
--- a/lld/test/ELF/edata-etext.s
+++ b/lld/test/ELF/edata-etext.s
@@ -18,19 +18,19 @@
# CHECK-NEXT: 2 .data 00000002 0000000000202159 DATA
# CHECK-NEXT: 3 .bss 00000006 000000000020215c BSS
# CHECK: SYMBOL TABLE:
-# CHECK-NEXT: 000000000020215b .data 00000000 _edata
-# CHECK-NEXT: 0000000000202162 .bss 00000000 _end
-# CHECK-NEXT: 0000000000201159 .text 00000000 _etext
-# CHECK-NEXT: 0000000000201158 .text 00000000 _start
-# CHECK-NEXT: 000000000020215b .data 00000000 edata
-# CHECK-NEXT: 0000000000202162 .bss 00000000 end
-# CHECK-NEXT: 0000000000201159 .text 00000000 etext
+# CHECK-NEXT: 000000000020215b .data 0000000000000000 _edata
+# CHECK-NEXT: 0000000000202162 .bss 0000000000000000 _end
+# CHECK-NEXT: 0000000000201159 .text 0000000000000000 _etext
+# CHECK-NEXT: 0000000000201158 .text 0000000000000000 _start
+# CHECK-NEXT: 000000000020215b .data 0000000000000000 edata
+# CHECK-NEXT: 0000000000202162 .bss 0000000000000000 end
+# CHECK-NEXT: 0000000000201159 .text 0000000000000000 etext
# RUN: ld.lld -r %t.o -o %t2
# RUN: llvm-objdump -t %t2 | FileCheck %s --check-prefix=RELOCATABLE
-# RELOCATABLE: 0000000000000000 *UND* 00000000 _edata
-# RELOCATABLE-NEXT: 0000000000000000 *UND* 00000000 _end
-# RELOCATABLE-NEXT: 0000000000000000 *UND* 00000000 _etext
+# RELOCATABLE: 0000000000000000 *UND* 0000000000000000 _edata
+# RELOCATABLE-NEXT: 0000000000000000 *UND* 0000000000000000 _end
+# RELOCATABLE-NEXT: 0000000000000000 *UND* 0000000000000000 _etext
.global _start,_end,_etext,_edata,end,etext,edata
.text
diff --git a/lld/test/ELF/edata-no-bss.s b/lld/test/ELF/edata-no-bss.s
index 089ba42865ed..bc459ab3d462 100644
--- a/lld/test/ELF/edata-no-bss.s
+++ b/lld/test/ELF/edata-no-bss.s
@@ -8,7 +8,7 @@
# CHECK: .data 00000008 000000000020215c DATA
-# CHECK: 0000000000202164 .data 00000000 _edata
+# CHECK: 0000000000202164 .data 0000000000000000 _edata
.text
.globl _start
diff --git a/lld/test/ELF/gc-sections-metadata-startstop.s b/lld/test/ELF/gc-sections-metadata-startstop.s
index 0a1efb7e6075..3e005ae17641 100644
--- a/lld/test/ELF/gc-sections-metadata-startstop.s
+++ b/lld/test/ELF/gc-sections-metadata-startstop.s
@@ -11,8 +11,8 @@
# CHECK-NOT: yy
# CHECK: SYMBOL TABLE:
-# CHECK: xx 00000000 .protected __start_xx
-# CHECK: w *UND* 00000000 __start_yy
+# CHECK: xx 0000000000000000 .protected __start_xx
+# CHECK: w *UND* 0000000000000000 __start_yy
.weak __start_xx
.weak __start_yy
diff --git a/lld/test/ELF/icf7.s b/lld/test/ELF/icf7.s
index 45fb351cf3f3..554056099aa7 100644
--- a/lld/test/ELF/icf7.s
+++ b/lld/test/ELF/icf7.s
@@ -7,8 +7,8 @@
# CHECK: selected section {{.*}}:(.text.f1)
# CHECK: removing identical section {{.*}}:(.text.f2)
-# ALIGN: .text 00000000 _start
-# ALIGN: .text 00000000 f1
+# ALIGN: .text 0000000000000000 _start
+# ALIGN: .text 0000000000000000 f1
.globl _start, f1, f2
_start:
diff --git a/lld/test/ELF/linkerscript/absolute2.s b/lld/test/ELF/linkerscript/absolute2.s
index 513468d25814..5c5dfe9ebd57 100644
--- a/lld/test/ELF/linkerscript/absolute2.s
+++ b/lld/test/ELF/linkerscript/absolute2.s
@@ -9,8 +9,8 @@
# RUN: ld.lld -o %t --script %t.script %t.o
# RUN: llvm-objdump -t %t | FileCheck %s
-# CHECK: 0000000000000001 .text 00000000 _start
-# CHECK: 0000000000000002 .text 00000000 foo
+# CHECK: 0000000000000001 .text 0000000000000000 _start
+# CHECK: 0000000000000002 .text 0000000000000000 foo
.global _start
nop
diff --git a/lld/test/ELF/linkerscript/align4.test b/lld/test/ELF/linkerscript/align4.test
index 834e843da82b..70ec4b2483cc 100644
--- a/lld/test/ELF/linkerscript/align4.test
+++ b/lld/test/ELF/linkerscript/align4.test
@@ -4,11 +4,11 @@
# RUN: llvm-objdump -t %t | FileCheck %s
# CHECK-LABEL: SYMBOL TABLE:
-# CHECK-NEXT: 0000000000014008 .text 00000000 _start
-# CHECK-NEXT: 0000000000010000 *ABS* 00000000 __code_base__
-# CHECK-NEXT: 0000000000001000 *ABS* 00000000 VAR
-# CHECK-NEXT: 0000000000011000 .bbb 00000000 __start_bbb
-# CHECK-NEXT: 0000000000012000 .bbb 00000000 __end_bbb
+# CHECK-NEXT: 0000000000014008 .text 0000000000000000 _start
+# CHECK-NEXT: 0000000000010000 *ABS* 0000000000000000 __code_base__
+# CHECK-NEXT: 0000000000001000 *ABS* 0000000000000000 VAR
+# CHECK-NEXT: 0000000000011000 .bbb 0000000000000000 __start_bbb
+# CHECK-NEXT: 0000000000012000 .bbb 0000000000000000 __end_bbb
VAR = 0x1000;
__code_base__ = 0x10000;
diff --git a/lld/test/ELF/linkerscript/align5.test b/lld/test/ELF/linkerscript/align5.test
index 47b5c8c03490..3c687e018238 100644
--- a/lld/test/ELF/linkerscript/align5.test
+++ b/lld/test/ELF/linkerscript/align5.test
@@ -17,7 +17,7 @@ SECTIONS {
.text : { *(.text); }
}
-# CHECK: 0000000000001000 .aaa 00000000 foo
-# CHECK: 0000000000001000 .aaa 00000000 bar
-# CHECK: 0000000000001001 .aaa 00000000 zed1
-# CHECK: 0000000000000fff .aaa 00000000 zed2
+# CHECK: 0000000000001000 .aaa 0000000000000000 foo
+# CHECK: 0000000000001000 .aaa 0000000000000000 bar
+# CHECK: 0000000000001001 .aaa 0000000000000000 zed1
+# CHECK: 0000000000000fff .aaa 0000000000000000 zed2
diff --git a/lld/test/ELF/linkerscript/data-commands-gc.s b/lld/test/ELF/linkerscript/data-commands-gc.s
index 6d5ae8c9ef9d..2f54b887f07f 100644
--- a/lld/test/ELF/linkerscript/data-commands-gc.s
+++ b/lld/test/ELF/linkerscript/data-commands-gc.s
@@ -4,7 +4,7 @@
# RUN: ld.lld --gc-sections -o %t %t.o --script %t.script
# RUN: llvm-objdump -t %t | FileCheck %s
-# CHECK: 0000000000000008 .rodata 00000000 bar
+# CHECK: 0000000000000008 .rodata 0000000000000000 bar
.section .rodata.bar
.quad 0x1122334455667788
diff --git a/lld/test/ELF/linkerscript/loadaddr.s b/lld/test/ELF/linkerscript/loadaddr.s
index 7f1434ea7137..77d22fd20f6e 100644
--- a/lld/test/ELF/linkerscript/loadaddr.s
+++ b/lld/test/ELF/linkerscript/loadaddr.s
@@ -18,11 +18,11 @@
# RUN: echo "SECTIONS { v = LOADADDR(.zzz); }" > %t.script
# RUN: not ld.lld %t --script %t.script -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR %s
-# CHECK: 0000000000002000 *ABS* 00000000 aaa_lma
-# CHECK-NEXT: 0000000000002008 *ABS* 00000000 bbb_lma
-# CHECK-NEXT: 0000000000003000 *ABS* 00000000 ccc_lma
-# CHECK-NEXT: 0000000000004000 *ABS* 00000000 ddd_lma
-# CHECK-NEXT: 0000000000004008 *ABS* 00000000 txt_lma
+# CHECK: 0000000000002000 *ABS* 0000000000000000 aaa_lma
+# CHECK-NEXT: 0000000000002008 *ABS* 0000000000000000 bbb_lma
+# CHECK-NEXT: 0000000000003000 *ABS* 0000000000000000 ccc_lma
+# CHECK-NEXT: 0000000000004000 *ABS* 0000000000000000 ddd_lma
+# CHECK-NEXT: 0000000000004008 *ABS* 0000000000000000 txt_lma
# ERROR: {{.*}}.script:1: undefined section .zzz
.global _start
diff --git a/lld/test/ELF/linkerscript/merge-nonalloc.s b/lld/test/ELF/linkerscript/merge-nonalloc.s
index 7c48d3bc6cd0..de4a1d5c3e49 100644
--- a/lld/test/ELF/linkerscript/merge-nonalloc.s
+++ b/lld/test/ELF/linkerscript/merge-nonalloc.s
@@ -4,7 +4,7 @@
# RUN: ld.lld -shared -o %t.exe %t.script %t.o
# RUN: llvm-objdump -syms %t.exe | FileCheck %s
-# CHECK: .text 00000000 nonalloc_start
+# CHECK: .text 0000000000000000 nonalloc_start
_start:
nop
diff --git a/lld/test/ELF/linkerscript/symbol-only.test b/lld/test/ELF/linkerscript/symbol-only.test
index 9951e9c8857f..61452483df5b 100644
--- a/lld/test/ELF/linkerscript/symbol-only.test
+++ b/lld/test/ELF/linkerscript/symbol-only.test
@@ -18,4 +18,4 @@ SECTIONS {
# CHECK: bar 00000000 0000000000001000
# CHECK: SYMBOL TABLE:
-# CHECK: [[ADDR]] abc 00000000 foo
+# CHECK: [[ADDR]] abc 0000000000000000 foo
diff --git a/lld/test/ELF/linkerscript/symbol-reserved.s b/lld/test/ELF/linkerscript/symbol-reserved.s
index 0c686d2cf256..52cd4e0c654e 100644
--- a/lld/test/ELF/linkerscript/symbol-reserved.s
+++ b/lld/test/ELF/linkerscript/symbol-reserved.s
@@ -7,46 +7,46 @@
# RUN: ld.lld -o %t1 %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck %s
-# CHECK: 0000000000200005 .text 00000000 .hidden newsym
+# CHECK: 0000000000200005 .text 0000000000000000 .hidden newsym
# RUN: ld.lld -o %t1.so %t.script %t -shared
# RUN: llvm-objdump -t %t1.so | FileCheck --check-prefix=SHARED %s
-# SHARED: 0000000000000005 .dynsym 00000000 .hidden newsym
+# SHARED: 0000000000000005 .dynsym 0000000000000000 .hidden newsym
# RUN: echo "PROVIDE_HIDDEN(newsym = ALIGN(__ehdr_start, CONSTANT(MAXPAGESIZE)) + 5);" > %t.script
# RUN: ld.lld -o %t1 %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=ALIGNED %s
-# ALIGNED: 0000000000200005 .text 00000000 .hidden newsym
+# ALIGNED: 0000000000200005 .text 0000000000000000 .hidden newsym
# RUN: echo "PROVIDE_HIDDEN(newsym = ALIGN(3, 8) + 10);" > %t.script
# RUN: ld.lld -o %t1 %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=ALIGN-ADD %s
-# ALIGN-ADD: 0000000000000012 *ABS* 00000000 .hidden newsym
+# ALIGN-ADD: 0000000000000012 *ABS* 0000000000000000 .hidden newsym
# RUN: echo "PROVIDE_HIDDEN(newsym = ALIGN(11, 8) - 10);" > %t.script
# RUN: ld.lld -o %t1 %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=ALIGN-SUB %s
-# ALIGN-SUB: 0000000000000006 *ABS* 00000000 .hidden newsym
+# ALIGN-SUB: 0000000000000006 *ABS* 0000000000000000 .hidden newsym
# RUN: echo "PROVIDE_HIDDEN(newsym = ALIGN(_end, CONSTANT(MAXPAGESIZE)) + 5);" > %t.script
# RUN: ld.lld -o %t1 %t %t.script
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=RELATIVE %s
-# RELATIVE: 0000000000202005 .text 00000000 .hidden newsym
-# RELATIVE: 0000000000201127 .text 00000000 _end
+# RELATIVE: 0000000000202005 .text 0000000000000000 .hidden newsym
+# RELATIVE: 0000000000201127 .text 0000000000000000 _end
# RUN: echo "PROVIDE_HIDDEN(newsym = ALIGN(_end, CONSTANT(MAXPAGESIZE)) + 5);" > %t.script
# RUN: ld.lld -o %t1 --script %p/Inputs/symbol-reserved.script %t %t.script
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=RELATIVE-ADD %s
-# RELATIVE-ADD: 0000000000001005 .text 00000000 .hidden newsym
-# RELATIVE-ADD: 0000000000000007 .text 00000000 .hidden _end
+# RELATIVE-ADD: 0000000000001005 .text 0000000000000000 .hidden newsym
+# RELATIVE-ADD: 0000000000000007 .text 0000000000000000 .hidden _end
# RUN: echo "PROVIDE_HIDDEN(newsym = ALIGN(_end, CONSTANT(MAXPAGESIZE)) - 5);" > %t.script
# RUN: ld.lld -o %t1 --script %p/Inputs/symbol-reserved.script %t %t.script
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=RELATIVE-SUB %s
-# RELATIVE-SUB: 0000000000000ffb .text 00000000 .hidden newsym
-# RELATIVE-SUB: 0000000000000007 .text 00000000 .hidden _end
+# RELATIVE-SUB: 0000000000000ffb .text 0000000000000000 .hidden newsym
+# RELATIVE-SUB: 0000000000000007 .text 0000000000000000 .hidden _end
.global _start
_start:
diff --git a/lld/test/ELF/linkerscript/symbolreferenced.s b/lld/test/ELF/linkerscript/symbolreferenced.s
index c2925b179ad5..7b6c5d099188 100644
--- a/lld/test/ELF/linkerscript/symbolreferenced.s
+++ b/lld/test/ELF/linkerscript/symbolreferenced.s
@@ -5,13 +5,13 @@
# RUN: echo "SECTIONS { PROVIDE(newsym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=PROVIDE1 %s
-# PROVIDE1: 0000000000000001 *ABS* 00000000 newsym
+# PROVIDE1: 0000000000000001 *ABS* 0000000000000000 newsym
# Provide new symbol (hidden). The value should be 1
# RUN: echo "SECTIONS { PROVIDE_HIDDEN(newsym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=HIDDEN1 %s
-# HIDDEN1: 0000000000000001 *ABS* 00000000 .hidden newsym
+# HIDDEN1: 0000000000000001 *ABS* 0000000000000000 .hidden newsym
.global _start
_start:
diff --git a/lld/test/ELF/linkerscript/symbols-non-alloc.test b/lld/test/ELF/linkerscript/symbols-non-alloc.test
index 6d7580affc26..2ef378010fe3 100644
--- a/lld/test/ELF/linkerscript/symbols-non-alloc.test
+++ b/lld/test/ELF/linkerscript/symbols-non-alloc.test
@@ -8,7 +8,7 @@
# CHECK: .nonalloc 00000008 0000000000000000
# CHECK: SYMBOL TABLE:
-# CHECK: 0000000000000008 .nonalloc 00000000 Sym
+# CHECK: 0000000000000008 .nonalloc 0000000000000000 Sym
SECTIONS {
. = SIZEOF_HEADERS;
diff --git a/lld/test/ELF/linkerscript/symbols.s b/lld/test/ELF/linkerscript/symbols.s
index a6d797584417..71a5f648c67d 100644
--- a/lld/test/ELF/linkerscript/symbols.s
+++ b/lld/test/ELF/linkerscript/symbols.s
@@ -7,7 +7,7 @@
# RUN: echo "SECTIONS {.text : {*(.text.*)} text_end = .;}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=SIMPLE %s
-# SIMPLE: .text 00000000 text_end
+# SIMPLE: .text 0000000000000000 text_end
# The symbol is not referenced. Don't provide it.
# RUN: echo "SECTIONS { PROVIDE(newsym = 1);}" > %t.script
@@ -25,20 +25,20 @@
# RUN: echo "SECTIONS { PROVIDE(somesym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=PROVIDE2 %s
-# PROVIDE2: 0000000000000000 *ABS* 00000000 somesym
+# PROVIDE2: 0000000000000000 *ABS* 0000000000000000 somesym
# Provide existing symbol. The value should be 0, even though we
# have value of 1 in PROVIDE_HIDDEN(). Visibility should not change
# RUN: echo "SECTIONS { PROVIDE_HIDDEN(somesym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=HIDDEN2 %s
-# HIDDEN2: 0000000000000000 *ABS* 00000000 somesym
+# HIDDEN2: 0000000000000000 *ABS* 0000000000000000 somesym
# Hidden symbol assignment.
# RUN: echo "SECTIONS { HIDDEN(newsym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=HIDDEN3 %s
-# HIDDEN3: 0000000000000001 *ABS* 00000000 .hidden newsym
+# HIDDEN3: 0000000000000001 *ABS* 0000000000000000 .hidden newsym
# The symbol is not referenced. Don't provide it.
# RUN: echo "PROVIDE(newsym = 1);" > %t.script
@@ -55,23 +55,23 @@
# RUN: echo "PROVIDE(somesym = 1);" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=PROVIDE5 %s
-# PROVIDE5: 0000000000000000 *ABS* 00000000 somesym
+# PROVIDE5: 0000000000000000 *ABS* 0000000000000000 somesym
# Provide existing symbol. The value should be 0, even though we
# have value of 1 in PROVIDE_HIDDEN(). Visibility should not change
# RUN: echo "PROVIDE_HIDDEN(somesym = 1);" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=HIDDEN5 %s
-# HIDDEN5: 0000000000000000 *ABS* 00000000 somesym
+# HIDDEN5: 0000000000000000 *ABS* 0000000000000000 somesym
# Simple symbol assignment. All three symbols should have the
# same value.
# RUN: echo "foo = 0x100; SECTIONS { bar = foo; } baz = bar;" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=SIMPLE2 %s
-# SIMPLE2: 0000000000000100 *ABS* 00000000 foo
-# SIMPLE2: 0000000000000100 *ABS* 00000000 bar
-# SIMPLE2: 0000000000000100 *ABS* 00000000 baz
+# SIMPLE2: 0000000000000100 *ABS* 0000000000000000 foo
+# SIMPLE2: 0000000000000100 *ABS* 0000000000000000 bar
+# SIMPLE2: 0000000000000100 *ABS* 0000000000000000 baz
.global _start
_start:
diff --git a/lld/test/ELF/linkerscript/synthetic-symbols1.test b/lld/test/ELF/linkerscript/synthetic-symbols1.test
index 908a05f49588..cd9f078a8bcf 100644
--- a/lld/test/ELF/linkerscript/synthetic-symbols1.test
+++ b/lld/test/ELF/linkerscript/synthetic-symbols1.test
@@ -38,19 +38,19 @@ SECTIONS {
.eh_frame : {}
}
-# CHECK: 0000000000000128 .foo 00000000 .hidden _end_sec
-# CHECK-NEXT: 0000000000000120 .foo 00000000 _begin_sec
-# CHECK-NEXT: 0000000000000128 *ABS* 00000000 _end_sec_abs
-# CHECK-NEXT: 000000000000104c .text 00000000 _start
-# CHECK-NEXT: 0000000000000120 .foo 00000000 begin_foo
-# CHECK-NEXT: 0000000000000128 .foo 00000000 end_foo
-# CHECK-NEXT: 0000000000000008 *ABS* 00000000 size_foo_1
-# CHECK-NEXT: 0000000000000008 *ABS* 00000000 size_foo_1_abs
-# CHECK-NEXT: 0000000000001000 .foo 00000000 begin_bar
-# CHECK-NEXT: 0000000000001004 .foo 00000000 end_bar
-# CHECK-NEXT: 0000000000000ee4 *ABS* 00000000 size_foo_2
-# CHECK-NEXT: 0000000000000ee4 *ABS* 00000000 size_foo_3
-# CHECK-NEXT: 0000000000001004 .eh_frame_hdr 00000000 __eh_frame_hdr_start
-# CHECK-NEXT: 0000000000001010 *ABS* 00000000 __eh_frame_hdr_start2
-# CHECK-NEXT: 0000000000001018 .eh_frame_hdr 00000000 __eh_frame_hdr_end
-# CHECK-NEXT: 0000000000001020 *ABS* 00000000 __eh_frame_hdr_end2
+# CHECK: 0000000000000128 .foo 0000000000000000 .hidden _end_sec
+# CHECK-NEXT: 0000000000000120 .foo 0000000000000000 _begin_sec
+# CHECK-NEXT: 0000000000000128 *ABS* 0000000000000000 _end_sec_abs
+# CHECK-NEXT: 000000000000104c .text 0000000000000000 _start
+# CHECK-NEXT: 0000000000000120 .foo 0000000000000000 begin_foo
+# CHECK-NEXT: 0000000000000128 .foo 0000000000000000 end_foo
+# CHECK-NEXT: 0000000000000008 *ABS* 0000000000000000 size_foo_1
+# CHECK-NEXT: 0000000000000008 *ABS* 0000000000000000 size_foo_1_abs
+# CHECK-NEXT: 0000000000001000 .foo 0000000000000000 begin_bar
+# CHECK-NEXT: 0000000000001004 .foo 0000000000000000 end_bar
+# CHECK-NEXT: 0000000000000ee4 *ABS* 0000000000000000 size_foo_2
+# CHECK-NEXT: 0000000000000ee4 *ABS* 0000000000000000 size_foo_3
+# CHECK-NEXT: 0000000000001004 .eh_frame_hdr 0000000000000000 __eh_frame_hdr_start
+# CHECK-NEXT: 0000000000001010 *ABS* 0000000000000000 __eh_frame_hdr_start2
+# CHECK-NEXT: 0000000000001018 .eh_frame_hdr 0000000000000000 __eh_frame_hdr_end
+# CHECK-NEXT: 0000000000001020 *ABS* 0000000000000000 __eh_frame_hdr_end2
diff --git a/lld/test/ELF/linkerscript/synthetic-symbols3.test b/lld/test/ELF/linkerscript/synthetic-symbols3.test
index 39e20e1468b7..4835c4a36e37 100644
--- a/lld/test/ELF/linkerscript/synthetic-symbols3.test
+++ b/lld/test/ELF/linkerscript/synthetic-symbols3.test
@@ -7,5 +7,5 @@
PROVIDE_HIDDEN(_begin_sec = _start);
PROVIDE_HIDDEN(_end_sec = ADDR(.text) + SIZEOF(.text));
-# CHECK: 00000000002011ac .text 00000000 .hidden _begin_sec
-# CHECK-NEXT: 00000000002011ad .text 00000000 .hidden _end_sec
+# CHECK: 00000000002011ac .text 0000000000000000 .hidden _begin_sec
+# CHECK-NEXT: 00000000002011ad .text 0000000000000000 .hidden _end_sec
diff --git a/lld/test/ELF/linkerscript/synthetic-symbols4.test b/lld/test/ELF/linkerscript/synthetic-symbols4.test
index fde06e3f3a44..db1a96fa52ce 100644
--- a/lld/test/ELF/linkerscript/synthetic-symbols4.test
+++ b/lld/test/ELF/linkerscript/synthetic-symbols4.test
@@ -10,5 +10,5 @@ SECTIONS {
PROVIDE_HIDDEN(_end_sec = ADDR(.text) + SIZEOF(.text));
}
-# CHECK: 0000000000201054 .text 00000000 .hidden _begin_sec
-# CHECK-NEXT: 0000000000201055 .text 00000000 .hidden _end_sec
+# CHECK: 0000000000201054 .text 0000000000000000 .hidden _begin_sec
+# CHECK-NEXT: 0000000000201055 .text 0000000000000000 .hidden _end_sec
diff --git a/lld/test/ELF/mips-64-got.s b/lld/test/ELF/mips-64-got.s
index 59a8f1d9a876..33011be0ccf5 100644
--- a/lld/test/ELF/mips-64-got.s
+++ b/lld/test/ELF/mips-64-got.s
@@ -10,7 +10,7 @@
# RUN: llvm-objdump -d -t --no-show-raw-insn %t.exe | FileCheck %s
# RUN: llvm-readelf -r -s -A %t.exe | FileCheck -check-prefix=GOT %s
-# CHECK: {{[0-9a-f]+}}1c8 .text 00000000 foo
+# CHECK: {{[0-9a-f]+}}1c8 .text 0000000000000000 foo
# CHECK: __start:
# CHECK-NEXT: {{.*}} ld $2, -32736($gp)
diff --git a/lld/test/ELF/mips-64-rels.s b/lld/test/ELF/mips-64-rels.s
index 0e21f63aa8cf..fa7b87c69b4d 100644
--- a/lld/test/ELF/mips-64-rels.s
+++ b/lld/test/ELF/mips-64-rels.s
@@ -11,7 +11,7 @@
# RUN: llvm-objdump -d -s -t --print-imm-hex --no-show-raw-insn %t.exe | FileCheck %s
# RUN: llvm-readobj -r %t.exe | FileCheck -check-prefix=REL %s
-# CHECK: 0000000000037ff0 .got 00000000 .hidden _gp
+# CHECK: 0000000000037ff0 .got 0000000000000000 .hidden _gp
# CHECK: Contents of section .rodata:
# CHECK-NEXT: {{[0-9a-f]+}} ffffffff fffe9014
diff --git a/lld/test/ELF/mips-64.s b/lld/test/ELF/mips-64.s
index 655fee697d53..b5cdf27d052e 100644
--- a/lld/test/ELF/mips-64.s
+++ b/lld/test/ELF/mips-64.s
@@ -14,7 +14,7 @@ v2:
.quad v1 # R_MIPS_64 target v1 addend 0
# SYM: SYMBOL TABLE:
-# SYM: 00000000[[V1:[0-9a-f]+]] .data 00000000 v1
+# SYM: 00000000[[V1:[0-9a-f]+]] .data 0000000000000000 v1
# SYM: Contents of section .data:
# SYM-NEXT: {{.*}} 00000000 00000008 00000000 [[V1]]
diff --git a/lld/test/ELF/mips-tls-64.s b/lld/test/ELF/mips-tls-64.s
index ffaaccce1dc1..4780b695065d 100644
--- a/lld/test/ELF/mips-tls-64.s
+++ b/lld/test/ELF/mips-tls-64.s
@@ -21,9 +21,9 @@
# RUN: | FileCheck -check-prefix=DIS-SO %s
# RUN: llvm-readobj -r -A %t-out.so | FileCheck -check-prefix=SO %s
-# DIS: 0000000000000000 l O .tdata 00000000 loc
-# DIS: 0000000000000004 g O .tdata 00000000 bar
-# DIS: 0000000000000000 g O *UND* 00000000 foo
+# DIS: 0000000000000000 l O .tdata 0000000000000000 loc
+# DIS: 0000000000000004 g O .tdata 0000000000000000 bar
+# DIS: 0000000000000000 g O *UND* 0000000000000000 foo
# DIS: Contents of section .got:
# DIS-NEXT: 30000 00000000 00000000 80000000 00000000
diff --git a/lld/test/ELF/mips-tls-static-64.s b/lld/test/ELF/mips-tls-static-64.s
index 80f5c686eca0..f75464bb9646 100644
--- a/lld/test/ELF/mips-tls-static-64.s
+++ b/lld/test/ELF/mips-tls-static-64.s
@@ -7,8 +7,8 @@
# RUN: llvm-objdump -s -t %t.exe | FileCheck %s
# CHECK: SYMBOL TABLE:
-# CHECK: [[TGA:[0-9a-f]{8}]] .text 00000000 __tls_get_addr
-# CHECK: 0000000000000000 g O .tdata 00000000 tls1
+# CHECK: [[TGA:[0-9a-f]{8}]] .text 0000000000000000 __tls_get_addr
+# CHECK: 0000000000000000 g O .tdata 0000000000000000 tls1
#
# CHECK: Contents of section .data:
# CHECK-NEXT: {{.*}} [[TGA]] ffffffff ffff8004 ffffffff
diff --git a/lld/test/ELF/relocation-common.s b/lld/test/ELF/relocation-common.s
index 460328d55486..1e3942b17630 100644
--- a/lld/test/ELF/relocation-common.s
+++ b/lld/test/ELF/relocation-common.s
@@ -10,5 +10,5 @@ _start:
.global sym1
.comm sym1,4,4
-# CHECK: 0000000000202164 g O .bss 00000004 sym1
+# CHECK: 0000000000202164 g O .bss 0000000000000004 sym1
# CHECK: 201158: {{.*}} movl $1, 4098(%rip)
diff --git a/lld/test/ELF/sht-group-gold-r.test b/lld/test/ELF/sht-group-gold-r.test
index d1757eee6e7d..c1650ede4e9b 100644
--- a/lld/test/ELF/sht-group-gold-r.test
+++ b/lld/test/ELF/sht-group-gold-r.test
@@ -10,8 +10,8 @@
# RUN: ld.lld %p/Inputs/sht-group-gold-r.elf %t.o -o %t.exe
# RUN: llvm-objdump -t %t.exe | FileCheck %s
-# CHECK: .text 00000000 bar
-# CHECK: .text 00000000 foo
+# CHECK: .text 0000000000000000 bar
+# CHECK: .text 0000000000000000 foo
.globl _start
_start:
diff --git a/lld/test/ELF/wrap-no-real.s b/lld/test/ELF/wrap-no-real.s
index a0ca2507f166..4f2f2b6dbfaf 100644
--- a/lld/test/ELF/wrap-no-real.s
+++ b/lld/test/ELF/wrap-no-real.s
@@ -18,11 +18,11 @@
// RUN: llvm-objdump -t %t | FileCheck -check-prefix=SYM %s
-// SYM: {{.*}} .dynamic 00000000 .hidden _DYNAMIC
-// SYM-NEXT: 0000000000011000 *ABS* 00000000 __real_foo
-// SYM-NEXT: 0000000000011010 *ABS* 00000000 __wrap_foo
-// SYM-NEXT: {{.*}} .text 00000000 _start
-// SYM-NEXT: 0000000000011000 *ABS* 00000000 foo
+// SYM: {{.*}} .dynamic 0000000000000000 .hidden _DYNAMIC
+// SYM-NEXT: 0000000000011000 *ABS* 0000000000000000 __real_foo
+// SYM-NEXT: 0000000000011010 *ABS* 0000000000000000 __wrap_foo
+// SYM-NEXT: {{.*}} .text 0000000000000000 _start
+// SYM-NEXT: 0000000000011000 *ABS* 0000000000000000 foo
.global _start
_start:
diff --git a/llvm/test/MC/AArch64/inst-directive.s b/llvm/test/MC/AArch64/inst-directive.s
index e4ccf788b0e9..9911c39421b2 100644
--- a/llvm/test/MC/AArch64/inst-directive.s
+++ b/llvm/test/MC/AArch64/inst-directive.s
@@ -30,6 +30,6 @@ aarch64_inst:
// 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
index 3d32c1dfb400..66574cd767da 100644
--- 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
index 00eaffa50af4..1b84cda1fa40 100644
--- 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
index 98088763675b..0c5e177b4103 100644
--- 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
index ab35a7d8a267..b6c27330aef8 100644
--- 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=ELF32 %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=ELF64 %s
+
+# ELF32: SYMBOL TABLE:
+# ELF32-NEXT: 00001004 l F .text 00000000 lfoo
+# ELF32-NEXT: 00001008 l O .text 00000000 lbar
+# ELF32-NEXT: 00001004 g F .text 00000000 foo
+# ELF32-NEXT: 00001008 g O .text 00000000 bar
+
+# ELF64: SYMBOL TABLE:
+# ELF64-NEXT: 0000000000001004 l F .text 0000000000000000 lfoo
+# ELF64-NEXT: 0000000000001008 l O .text 0000000000000000 lbar
+# ELF64-NEXT: 0000000000001004 g F .text 0000000000000000 foo
+# ELF64-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
index c07a4ecfe439..c9dec65d1555 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -1943,7 +1943,7 @@ void printSymbolTable(const ObjectFile *O, StringRef ArchiveName,
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)) {
More information about the llvm-commits
mailing list