[llvm-commits] CVS: llvm/tools/llvmc/CompilerDriver.cpp Makefile

[Chris Lattner]

Changes in directory llvm/tools/llvmc:

CompilerDriver.cpp updated: 1.49 -> 1.50
Makefile updated: 1.25 -> 1.26
---
Log message:

switch tools to bitcode instead of bytecode


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

 CompilerDriver.cpp |   21 ++++++---------------
 Makefile           |    2 +-
 2 files changed, 7 insertions(+), 16 deletions(-)


Index: llvm/tools/llvmc/CompilerDriver.cpp
diff -u llvm/tools/llvmc/CompilerDriver.cpp:1.49 llvm/tools/llvmc/CompilerDriver.cpp:1.50
--- llvm/tools/llvmc/CompilerDriver.cpp:1.49	Sun May  6 00:51:37 2007
+++ llvm/tools/llvmc/CompilerDriver.cpp	Sun May  6 04:29:57 2007
@@ -15,8 +15,8 @@
 #include "CompilerDriver.h"
 #include "ConfigLexer.h"
 #include "llvm/Module.h"
+#include "llvm/ModuleProvider.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Bytecode/Reader.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/System/Signals.h"
@@ -27,8 +27,6 @@
 using namespace llvm;
 
 
-static bool Bitcode = false;
-
 namespace {
 
 void WriteAction(CompilerDriver::Action* action ) {
@@ -69,17 +67,12 @@
 
 static bool GetBytecodeDependentLibraries(const std::string &fname,
                                           Module::LibraryListType& deplibs,
-                                          BCDecompressor_t *BCDC,
                                           std::string* ErrMsg) {
   ModuleProvider *MP = 0;
-  if (Bitcode) {
-    if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&fname[0],
-                                                            fname.size())) {
-      MP = getBitcodeModuleProvider(Buffer);
-      if (MP == 0) delete Buffer;
-    }
-  } else {
-    MP = getBytecodeModuleProvider(fname, BCDC, ErrMsg);
+  if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&fname[0],
+                                                          fname.size())) {
+    MP = getBitcodeModuleProvider(Buffer);
+    if (MP == 0) delete Buffer;
   }
   if (!MP) {
     deplibs.clear();
@@ -598,9 +591,7 @@
     if (fullpath.isBytecodeFile()) {
       // Process the dependent libraries recursively
       Module::LibraryListType modlibs;
-      if (GetBytecodeDependentLibraries(fullpath.toString(),modlibs,
-                                        Compressor::decompressToNewBuffer,
-                                        &err)) {
+      if (GetBytecodeDependentLibraries(fullpath.toString(),modlibs, &err)) {
         // Traverse the dependent libraries list
         Module::lib_iterator LI = modlibs.begin();
         Module::lib_iterator LE = modlibs.end();


Index: llvm/tools/llvmc/Makefile
diff -u llvm/tools/llvmc/Makefile:1.25 llvm/tools/llvmc/Makefile:1.26
--- llvm/tools/llvmc/Makefile:1.25	Sun May  6 00:51:37 2007
+++ llvm/tools/llvmc/Makefile	Sun May  6 04:29:57 2007
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvmc
-LINK_COMPONENTS = support system core bcreader bitreader
+LINK_COMPONENTS = support system core bitreader
 CONFIG_FILES = c cpp ll st
 EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs
 REQUIRES_EH := 1