Add support for archives with no symbol table or string table.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185664 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp
index 8206b0a18bc52558e5418d05fb09e74a5cfcbab7..0b819f4c806cc3247df014debbee7e8db96bdf63 100644 (file)
--- a/lib/Object/Archive.cpp
+++ b/lib/Object/Archive.cpp
@@ -104,7 +104,7 @@ Archive::Archive(MemoryBuffer *source, error_code &ec)
   : Binary(Binary::ID_Archive, source) {
   // Check for sufficient magic.
   if (!source || source->getBufferSize()
-                 < (8 + sizeof(ArchiveMemberHeader) + 2) // Smallest archive.
+                 < (8 + sizeof(ArchiveMemberHeader)) // Smallest archive.
               || StringRef(source->getBufferStart(), 8) != Magic) {
     ec = object_error::invalid_file_type;
     return;

diff --git a/test/Object/Inputs/archive-test.a-gnu-minimal b/test/Object/Inputs/archive-test.a-gnu-minimal
new file mode 100644 (file)
index 0000000..a243273
--- /dev/null
+++ b/test/Object/Inputs/archive-test.a-gnu-minimal
@@ -0,0 +1,2 @@
+!<arch>
+test/           1372964340  1000  1000  100664  0         `

diff --git a/test/Object/nm-archive.test b/test/Object/nm-archive.test
index 869bea849c43b29c781654d9ad7b85d47f04f4fe..922983c887fbee5f4b43c080430d64f577764b07 100644 (file)
--- a/test/Object/nm-archive.test
+++ b/test/Object/nm-archive.test
@@ -9,6 +9,9 @@ RUN: llvm-nm %t2 | FileCheck %s -check-prefix BITCODE
 Test we don't error with an archive with no symtab.
 RUN: llvm-nm %p/Inputs/archive-test.a-gnu-no-symtab
 
+Or in an archive with no symtab or string table.
+RUN: llvm-nm %p/Inputs/archive-test.a-gnu-minimal
+
 COFF: trivial-object-test.coff-i386:
 COFF-NEXT: 00000000 d .data
 COFF-NEXT: 00000000 t .text