diff --git a/test/ELF/mips-26.s b/test/ELF/mips-26.s
index 7ccf1cd..6d8cde4 100644
--- a/test/ELF/mips-26.s
+++ b/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/test/ELF/mips-32.s b/test/ELF/mips-32.s
index 97b49ae..d2c8aff 100644
--- a/test/ELF/mips-32.s
+++ b/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/test/ELF/mips-64-disp.s b/test/ELF/mips-64-disp.s
index def6618..a26b450 100644
--- a/test/ELF/mips-64-disp.s
+++ b/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/test/ELF/mips-64-got-overflow.s b/test/ELF/mips-64-got-overflow.s
index 37c6ef3..86289b9 100644
--- a/test/ELF/mips-64-got-overflow.s
+++ b/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/test/ELF/mips-64-got.s b/test/ELF/mips-64-got.s
index 04aeeb7..2a6b78d 100644
--- a/test/ELF/mips-64-got.s
+++ b/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/test/ELF/mips-64.s b/test/ELF/mips-64.s
index c0ca027..037daaf 100644
--- a/test/ELF/mips-64.s
+++ b/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/test/ELF/mips-abs-got.s b/test/ELF/mips-abs-got.s
index bccfe59..67ae27c 100644
--- a/test/ELF/mips-abs-got.s
+++ b/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/test/ELF/mips-call-hilo.s b/test/ELF/mips-call-hilo.s
index 3285eae..35d2c41 100644
--- a/test/ELF/mips-call-hilo.s
+++ b/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/test/ELF/mips-call16.s b/test/ELF/mips-call16.s
index 8898a64..c67f3f0 100644
--- a/test/ELF/mips-call16.s
+++ b/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/test/ELF/mips-elf-flags.s b/test/ELF/mips-elf-flags.s
index 40ef0a7..ca4656e 100644
--- a/test/ELF/mips-elf-flags.s
+++ b/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/test/ELF/mips-got-and-copy.s b/test/ELF/mips-got-and-copy.s
index f51e679..c401db8 100644
--- a/test/ELF/mips-got-and-copy.s
+++ b/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/test/ELF/mips-got-extsym.s b/test/ELF/mips-got-extsym.s
index 541023f..b4ee5fc 100644
--- a/test/ELF/mips-got-extsym.s
+++ b/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/test/ELF/mips-got-hilo.s b/test/ELF/mips-got-hilo.s
index f3b5098..1c6f609 100644
--- a/test/ELF/mips-got-hilo.s
+++ b/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/test/ELF/mips-got-page-script.s b/test/ELF/mips-got-page-script.s
index f8fe3bc..4055fb6 100644
--- a/test/ELF/mips-got-page-script.s
+++ b/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/test/ELF/mips-got-page.s b/test/ELF/mips-got-page.s
index faddb67..62de3c9 100644
--- a/test/ELF/mips-got-page.s
+++ b/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/test/ELF/mips-got-redundant.s b/test/ELF/mips-got-redundant.s
index e48e380..2b6d1a6 100644
--- a/test/ELF/mips-got-redundant.s
+++ b/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/test/ELF/mips-got-relocs.s b/test/ELF/mips-got-relocs.s
index cad6783..6e3e4b3 100644
--- a/test/ELF/mips-got-relocs.s
+++ b/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/test/ELF/mips-got-script.s b/test/ELF/mips-got-script.s
index 7c43de2..4f21983 100644
--- a/test/ELF/mips-got-script.s
+++ b/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/test/ELF/mips-got-string.s b/test/ELF/mips-got-string.s
index 7dee285..84cf0ff 100644
--- a/test/ELF/mips-got-string.s
+++ b/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/test/ELF/mips-got-weak.s b/test/ELF/mips-got-weak.s
index 7d13f7d..a5fdfa3 100644
--- a/test/ELF/mips-got-weak.s
+++ b/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/test/ELF/mips-got16.s b/test/ELF/mips-got16.s
index 18cfe43..427da3f 100644
--- a/test/ELF/mips-got16.s
+++ b/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/test/ELF/mips-gprel32-relocs-gp0.s b/test/ELF/mips-gprel32-relocs-gp0.s
index 773a05b..6dbe5e1 100644
--- a/test/ELF/mips-gprel32-relocs-gp0.s
+++ b/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/test/ELF/mips-merge-abiflags.s b/test/ELF/mips-merge-abiflags.s
index 27587e1..e7abbe7 100644
--- a/test/ELF/mips-merge-abiflags.s
+++ b/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/test/ELF/mips-mgot.s b/test/ELF/mips-mgot.s
index f958478..62b2cc0 100644
--- a/test/ELF/mips-mgot.s
+++ b/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/test/ELF/mips-micro-got.s b/test/ELF/mips-micro-got.s
index 539b622..2939a1b 100644
--- a/test/ELF/mips-micro-got.s
+++ b/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/test/ELF/mips-micro-jal.s b/test/ELF/mips-micro-jal.s
index f2bc0e4..987b5f6 100644
--- a/test/ELF/mips-micro-jal.s
+++ b/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/test/ELF/mips-micro-plt.s b/test/ELF/mips-micro-plt.s
index 47ef46b..93a058d 100644
--- a/test/ELF/mips-micro-plt.s
+++ b/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/test/ELF/mips-non-zero-gp0.s b/test/ELF/mips-non-zero-gp0.s
index 0d385fa..8b8dc16 100644
--- a/test/ELF/mips-non-zero-gp0.s
+++ b/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/test/ELF/mips-options.s b/test/ELF/mips-options.s
index 67179af..f87a399 100644
--- a/test/ELF/mips-options.s
+++ b/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/test/ELF/mips-plt-copy.s b/test/ELF/mips-plt-copy.s
index 1036e79..acdd719 100644
--- a/test/ELF/mips-plt-copy.s
+++ b/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/test/ELF/mips-reginfo.s b/test/ELF/mips-reginfo.s
index 2df0cab..c5517c7 100644
--- a/test/ELF/mips-reginfo.s
+++ b/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/test/ELF/mips-sto-plt.s b/test/ELF/mips-sto-plt.s
index dde5aff..46bcdb4 100644
--- a/test/ELF/mips-sto-plt.s
+++ b/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/test/ELF/mips-tls-64.s b/test/ELF/mips-tls-64.s
index f0b7618..296bbc3 100644
--- a/test/ELF/mips-tls-64.s
+++ b/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/test/ELF/mips-tls-hilo.s b/test/ELF/mips-tls-hilo.s
index abac8fa..b557e96 100644
--- a/test/ELF/mips-tls-hilo.s
+++ b/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/test/ELF/mips-tls.s b/test/ELF/mips-tls.s
index 842c2df..4e4f1c2 100644
--- a/test/ELF/mips-tls.s
+++ b/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/test/ELF/mips-xgot-order.s b/test/ELF/mips-xgot-order.s
index a9925d2..87e5703 100644
--- a/test/ELF/mips-xgot-order.s
+++ b/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: