X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinker.cpp;h=d6737721d25fb74a5330e386737496a5cb8d3348;hb=0001e56f15215ae4bc5fffb82eec5c4828b888f0;hp=c72f1b5aca8083690a1e384d6fc026d2e5223bcc;hpb=dd04df0ec33a903ee7fc747701bafde622f77d8b;p=oota-llvm.git

diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp
index c72f1b5aca8..d6737721d25 100644
--- a/lib/Linker/Linker.cpp
+++ b/lib/Linker/Linker.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -13,20 +13,21 @@
 
 #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"
 using namespace llvm;
 
-Linker::Linker(const std::string& progname, unsigned flags)
+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,26 +46,23 @@ 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&QuietWarnings))
+    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
@@ -83,7 +81,7 @@ Linker::addPaths(const std::vector<std::string>& paths) {
 
 void
 Linker::addSystemPaths() {
-  sys::Path::GetBytecodeLibraryPaths(LibPaths);
+  sys::Path::GetBitcodeLibraryPaths(LibPaths);
   LibPaths.insert(LibPaths.begin(),sys::Path("./"));
 }
 
@@ -97,16 +95,24 @@ Linker::releaseModule() {
   return result;
 }
 
-// LoadObject - Read in and parse the bytecode file named by FN and return the
+// LoadObject - Read in and parse the bitcode file named by FN and return the
 // module it contains (wrapped in an auto_ptr), or auto_ptr<Module>() and set
 // Error if an error occurs.
 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();
+  std::auto_ptr<MemoryBuffer> Buffer(MemoryBuffer::getFileOrSTDIN(FNS.c_str()));
+  if (Buffer.get())
+    Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage);
+  else
+    ParseErrorMessage = "Error reading file '" + FNS + "'";
+    
   if (Result)
     return std::auto_ptr<Module>(Result);
-  Error = "Bytecode file '" + FN.toString() + "' could not be loaded";
+  Error = "Bitcode file '" + FN.toString() + "' could not be loaded";
   if (ParseErrorMessage.size())
     Error += ": " + ParseErrorMessage;
   return std::auto_ptr<Module>();
@@ -119,31 +125,27 @@ static inline sys::Path IsLibrary(const std::string& Name,
 
   sys::Path FullPath(Directory);
 
-  // Make sure the directory actually is a directory in the file system.
-  if (FullPath.isDirectory())
-  {
-    // Try the libX.a form
-    FullPath.appendComponent("lib" + Name);
-    FullPath.appendSuffix("a");
-    if (FullPath.isArchive())
-      return FullPath;
+  // Try the libX.a form
+  FullPath.appendComponent("lib" + Name);
+  FullPath.appendSuffix("a");
+  if (FullPath.isArchive())
+    return FullPath;
 
-    // Try the libX.bca form
-    FullPath.eraseSuffix();
-    FullPath.appendSuffix("bca");
-    if (FullPath.isArchive())
-      return FullPath;
+  // Try the libX.bca form
+  FullPath.eraseSuffix();
+  FullPath.appendSuffix("bca");
+  if (FullPath.isArchive())
+    return FullPath;
 
-    // Try the libX.so 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;
+  // 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.isBitcodeFile())    // .so file containing bitcode?
+    return FullPath;
 
-    // Not found .. fall through
-  }
+  // Not found .. fall through
 
   // Indicate that the library was not found in the directory.
   FullPath.clear();
@@ -157,8 +159,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() &&