[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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@373291 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/docs/CommandGuide/llvm-readelf.rst b/docs/CommandGuide/llvm-readelf.rst
index efb3f6a9c30182e6f056f3569006ae9bd5c6cb34..2868d0b598977f54f13bd6888ec71fb1d30adddf 100644 (file)
--- a/docs/CommandGuide/llvm-readelf.rst
+++ b/docs/CommandGuide/llvm-readelf.rst
@@ -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
 

diff --git a/docs/CommandGuide/llvm-readobj.rst b/docs/CommandGuide/llvm-readobj.rst
index ece79797e21236c8d0de69a47308502b386e881a..ea1b22d6d9f564a89e7fad02aaf809d35d325fd5 100644 (file)
--- a/docs/CommandGuide/llvm-readobj.rst
+++ b/docs/CommandGuide/llvm-readobj.rst
@@ -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
 

diff --git a/test/tools/llvm-readobj/ARM/attribute-conformance-1.s b/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
index 0379a0ed2047cdeedeb10b1f42659d9962c4929a..2ceaca2ccede0a80945dc167ce7e7a176be2ef72 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
+++ b/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
@@ -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

diff --git a/test/tools/llvm-readobj/ARM/attribute-conformance-2.s b/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
index 745d56c0db9e102da7c8bc9f87a2cd313faee62f..2ac459aa2379959c2dd63c39051f80703c317273 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
+++ b/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
@@ -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

diff --git a/tools/llvm-readobj/llvm-readobj.cpp b/tools/llvm-readobj/llvm-readobj.cpp
index 03f2ad24636928c97012568c5b8b7d889baf875c..5919a7eed3e3a7fc66db146c24b572037f194f83 100644 (file)
--- a/tools/llvm-readobj/llvm-readobj.cpp
+++ b/tools/llvm-readobj/llvm-readobj.cpp
@@ -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>