[llvm] r373291 - [llvm-readobj/llvm-readelf] Delete --arm-attributes (alias for --arch-specific)

[Fangrui Song via llvm-commits]

Author: maskray
Date: Mon Sep 30 18:31:15 2019
New Revision: 373291

URL: http://llvm.org/viewvc/llvm-project?rev=373291&view=rev
Log:
[llvm-readobj/llvm-readelf] Delete --arm-attributes (alias for --arch-specific)

D68110 added --arch-specific (supported by GNU readelf) and made
--arm-attributes an alias for it. The tests were later migrated to use
--arch-specific.

Note, llvm-readelf --arch-specific currently just uses llvm-readobj
style output for ARM attributes. The readelf-style output is not
implemented.

Reviewed By: compnerd, kongyi, rupprecht

Differential Revision: https://reviews.llvm.org/D68196

Modified:
    llvm/trunk/docs/CommandGuide/llvm-readelf.rst
    llvm/trunk/docs/CommandGuide/llvm-readobj.rst
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
    llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp

Modified: llvm/trunk/docs/CommandGuide/llvm-readelf.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/llvm-readelf.rst?rev=373291&r1=373290&r2=373291&view=diff
==============================================================================
--- llvm/trunk/docs/CommandGuide/llvm-readelf.rst (original)
+++ llvm/trunk/docs/CommandGuide/llvm-readelf.rst Mon Sep 30 18:31:15 2019
@@ -28,9 +28,9 @@ OPTIONS
 
  Display the address-significance table.
 
-.. option:: --arm-attributes
+.. option:: --arch-specific, -A
 
- Display the ARM attributes section. Only applicable for ARM architectures.
+ Display architecture-specific information, e.g. the ARM attributes section on ARM.
 
 .. option:: --color
 

Modified: llvm/trunk/docs/CommandGuide/llvm-readobj.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/llvm-readobj.rst?rev=373291&r1=373290&r2=373291&view=diff
==============================================================================
--- llvm/trunk/docs/CommandGuide/llvm-readobj.rst (original)
+++ llvm/trunk/docs/CommandGuide/llvm-readobj.rst Mon Sep 30 18:31:15 2019
@@ -144,9 +144,9 @@ ELF SPECIFIC OPTIONS
 
 The following options are implemented only for the ELF file format.
 
-.. option:: --arm-attributes
+.. option:: --arch-specific, -A
 
- Display the ARM attributes section. Only applicable for ARM architectures.
+ Display architecture-specific information, e.g. the ARM attributes section on ARM.
 
 .. option:: --demangle, -C
 

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s?rev=373291&r1=373290&r2=373291&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s Mon Sep 30 18:31:15 2019
@@ -3,8 +3,6 @@
 @ 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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s?rev=373291&r1=373290&r2=373291&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s Mon Sep 30 18:31:15 2019
@@ -3,8 +3,6 @@
 @ 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

Modified: llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp?rev=373291&r1=373290&r2=373291&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp Mon Sep 30 18:31:15 2019
@@ -236,8 +236,6 @@ namespace opts {
                               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>