Testcase for pr2169.

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

diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp
index e66fa5b6e6df06c930609a86cbbc4c09c4579010..7c888aa498a3f1658b3e7f3a964698b4f03145c1 100644 (file)
--- a/lib/Linker/LinkItems.cpp
+++ b/lib/Linker/LinkItems.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.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -14,6 +14,8 @@
 
 #include "llvm/Linker.h"
 #include "llvm/Module.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Bitcode/ReaderWriter.h"
 
 using namespace llvm;
 
@@ -72,7 +74,7 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) {
   // Determine where this library lives.
   sys::Path Pathname = FindLib(Lib);
   if (Pathname.isEmpty())
-    return warning("Cannot find library '" + Lib + "'");
+    return error("Cannot find library '" + Lib + "'");
 
   // If its an archive, try to link it in
   std::string Magic;
@@ -82,12 +84,10 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) {
     case sys::Unknown_FileType:
       return warning("Supposed library '" + Lib + "' isn't a library.");
 
-    case sys::Bytecode_FileType:
     case sys::Bitcode_FileType:
-    case sys::CompressedBytecode_FileType:
       // LLVM ".so" file.
       if (LinkInFile(Pathname, is_native))
-        return error("Cannot link file '" + Pathname.toString() + "'");
+        return true;
       break;
 
     case sys::Archive_FileType:
@@ -155,6 +155,21 @@ bool Linker::LinkInLibraries(const std::vector<std::string> &Libraries) {
 ///
 bool Linker::LinkInFile(const sys::Path &File, bool &is_native) {
   is_native = false;
+  
+  // Check for a file of name "-", which means "read standard input"
+  if (File.toString() == "-") {
+    std::auto_ptr<Module> M;
+    if (MemoryBuffer *Buffer = MemoryBuffer::getSTDIN()) {
+      M.reset(ParseBitcodeFile(Buffer, &Error));
+      delete Buffer;
+      if (M.get())
+        if (!LinkInModule(M.get(), &Error))
+          return false;
+    } else 
+      Error = "standard input is empty";
+    return error("Cannot link stdin: " + Error);
+  }
+
   // Make sure we can at least read the file
   if (!File.canRead())
     return error("Cannot find linker input '" + File.toString() + "'");
@@ -165,26 +180,24 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) {
   switch (sys::IdentifyFileType(Magic.c_str(), 64)) {
     default: assert(0 && "Bad file type identification");
     case sys::Unknown_FileType:
-      return warning("Supposed object file '" + File.toString() + 
-                     "' not recognized as such");
+      return warning("Ignoring file '" + File.toString() + 
+                   "' because does not contain bitcode.");
 
     case sys::Archive_FileType:
       // A user may specify an ar archive without -l, perhaps because it
       // is not installed as a library. Detect that and link the archive.
       verbose("Linking archive file '" + File.toString() + "'");
       if (LinkInArchive(File, is_native))
-        return error("Cannot link archive '" + File.toString() + "'");
+        return true;
       break;
 
-    case sys::Bitcode_FileType:
-    case sys::Bytecode_FileType:
-    case sys::CompressedBytecode_FileType: {
+    case sys::Bitcode_FileType: {
       verbose("Linking bitcode file '" + File.toString() + "'");
       std::auto_ptr<Module> M(LoadObject(File));
       if (M.get() == 0)
-        return error("Cannot load file '" + File.toString() + "'" + Error);
-      if (LinkInModule(M.get()))
-        return error("Cannot link file '" + File.toString() + "'" + Error);
+        return error("Cannot load file '" + File.toString() + "': " + Error);
+      if (LinkInModule(M.get(), &Error))
+        return error("Cannot link file '" + File.toString() + "': " + Error);
 
       verbose("Linked in file '" + File.toString() + "'");
       break;