add bitcode support

[oota-llvm.git] / lib / Linker / Linker.cpp

diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp
index 337174039383034198d2f3fab07eb07861e4b61c..bfa30044dcf61b060ddc4f2e25181d70c98f99c2 100644 (file)
--- a/lib/Linker/Linker.cpp
+++ b/lib/Linker/Linker.cpp
@@ -14,19 +14,23 @@
 #include "llvm/Linker.h"
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
+#include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Config/config.h"
-#include <iostream>
-
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/Streams.h"
+#include "llvm/Support/Compressor.h"
 using namespace llvm;
 
-Linker::Linker(const std::string& progname, unsigned flags)
+static const bool Bitcode = false;
+
+Linker::Linker(const std::string& progname, const std::string& modname, unsigned flags)
   : Composite(0)
   , LibPaths()
   , Flags(flags)
   , Error()
   , ProgramName(progname)
 {
-  Composite = new Module(progname);
+  Composite = new Module(modname);
 }
 
 Linker::Linker(const std::string& progname, Module* aModule, unsigned flags)
@@ -45,31 +49,27 @@ Linker::~Linker() {
 bool
 Linker::error(const std::string& message) {
   Error = message;
-  if (!(Flags&QuietErrors)) {
-    std::cerr << ProgramName << ": error: " << message << "\n";
-  }
+  if (!(Flags&QuietErrors))
+    cerr << ProgramName << ": error: " << message << "\n";
   return true;
 }
 
 bool
 Linker::warning(const std::string& message) {
   Error = message;
-  if (!(Flags&QuietErrors)) {
-    std::cerr << ProgramName << ": warning: " << message << "\n";
-  }
+  if (!(Flags&QuietErrors))
+    cerr << ProgramName << ": warning: " << message << "\n";
   return false;
 }
 
 void
 Linker::verbose(const std::string& message) {
-  if (Flags&Verbose) {
-    std::cerr << "  " << message << "\n";
-  }
+  if (Flags&Verbose)
+    cerr << "  " << message << "\n";
 }
 
 void
 Linker::addPath(const sys::Path& path) {
-  assert(path.isDirectory() && "Can only insert directories into the path");
   LibPaths.push_back(path);
 }
 
@@ -77,7 +77,7 @@ void
 Linker::addPaths(const std::vector<std::string>& paths) {
   for (unsigned i = 0; i != paths.size(); ++i) {
     sys::Path aPath;
-    aPath.setDirectory(paths[i]);
+    aPath.set(paths[i]);
     LibPaths.push_back(aPath);
   }
 }
@@ -104,7 +104,21 @@ Linker::releaseModule() {
 std::auto_ptr<Module>
 Linker::LoadObject(const sys::Path &FN) {
   std::string ParseErrorMessage;
-  Module *Result = ParseBytecodeFile(FN.toString(), &ParseErrorMessage);
+  Module *Result = 0;
+  
+  const std::string &FNS = FN.toString();
+  if (Bitcode) {
+    std::auto_ptr<MemoryBuffer> Buffer(
+                          MemoryBuffer::getFileOrSTDIN(&FNS[0], FNS.size()));
+    if (Buffer.get())
+      Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage);
+    else
+      ParseErrorMessage = "Error reading file '" + FNS + "'";
+    
+  } else {
+    Result = ParseBytecodeFile(FNS, Compressor::decompressToNewBuffer,
+                               &ParseErrorMessage);
+  }
   if (Result)
     return std::auto_ptr<Module>(Result);
   Error = "Bytecode file '" + FN.toString() + "' could not be loaded";
@@ -118,26 +132,33 @@ Linker::LoadObject(const sys::Path &FN) {
 static inline sys::Path IsLibrary(const std::string& Name,
                                   const sys::Path& Directory) {
 
-  assert(Directory.isDirectory() && "Need to specify a directory");
   sys::Path FullPath(Directory);
-  FullPath.appendFile("lib" + Name);
 
+  // Try the libX.a form
+  FullPath.appendComponent("lib" + Name);
   FullPath.appendSuffix("a");
   if (FullPath.isArchive())
     return FullPath;
 
-  FullPath.elideSuffix();
+  // Try the libX.bca form
+  FullPath.eraseSuffix();
   FullPath.appendSuffix("bca");
   if (FullPath.isArchive())
     return FullPath;
 
-  FullPath.elideSuffix();
+  // Try the libX.so (or .dylib) form
+  FullPath.eraseSuffix();
   FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
   if (FullPath.isDynamicLibrary())  // Native shared library?
     return FullPath;
   if (FullPath.isBytecodeFile())    // .so file containing bytecode?
     return FullPath;
+  if (FullPath.isBitcodeFile())    // .so file containing bitcode?
+    return FullPath;
 
+  // Not found .. fall through
+
+  // Indicate that the library was not found in the directory.
   FullPath.clear();
   return FullPath;
 }
@@ -149,8 +170,7 @@ static inline sys::Path IsLibrary(const std::string& Name,
 /// Path if no matching file can be found.
 ///
 sys::Path
-Linker::FindLib(const std::string &Filename)
-{
+Linker::FindLib(const std::string &Filename) {
   // Determine if the pathname can be found as it stands.
   sys::Path FilePath(Filename);
   if (FilePath.canRead() &&