X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinker.cpp;h=ef242e5c798d585f47188297db3ff8d7737c6ff9;hb=56867520990a4fea1353d55f71bb74a0126554e6;hp=e72f5b9f6a1e167e384426f6f3aa181e7aafe80c;hpb=de4cedca140bfdf2c4c2cd059f61d7ab964ec6fa;p=oota-llvm.git diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp index e72f5b9f6a1..ef242e5c798 100644 --- a/lib/Linker/Linker.cpp +++ b/lib/Linker/Linker.cpp @@ -1,32 +1,33 @@ -//===- lib/Linker/LinkItems.cpp - Link LLVM objects and libraries ---------===// -// +//===- lib/Linker/Linker.cpp - Basic Linker functionality ----------------===// +// // 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, -// and to handle annoying things like static libraries. +// This file contains basic Linker functionality that all usages will need. // //===----------------------------------------------------------------------===// #include "llvm/Linker.h" #include "llvm/Module.h" -#include "llvm/Bytecode/Reader.h" -#include - +#include "llvm/Bitcode/ReaderWriter.h" +#include "llvm/Config/config.h" +#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) @@ -42,98 +43,111 @@ Linker::~Linker() { delete Composite; } -bool +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); } void Linker::addPaths(const std::vector& paths) { - for (unsigned i = 0; i < paths.size(); i++) { + for (unsigned i = 0; i != paths.size(); ++i) { sys::Path aPath; - aPath.setDirectory(paths[i]); + aPath.set(paths[i]); LibPaths.push_back(aPath); } } void Linker::addSystemPaths() { - sys::Path::GetBytecodeLibraryPaths(LibPaths); + sys::Path::GetBitcodeLibraryPaths(LibPaths); LibPaths.insert(LibPaths.begin(),sys::Path("./")); } Module* Linker::releaseModule() { Module* result = Composite; - Composite = new Module(ProgramName); LibPaths.clear(); Error.clear(); + Composite = 0; Flags = 0; return result; } -// LoadObject - Read in and parse the bytecode file named by FN and return the -// module it contains (wrapped in an auto_ptr), or auto_ptr() and set +// 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() and set // Error if an error occurs. -std::auto_ptr +std::auto_ptr Linker::LoadObject(const sys::Path &FN) { std::string ParseErrorMessage; - Module *Result = ParseBytecodeFile(FN.toString(), &ParseErrorMessage); - if (Result) + Module *Result = 0; + + const std::string &FNS = FN.toString(); + std::auto_ptr 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(Result); - Error = "Bytecode file '" + FN.toString() + "' could not be loaded"; - if (ParseErrorMessage.size()) + Error = "Bitcode file '" + FN.toString() + "' could not be loaded"; + if (ParseErrorMessage.size()) Error += ": " + ParseErrorMessage; return std::auto_ptr(); } -static inline sys::Path IsLibrary(const std::string& Name, +// IsLibrary - Determine if "Name" is a library in "Directory". Return +// a non-empty sys::Path if its found, an empty one otherwise. +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()) + if (FullPath.isDynamicLibrary()) // Native shared library? + 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; } @@ -141,16 +155,14 @@ static inline sys::Path IsLibrary(const std::string& Name, /// FindLib - Try to convert Filename into the name of a file that we can open, /// if it does not already name a file we can open, by first trying to open /// Filename, then libFilename.[suffix] for each of a set of several common -/// library suffixes, in each of the directories in Paths and the directory -/// named by the value of the environment variable LLVM_LIB_SEARCH_PATH. Returns -/// an empty string if no matching file can be found. +/// library suffixes, in each of the directories in LibPaths. Returns an empty +/// Path if no matching file can be found. /// -sys::Path -Linker::FindLib(const std::string &Filename) -{ +sys::Path +Linker::FindLib(const std::string &Filename) { // Determine if the pathname can be found as it stands. sys::Path FilePath(Filename); - if (FilePath.readable() && + if (FilePath.canRead() && (FilePath.isArchive() || FilePath.isDynamicLibrary())) return FilePath;