Make getObjectType() smarter about ranlibbed Mac OS X archives.

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

diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 21f1f7d84833252e3d097bce20e12437237d9b06..b147cb3344e04270a395690f0d6736bf79785db3 100644 (file)
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -53,6 +53,8 @@ static enum ObjectType getObjectType(ar_hdr *H, unsigned char *MemberData,
   // Check for sections with special names...
   if (!memcmp(H->name, "__.SYMDEF       ", 16))
     return ArchiveSymbolTable;
   // Check for sections with special names...
   if (!memcmp(H->name, "__.SYMDEF       ", 16))
     return ArchiveSymbolTable;

+  if (!memcmp(H->name, "__.SYMDEF SORTED", 16))
+    return ArchiveSymbolTable;

   if (!memcmp(H->name, "//              ", 16))
     return SVR4LongFilename;
 
   if (!memcmp(H->name, "//              ", 16))
     return SVR4LongFilename;
 

diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index 21f1f7d84833252e3d097bce20e12437237d9b06..b147cb3344e04270a395690f0d6736bf79785db3 100644 (file)
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/lib/Bytecode/Archive/ArchiveReader.cpp
@@ -53,6 +53,8 @@ static enum ObjectType getObjectType(ar_hdr *H, unsigned char *MemberData,
   // Check for sections with special names...
   if (!memcmp(H->name, "__.SYMDEF       ", 16))
     return ArchiveSymbolTable;
   // Check for sections with special names...
   if (!memcmp(H->name, "__.SYMDEF       ", 16))
     return ArchiveSymbolTable;

+  if (!memcmp(H->name, "__.SYMDEF SORTED", 16))
+    return ArchiveSymbolTable;

   if (!memcmp(H->name, "//              ", 16))
     return SVR4LongFilename;
 
   if (!memcmp(H->name, "//              ", 16))
     return SVR4LongFilename;
 

diff --git a/lib/Bytecode/Reader/ArchiveReader.cpp b/lib/Bytecode/Reader/ArchiveReader.cpp
index 21f1f7d84833252e3d097bce20e12437237d9b06..b147cb3344e04270a395690f0d6736bf79785db3 100644 (file)
--- a/lib/Bytecode/Reader/ArchiveReader.cpp
+++ b/lib/Bytecode/Reader/ArchiveReader.cpp
@@ -53,6 +53,8 @@ static enum ObjectType getObjectType(ar_hdr *H, unsigned char *MemberData,
   // Check for sections with special names...
   if (!memcmp(H->name, "__.SYMDEF       ", 16))
     return ArchiveSymbolTable;
   // Check for sections with special names...
   if (!memcmp(H->name, "__.SYMDEF       ", 16))
     return ArchiveSymbolTable;

+  if (!memcmp(H->name, "__.SYMDEF SORTED", 16))
+    return ArchiveSymbolTable;

   if (!memcmp(H->name, "//              ", 16))
     return SVR4LongFilename;
 
   if (!memcmp(H->name, "//              ", 16))
     return SVR4LongFilename;