[llvm-commits] CVS: llvm/tools/llvm-ar/llvm-ar.cpp

[Chris Lattner]

Changes in directory llvm/tools/llvm-ar:

llvm-ar.cpp updated: 1.44 -> 1.45
---
Log message:

switch tools to bitcode instead of bytecode


---
Diffs of the changes:  (+5 -16)

 llvm-ar.cpp |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)


Index: llvm/tools/llvm-ar/llvm-ar.cpp
diff -u llvm/tools/llvm-ar/llvm-ar.cpp:1.44 llvm/tools/llvm-ar/llvm-ar.cpp:1.45
--- llvm/tools/llvm-ar/llvm-ar.cpp:1.44	Sun Apr  8 14:59:07 2007
+++ llvm/tools/llvm-ar/llvm-ar.cpp	Sun May  6 04:29:57 2007
@@ -13,9 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Module.h"
-#include "llvm/Bytecode/Archive.h"
+#include "llvm/Bitcode/Archive.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Compressor.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
@@ -364,14 +363,8 @@
         if (Verbose)
           std::cout << "Printing " << I->getPath().toString() << "\n";
 
-        if (I->isCompressedBytecode())
-          Compressor::decompressToStream(data+4,I->getSize()-4,std::cout);
-        else if (I->isCompressed()) {
-          Compressor::decompressToStream(data,I->getSize(),std::cout);
-        } else {
-          unsigned len = I->getSize();
-          std::cout.write(data, len);
-        }
+        unsigned len = I->getSize();
+        std::cout.write(data, len);
       } else {
         countDown--;
       }
@@ -469,12 +462,8 @@
       const char* data = reinterpret_cast<const char*>(I->getData());
       unsigned len = I->getSize();
 
-      // Write the data, making sure to uncompress things first
-      if (I->isCompressed()) {
-        Compressor::decompressToStream(data,len,file);
-      } else {
-        file.write(data,len);
-      }
+      // Write the data.
+      file.write(data,len);
       file.close();
 
       // If we're supposed to retain the original modification times, etc. do so