X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-link%2Fllvm-link.cpp;h=d8d7534e5c73c98d11f2c49fb775ff29898ed691;hb=566fb9fe3ed767be7218fb1608ec6a284067d3b0;hp=4fbeea85ddebb1d5597500c9313bd294d8c7d3b5;hpb=a6bcd83854d08fa89a27b4ab8f93241d6365b458;p=oota-llvm.git diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 4fbeea85dde..d8d7534e5c7 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -1,10 +1,10 @@ //===- llvm-link.cpp - Low-level LLVM linker ------------------------------===// -// +// // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group 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 utility may be invoked in the following manner: @@ -12,31 +12,37 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Module.h" +#include "llvm/Linker.h" #include "llvm/Analysis/Verifier.h" -#include "llvm/Bytecode/Reader.h" -#include "llvm/Bytecode/Writer.h" -#include "llvm/Support/Linker.h" +#include "llvm/Bitcode/ReaderWriter.h" +#include "llvm/IR/LLVMContext.h" +#include "llvm/IR/Module.h" +#include "llvm/IRReader/IRReader.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/FileUtilities.h" -#include "llvm/System/Signals.h" -#include "llvm/System/Path.h" -#include "llvm/ADT/SetVector.h" -#include -#include +#include "llvm/Support/ManagedStatic.h" +#include "llvm/Support/Path.h" +#include "llvm/Support/PrettyStackTrace.h" +#include "llvm/Support/Signals.h" +#include "llvm/Support/SourceMgr.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/Support/ToolOutputFile.h" #include - using namespace llvm; static cl::list InputFilenames(cl::Positional, cl::OneOrMore, - cl::desc("")); + cl::desc("")); static cl::opt OutputFilename("o", cl::desc("Override output filename"), cl::init("-"), cl::value_desc("filename")); -static cl::opt Force("f", cl::desc("Overwrite output files")); +static cl::opt +Force("f", cl::desc("Enable binary output on terminals")); + +static cl::opt +OutputAssembly("S", + cl::desc("Write output as LLVM assembly"), cl::Hidden); static cl::opt Verbose("v", cl::desc("Print information about actions taken")); @@ -44,226 +50,82 @@ Verbose("v", cl::desc("Print information about actions taken")); static cl::opt DumpAsm("d", cl::desc("Print assembly as linked"), cl::Hidden); -static cl::list -LibPaths("L", cl::desc("Specify a library search path"), cl::ZeroOrMore, - cl::value_desc("directory"), cl::Prefix); - -static cl::list -Libraries("l", cl::desc("Specify library names to link with"), cl::ZeroOrMore, - cl::Prefix, cl::value_desc("library name")); - -// GetModule - This function is just factored out of the functions below -static inline Module* GetModule(const sys::Path& Filename) { - if (Verbose) std::cerr << "Loading '" << Filename.c_str() << "'\n"; - std::string ErrorMessage; - if (Filename.exists()) { - Module* Result = ParseBytecodeFile(Filename.get(), &ErrorMessage); - if (Result) return Result; // Load successful! - - if (Verbose) { - std::cerr << "Error opening bytecode file: '" << Filename.c_str() << "'"; - if (ErrorMessage.size()) std::cerr << ": " << ErrorMessage; - std::cerr << "\n"; - } - } else { - std::cerr << "Bytecode file: '" << Filename.c_str() - << "' does not exist.\n"; - } - return 0; -} - -// LoadFile - Read the specified bytecode file in and return it. This routine +// LoadFile - Read the specified bitcode file in and return it. This routine // searches the link path for the specified file to try to find it... // -static inline std::auto_ptr LoadFile(const std::string &FN) { - sys::Path Filename; - if (!Filename.set_file(FN)) { - std::cerr << "Invalid file name: '" << Filename.c_str() << "'\n"; - return std::auto_ptr(); - } +static inline Module *LoadFile(const char *argv0, const std::string &FN, + LLVMContext& Context) { + SMDiagnostic Err; + if (Verbose) errs() << "Loading '" << FN << "'\n"; + Module* Result = 0; - if (Module* Result = GetModule(Filename)) - return std::auto_ptr(Result); + Result = ParseIRFile(FN, Err, Context); + if (Result) return Result; // Load successful! - bool FoundAFile = false; - - for (unsigned i = 0; i < LibPaths.size(); i++) { - if (!Filename.set_directory(LibPaths[i])) { - std::cerr << "Invalid library path: '" << LibPaths[i] << "'\n"; - } else if (!Filename.append_file(FN)) { - std::cerr << "Invalid library path: '" << LibPaths[i] - << "/" << FN.c_str() << "'\n"; - } else if (Filename.exists()) { - FoundAFile = true; - if (Module *Result = GetModule(Filename)) - return std::auto_ptr(Result); // Load successful! - } - } - - if (FoundAFile) - std::cerr << "Bytecode file '" << FN << "' corrupt! " - << "Use 'llvm-link -v ...' for more info.\n"; - else - std::cerr << "Could not locate bytecode file: '" << FN << "'\n"; - return std::auto_ptr(); -} - -sys::Path GetPathForLinkageItem(const std::string& link_item, - const std::string& dir) { - sys::Path fullpath; - fullpath.set_directory(dir); - - // Try *.o - fullpath.append_file(link_item); - fullpath.append_suffix("o"); - if (fullpath.readable()) - return fullpath; - - // Try *.bc - fullpath.elide_suffix(); - fullpath.append_suffix("bc"); - if (fullpath.readable()) - return fullpath; - - // Try *.so - fullpath.elide_suffix(); - fullpath.append_suffix(sys::Path::GetDLLSuffix()); - if (fullpath.readable()) - return fullpath; - - // Try lib*.a - fullpath.set_directory(dir); - fullpath.append_file(std::string("lib") + link_item); - fullpath.append_suffix("a"); - if (fullpath.readable()) - return fullpath; - - // Didn't find one. - fullpath.clear(); - return fullpath; -} - -static inline bool LoadLibrary(const std::string &FN, Module*& Result) { - Result = 0; - sys::Path Filename; - if (!Filename.set_file(FN)) { - return false; - } - - if (Filename.readable() && Filename.is_bytecode_file()) { - if ((Result = GetModule(Filename))) - return true; - } - - bool foundAFile = false; - - for (unsigned I = 0; I < LibPaths.size(); I++) { - sys::Path path = GetPathForLinkageItem(FN,LibPaths[I]); - if (!path.is_empty()) { - if (path.is_bytecode_file()) { - if ((Result = GetModule(path))) { - return true; - } else { - // We found file but its not a valid bytecode file so we - // return false and leave Result null. - return false; - } - } else { - // We found a file, but its not a bytecode file so we return - // false and leave Result null. - return false; - } - } - } - - // We didn't find a file so we leave Result null and return - // false to indicate that the library should be just left in the - // emitted module as resolvable at runtime. - return false; + Err.print(argv0, errs()); + return NULL; } int main(int argc, char **argv) { - cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); + // Print a stack trace if we signal out. sys::PrintStackTraceOnErrorSignal(); - assert(InputFilenames.size() > 0 && "OneOrMore is not working"); + PrettyStackTraceProgram X(argc, argv); + + LLVMContext &Context = getGlobalContext(); + llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. + cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); unsigned BaseArg = 0; std::string ErrorMessage; - std::auto_ptr Composite(LoadFile(InputFilenames[BaseArg])); - if (Composite.get() == 0) return 1; + OwningPtr Composite(LoadFile(argv[0], + InputFilenames[BaseArg], Context)); + if (Composite.get() == 0) { + errs() << argv[0] << ": error loading file '" + << InputFilenames[BaseArg] << "'\n"; + return 1; + } + Linker L(Composite.get()); for (unsigned i = BaseArg+1; i < InputFilenames.size(); ++i) { - std::auto_ptr M(LoadFile(InputFilenames[i])); - if (M.get() == 0) return 1; - - if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n"; - - if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { - std::cerr << argv[0] << ": link error in '" << InputFilenames[i] - << "': " << ErrorMessage << "\n"; + OwningPtr M(LoadFile(argv[0], InputFilenames[i], Context)); + if (M.get() == 0) { + errs() << argv[0] << ": error loading file '" <getLibraries(); + if (Verbose) errs() << "Linking in '" << InputFilenames[i] << "'\n"; - // Iterate over the list of dependent libraries, linking them in as we - // find them - Module::LibraryListType::const_iterator I = libs.begin(); - while (I != libs.end()) { - Module* Mod = 0; - if (LoadLibrary(*I,Mod)) { - if (Mod != 0) { - std::auto_ptr M(Mod); - if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { - std::cerr << argv[0] << ": link error in '" << *I - << "': " << ErrorMessage << "\n"; - return 1; - } - } else { - std::cerr << argv[0] << ": confused loading library '" << *I - << "'. Aborting\n"; - return 2; - } + if (L.linkInModule(M.get(), &ErrorMessage)) { + errs() << argv[0] << ": link error in '" << InputFilenames[i] + << "': " << ErrorMessage << "\n"; + return 1; } - ++I; } - // TODO: Iterate over the -l list and link in any modules containing - // global symbols that have not been resolved so far. - - if (DumpAsm) std::cerr << "Here's the assembly:\n" << Composite.get(); + if (DumpAsm) errs() << "Here's the assembly:\n" << *Composite; - std::ostream *Out = &std::cout; // Default to printing to stdout... - if (OutputFilename != "-") { - if (!Force && std::ifstream(OutputFilename.c_str())) { - // If force is not specified, make sure not to overwrite a file! - std::cerr << argv[0] << ": error opening '" << OutputFilename - << "': file exists!\n" - << "Use -f command line argument to force output\n"; - return 1; - } - Out = new std::ofstream(OutputFilename.c_str()); - if (!Out->good()) { - std::cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n"; - return 1; - } - - // Make sure that the Out file gets unlinked from the disk if we get a - // SIGINT - sys::RemoveFileOnSignal(OutputFilename); + std::string ErrorInfo; + tool_output_file Out(OutputFilename.c_str(), ErrorInfo, + raw_fd_ostream::F_Binary); + if (!ErrorInfo.empty()) { + errs() << ErrorInfo << '\n'; + return 1; } - if (verifyModule(*Composite.get())) { - std::cerr << argv[0] << ": linked module is broken!\n"; + if (verifyModule(*Composite)) { + errs() << argv[0] << ": linked module is broken!\n"; return 1; } - if (Verbose) std::cerr << "Writing bytecode...\n"; - WriteBytecodeToFile(Composite.get(), *Out); + if (Verbose) errs() << "Writing bitcode...\n"; + if (OutputAssembly) { + Out.os() << *Composite; + } else if (Force || !CheckBitcodeOutputToConsole(Out.os(), true)) + WriteBitcodeToFile(Composite.get(), Out.os()); + + // Declare success. + Out.keep(); - if (Out != &std::cout) delete Out; return 0; }