X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinkItems.cpp;h=52a0d175a5cdd8bd66a81b04b05279bc46eea4a4;hb=0d18174f0f138e98fcb8348b735a90add45428b8;hp=87de4af89ae0d292b6c3ba61d52dec2fab9cfd03;hpb=126b1b868309659e124f7706bc8161943cfc0290;p=oota-llvm.git diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp index 87de4af89ae..52a0d175a5c 100644 --- a/lib/Linker/LinkItems.cpp +++ b/lib/Linker/LinkItems.cpp @@ -2,25 +2,29 @@ // // 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/Bitcode/ReaderWriter.h" +#include "llvm/Support/Path.h" +#include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/system_error.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) { @@ -67,31 +71,30 @@ Linker::LinkInItems(const ItemList& Items, ItemList& NativeItems) { /// LinkInLibrary - links one library into the HeadModule. /// -bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) { +bool Linker::LinkInLibrary(StringRef Lib, bool& is_native) { is_native = 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.str() + "'"); // If its an archive, try to link it in std::string Magic; Pathname.getMagicNumber(Magic, 64); switch (sys::IdentifyFileType(Magic.c_str(), 64)) { - default: assert(0 && "Bad file type identification"); + default: llvm_unreachable("Bad file type identification"); case sys::Unknown_FileType: - return warning("Supposed library '" + Lib + "' isn't a library."); + return warning("Supposed library '" + Lib.str() + "' 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)) - return error("Cannot link archive '" + Pathname.toString() + "'"); + if (LinkInArchive(Pathname, is_native)) + return error("Cannot link archive '" + Pathname.str() + "'"); break; case sys::ELF_Relocatable_FileType: @@ -108,7 +111,7 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) { } /// 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. @@ -139,11 +142,11 @@ bool Linker::LinkInLibraries(const std::vector &Libraries) { 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. @@ -154,37 +157,52 @@ bool Linker::LinkInLibraries(const std::vector &Libraries) { /// bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { is_native = false; - // Make sure we can at least read the file - if (!File.canRead()) - return error("Cannot find linker input '" + File.toString() + "'"); + + // Check for a file of name "-", which means "read standard input" + if (File.str() == "-") { + std::auto_ptr M; + OwningPtr Buffer; + error_code ec; + if (!(ec = MemoryBuffer::getSTDIN(Buffer))) { + if (!Buffer->getBufferSize()) { + Error = "standard input is empty"; + } else { + M.reset(ParseBitcodeFile(Buffer.get(), Context, &Error)); + if (M.get()) + if (!LinkInModule(M.get(), &Error)) + return false; + } + } + return error("Cannot link stdin: " + ec.message()); + } - // If its an archive, try to link it in + // Determine what variety of file it is. std::string Magic; - File.getMagicNumber(Magic, 64); + if (!File.getMagicNumber(Magic, 64)) + return error("Cannot find linker input '" + File.str() + "'"); + switch (sys::IdentifyFileType(Magic.c_str(), 64)) { - default: assert(0 && "Bad file type identification"); + default: llvm_unreachable("Bad file type identification"); case sys::Unknown_FileType: - return warning("Supposed object file '" + File.toString() + - "' not recognized as such"); + return warning("Ignoring file '" + File.str() + + "' 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.str() + "'"); std::auto_ptr 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.str() + "': " + Error); + if (LinkInModule(M.get(), &Error)) + return error("Cannot link file '" + File.str() + "': " + Error); - verbose("Linked in file '" + File.toString() + "'"); + verbose("Linked in file '" + File.str() + "'"); break; } @@ -206,9 +224,9 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { /// 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.