Index: test/tools/llvm-objdump/archive-headers.test
===================================================================
--- test/tools/llvm-objdump/archive-headers.test
+++ test/tools/llvm-objdump/archive-headers.test
@@ -1,6 +1,9 @@
 # RUN: llvm-objdump -a %p/Inputs/liblong_filenames.a | FileCheck %s
 # RUN: llvm-objdump -archive-headers %p/Inputs/liblong_filenames.a | FileCheck %s
 
+## Check that we dump the archive headers when -all-headers is specified.
+# RUN: llvm-objdump -all-headers %p/Inputs/liblong_filenames.a | FileCheck %s
+
 # CHECK: {{.*}}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
Index: tools/llvm-objdump/llvm-objdump.cpp
===================================================================
--- tools/llvm-objdump/llvm-objdump.cpp
+++ tools/llvm-objdump/llvm-objdump.cpp
@@ -2481,8 +2481,8 @@
     InputFilenames.push_back("a.out");
 
   if (AllHeaders)
-    FileHeaders = PrivateHeaders = Relocations = SectionHeaders = SymbolTable =
-        true;
+    ArchiveHeaders = FileHeaders = PrivateHeaders = Relocations =
+        SectionHeaders = SymbolTable = true;
 
   if (DisassembleAll || PrintSource || PrintLines)
     Disassemble = true;