Adjust to Compressor interface change

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

diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp
index 8651e95391f47e4a42e16bfacb22e2f29f2c66e4..21be628452ab07c3e8d899c231203785787daade 100644 (file)
--- a/lib/Archive/ArchiveWriter.cpp
+++ b/lib/Archive/ArchiveWriter.cpp
@@ -262,8 +262,7 @@ Archive::writeMember(
       data +=4;
       fSize -= 4;
     }
-    fSize = Compressor::compressToNewBuffer(
-              data,fSize,output,Compressor::COMP_TYPE_ZLIB);
+    fSize = Compressor::compressToNewBuffer(data,fSize,output);
     data = output;
     if (member.isBytecode())
       hdrSize = -fSize-4; 

diff --git a/lib/Bytecode/Archive/ArchiveWriter.cpp b/lib/Bytecode/Archive/ArchiveWriter.cpp
index 8651e95391f47e4a42e16bfacb22e2f29f2c66e4..21be628452ab07c3e8d899c231203785787daade 100644 (file)
--- a/lib/Bytecode/Archive/ArchiveWriter.cpp
+++ b/lib/Bytecode/Archive/ArchiveWriter.cpp
@@ -262,8 +262,7 @@ Archive::writeMember(
       data +=4;
       fSize -= 4;
     }
-    fSize = Compressor::compressToNewBuffer(
-              data,fSize,output,Compressor::COMP_TYPE_ZLIB);
+    fSize = Compressor::compressToNewBuffer(data,fSize,output);
     data = output;
     if (member.isBytecode())
       hdrSize = -fSize-4; 

diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index ed43bc9e2e8884bf02b5d4ccbbc08c669d80c92e..b54a513b72db112bf5ba4fe5426e095a759bb7f8 100644 (file)
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -1128,8 +1128,7 @@ void llvm::WriteBytecodeToFile(const Module *M, std::ostream &Out,
     uint64_t zipSize = Compressor::compressToStream(
       (char*)(FirstByte+4),        // Skip the magic number
       Buffer.size()-4,             // Skip the magic number
-      Out,                         // Where to write compressed data
-      Compressor::COMP_TYPE_BZIP2  // Try bzip2 compression first
+      Out                          // Where to write compressed data
     );
 
   } else {