From: Nick Kledzik <kledzik@apple.com>
Date: Wed, 12 Nov 2014 01:37:45 +0000 (+0000)
Subject: Object, support both mach-o archive t.o.c file names
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9abbcb7453368fbdb30f155e99c9dd05b5a154a3;p=oota-llvm.git

Object, support both mach-o archive t.o.c file names

For historical reasons archives on mach-o have two possible names for the
file containing the table of contents for the archive: "__.SYMDEF SORTED"
and "__.SYMDEF".  But the libObject archive reader only supported the former.

This patch fixes llvm::object::Archive to support both names.


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

diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp
index 070fe812eec..d169dbee46e 100644
--- a/lib/Object/Archive.cpp
+++ b/lib/Object/Archive.cpp
@@ -240,7 +240,7 @@ Archive::Archive(MemoryBufferRef Source, std::error_code &ec)
     if (ec)
       return;
     Name = NameOrErr.get();
-    if (Name == "__.SYMDEF SORTED") {
+    if (Name == "__.SYMDEF SORTED" || Name == "__.SYMDEF") {
       SymbolTable = i;
       ++i;
     }
diff --git a/test/Object/Inputs/macho-archive-unsorted-x86_64.a b/test/Object/Inputs/macho-archive-unsorted-x86_64.a
new file mode 100644
index 00000000000..6a2b570f160
Binary files /dev/null and b/test/Object/Inputs/macho-archive-unsorted-x86_64.a differ
diff --git a/test/Object/archive-symtab.test b/test/Object/archive-symtab.test
index 0899828bdfb..01f17bcc8b6 100644
--- a/test/Object/archive-symtab.test
+++ b/test/Object/archive-symtab.test
@@ -61,6 +61,7 @@ RUN: llvm-ranlib %t.a
 RUN: llvm-nm -M %t.a | FileCheck %s
 
 RUN: llvm-nm -M %p/Inputs/macho-archive-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
+RUN: llvm-nm -M %p/Inputs/macho-archive-unsorted-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
 
 BSD-MachO: Archive map
 BSD-MachO: _bar in bar.o