[llvm-readobj] Rename --arm-attributes to --arch-specific

[kongyi]

Summary

This is for compatibility with GNU readobj. "--arm-attributes" option is left as a hidden alias due to large number of tests using it.

[MaskRay]

Looks good to me. GNU readelf --arch-specific also handles MIPS .MIPS.abiflags, PowerPC specific tags, RISC-V specific tags, etc, which llvm-readobj does not support now but these targets are supported by LLVM. CC some people for more opinions.

[atanasyan]

LGTM. Later I will include under this option all existing MIPS specific "dumpers": printMipsPLTGOT, printMipsABIFlags, etc.

[peter.smith]

LGTM too, thanks for the patch.

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 0
 @CHECK:   .eabi_attribute 6, 0
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 0
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: Pre-v4
 
 .eabi_attribute  Tag_CPU_arch_profile, 0

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 1
 @CHECK:   .eabi_attribute 6, 1
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 1
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v4
 
 .eabi_attribute  Tag_ARM_ISA_use, 1

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 10
 @CHECK:   .eabi_attribute 6, 10
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 10
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v7
 
 .eabi_attribute  Tag_ABI_align_needed, 10

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 11
 @CHECK:   .eabi_attribute 6, 11
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 11
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v6-M
 
 .eabi_attribute  Tag_ABI_align_needed, 11

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 12
 @CHECK:   .eabi_attribute 6, 12
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 12
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v6S-M
 
 .eabi_attribute  Tag_ABI_align_needed, 12

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 13
 @CHECK:   .eabi_attribute 6, 13
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 13
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v7E-M
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_compatibility, 136, "Foo Corp"
 @CHECK:   .eabi_attribute 32, 136
 @CHECK-OBJ: Tag: 32
 @CHECK-OBJ-NEXT: Value: 136, Foo Corp
 @CHECK-OBJ-NEXT: TagName: compatibility
 @CHECK-OBJ-NEXT: Description: AEABI Non-Conformant
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 14
 @CHECK:   .eabi_attribute 6, 14
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 14
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v8
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_compatibility, 15, "Longer Corporation NaMe"
 @CHECK:   .eabi_attribute 32, 15
 @CHECK-OBJ: Tag: 32
 @CHECK-OBJ-NEXT: Value: 15, Longer Corporation NaMe
 @CHECK-OBJ-NEXT: TagName: compatibility
 @CHECK-OBJ-NEXT: Description: AEABI Non-Conformant
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 2
 @CHECK:   .eabi_attribute 6, 2
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 2
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v4T
 
 .eabi_attribute  Tag_THUMB_ISA_use, 2

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 3
 @CHECK:   .eabi_attribute 6, 3
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 3
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v5T
 
 .eabi_attribute  Tag_FP_arch, 3

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 4
 @CHECK:   .eabi_attribute 6, 4
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 4
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v5TE
 
 .eabi_attribute  Tag_FP_arch, 4

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 5
 @CHECK:   .eabi_attribute 6, 5
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 5
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v5TEJ
 
 .eabi_attribute  Tag_FP_arch, 5

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 6
 @CHECK:   .eabi_attribute 6, 6
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 6
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v6
 
 .eabi_attribute  Tag_FP_arch, 6

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 7
 @CHECK:   .eabi_attribute 6, 7
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 7
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v6KZ
 
 .eabi_attribute  Tag_FP_arch, 7

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 8
 @CHECK:   .eabi_attribute 6, 8
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 8
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v6T2
 
 .eabi_attribute  Tag_FP_arch, 8

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch, 9
 @CHECK:   .eabi_attribute 6, 9
 @CHECK-OBJ: Tag: 6
 @CHECK-OBJ-NEXT: Value: 9
 @CHECK-OBJ-NEXT: TagName: CPU_arch
 @CHECK-OBJ-NEXT: Description: ARM v6K
 
 .eabi_attribute  Tag_ABI_align_needed, 9

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch_profile, 'A'
 @CHECK:   .eabi_attribute 7, 65
 @CHECK-OBJ: Tag: 7
 @CHECK-OBJ-NEXT: Value: 65
 @CHECK-OBJ-NEXT: TagName: CPU_arch_profile
 @CHECK-OBJ-NEXT: Description: Application
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch_profile, 'M'
 @CHECK:   .eabi_attribute 7, 77
 @CHECK-OBJ: Tag: 7
 @CHECK-OBJ-NEXT: Value: 77
 @CHECK-OBJ-NEXT: TagName: CPU_arch_profile
 @CHECK-OBJ-NEXT: Description: Microcontroller
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch_profile, 'R'
 @CHECK:   .eabi_attribute 7, 82
 @CHECK-OBJ: Tag: 7
 @CHECK-OBJ-NEXT: Value: 82
 @CHECK-OBJ-NEXT: TagName: CPU_arch_profile
 @CHECK-OBJ-NEXT: Description: Real-time
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_CPU_arch_profile, 'S'
 @CHECK:   .eabi_attribute 7, 83
 @CHECK-OBJ: Tag: 7
 @CHECK-OBJ-NEXT: Value: 83
 @CHECK-OBJ-NEXT: TagName: CPU_arch_profile
 @CHECK-OBJ-NEXT: Description: Classic
 

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
+@ RUN:   | llvm-readobj -A - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
 @ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_conformance, "0"
 @CHECK:   .eabi_attribute 67, "0"
 @CHECK-OBJ: Tag: 67
 @CHECK-OBJ-NEXT: TagName: conformance
 @CHECK-OBJ-NEXT: Value: 0

llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s

 @ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
+@ RUN:   | llvm-readobj -A - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
 @ RUN:   | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
 .eabi_attribute  Tag_conformance, "A.long--non numeric oddity...!!"
 @CHECK:   .eabi_attribute 67, "A.long--non numeric oddity...!!"
 @CHECK-OBJ: Tag: 67
 @CHECK-OBJ-NEXT: TagName: conformance
 @CHECK-OBJ-NEXT: Value: A.long--non numeric oddity...!!

llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp

cl::opt<bool> CodeViewEnableGHash(
       cl::desc(
           "Enable global hashing for CodeView type stream de-duplication"));
 
   // --codeview-subsection-bytes
   cl::opt<bool> CodeViewSubsectionBytes(
       "codeview-subsection-bytes",
       cl::desc("Dump raw contents of codeview debug sections and records"));
 
-  // --arm-attributes
-  cl::opt<bool> ARMAttributes("arm-attributes",
-                              cl::desc("Display the ARM attributes section"));
+  // --arch-specific
+  cl::opt<bool> ArchSpecificInfo("arch-specific",
+                              cl::desc("Displays architecture-specific information, if there is any."));
+  cl::alias ArchSpecifcInfoShort("A", cl::desc("Alias for --arch-specific"),
+                                 cl::aliasopt(ArchSpecificInfo), cl::NotHidden);
+  cl::alias ARMAttributes("arm-attributes", cl::desc("Alias for --arch-specific"),
+                           cl::aliasopt(ArchSpecificInfo), cl::Hidden);
 
   // --mips-plt-got
   cl::opt<bool>
   MipsPLTGOT("mips-plt-got",
              cl::desc("Display the MIPS GOT and PLT GOT sections"));
 
   // --mips-abi-flags
   cl::opt<bool> MipsABIFlags("mips-abi-flags",
if (opts::HashTable)
     Dumper->printHashTable();
   if (opts::GnuHashTable)
     Dumper->printGnuHashTable();
   if (opts::VersionInfo)
     Dumper->printVersionInfo();
   if (Obj->isELF()) {
     if (opts::ELFLinkerOptions)
       Dumper->printELFLinkerOptions();
+    if (opts::ArchSpecificInfo)
       if (Obj->getArch() == llvm::Triple::arm)
-      if (opts::ARMAttributes)
         Dumper->printAttributes();
     if (isMipsArch(Obj->getArch())) {
       if (opts::MipsPLTGOT)
         Dumper->printMipsPLTGOT();
       if (opts::MipsABIFlags)
         Dumper->printMipsABIFlags();
       if (opts::MipsReginfo)
         Dumper->printMipsReginfo();