summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lld/test/ELF/mips-26.s2
-rw-r--r--lld/test/ELF/mips-32.s4
-rw-r--r--lld/test/ELF/mips-64-disp.s2
-rw-r--r--lld/test/ELF/mips-64-got-overflow.s6
-rw-r--r--lld/test/ELF/mips-64-got.s2
-rw-r--r--lld/test/ELF/mips-64.s2
-rw-r--r--lld/test/ELF/mips-abs-got.s2
-rw-r--r--lld/test/ELF/mips-call-hilo.s2
-rw-r--r--lld/test/ELF/mips-call16.s3
-rw-r--r--lld/test/ELF/mips-elf-flags.s18
-rw-r--r--lld/test/ELF/mips-got-and-copy.s5
-rw-r--r--lld/test/ELF/mips-got-extsym.s2
-rw-r--r--lld/test/ELF/mips-got-hilo.s2
-rw-r--r--lld/test/ELF/mips-got-page-script.s2
-rw-r--r--lld/test/ELF/mips-got-page.s2
-rw-r--r--lld/test/ELF/mips-got-redundant.s2
-rw-r--r--lld/test/ELF/mips-got-relocs.s8
-rw-r--r--lld/test/ELF/mips-got-script.s2
-rw-r--r--lld/test/ELF/mips-got-string.s2
-rw-r--r--lld/test/ELF/mips-got-weak.s4
-rw-r--r--lld/test/ELF/mips-got16.s2
-rw-r--r--lld/test/ELF/mips-gprel32-relocs-gp0.s2
-rw-r--r--lld/test/ELF/mips-merge-abiflags.s7
-rw-r--r--lld/test/ELF/mips-mgot.s2
-rw-r--r--lld/test/ELF/mips-micro-got.s2
-rw-r--r--lld/test/ELF/mips-micro-jal.s4
-rw-r--r--lld/test/ELF/mips-micro-plt.s2
-rw-r--r--lld/test/ELF/mips-non-zero-gp0.s4
-rw-r--r--lld/test/ELF/mips-options.s2
-rw-r--r--lld/test/ELF/mips-plt-copy.s2
-rw-r--r--lld/test/ELF/mips-reginfo.s2
-rw-r--r--lld/test/ELF/mips-sto-plt.s2
-rw-r--r--lld/test/ELF/mips-tls-64.s14
-rw-r--r--lld/test/ELF/mips-tls-hilo.s4
-rw-r--r--lld/test/ELF/mips-tls.s14
-rw-r--r--lld/test/ELF/mips-xgot-order.s2
-rw-r--r--llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll2
-rw-r--r--llvm/test/MC/Mips/crc/module-crc.s2
-rw-r--r--llvm/test/MC/Mips/crc/module-nocrc.s2
-rw-r--r--llvm/test/MC/Mips/ginv/module-ginv.s2
-rw-r--r--llvm/test/MC/Mips/ginv/module-noginv.s2
-rw-r--r--llvm/test/MC/Mips/micromips-ase-directive.s2
-rw-r--r--llvm/test/MC/Mips/mips_abi_flags_xx.s8
-rw-r--r--llvm/test/MC/Mips/mips_abi_flags_xx_set.s2
-rw-r--r--llvm/test/MC/Mips/module-hardfloat.s2
-rw-r--r--llvm/test/MC/Mips/module-softfloat.s2
-rw-r--r--llvm/test/MC/Mips/mt/abiflag.s2
-rw-r--r--llvm/test/MC/Mips/mt/module-directive.s2
-rw-r--r--llvm/test/MC/Mips/mt/set-directive.s2
-rw-r--r--llvm/test/MC/Mips/virt/module-novirt.s2
-rw-r--r--llvm/test/MC/Mips/virt/module-virt.s2
-rw-r--r--llvm/test/Object/Mips/abi-flags.yaml2
-rw-r--r--llvm/test/tools/llvm-readobj/mips-abiflags.test4
53 files changed, 90 insertions, 93 deletions
diff --git a/lld/test/ELF/mips-26.s b/lld/test/ELF/mips-26.s
index 7ccf1cd29d8..6d8cde47de0 100644
--- a/lld/test/ELF/mips-26.s
+++ b/lld/test/ELF/mips-26.s
@@ -7,7 +7,7 @@
# RUN: ld.lld %t2.o -shared -o %t.so
# RUN: ld.lld %t1.o %t.so -o %t.exe
# RUN: llvm-objdump -d --no-show-raw-insn --print-imm-hex %t.exe | FileCheck %s
-# RUN: llvm-readobj --dynamic-table -S -r --mips-plt-got %t.exe \
+# RUN: llvm-readobj --dynamic-table -S -r -A %t.exe \
# RUN: | FileCheck -check-prefix=REL %s
# CHECK: Disassembly of section .text:
diff --git a/lld/test/ELF/mips-32.s b/lld/test/ELF/mips-32.s
index 97b49ae8106..d2c8aff6efa 100644
--- a/lld/test/ELF/mips-32.s
+++ b/lld/test/ELF/mips-32.s
@@ -8,13 +8,13 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
# RUN: ld.lld -shared %t-be.o -script %t.script -o %t-be.so
# RUN: llvm-objdump -t -s %t-be.so | FileCheck -check-prefixes=SYM,BE %s
-# RUN: llvm-readelf -r -s --dynamic-table --mips-plt-got %t-be.so \
+# RUN: llvm-readelf -r -s --dynamic-table -A %t-be.so \
# RUN: | FileCheck -check-prefix=REL %s
# RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
# RUN: ld.lld -shared %t-el.o -script %t.script -o %t-el.so
# RUN: llvm-objdump -t -s %t-el.so | FileCheck -check-prefixes=SYM,EL %s
-# RUN: llvm-readelf -r -s --dynamic-table --mips-plt-got %t-el.so \
+# RUN: llvm-readelf -r -s --dynamic-table -A %t-el.so \
# RUN: | FileCheck -check-prefix=REL %s
.data
diff --git a/lld/test/ELF/mips-64-disp.s b/lld/test/ELF/mips-64-disp.s
index def661823fa..a26b4507368 100644
--- a/lld/test/ELF/mips-64-disp.s
+++ b/lld/test/ELF/mips-64-disp.s
@@ -7,7 +7,7 @@
# RUN: ld.lld %t.so.o -shared -soname=t.so -o %t.so
# RUN: ld.lld %t.exe.o %t.so -o %t.exe
# RUN: llvm-objdump -d -t --no-show-raw-insn %t.exe | FileCheck %s
-# RUN: llvm-readelf -r -s --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r -s -A %t.exe | FileCheck -check-prefix=GOT %s
# CHECK: __start:
# CHECK-NEXT: {{.*}}: addiu $2, $2, -32704
diff --git a/lld/test/ELF/mips-64-got-overflow.s b/lld/test/ELF/mips-64-got-overflow.s
index 37c6ef366e9..86289b9f1a5 100644
--- a/lld/test/ELF/mips-64-got-overflow.s
+++ b/lld/test/ELF/mips-64-got-overflow.s
@@ -6,10 +6,8 @@
# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t2.so.o
# RUN: ld.lld -shared -mips-got-size 32 %t1.so.o %t2.so.o -o %t-sgot.so
# RUN: ld.lld -shared -mips-got-size 24 %t1.so.o %t2.so.o -o %t-mgot.so
-# RUN: llvm-readelf -s --mips-plt-got %t-sgot.so \
-# RUN: | FileCheck -check-prefixes=SYM,SGOT %s
-# RUN: llvm-readelf -s --mips-plt-got %t-mgot.so \
-# RUN: | FileCheck -check-prefixes=SYM,MGOT %s
+# RUN: llvm-readelf -s -A %t-sgot.so | FileCheck -check-prefixes=SYM,SGOT %s
+# RUN: llvm-readelf -s -A %t-mgot.so | FileCheck -check-prefixes=SYM,MGOT %s
# SYM: Symbol table '.symtab'
# SYM: {{.*}}: [[LOC1:[0-9a-f]+]] {{.*}} local1
diff --git a/lld/test/ELF/mips-64-got.s b/lld/test/ELF/mips-64-got.s
index 04aeeb72094..2a6b78d4249 100644
--- a/lld/test/ELF/mips-64-got.s
+++ b/lld/test/ELF/mips-64-got.s
@@ -8,7 +8,7 @@
# RUN: ld.lld %t.so.o -shared -soname=t.so -o %t.so
# RUN: ld.lld %t.exe.o --script %t.script %t.so -o %t.exe
# RUN: llvm-objdump -d -t --no-show-raw-insn %t.exe | FileCheck %s
-# RUN: llvm-readelf -r -s --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r -s -A %t.exe | FileCheck -check-prefix=GOT %s
# CHECK: __start:
# CHECK-NEXT: {{.*}} ld $2, -32736($gp)
diff --git a/lld/test/ELF/mips-64.s b/lld/test/ELF/mips-64.s
index c0ca02765e5..037daaf2838 100644
--- a/lld/test/ELF/mips-64.s
+++ b/lld/test/ELF/mips-64.s
@@ -4,7 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t.o
# RUN: ld.lld -shared %t.o -o %t.so
# RUN: llvm-objdump -s -t %t.so | FileCheck -check-prefix=SYM %s
-# RUN: llvm-readelf -r -s --dynamic-table --mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readelf -r -s --dynamic-table -A %t.so | FileCheck %s
.data
.globl v2
diff --git a/lld/test/ELF/mips-abs-got.s b/lld/test/ELF/mips-abs-got.s
index bccfe5914e6..67ae27c5da7 100644
--- a/lld/test/ELF/mips-abs-got.s
+++ b/lld/test/ELF/mips-abs-got.s
@@ -6,7 +6,7 @@
# RUN: echo "SECTIONS { \
# RUN: zero1 = 0; zero2 = 0; foo = 0x11004; bar = 0x22000; }" > %t.script
# RUN: ld.lld --script %t.script -o %t.exe %t.o
-# RUN: llvm-readobj --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -A %t.exe | FileCheck %s
# CHECK: Static GOT {
# CHECK: Local entries [
diff --git a/lld/test/ELF/mips-call-hilo.s b/lld/test/ELF/mips-call-hilo.s
index 3285eae1953..35d2c414611 100644
--- a/lld/test/ELF/mips-call-hilo.s
+++ b/lld/test/ELF/mips-call-hilo.s
@@ -4,7 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -shared -o %t.so
# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
-# RUN: llvm-readelf -r -s --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r -s -A %t.so | FileCheck -check-prefix=GOT %s
# CHECK: Disassembly of section .text:
# CHECK-EMPTY:
diff --git a/lld/test/ELF/mips-call16.s b/lld/test/ELF/mips-call16.s
index 8898a649e46..c67f3f0cc5a 100644
--- a/lld/test/ELF/mips-call16.s
+++ b/lld/test/ELF/mips-call16.s
@@ -4,8 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -shared -o %t.so
# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
-# RUN: llvm-readelf --mips-plt-got --symbols %t.so \
-# RUN: | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -A --symbols %t.so | FileCheck -check-prefix=GOT %s
.text
.globl __start
diff --git a/lld/test/ELF/mips-elf-flags.s b/lld/test/ELF/mips-elf-flags.s
index 40ef0a7cafd..ca4656e6276 100644
--- a/lld/test/ELF/mips-elf-flags.s
+++ b/lld/test/ELF/mips-elf-flags.s
@@ -4,43 +4,39 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: %S/Inputs/mips-dynamic.s -o %t-so.o
# RUN: ld.lld %t-so.o --gc-sections -shared -o %t.so
-# RUN: llvm-readobj -h --mips-abi-flags %t.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -h -A %t.so | FileCheck -check-prefix=SO %s
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -h --mips-abi-flags %t.exe | FileCheck -check-prefix=EXE %s
+# RUN: llvm-readobj -h -A %t.exe | FileCheck -check-prefix=EXE %s
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: -mcpu=mips32r2 %s -o %t-r2.o
# RUN: ld.lld %t-r2.o -o %t-r2.exe
-# RUN: llvm-readobj -h --mips-abi-flags %t-r2.exe \
-# RUN: | FileCheck -check-prefix=EXE-R2 %s
+# RUN: llvm-readobj -h -A %t-r2.exe | FileCheck -check-prefix=EXE-R2 %s
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: -mcpu=mips32r2 %s -o %t-r2.o
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: -mcpu=mips32r5 %S/Inputs/mips-dynamic.s -o %t-r5.o
# RUN: ld.lld %t-r2.o %t-r5.o -o %t-r5.exe
-# RUN: llvm-readobj -h --mips-abi-flags %t-r5.exe \
-# RUN: | FileCheck -check-prefix=EXE-R5 %s
+# RUN: llvm-readobj -h -A %t-r5.exe | FileCheck -check-prefix=EXE-R5 %s
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: -mcpu=mips32r6 %s -o %t-r6.o
# RUN: ld.lld %t-r6.o -o %t-r6.exe
-# RUN: llvm-readobj -h --mips-abi-flags %t-r6.exe \
-# RUN: | FileCheck -check-prefix=EXE-R6 %s
+# RUN: llvm-readobj -h -A %t-r6.exe | FileCheck -check-prefix=EXE-R6 %s
# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux \
# RUN: -position-independent -mcpu=octeon %s -o %t.o
# RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -h --mips-abi-flags %t.exe \
-# RUN: | FileCheck -check-prefix=OCTEON %s
+# RUN: llvm-readobj -h -A %t.exe | FileCheck -check-prefix=OCTEON %s
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: -mattr=micromips %S/Inputs/mips-fpic.s -o %t-mm.o
# RUN: ld.lld %t.o %t-mm.o -o %t.exe
-# RUN: llvm-readobj -h --mips-abi-flags %t.exe | FileCheck -check-prefix=MICRO %s
+# RUN: llvm-readobj -h -A %t.exe | FileCheck -check-prefix=MICRO %s
.text
.globl __start
diff --git a/lld/test/ELF/mips-got-and-copy.s b/lld/test/ELF/mips-got-and-copy.s
index f51e679821a..c401db81202 100644
--- a/lld/test/ELF/mips-got-and-copy.s
+++ b/lld/test/ELF/mips-got-and-copy.s
@@ -10,7 +10,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.so.o -shared -o %t.so
# RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r -A %t.exe | FileCheck %s
# CHECK: Relocations [
# CHECK-NEXT: Section (7) .rel.dyn {
@@ -18,7 +18,8 @@
# CHECK-NEXT: 0x[[DATA1:[0-9A-F]+]] R_MIPS_COPY data1
# CHECK-NEXT: }
# CHECK-NEXT: ]
-# CHECK-NEXT: Primary GOT {
+
+# CHECK: Primary GOT {
# CHECK-NEXT: Canonical gp value:
# CHECK-NEXT: Reserved entries [
# CHECK: ]
diff --git a/lld/test/ELF/mips-got-extsym.s b/lld/test/ELF/mips-got-extsym.s
index 541023f89ff..b4ee5fc49fb 100644
--- a/lld/test/ELF/mips-got-extsym.s
+++ b/lld/test/ELF/mips-got-extsym.s
@@ -9,7 +9,7 @@
# RUN: ld.lld -shared %t.so.o -o %t.so
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readelf --dyn-syms --symbols --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readelf --dyn-syms --symbols -A %t.exe | FileCheck %s
# CHECK: Symbol table '.dynsym'
# CHECK-NOT: bar
diff --git a/lld/test/ELF/mips-got-hilo.s b/lld/test/ELF/mips-got-hilo.s
index f3b5098361d..1c6f609b1ce 100644
--- a/lld/test/ELF/mips-got-hilo.s
+++ b/lld/test/ELF/mips-got-hilo.s
@@ -4,7 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -shared -o %t.so
# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
-# RUN: llvm-readelf -r -s --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r -s -A %t.so | FileCheck -check-prefix=GOT %s
# CHECK: Disassembly of section .text:
# CHECK-EMPTY:
diff --git a/lld/test/ELF/mips-got-page-script.s b/lld/test/ELF/mips-got-page-script.s
index f8fe3bc6057..4055fb6dabe 100644
--- a/lld/test/ELF/mips-got-page-script.s
+++ b/lld/test/ELF/mips-got-page-script.s
@@ -7,7 +7,7 @@
# RUN: .text : { *(.text) } \
# RUN: .data 0x10000 : { *(.data) } }" > %t.script
# RUN: ld.lld -shared --script %t.script -o %t.so %t.o
-# RUN: llvm-readobj --symbols --mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols -A %t.so | FileCheck %s
# CHECK: Name: foo1
# CHECK-NEXT: Value: 0x10000
diff --git a/lld/test/ELF/mips-got-page.s b/lld/test/ELF/mips-got-page.s
index faddb67f13e..62de3c96376 100644
--- a/lld/test/ELF/mips-got-page.s
+++ b/lld/test/ELF/mips-got-page.s
@@ -5,7 +5,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux -o %t.o %s
# RUN: ld.lld --section-start .rodata=0x27FFC -shared -o %t.so %t.o
-# RUN: llvm-readobj --symbols --mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols -A %t.so | FileCheck %s
# CHECK: Name: bar
# CHECK-NEXT: Value: 0x28000
diff --git a/lld/test/ELF/mips-got-redundant.s b/lld/test/ELF/mips-got-redundant.s
index e48e3806a41..2b6d1a6224d 100644
--- a/lld/test/ELF/mips-got-redundant.s
+++ b/lld/test/ELF/mips-got-redundant.s
@@ -3,7 +3,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readelf -s --mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readelf -s -A %t.so | FileCheck %s
# CHECK: Symbol table '.symtab'
# CHECK: {{.*}}: [[VAL:[0-9a-f]+]] {{.*}} glb1
diff --git a/lld/test/ELF/mips-got-relocs.s b/lld/test/ELF/mips-got-relocs.s
index cad67835ba7..6e3e4b371d3 100644
--- a/lld/test/ELF/mips-got-relocs.s
+++ b/lld/test/ELF/mips-got-relocs.s
@@ -8,23 +8,23 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
# RUN: ld.lld %t-be.o --script %t.script -o %t-be.exe
-# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-be.exe \
+# RUN: llvm-readobj --sections -r --symbols -A %t-be.exe \
# RUN: | FileCheck -check-prefix=ELF %s
# RUN: llvm-objdump -d %t-be.exe | FileCheck -check-prefix=DIS %s
# RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
# RUN: ld.lld %t-el.o --script %t.script -o %t-el.exe
-# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-el.exe \
+# RUN: llvm-readobj --sections -r --symbols -A %t-el.exe \
# RUN: | FileCheck -check-prefix=ELF %s
# RUN: llvm-objdump -d %t-el.exe | FileCheck -check-prefix=DIS %s
# RUN: ld.lld -shared %t-be.o --script %t.script -o %t-be.so
-# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-be.so \
+# RUN: llvm-readobj --sections -r --symbols -A %t-be.so \
# RUN: | FileCheck -check-prefix=ELF %s
# RUN: llvm-objdump -d %t-be.so | FileCheck -check-prefix=DIS %s
# RUN: ld.lld -shared %t-el.o --script %t.script -o %t-el.so
-# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-el.so \
+# RUN: llvm-readobj --sections -r --symbols -A %t-el.so \
# RUN: | FileCheck -check-prefix=ELF %s
# RUN: llvm-objdump -d %t-el.so | FileCheck -check-prefix=DIS %s
diff --git a/lld/test/ELF/mips-got-script.s b/lld/test/ELF/mips-got-script.s
index 7c43de2ce54..4f21983ebd8 100644
--- a/lld/test/ELF/mips-got-script.s
+++ b/lld/test/ELF/mips-got-script.s
@@ -4,7 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: echo "SECTIONS { .data : { *(.data.1); . += 0x10000; *(.data.2) } }" > %t.script
# RUN: ld.lld %t.o -shared -o %t.so -T %t.script
-# RUN: llvm-readobj --mips-plt-got --dynamic-table %t.so | FileCheck %s
+# RUN: llvm-readobj -A --dynamic-table %t.so | FileCheck %s
# CHECK: 0x7000000A MIPS_LOCAL_GOTNO 4
# ^-- 2 * header + 2 local entries
diff --git a/lld/test/ELF/mips-got-string.s b/lld/test/ELF/mips-got-string.s
index 7dee285bd74..84cf0ffd2f2 100644
--- a/lld/test/ELF/mips-got-string.s
+++ b/lld/test/ELF/mips-got-string.s
@@ -3,7 +3,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -o %t.o %s
# RUN: ld.lld -shared -o %t.so %t.o
-# RUN: llvm-readelf --mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readelf -A %t.so | FileCheck %s
# CHECK: Local entries:
# CHECK-NEXT: Address Access Initial
diff --git a/lld/test/ELF/mips-got-weak.s b/lld/test/ELF/mips-got-weak.s
index 7d13f7d22d3..a5fdfa39fcb 100644
--- a/lld/test/ELF/mips-got-weak.s
+++ b/lld/test/ELF/mips-got-weak.s
@@ -3,10 +3,10 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -shared -o %t1.so
-# RUN: llvm-readelf -r --dyn-syms --dynamic-table --mips-plt-got %t1.so \
+# RUN: llvm-readelf -r --dyn-syms --dynamic-table -A %t1.so \
# RUN: | FileCheck -check-prefixes=CHECK,NOSYM %s
# RUN: ld.lld %t.o -shared -Bsymbolic -o %t2.so
-# RUN: llvm-readelf -r --dyn-syms --dynamic-table --mips-plt-got %t2.so \
+# RUN: llvm-readelf -r --dyn-syms --dynamic-table -A %t2.so \
# RUN: | FileCheck -check-prefixes=CHECK,SYM %s
# CHECK: There are no relocations in this file.
diff --git a/lld/test/ELF/mips-got16.s b/lld/test/ELF/mips-got16.s
index 18cfe43ae3c..427da3f8821 100644
--- a/lld/test/ELF/mips-got16.s
+++ b/lld/test/ELF/mips-got16.s
@@ -8,7 +8,7 @@
# RUN: }" > %t.script
# RUN: ld.lld %t.o -shared --script %t.script -o %t.so
# RUN: llvm-objdump -d -t --no-show-raw-insn %t.so | FileCheck %s
-# RUN: llvm-readelf -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r -A %t.so | FileCheck -check-prefix=GOT %s
# CHECK: __start:
# CHECK-NEXT: lw $8, -32744($gp)
diff --git a/lld/test/ELF/mips-gprel32-relocs-gp0.s b/lld/test/ELF/mips-gprel32-relocs-gp0.s
index 773a05b8ec7..6dbe5e1881e 100644
--- a/lld/test/ELF/mips-gprel32-relocs-gp0.s
+++ b/lld/test/ELF/mips-gprel32-relocs-gp0.s
@@ -3,7 +3,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld -r -o %t-rel.o %t.o
-# RUN: llvm-readobj --mips-reginfo %t-rel.o | FileCheck --check-prefix=REL %s
+# RUN: llvm-readobj -A %t-rel.o | FileCheck --check-prefix=REL %s
# RUN: echo "SECTIONS { \
# RUN: .rodata ALIGN(0x1000) : { *(.rodata) } \
diff --git a/lld/test/ELF/mips-merge-abiflags.s b/lld/test/ELF/mips-merge-abiflags.s
index 27587e124b9..e7abbe79421 100644
--- a/lld/test/ELF/mips-merge-abiflags.s
+++ b/lld/test/ELF/mips-merge-abiflags.s
@@ -4,10 +4,9 @@
# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-freebsd %s -o %t.o
# RUN: ld.lld %t.o %p/Inputs/mips-concatenated-abiflags.o -o %t.exe
-# RUN: llvm-readobj --sections --mips-abi-flags %t.exe | FileCheck %s
-# RUN: llvm-readobj --sections --mips-abi-flags \
-# RUN: %p/Inputs/mips-concatenated-abiflags.o | \
-# RUN: FileCheck --check-prefix=INPUT-OBJECT %s
+# RUN: llvm-readobj --sections -A %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections -A %p/Inputs/mips-concatenated-abiflags.o \
+# RUN: | FileCheck --check-prefix=INPUT-OBJECT %s
.globl __start
__start:
diff --git a/lld/test/ELF/mips-mgot.s b/lld/test/ELF/mips-mgot.s
index f9584786491..62b2cc04408 100644
--- a/lld/test/ELF/mips-mgot.s
+++ b/lld/test/ELF/mips-mgot.s
@@ -12,7 +12,7 @@
# RUN: }" > %t.script
# RUN: ld.lld -shared -mips-got-size 52 --script %t.script %t0.o %t1.o %t2.o -o %t.so
# RUN: llvm-objdump -s -section=.got -t %t.so | FileCheck %s
-# RUN: llvm-readobj -r --dyn-syms --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --dyn-syms -A %t.so | FileCheck -check-prefix=GOT %s
# CHECK: Contents of section .got:
# CHECK-NEXT: 70000 00000000 80000000 [[FOO0:[0-9a-f]+]] [[FOO2:[0-9a-f]+]]
diff --git a/lld/test/ELF/mips-micro-got.s b/lld/test/ELF/mips-micro-got.s
index 539b6223fb7..2939a1bc97c 100644
--- a/lld/test/ELF/mips-micro-got.s
+++ b/lld/test/ELF/mips-micro-got.s
@@ -7,7 +7,7 @@
# RUN: %S/Inputs/mips-dynamic.s -o %t2.o
# RUN: ld.lld %t2.o -shared -o %t.so
# RUN: ld.lld %t1.o %t.so -o %t.exe
-# RUN: llvm-readobj --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -A %t.exe | FileCheck %s
# CHECK: Local entries [
# CHECK-NEXT: Entry {
diff --git a/lld/test/ELF/mips-micro-jal.s b/lld/test/ELF/mips-micro-jal.s
index f2bc0e4823e..987b5f6c336 100644
--- a/lld/test/ELF/mips-micro-jal.s
+++ b/lld/test/ELF/mips-micro-jal.s
@@ -14,7 +14,7 @@
# RUN: ld.lld --script %t.script -o %teb.exe %t2eb.o %teb.so
# RUN: llvm-objdump -d -mattr=micromips --no-show-raw-insn %teb.exe \
# RUN: | FileCheck --check-prefix=R2 %s
-# RUN: llvm-readelf --mips-plt-got %teb.exe | FileCheck --check-prefix=PLT %s
+# RUN: llvm-readelf -A %teb.exe | FileCheck --check-prefix=PLT %s
# RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux \
# RUN: -mattr=micromips %S/Inputs/mips-micro.s -o %t1el.o
@@ -24,7 +24,7 @@
# RUN: ld.lld --script %t.script -o %tel.exe %t2el.o %tel.so
# RUN: llvm-objdump -d -mattr=micromips --no-show-raw-insn %tel.exe \
# RUN: | FileCheck --check-prefix=R2 %s
-# RUN: llvm-readelf --mips-plt-got %tel.exe | FileCheck --check-prefix=PLT %s
+# RUN: llvm-readelf -A %tel.exe | FileCheck --check-prefix=PLT %s
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: -mattr=micromips -mcpu=mips32r6 %S/Inputs/mips-micro.s -o %t1eb.o
diff --git a/lld/test/ELF/mips-micro-plt.s b/lld/test/ELF/mips-micro-plt.s
index 47ef46bbcbe..93a058df44a 100644
--- a/lld/test/ELF/mips-micro-plt.s
+++ b/lld/test/ELF/mips-micro-plt.s
@@ -11,7 +11,7 @@
# RUN: . = 0x20300; .plt : { *(.plt) } \
# RUN: }" > %t.script
# RUN: ld.lld %t-exe.o %t.so --script %t.script -o %t.exe
-# RUN: llvm-readelf --symbols --dyn-syms --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readelf --symbols --dyn-syms -A %t.exe | FileCheck %s
# RUN: llvm-objdump -d -mattr=micromips --no-show-raw-insn %t.exe \
# RUN: | FileCheck --check-prefix=ASM %s
diff --git a/lld/test/ELF/mips-non-zero-gp0.s b/lld/test/ELF/mips-non-zero-gp0.s
index 0d385fafccf..8b8dc16ac83 100644
--- a/lld/test/ELF/mips-non-zero-gp0.s
+++ b/lld/test/ELF/mips-non-zero-gp0.s
@@ -34,11 +34,11 @@
# lui $gp,%hi(%neg(%gp_rel(foo)))
# RUN: ld.lld -r -o %t-32.r %S/Inputs/mips-gp0-non-zero.o
-# RUN: llvm-readobj --mips-reginfo %t-32.r | FileCheck --check-prefix=GPVAL %s
+# RUN: llvm-readobj -A %t-32.r | FileCheck --check-prefix=GPVAL %s
# RUN: llvm-objdump -s %t-32.r | FileCheck --check-prefix=ADDEND32 %s
# RUN: ld.lld -r -o %t-64.r %S/Inputs/mips-n64-gp0-non-zero.o
-# RUN: llvm-readobj --mips-options %t-64.r | FileCheck --check-prefix=GPVAL %s
+# RUN: llvm-readobj -A %t-64.r | FileCheck --check-prefix=GPVAL %s
# RUN: llvm-readobj -r %S/Inputs/mips-n64-gp0-non-zero.o %t-64.r \
# RUN: | FileCheck --check-prefix=ADDEND64 %s
diff --git a/lld/test/ELF/mips-options.s b/lld/test/ELF/mips-options.s
index 67179af8d10..f87a3990cb9 100644
--- a/lld/test/ELF/mips-options.s
+++ b/lld/test/ELF/mips-options.s
@@ -8,7 +8,7 @@
# RUN: . = 0x100000000; \
# RUN: .got : { *(.got) } }" > %t.rel.script
# RUN: ld.lld %t1.o %t2.o --gc-sections --script %t.rel.script -shared -o %t.so
-# RUN: llvm-readobj -l --symbols --mips-options %t.so | FileCheck %s
+# RUN: llvm-readobj -l --symbols -A %t.so | FileCheck %s
.text
.globl __start
diff --git a/lld/test/ELF/mips-plt-copy.s b/lld/test/ELF/mips-plt-copy.s
index 1036e792a20..acdd71987ca 100644
--- a/lld/test/ELF/mips-plt-copy.s
+++ b/lld/test/ELF/mips-plt-copy.s
@@ -7,7 +7,7 @@
# RUN: %S/Inputs/mips-dynamic.s -o %t.so.o
# RUN: ld.lld %t.so.o -shared -soname=t.so -o %t.so
# RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r -A %t.exe | FileCheck %s
# CHECK: Relocations [
# CHECK-NEXT: Section ({{.*}}) .rel.dyn {
diff --git a/lld/test/ELF/mips-reginfo.s b/lld/test/ELF/mips-reginfo.s
index 2df0cabe4c7..c5517c7bc09 100644
--- a/lld/test/ELF/mips-reginfo.s
+++ b/lld/test/ELF/mips-reginfo.s
@@ -5,7 +5,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
# RUN: %S/Inputs/mips-dynamic.s -o %t2.o
# RUN: ld.lld %t1.o %t2.o --gc-sections -shared -o %t.so
-# RUN: llvm-readobj --symbols --mips-reginfo %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols -A %t.so | FileCheck %s
.text
.globl __start
diff --git a/lld/test/ELF/mips-sto-plt.s b/lld/test/ELF/mips-sto-plt.s
index dde5aff6a9b..46bcdb4df86 100644
--- a/lld/test/ELF/mips-sto-plt.s
+++ b/lld/test/ELF/mips-sto-plt.s
@@ -6,7 +6,7 @@
# RUN: ld.lld %t.so.o -shared -o %t.so
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj --dyn-syms --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms -A %t.exe | FileCheck %s
# CHECK: Symbol {
# CHECK: Name: foo0
diff --git a/lld/test/ELF/mips-tls-64.s b/lld/test/ELF/mips-tls-64.s
index f0b76187643..296bbc3b7df 100644
--- a/lld/test/ELF/mips-tls-64.s
+++ b/lld/test/ELF/mips-tls-64.s
@@ -12,12 +12,14 @@
# RUN: }" > %t.script
# RUN: ld.lld %t.o %t.so -script %t.script -o %t.exe
-# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t.exe \
+# RUN: | FileCheck -check-prefix=DIS %s
+# RUN: llvm-readobj -r -A %t.exe | FileCheck %s
# RUN: ld.lld -shared %t.o %t.so -script %t.script -o %t-out.so
-# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t-out.so | FileCheck -check-prefix=DIS-SO %s
-# RUN: llvm-readobj -r --mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t-out.so \
+# RUN: | FileCheck -check-prefix=DIS-SO %s
+# RUN: llvm-readobj -r -A %t-out.so | FileCheck -check-prefix=SO %s
# DIS: __start:
# DIS-NEXT: addiu $2, $3, -32720
@@ -44,7 +46,7 @@
# CHECK-NEXT: 0x30028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
# CHECK-NEXT: }
# CHECK-NEXT: ]
-# CHECK-NEXT: Primary GOT {
+# CHECK: Primary GOT {
# CHECK-NEXT: Canonical gp value: 0x37FF0
# CHECK-NEXT: Reserved entries [
# CHECK: ]
@@ -80,7 +82,7 @@
# SO-NEXT: 0x30028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
# SO-NEXT: }
# SO-NEXT: ]
-# SO-NEXT: Primary GOT {
+# SO: Primary GOT {
# SO-NEXT: Canonical gp value: 0x37FF0
# SO-NEXT: Reserved entries [
# SO: ]
diff --git a/lld/test/ELF/mips-tls-hilo.s b/lld/test/ELF/mips-tls-hilo.s
index abac8fa3b83..b557e962c5c 100644
--- a/lld/test/ELF/mips-tls-hilo.s
+++ b/lld/test/ELF/mips-tls-hilo.s
@@ -5,10 +5,10 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -o %t.exe
# RUN: llvm-objdump -d -t --no-show-raw-insn %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r -A %t.exe | FileCheck %s
# RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -r -A %t.so | FileCheck -check-prefix=SO %s
# DIS: __start:
# DIS-NEXT: addiu $2, $3, 0
diff --git a/lld/test/ELF/mips-tls.s b/lld/test/ELF/mips-tls.s
index 842c2df7cf6..4e4f1c2dbb1 100644
--- a/lld/test/ELF/mips-tls.s
+++ b/lld/test/ELF/mips-tls.s
@@ -12,12 +12,14 @@
# RUN: }" > %t.script
# RUN: ld.lld %t.o %t.so -script %t.script -o %t.exe
-# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t.exe \
+# RUN: | FileCheck -check-prefix=DIS %s
+# RUN: llvm-readobj -r -A %t.exe | FileCheck %s
# RUN: ld.lld -shared %t.o %t.so -script %t.script -o %t-out.so
-# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t-out.so | FileCheck -check-prefix=DIS-SO %s
-# RUN: llvm-readobj -r --mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-objdump -d -s -t --no-show-raw-insn %t-out.so \
+# RUN: | FileCheck -check-prefix=DIS-SO %s
+# RUN: llvm-readobj -r -A %t-out.so | FileCheck -check-prefix=SO %s
# DIS: __start:
# DIS-NEXT: addiu $2, $3, -32736
@@ -42,7 +44,7 @@
# CHECK-NEXT: 0x30014 R_MIPS_TLS_DTPREL32 foo 0x0
# CHECK-NEXT: }
# CHECK-NEXT: ]
-# CHECK-NEXT: Primary GOT {
+# CHECK: Primary GOT {
# CHECK-NEXT: Canonical gp value: 0x37FF0
# CHECK-NEXT: Reserved entries [
# CHECK: ]
@@ -76,7 +78,7 @@
# SO-NEXT: 0x30014 R_MIPS_TLS_DTPREL32 foo 0x0
# SO-NEXT: }
# SO-NEXT: ]
-# SO-NEXT: Primary GOT {
+# SO: Primary GOT {
# SO-NEXT: Canonical gp value: 0x37FF0
# SO-NEXT: Reserved entries [
# SO: ]
diff --git a/lld/test/ELF/mips-xgot-order.s b/lld/test/ELF/mips-xgot-order.s
index a9925d21366..87e57030fcd 100644
--- a/lld/test/ELF/mips-xgot-order.s
+++ b/lld/test/ELF/mips-xgot-order.s
@@ -5,7 +5,7 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
# RUN: ld.lld %t.o -o %t.exe
# RUN: llvm-objdump -d --no-show-raw-insn %t.exe | FileCheck %s
-# RUN: llvm-readelf -s -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -s -A %t.exe | FileCheck -check-prefix=GOT %s
# CHECK: Disassembly of section .text:
# CHECK-EMPTY:
diff --git a/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll b/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll
index fe82b7c5b6c..cd78166d372 100644
--- a/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll
+++ b/llvm/test/CodeGen/Mips/micromips-ase-function-attribute.ll
@@ -1,5 +1,5 @@
; RUN: llc -mtriple=mips-unknown-linux -filetype=obj %s -o - | \
-; RUN: llvm-readobj --mips-abi-flags | \
+; RUN: llvm-readobj -A | \
; RUN: FileCheck --check-prefix=ASE-MICROMIPS %s
define void @_Z3foov() #0 {
diff --git a/llvm/test/MC/Mips/crc/module-crc.s b/llvm/test/MC/Mips/crc/module-crc.s
index 92c428e67ff..66c54647cf4 100644
--- a/llvm/test/MC/Mips/crc/module-crc.s
+++ b/llvm/test/MC/Mips/crc/module-crc.s
@@ -3,7 +3,7 @@
#
# RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r6 \
# RUN: -filetype=obj -o - | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module crc
diff --git a/llvm/test/MC/Mips/crc/module-nocrc.s b/llvm/test/MC/Mips/crc/module-nocrc.s
index c67279194c8..193ed360b57 100644
--- a/llvm/test/MC/Mips/crc/module-nocrc.s
+++ b/llvm/test/MC/Mips/crc/module-nocrc.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r6 -filetype=obj -o - -mattr=+crc | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module nocrc
diff --git a/llvm/test/MC/Mips/ginv/module-ginv.s b/llvm/test/MC/Mips/ginv/module-ginv.s
index 07f1bc4d40e..8adcd90b23f 100644
--- a/llvm/test/MC/Mips/ginv/module-ginv.s
+++ b/llvm/test/MC/Mips/ginv/module-ginv.s
@@ -3,7 +3,7 @@
#
# RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r6 \
# RUN: -filetype=obj -o - | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module ginv
diff --git a/llvm/test/MC/Mips/ginv/module-noginv.s b/llvm/test/MC/Mips/ginv/module-noginv.s
index 2ed4fd9c314..611d72c52d5 100644
--- a/llvm/test/MC/Mips/ginv/module-noginv.s
+++ b/llvm/test/MC/Mips/ginv/module-noginv.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r6 -filetype=obj -o - -mattr=+ginv | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module noginv
diff --git a/llvm/test/MC/Mips/micromips-ase-directive.s b/llvm/test/MC/Mips/micromips-ase-directive.s
index f3ac60057dc..fef40ecc3ee 100644
--- a/llvm/test/MC/Mips/micromips-ase-directive.s
+++ b/llvm/test/MC/Mips/micromips-ase-directive.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple=mips-unknown-linux -filetype=obj %s -o - | \
-# RUN: llvm-readobj --mips-abi-flags | \
+# RUN: llvm-readobj -A | \
# RUN: FileCheck --check-prefix=ASE-MICROMIPS %s
.set micromips
diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx.s b/llvm/test/MC/Mips/mips_abi_flags_xx.s
index 94101ae0c8f..f8386b49774 100644
--- a/llvm/test/MC/Mips/mips_abi_flags_xx.s
+++ b/llvm/test/MC/Mips/mips_abi_flags_xx.s
@@ -2,19 +2,19 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations -A - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS
# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mattr=fpxx -filetype=obj -o - | \
-# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations -A - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS
# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mcpu=mips32r6 -mattr=fpxx -filetype=obj -o - | \
-# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations -A - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R6,CHECK-OBJ-MIPS
# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -mcpu=octeon -filetype=obj -o - | \
-# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations -A - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-64R2,CHECK-OBJ-OCTEON
# CHECK-ASM: .module fp=xx
diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
index f2445eba777..8e4e2dbcf53 100644
--- a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
+++ b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=xx
diff --git a/llvm/test/MC/Mips/module-hardfloat.s b/llvm/test/MC/Mips/module-hardfloat.s
index f29fbc09353..5738a09a91b 100644
--- a/llvm/test/MC/Mips/module-hardfloat.s
+++ b/llvm/test/MC/Mips/module-hardfloat.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module hardfloat
diff --git a/llvm/test/MC/Mips/module-softfloat.s b/llvm/test/MC/Mips/module-softfloat.s
index 77e62e38e20..94ab7be63dc 100644
--- a/llvm/test/MC/Mips/module-softfloat.s
+++ b/llvm/test/MC/Mips/module-softfloat.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module softfloat
diff --git a/llvm/test/MC/Mips/mt/abiflag.s b/llvm/test/MC/Mips/mt/abiflag.s
index 2d03c5d1106..d067c55587c 100644
--- a/llvm/test/MC/Mips/mt/abiflag.s
+++ b/llvm/test/MC/Mips/mt/abiflag.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -mattr=+mt -filetype=obj -o - \
-# RUN: | llvm-readobj --mips-abi-flags | FileCheck %s
+# RUN: | llvm-readobj -A | FileCheck %s
# Test that the usage of the MT ASE is recorded in .MIPS.abiflags
diff --git a/llvm/test/MC/Mips/mt/module-directive.s b/llvm/test/MC/Mips/mt/module-directive.s
index 0d9ab97b455..1bbe9114754 100644
--- a/llvm/test/MC/Mips/mt/module-directive.s
+++ b/llvm/test/MC/Mips/mt/module-directive.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj --mips-abi-flags | FileCheck --check-prefix=CHECK-OBJ %s
+# RUN: llvm-readobj -A | FileCheck --check-prefix=CHECK-OBJ %s
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=asm -o - | \
# RUN: FileCheck --check-prefix=CHECK-ASM %s
diff --git a/llvm/test/MC/Mips/mt/set-directive.s b/llvm/test/MC/Mips/mt/set-directive.s
index 9088655d8c5..5d18486059d 100644
--- a/llvm/test/MC/Mips/mt/set-directive.s
+++ b/llvm/test/MC/Mips/mt/set-directive.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj --mips-abi-flags | FileCheck %s --check-prefix=CHECK-OBJ
+# RUN: llvm-readobj -A | FileCheck %s --check-prefix=CHECK-OBJ
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=asm -o - | \
# RUN: FileCheck %s --check-prefix=CHECK-ASM
diff --git a/llvm/test/MC/Mips/virt/module-novirt.s b/llvm/test/MC/Mips/virt/module-novirt.s
index 0f531dbbc80..6b953d0c585 100644
--- a/llvm/test/MC/Mips/virt/module-novirt.s
+++ b/llvm/test/MC/Mips/virt/module-novirt.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r5 -filetype=obj -o - -mattr=+virt | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module novirt
diff --git a/llvm/test/MC/Mips/virt/module-virt.s b/llvm/test/MC/Mips/virt/module-virt.s
index ae38b83d848..1fb035df878 100644
--- a/llvm/test/MC/Mips/virt/module-virt.s
+++ b/llvm/test/MC/Mips/virt/module-virt.s
@@ -3,7 +3,7 @@
#
# RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r5 \
# RUN: -filetype=obj -o - | \
-# RUN: llvm-readobj --mips-abi-flags - | \
+# RUN: llvm-readobj -A - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module virt
diff --git a/llvm/test/Object/Mips/abi-flags.yaml b/llvm/test/Object/Mips/abi-flags.yaml
index b5142fd3303..ce8234a9a0d 100644
--- a/llvm/test/Object/Mips/abi-flags.yaml
+++ b/llvm/test/Object/Mips/abi-flags.yaml
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-readobj --mips-abi-flags %t | FileCheck -check-prefix=OBJ %s
+# RUN: llvm-readobj -A %t | FileCheck -check-prefix=OBJ %s
# RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s
# OBJ: MIPS ABI Flags {
diff --git a/llvm/test/tools/llvm-readobj/mips-abiflags.test b/llvm/test/tools/llvm-readobj/mips-abiflags.test
index c06d147397e..f014c10340f 100644
--- a/llvm/test/tools/llvm-readobj/mips-abiflags.test
+++ b/llvm/test/tools/llvm-readobj/mips-abiflags.test
@@ -1,6 +1,6 @@
-RUN: llvm-readobj --mips-abi-flags %p/Inputs/abiflags.obj.elf-mipsel | \
+RUN: llvm-readobj -A %p/Inputs/abiflags.obj.elf-mipsel | \
RUN: FileCheck -check-prefix=EL64 %s
-RUN: llvm-readobj --mips-abi-flags %p/Inputs/abiflags.obj.elf-mips | \
+RUN: llvm-readobj -A %p/Inputs/abiflags.obj.elf-mips | \
RUN: FileCheck -check-prefix=BE32 %s
EL64: MIPS ABI Flags {
OpenPOWER on IntegriCloud