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

Yi Kong via llvm-commits llvm-commits at lists.llvm.org
Fri Sep 27 13:38:18 PDT 2019


Author: kongyi
Date: Fri Sep 27 13:38:18 2019
New Revision: 373125

URL: http://llvm.org/viewvc/llvm-project?rev=373125&view=rev
Log:
[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

Modified:
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
    llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
    llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-0.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-1.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-10.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-11.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-12.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-13.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-136.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-14.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-15.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-2.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-3.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-4.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-5.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-6.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-7.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-8.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-9.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-A.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-M.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-R.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-S.s Fri Sep 27 13:38:18 2019
@@ -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

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-1.s Fri Sep 27 13:38:18 2019
@@ -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"

Modified: llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s (original)
+++ llvm/trunk/test/tools/llvm-readobj/ARM/attribute-conformance-2.s Fri Sep 27 13:38:18 2019
@@ -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...!!"

Modified: llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp?rev=373125&r1=373124&r2=373125&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp Fri Sep 27 13:38:18 2019
@@ -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
   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)




More information about the llvm-commits mailing list