Recognize compressed LLVM bytecode files.

This should fix the problem of not being able to link compressed LLVM
bytecode files from LLVM libraries.

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

diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 50e11d6ab5838e0b03d3fbc05971a686ef61a683..e12648386525ad5ee55a86fdc984e481de800b63 100644 (file)
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -58,6 +58,9 @@ static enum ObjectType getObjectType(ar_hdr *H, std::string MemberName,
   if (Size >= 4 && !memcmp(MemberData, "llvm", 4))
     return UserObject;
 
+  if (Size >= 4 && !memcmp(MemberData, "llvc", 4))
+    return UserObject;
+
   return Unknown;
 }
 

diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index 50e11d6ab5838e0b03d3fbc05971a686ef61a683..e12648386525ad5ee55a86fdc984e481de800b63 100644 (file)
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/lib/Bytecode/Archive/ArchiveReader.cpp
@@ -58,6 +58,9 @@ static enum ObjectType getObjectType(ar_hdr *H, std::string MemberName,
   if (Size >= 4 && !memcmp(MemberData, "llvm", 4))
     return UserObject;
 
+  if (Size >= 4 && !memcmp(MemberData, "llvc", 4))
+    return UserObject;
+
   return Unknown;
 }
 

diff --git a/lib/Bytecode/Reader/ArchiveReader.cpp b/lib/Bytecode/Reader/ArchiveReader.cpp
index 50e11d6ab5838e0b03d3fbc05971a686ef61a683..e12648386525ad5ee55a86fdc984e481de800b63 100644 (file)
--- a/lib/Bytecode/Reader/ArchiveReader.cpp
+++ b/lib/Bytecode/Reader/ArchiveReader.cpp
@@ -58,6 +58,9 @@ static enum ObjectType getObjectType(ar_hdr *H, std::string MemberName,
   if (Size >= 4 && !memcmp(MemberData, "llvm", 4))
     return UserObject;
 
+  if (Size >= 4 && !memcmp(MemberData, "llvc", 4))
+    return UserObject;
+
   return Unknown;
 }