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

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

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

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

diff --git a/test/tools/llvm-readobj/ARM/attribute-0.s b/test/tools/llvm-readobj/ARM/attribute-0.s
index 24049941492e5d208d10d9fa8fdd9f45069b6a79..dfee5411256518131aede191b5cb3a7cf43e438a 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-0.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-1.s b/test/tools/llvm-readobj/ARM/attribute-1.s
index e493a426576a290570cdeea5a2dd43acfe2be33d..d7cc1aaf12077fa6334be38bbdb54db91732de3f 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-1.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-10.s b/test/tools/llvm-readobj/ARM/attribute-10.s
index 570e27b08f513bb035b157643789126e890fd8a8..1c62fee75ade0cb9578de9f35cbf7bf4059bccf5 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-10.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-11.s b/test/tools/llvm-readobj/ARM/attribute-11.s
index b70e5a0c5e4a91d3e728d6ed9a189003b2631f10..04a2e41065db5462df635b46b148bcd9cdb11948 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-11.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-12.s b/test/tools/llvm-readobj/ARM/attribute-12.s
index 1bedf6dc4c4e6c65b381217a6be23f7dcc879a32..e36ed9b652109c1cc92d3582458be71499a5959f 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-12.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-13.s b/test/tools/llvm-readobj/ARM/attribute-13.s
index d3b9fb70953c63e77d8b45368398cfdbb4e20fb8..407995c01a57804b92e6daf8e46c08761bcd376a 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-13.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-136.s b/test/tools/llvm-readobj/ARM/attribute-136.s
index 5952b34ccc4c83a8107d7e86e14d84c20f2dbfb0..674970a654ea00230fcf4d8221893d3c9a062920 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-136.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-14.s b/test/tools/llvm-readobj/ARM/attribute-14.s
index aad44332af76f362a0ad170396570fb8219b2fa9..c15a5cd535f6d0a60a80fcce2136696d6189f52a 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-14.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-15.s b/test/tools/llvm-readobj/ARM/attribute-15.s
index efe4c7a3e581c8def36d17055c11f4262b229979..1fd1869c9c7130f382d70b10268224df5107106f 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-15.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-2.s b/test/tools/llvm-readobj/ARM/attribute-2.s
index dd7fc9e4ca79a74ce489c1e0fff39f47e3dffef4..33aeca8a1a7838fa67b20006f0a1ad13fbc7a170 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-2.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-3.s b/test/tools/llvm-readobj/ARM/attribute-3.s
index 3ef7dde5cdc01320b2d31396e5f2667ac4883462..284e6ed8295906724c65b82ac4c9c90cf1b6e05f 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-3.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-4.s b/test/tools/llvm-readobj/ARM/attribute-4.s
index 01cd6d412068d2ce5ab72186729c7e56ba06cb52..5f5f2b9e9d65cac1a07ab37c07f0906dde10538c 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-4.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-5.s b/test/tools/llvm-readobj/ARM/attribute-5.s
index cadf1fc1d695daa9f91e7d9774247a6ce1a7dc03..d1d386ef97819a12aa1274492403790a9231a5e8 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-5.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-6.s b/test/tools/llvm-readobj/ARM/attribute-6.s
index cf603971cbf42d02337274822181ceb5fa94864b..63c1019a3acc8aa01c54a39eaef3e8388046af9d 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-6.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-7.s b/test/tools/llvm-readobj/ARM/attribute-7.s
index 36242c0aa882ab717aa27f69be5dbd1881058bc1..7f511674aef1936517c3fb6c1bf8d05c81173f4b 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-7.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-8.s b/test/tools/llvm-readobj/ARM/attribute-8.s
index 42a6116e6af0bcd4e9e5e37e8edde289049d9559..42e2c878408bbef98b7959380e6c52b91fdd102e 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-8.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-9.s b/test/tools/llvm-readobj/ARM/attribute-9.s
index 1c75784932fcad3066e61ba1928f4f5380c0151c..1d15ddeb79f5a189a9f4ff2f483e6cc3cba8e088 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-9.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-A.s b/test/tools/llvm-readobj/ARM/attribute-A.s
index 8c08c7eb2d13fdea71b3b9928f914bff893bad65..105e70532aab352237e8d155d0b965d37e9152e9 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-A.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-M.s b/test/tools/llvm-readobj/ARM/attribute-M.s
index 56c0c953ae2613df8a4e80ab2654325f305ab7fc..72ea70f30c7028bc4374aefb66d356094c640728 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-M.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-R.s b/test/tools/llvm-readobj/ARM/attribute-R.s
index add4192ff6994514c349915b752b860129985fbb..6a4c2620bab86ebf6bc2a4229d21f3353f7f3081 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-R.s
+++ b/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

diff --git a/test/tools/llvm-readobj/ARM/attribute-S.s b/test/tools/llvm-readobj/ARM/attribute-S.s
index 0bd4924adcecad0e87391632d733bc06a69ec72a..a8cd27c156c071646c2033718545af02d649b6ef 100644 (file)
--- a/test/tools/llvm-readobj/ARM/attribute-S.s
+++ b/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

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

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

diff --git a/tools/llvm-readobj/llvm-readobj.cpp b/tools/llvm-readobj/llvm-readobj.cpp
index 2b4e002ac1a1794121434e2deb514d088f4e5674..03f2ad24636928c97012568c5b8b7d889baf875c 100644 (file)
--- a/tools/llvm-readobj/llvm-readobj.cpp
+++ b/tools/llvm-readobj/llvm-readobj.cpp
@@ -231,9 +231,13 @@ namespace opts {
       "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 @@ static void dumpObject(const ObjectFile *Obj, ScopedPrinter &Writer,
   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)