//===- 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 utility may be invoked in the following manner:
//
//===----------------------------------------------------------------------===//
+#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Analysis/Verifier.h"
-#include "llvm/Bytecode/Reader.h"
-#include "llvm/Bytecode/Writer.h"
-#include "llvm/Support/Linker.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Signals.h"
+#include "llvm/System/Path.h"
#include <fstream>
#include <iostream>
#include <memory>
-
using namespace llvm;
static cl::list<std::string>
static cl::opt<bool>
DumpAsm("d", cl::desc("Print assembly as linked"), cl::Hidden);
-static cl::list<std::string>
-LibPaths("L", cl::desc("Specify a library search path"), cl::ZeroOrMore,
- cl::value_desc("directory"), cl::Prefix);
-
// LoadFile - Read the specified bytecode 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<Module> LoadFile(const std::string &FN) {
- std::string Filename = FN;
- std::string ErrorMessage;
-
- unsigned NextLibPathIdx = 0;
- bool FoundAFile = false;
+ sys::Path Filename;
+ if (!Filename.set(FN)) {
+ cerr << "Invalid file name: '" << FN << "'\n";
+ return std::auto_ptr<Module>();
+ }
- while (1) {
- if (Verbose) std::cerr << "Loading '" << Filename << "'\n";
- if (getFileSize(Filename) != -1) FoundAFile = true;
- Module *Result = ParseBytecodeFile(Filename, &ErrorMessage);
+ std::string ErrorMessage;
+ if (Filename.exists()) {
+ if (Verbose) cerr << "Loading '" << Filename.c_str() << "'\n";
+ Module* Result = 0;
+
+ const std::string &FNStr = Filename.toString();
+ MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&FNStr[0],
+ FNStr.size());
+ if (Buffer == 0)
+ ErrorMessage = "Error reading file '" + FNStr + "'";
+ else
+ Result = ParseBitcodeFile(Buffer, &ErrorMessage);
+ delete Buffer;
if (Result) return std::auto_ptr<Module>(Result); // Load successful!
if (Verbose) {
- std::cerr << "Error opening bytecode file: '" << Filename << "'";
- if (ErrorMessage.size()) std::cerr << ": " << ErrorMessage;
- std::cerr << "\n";
+ cerr << "Error opening bytecode file: '" << Filename.c_str() << "'";
+ if (ErrorMessage.size()) cerr << ": " << ErrorMessage;
+ cerr << "\n";
}
-
- if (NextLibPathIdx == LibPaths.size()) break;
- Filename = LibPaths[NextLibPathIdx++] + "/" + FN;
+ } else {
+ cerr << "Bytecode file: '" << Filename.c_str() << "' does not exist.\n";
}
- 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<Module>();
}
-
-
-
int main(int argc, char **argv) {
+ llvm_shutdown_obj X; // Call llvm_shutdown() on exit.
cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
sys::PrintStackTraceOnErrorSignal();
assert(InputFilenames.size() > 0 && "OneOrMore is not working");
std::string ErrorMessage;
std::auto_ptr<Module> Composite(LoadFile(InputFilenames[BaseArg]));
- if (Composite.get() == 0) return 1;
+ if (Composite.get() == 0) {
+ cerr << argv[0] << ": error loading file '"
+ << InputFilenames[BaseArg] << "'\n";
+ return 1;
+ }
for (unsigned i = BaseArg+1; i < InputFilenames.size(); ++i) {
std::auto_ptr<Module> M(LoadFile(InputFilenames[i]));
- if (M.get() == 0) return 1;
+ if (M.get() == 0) {
+ cerr << argv[0] << ": error loading file '" <<InputFilenames[i]<< "'\n";
+ return 1;
+ }
- if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n";
+ if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
- if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
- std::cerr << argv[0] << ": error linking in '" << InputFilenames[i]
- << "': " << ErrorMessage << "\n";
+ if (Linker::LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
+ cerr << argv[0] << ": link error in '" << InputFilenames[i]
+ << "': " << ErrorMessage << "\n";
return 1;
}
}
- if (DumpAsm) std::cerr << "Here's the assembly:\n" << Composite.get();
+ // TODO: Iterate over the -l list and link in any modules containing
+ // global symbols that have not been resolved so far.
+
+ if (DumpAsm) cerr << "Here's the assembly:\n" << *Composite.get();
+ // FIXME: cout is not binary!
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";
+ 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());
+ std::ios::openmode io_mode = std::ios::out | std::ios::trunc |
+ std::ios::binary;
+ Out = new std::ofstream(OutputFilename.c_str(), io_mode);
if (!Out->good()) {
- std::cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n";
+ 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);
+ sys::RemoveFileOnSignal(sys::Path(OutputFilename));
}
if (verifyModule(*Composite.get())) {
- std::cerr << argv[0] << ": linked module is broken!\n";
+ cerr << argv[0] << ": linked module is broken!\n";
return 1;
}
- if (Verbose) std::cerr << "Writing bytecode...\n";
- WriteBytecodeToFile(Composite.get(), *Out);
+ if (Verbose) cerr << "Writing bytecode...\n";
+ WriteBitcodeToFile(Composite.get(), *Out);
if (Out != &std::cout) delete Out;
return 0;
projects / oota-llvm.git / blobdiff