//
//===----------------------------------------------------------------------===//
-#include "llvm/Linker.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
-#include "llvm/Analysis/Verifier.h"
+#include "llvm/Linker/Linker.h"
#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Verifier.h"
+#include "llvm/IRReader/IRReader.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileSystem.h"
#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/Path.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/Streams.h"
-#include "llvm/System/Signals.h"
-#include "llvm/System/Path.h"
+#include "llvm/Support/Signals.h"
+#include "llvm/Support/SourceMgr.h"
+#include "llvm/Support/SystemUtils.h"
+#include "llvm/Support/ToolOutputFile.h"
#include <memory>
using namespace llvm;
OutputFilename("o", cl::desc("Override output filename"), cl::init("-"),
cl::value_desc("filename"));
-static cl::opt<bool> Force("f", cl::desc("Overwrite output files"));
+static cl::opt<bool>
+Force("f", cl::desc("Enable binary output on terminals"));
+
+static cl::opt<bool>
+OutputAssembly("S",
+ cl::desc("Write output as LLVM assembly"), cl::Hidden);
static cl::opt<bool>
Verbose("v", cl::desc("Print information about actions taken"));
static cl::opt<bool>
DumpAsm("d", cl::desc("Print assembly as linked"), cl::Hidden);
+static cl::opt<bool>
+SuppressWarnings("suppress-warnings", cl::desc("Suppress all linking warnings"),
+ cl::init(false));
+
// 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<Module> LoadFile(const std::string &FN,
- LLVMContext& Context) {
- sys::Path Filename;
- if (!Filename.set(FN)) {
- cerr << "Invalid file name: '" << FN << "'\n";
- return std::auto_ptr<Module>();
- }
-
- std::string ErrorMessage;
- if (Filename.exists()) {
- if (Verbose) cerr << "Loading '" << Filename.c_str() << "'\n";
- Module* Result = 0;
-
- const std::string &FNStr = Filename.toString();
- if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(FNStr,
- &ErrorMessage)) {
- Result = ParseBitcodeFile(Buffer, Context, &ErrorMessage);
- delete Buffer;
- }
- if (Result) return std::auto_ptr<Module>(Result); // Load successful!
+static inline Module *LoadFile(const char *argv0, const std::string &FN,
+ LLVMContext& Context) {
+ SMDiagnostic Err;
+ if (Verbose) errs() << "Loading '" << FN << "'\n";
+ Module* Result = nullptr;
- if (Verbose) {
- cerr << "Error opening bitcode file: '" << Filename.c_str() << "'";
- if (ErrorMessage.size()) cerr << ": " << ErrorMessage;
- cerr << "\n";
- }
- } else {
- cerr << "Bitcode file: '" << Filename.c_str() << "' does not exist.\n";
- }
+ Result = ParseIRFile(FN, Err, Context);
+ if (Result) return Result; // Load successful!
- return std::auto_ptr<Module>();
+ Err.print(argv0, errs());
+ return nullptr;
}
int main(int argc, char **argv) {
// Print a stack trace if we signal out.
sys::PrintStackTraceOnErrorSignal();
PrettyStackTraceProgram X(argc, argv);
-
- LLVMContext Context;
+
+ 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<Module> Composite(LoadFile(InputFilenames[BaseArg], Context));
- if (Composite.get() == 0) {
- cerr << argv[0] << ": error loading file '"
- << InputFilenames[BaseArg] << "'\n";
+ std::unique_ptr<Module> Composite(
+ LoadFile(argv[0], InputFilenames[BaseArg], Context));
+ if (!Composite.get()) {
+ errs() << argv[0] << ": error loading file '"
+ << InputFilenames[BaseArg] << "'\n";
return 1;
}
+ Linker L(Composite.get(), SuppressWarnings);
for (unsigned i = BaseArg+1; i < InputFilenames.size(); ++i) {
- std::auto_ptr<Module> M(LoadFile(InputFilenames[i], Context));
- if (M.get() == 0) {
- cerr << argv[0] << ": error loading file '" <<InputFilenames[i]<< "'\n";
+ std::unique_ptr<Module> M(LoadFile(argv[0], InputFilenames[i], Context));
+ if (!M.get()) {
+ errs() << argv[0] << ": error loading file '" <<InputFilenames[i]<< "'\n";
return 1;
}
- if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
+ if (Verbose) errs() << "Linking in '" << InputFilenames[i] << "'\n";
- if (Linker::LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
- cerr << argv[0] << ": link error in '" << InputFilenames[i]
- << "': " << ErrorMessage << "\n";
+ if (L.linkInModule(M.get(), &ErrorMessage)) {
+ errs() << argv[0] << ": link error in '" << InputFilenames[i]
+ << "': " << ErrorMessage << "\n";
return 1;
}
}
- // 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!
- raw_ostream *Out = &outs(); // Default to printing to stdout...
- if (OutputFilename != "-") {
- std::string ErrorInfo;
- Out = new raw_fd_ostream(OutputFilename.c_str(), /*Binary=*/true,
- Force, ErrorInfo);
- if (!ErrorInfo.empty()) {
- errs() << ErrorInfo << '\n';
- if (!Force)
- errs() << "Use -f command line argument to force output\n";
- delete Out;
- return 1;
- }
+ if (DumpAsm) errs() << "Here's the assembly:\n" << *Composite;
- // Make sure that the Out file gets unlinked from the disk if we get a
- // SIGINT
- sys::RemoveFileOnSignal(sys::Path(OutputFilename));
+ std::error_code EC;
+ tool_output_file Out(OutputFilename, EC, sys::fs::F_None);
+ if (EC) {
+ errs() << EC.message() << '\n';
+ return 1;
}
- if (verifyModule(*Composite.get())) {
- cerr << argv[0] << ": linked module is broken!\n";
+ if (verifyModule(*Composite)) {
+ errs() << argv[0] << ": linked module is broken!\n";
return 1;
}
- if (Verbose) cerr << "Writing bitcode...\n";
- WriteBitcodeToFile(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 != &outs()) delete Out;
return 0;
}
projects / oota-llvm.git / blobdiff