Index: llvm/trunk/docs/CommandGuide/llvm-readelf.rst
===================================================================
--- llvm/trunk/docs/CommandGuide/llvm-readelf.rst
+++ llvm/trunk/docs/CommandGuide/llvm-readelf.rst
@@ -28,9 +28,9 @@
 
  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
 
Index: llvm/trunk/docs/CommandGuide/llvm-readobj.rst
===================================================================
--- llvm/trunk/docs/CommandGuide/llvm-readobj.rst
+++ llvm/trunk/docs/CommandGuide/llvm-readobj.rst
@@ -144,9 +144,9 @@
 
 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
 
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
+++ llvm/trunk/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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
+++ llvm/trunk/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
Index: llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
===================================================================
--- llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
+++ llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
@@ -236,8 +236,6 @@
                               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>