Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s
@@ -1,6 +1,6 @@
 @ 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
Index: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s
@@ -1,6 +1,6 @@
 @ 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
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
@@ -1,5 +1,9 @@
 @ 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"
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
@@ -1,5 +1,9 @@
 @ 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...!!"
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
@@ -231,9 +231,13 @@
       "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>
@@ -517,8 +521,8 @@
   if (Obj->isELF()) {
     if (opts::ELFLinkerOptions)
       Dumper->printELFLinkerOptions();
-    if (Obj->getArch() == llvm::Triple::arm)
-      if (opts::ARMAttributes)
+    if (opts::ArchSpecificInfo)
+      if (Obj->getArch() == llvm::Triple::arm)
         Dumper->printAttributes();
     if (isMipsArch(Obj->getArch())) {
       if (opts::MipsPLTGOT)