[llvm] dcf6d0d - [llvm-objdump] Fix -a after D100433

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2021-05-04T10:17:36-07:00
New Revision: dcf6d0d389dfb6b83aa1a6c20db32dc31c19f531

URL: https://github.com/llvm/llvm-project/commit/dcf6d0d389dfb6b83aa1a6c20db32dc31c19f531
DIFF: https://github.com/llvm/llvm-project/commit/dcf6d0d389dfb6b83aa1a6c20db32dc31c19f531.diff

LOG: [llvm-objdump] Fix -a after D100433

-a is alias for --archive-headers, not --all-headers

Added: 
    

Modified: 
    llvm/test/tools/llvm-objdump/archive-headers.test
    llvm/tools/llvm-objdump/ObjdumpOpts.td

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-objdump/archive-headers.test b/llvm/test/tools/llvm-objdump/archive-headers.test
index 9cdc68416da6..1e00c3bd6d63 100644
--- a/llvm/test/tools/llvm-objdump/archive-headers.test
+++ b/llvm/test/tools/llvm-objdump/archive-headers.test
@@ -1,7 +1,8 @@
 # RUN: llvm-objdump -a %p/Inputs/liblong_filenames.a | FileCheck %s
 # RUN: llvm-objdump --archive-headers %p/Inputs/liblong_filenames.a | FileCheck %s
 
-# CHECK: {{.*}}liblong_filenames.a(1.o): file format elf64-x86-64
+# CHECK:      {{^$}}
+# CHECK-NEXT: {{.*}}liblong_filenames.a(1.o): file format elf64-x86-64
 # CHECK: rw-r--r-- 204299/200  1416 {{.*}} 1.o
 # CHECK: {{.*}}liblong_filenames.a(2.o): file format elf64-x86-64
 # CHECK: rw-r--r-- 204299/200  1224 {{.*}} 2.o

diff  --git a/llvm/tools/llvm-objdump/ObjdumpOpts.td b/llvm/tools/llvm-objdump/ObjdumpOpts.td
index c5890d53d380..14811d82103f 100644
--- a/llvm/tools/llvm-objdump/ObjdumpOpts.td
+++ b/llvm/tools/llvm-objdump/ObjdumpOpts.td
@@ -25,7 +25,7 @@ def arch_name_EQ : Joined<["--"], "arch-name=">,
 def archive_headers : Flag<["--"], "archive-headers">,
   HelpText<"Display archive header information">;
 
-def : Flag<["-"], "a">, Alias<all_headers>,
+def : Flag<["-"], "a">, Alias<archive_headers>,
   HelpText<"Alias for --archive-headers">;
 
 def demangle : Flag<["--"], "demangle">, HelpText<"Demangle symbol names">;