Skip to content

Commit 6556628

Browse files
authored
[llvm-objdump] Remove leading whitespace for PT_GNU_PROPERTY. (#121591)
This fixes the misaligned display of addresses for this p_type. Previous: ``` STACK off 0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**64 filesz 0x0000000000000000 memsz 0x0000000000000000 flags rw- PROPERTY off 0x0000000000000358 vaddr 0x0000000000000358 paddr 0x0000000000000358 align 2**3 filesz 0x0000000000000020 memsz 0x0000000000000020 flags r-- NOTE off 0x0000000000000334 vaddr 0x0000000000000334 paddr 0x0000000000000334 align 2**2 filesz 0x0000000000000020 memsz 0x0000000000000020 flags r-- ``` After: ``` STACK off 0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**64 filesz 0x0000000000000000 memsz 0x0000000000000000 flags rw- PROPERTY off 0x0000000000000358 vaddr 0x0000000000000358 paddr 0x0000000000000358 align 2**3 filesz 0x0000000000000020 memsz 0x0000000000000020 flags r-- NOTE off 0x0000000000000334 vaddr 0x0000000000000334 paddr 0x0000000000000334 align 2**2 filesz 0x0000000000000020 memsz 0x0000000000000020 flags r-- ```
1 parent 7457f51 commit 6556628

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

llvm/test/tools/llvm-objdump/ELF/pt-gnu-property.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# RUN: llvm-objdump -p %t | FileCheck %s
33

44
# CHECK: Program Header:
5-
# CHECK-NEXT: {{ }}PROPERTY{{ }}
5+
# CHECK-NEXT: {{^}}PROPERTY{{ }}
66

77
--- !ELF
88
FileHeader:

llvm/tools/llvm-objdump/ELFDump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ template <class ELFT> void ELFDumper<ELFT>::printProgramHeaders() {
269269
outs() << " RELRO ";
270270
break;
271271
case ELF::PT_GNU_PROPERTY:
272-
outs() << " PROPERTY ";
272+
outs() << "PROPERTY ";
273273
break;
274274
case ELF::PT_GNU_STACK:
275275
outs() << " STACK ";

0 commit comments

Comments
 (0)