[llvm-objdump] Add '--full-contents' as alias for '-s'
This fixes PR39404.
Reviewed By: jhenderson
Patch by Xing Guo
Differential Revision: https://reviews.llvm.org/D53576
llvm-svn: 345495
diff --git a/llvm/test/tools/llvm-objdump/full-contents.test b/llvm/test/tools/llvm-objdump/full-contents.test
new file mode 100644
index 0000000..de0d584
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/full-contents.test
@@ -0,0 +1,47 @@
+# RUN: yaml2obj %s > %t
+# RUN: llvm-objdump --full-contents %t > %t.out1
+# RUN: llvm-objdump -s %t > %t.out2
+# RUN: cmp %t.out1 %t.out2
+# RUN: FileCheck %s --input-file=%t.out1
+
+# CHECK: .bss
+# CHECK-NEXT: <skipping contents of bss section at [0000, 0040)>
+# CHECK: .text
+# CHECK-NEXT: 0000 01234567 .#Eg
+# CHECK: .user-defined
+# CHECK-NEXT: 0000 76543210 vT2.
+# CHECK: .empty-section
+# CHECK-NEXT: <skipping contents of bss section at [0000, 0020)>
+# CHECK: .symtab
+# CHECK: .strtab
+# CHECK: .shstrtab
+
+!ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_EXEC
+ Machine: EM_X86_64
+Sections:
+ - Name: .bss
+ Type: SHT_NOBITS
+ Flags: [ SHF_ALLOC ]
+ AddressAlign: 0x0000000000000010
+ Size: 64
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x0000000000000010
+ Content: "01234567"
+ Size: 4
+ - Name: .user-defined
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC ]
+ AddressAlign: 0x0000000000000010
+ Content: "76543210"
+ Size: 4
+ - Name: .empty-section
+ Type: SHT_NOBITS
+ Flags: [ SHF_ALLOC ]
+ AddressAlign: 0x0000000000000010
+ Size: 32
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 7107966..a4fddf3 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -116,7 +116,11 @@
cl::aliasopt(DynamicRelocations));
cl::opt<bool>
-llvm::SectionContents("s", cl::desc("Display the content of each section"));
+ llvm::SectionContents("full-contents",
+ cl::desc("Display the content of each section"));
+static cl::alias SectionContentsShort("s",
+ cl::desc("Alias for --full-contents"),
+ cl::aliasopt(SectionContents));
cl::opt<bool>
llvm::SymbolTable("t", cl::desc("Display the symbol table"));