//
// 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.
//
//===----------------------------------------------------------------------===//
//
-// This file contains routines to handle linking together LLVM bytecode files,
+// This file contains routines to handle linking together LLVM bitcode files,
// and to handle annoying things like static libraries.
//
//===----------------------------------------------------------------------===//
#include "llvm/Linker.h"
#include "llvm/Module.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Bitcode/ReaderWriter.h"
using namespace llvm;
// LinkItems - This function is the main entry point into linking. It takes a
// list of LinkItem which indicates the order the files should be linked and
// how each file should be treated (plain file or with library search). The
-// function only links bytecode and produces a result list of items that are
+// function only links bitcode and produces a result list of items that are
// native objects.
bool
Linker::LinkInItems(const ItemList& Items, ItemList& NativeItems) {
// symbols.
bool is_native;
for (Module::lib_iterator I = Composite->lib_begin(),
- E = Composite->lib_end(); I != E; ++I)
+ E = Composite->lib_end(); I != E; ++I) {
if(LinkInLibrary(*I, is_native))
return true;
+ if (is_native)
+ NativeItems.push_back(std::make_pair(*I, true));
+ }
return false;
}
// 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;
case sys::Unknown_FileType:
return warning("Supposed library '" + Lib + "' isn't a library.");
- case sys::Bytecode_FileType:
- case sys::CompressedBytecode_FileType:
+ case sys::Bitcode_FileType:
// LLVM ".so" file.
if (LinkInFile(Pathname, is_native))
- return error("Cannot link file '" + Pathname.toString() + "'");
+ return true;
break;
case sys::Archive_FileType:
- if (LinkInArchive(Pathname))
+ if (LinkInArchive(Pathname, is_native))
return error("Cannot link archive '" + Pathname.toString() + "'");
break;
- case sys::ELF_FileType:
- case sys::Mach_O_FileType:
+ case sys::ELF_Relocatable_FileType:
+ case sys::ELF_SharedObject_FileType:
+ case sys::Mach_O_Object_FileType:
+ case sys::Mach_O_FixedVirtualMemorySharedLib_FileType:
+ case sys::Mach_O_DynamicallyLinkedSharedLib_FileType:
+ case sys::Mach_O_DynamicallyLinkedSharedLibStub_FileType:
case sys::COFF_FileType:
is_native = true;
break;
}
/// LinkLibraries - takes the specified library files and links them into the
-/// main bytecode object file.
+/// main bitcode object file.
///
/// Inputs:
/// Libraries - The list of libraries to link into the module.
return false;
}
-/// LinkInFile - opens a bytecode file and links in all objects which
+/// LinkInFile - opens a bitcode file and links in all objects which
/// provide symbols that are currently undefined.
///
/// Inputs:
-/// File - The pathname of the bytecode file.
+/// File - The pathname of the bitcode file.
///
/// Outputs:
/// ErrorMessage - A C++ string detailing what error occurred, if any.
///
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() + "'");
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))
- return error("Cannot link archive '" + File.toString() + "'");
+ if (LinkInArchive(File, is_native))
+ return true;
break;
- case sys::Bytecode_FileType:
- case sys::CompressedBytecode_FileType: {
- verbose("Linking bytecode file '" + File.toString() + "'");
+ 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;
}
- case sys::ELF_FileType:
- case sys::Mach_O_FileType:
+ case sys::ELF_Relocatable_FileType:
+ case sys::ELF_SharedObject_FileType:
+ case sys::Mach_O_Object_FileType:
+ case sys::Mach_O_FixedVirtualMemorySharedLib_FileType:
+ case sys::Mach_O_DynamicallyLinkedSharedLib_FileType:
+ case sys::Mach_O_DynamicallyLinkedSharedLibStub_FileType:
case sys::COFF_FileType:
is_native = true;
break;
/// or relative pathname, or as a file somewhere in LLVM_LIB_SEARCH_PATH.
///
/// Inputs:
-/// Files - A vector of sys::Path indicating the LLVM bytecode filenames
+/// Files - A vector of sys::Path indicating the LLVM bitcode filenames
/// to be linked. The names can refer to a mixture of pure LLVM
-/// bytecode files and archive (ar) formatted files.
+/// bitcode files and archive (ar) formatted files.
///
/// Return value:
/// FALSE - No errors.
projects / oota-llvm.git / blobdiff