diff options
24 files changed, 38 insertions, 26 deletions
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-0.s b/llvm/test/tools/llvm-readobj/ARM/attribute-0.s index 24049941492..dfee5411256 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-0.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-1.s b/llvm/test/tools/llvm-readobj/ARM/attribute-1.s index e493a426576..d7cc1aaf120 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-1.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-10.s b/llvm/test/tools/llvm-readobj/ARM/attribute-10.s index 570e27b08f5..1c62fee75ad 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-10.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-11.s b/llvm/test/tools/llvm-readobj/ARM/attribute-11.s index b70e5a0c5e4..04a2e41065d 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-11.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-12.s b/llvm/test/tools/llvm-readobj/ARM/attribute-12.s index 1bedf6dc4c4..e36ed9b6521 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-12.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-13.s b/llvm/test/tools/llvm-readobj/ARM/attribute-13.s index d3b9fb70953..407995c01a5 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-13.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-136.s b/llvm/test/tools/llvm-readobj/ARM/attribute-136.s index 5952b34ccc4..674970a654e 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-136.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-14.s b/llvm/test/tools/llvm-readobj/ARM/attribute-14.s index aad44332af7..c15a5cd535f 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-14.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-15.s b/llvm/test/tools/llvm-readobj/ARM/attribute-15.s index efe4c7a3e58..1fd1869c9c7 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-15.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-2.s b/llvm/test/tools/llvm-readobj/ARM/attribute-2.s index dd7fc9e4ca7..33aeca8a1a7 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-2.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-3.s b/llvm/test/tools/llvm-readobj/ARM/attribute-3.s index 3ef7dde5cdc..284e6ed8295 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-3.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-4.s b/llvm/test/tools/llvm-readobj/ARM/attribute-4.s index 01cd6d41206..5f5f2b9e9d6 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-4.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-5.s b/llvm/test/tools/llvm-readobj/ARM/attribute-5.s index cadf1fc1d69..d1d386ef978 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-5.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-6.s b/llvm/test/tools/llvm-readobj/ARM/attribute-6.s index cf603971cbf..63c1019a3ac 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-6.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-7.s b/llvm/test/tools/llvm-readobj/ARM/attribute-7.s index 36242c0aa88..7f511674aef 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-7.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-8.s b/llvm/test/tools/llvm-readobj/ARM/attribute-8.s index 42a6116e6af..42e2c878408 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-8.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-9.s b/llvm/test/tools/llvm-readobj/ARM/attribute-9.s index 1c75784932f..1d15ddeb79f 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-9.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-A.s b/llvm/test/tools/llvm-readobj/ARM/attribute-A.s index 8c08c7eb2d1..105e70532aa 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-A.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-M.s b/llvm/test/tools/llvm-readobj/ARM/attribute-M.s index 56c0c953ae2..72ea70f30c7 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-M.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-R.s b/llvm/test/tools/llvm-readobj/ARM/attribute-R.s index add4192ff69..6a4c2620bab 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-R.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-S.s b/llvm/test/tools/llvm-readobj/ARM/attribute-S.s index 0bd4924adce..a8cd27c156c 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-S.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s index cfa426d155f..0379a0ed204 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s +++ b/llvm/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/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s index 00d08fbcc64..745d56c0db9 100644 --- a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s +++ b/llvm/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/llvm/tools/llvm-readobj/llvm-readobj.cpp b/llvm/tools/llvm-readobj/llvm-readobj.cpp index 2b4e002ac1a..03f2ad24636 100644 --- a/llvm/tools/llvm-readobj/llvm-readobj.cpp +++ b/llvm/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) |
