//
// 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.
//
//===----------------------------------------------------------------------===//
//
#include "llvm/Linker.h"
#include "llvm/Module.h"
-#include "llvm/Bytecode/Reader.h"
+#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
#include "llvm/Config/config.h"
-#include <iostream>
-
+#include "llvm/Support/system_error.h"
using namespace llvm;
-Linker::Linker(const std::string& progname, unsigned flags)
- : Composite(0)
- , LibPaths()
- , Flags(flags)
- , Error()
- , ProgramName(progname)
-{
- Composite = new Module(progname);
-}
-
-Linker::Linker(const std::string& progname, Module* aModule, unsigned flags)
- : Composite(aModule)
- , LibPaths()
- , Flags(flags)
- , Error()
- , ProgramName(progname)
-{
-}
+Linker::Linker(StringRef progname, StringRef modname,
+ LLVMContext& C, unsigned flags):
+ Context(C),
+ Composite(new Module(modname, C)),
+ LibPaths(),
+ Flags(flags),
+ Error(),
+ ProgramName(progname) { }
+
+Linker::Linker(StringRef progname, Module* aModule, unsigned flags) :
+ Context(aModule->getContext()),
+ Composite(aModule),
+ LibPaths(),
+ Flags(flags),
+ Error(),
+ ProgramName(progname) { }
Linker::~Linker() {
delete Composite;
}
bool
-Linker::error(const std::string& message) {
+Linker::error(StringRef message) {
Error = message;
- if (!(Flags&QuietErrors)) {
- std::cerr << ProgramName << ": error: " << message << "\n";
- }
+ if (!(Flags&QuietErrors))
+ errs() << ProgramName << ": error: " << message << "\n";
return true;
}
bool
-Linker::warning(const std::string& message) {
+Linker::warning(StringRef message) {
Error = message;
- if (!(Flags&QuietErrors)) {
- std::cerr << ProgramName << ": warning: " << message << "\n";
- }
+ if (!(Flags&QuietWarnings))
+ errs() << ProgramName << ": warning: " << message << "\n";
return false;
}
void
-Linker::verbose(const std::string& message) {
- if (Flags&Verbose) {
- std::cerr << " " << message << "\n";
- }
+Linker::verbose(StringRef message) {
+ if (Flags&Verbose)
+ errs() << " " << 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<std::string>& paths) {
- for (unsigned i = 0; i != paths.size(); ++i) {
- sys::Path aPath;
- aPath.setDirectory(paths[i]);
- LibPaths.push_back(aPath);
- }
+ for (unsigned i = 0, e = paths.size(); i != e; ++i)
+ LibPaths.push_back(sys::Path(paths[i]));
}
void
Linker::addSystemPaths() {
- sys::Path::GetBytecodeLibraryPaths(LibPaths);
+ sys::Path::GetBitcodeLibraryPaths(LibPaths);
LibPaths.insert(LibPaths.begin(),sys::Path("./"));
}
return result;
}
-// LoadObject - Read in and parse the bytecode file named by FN and return the
+// 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<Module>() and set
// Error if an error occurs.
std::auto_ptr<Module>
Linker::LoadObject(const sys::Path &FN) {
std::string ParseErrorMessage;
- Module *Result = ParseBytecodeFile(FN.toString(), &ParseErrorMessage);
+ Module *Result = 0;
+
+ OwningPtr<MemoryBuffer> Buffer;
+ if (error_code ec = MemoryBuffer::getFileOrSTDIN(FN.c_str(), Buffer))
+ ParseErrorMessage = "Error reading file '" + FN.str() + "'" + ": "
+ + ec.message();
+ else
+ Result = ParseBitcodeFile(Buffer.get(), Context, &ParseErrorMessage);
+
if (Result)
return std::auto_ptr<Module>(Result);
- Error = "Bytecode file '" + FN.toString() + "' could not be loaded";
+ Error = "Bitcode file '" + FN.str() + "' could not be loaded";
if (ParseErrorMessage.size())
Error += ": " + ParseErrorMessage;
return std::auto_ptr<Module>();
// 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) {
+static inline sys::Path IsLibrary(StringRef 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).str());
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();
- FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
+ // Try the libX.so (or .dylib) form
+ FullPath.eraseSuffix();
+ FullPath.appendSuffix(sys::Path::GetDLLSuffix());
if (FullPath.isDynamicLibrary()) // Native shared library?
return FullPath;
- if (FullPath.isBytecodeFile()) // .so file containing bytecode?
+ 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;
}
/// Path if no matching file can be found.
///
sys::Path
-Linker::FindLib(const std::string &Filename)
-{
+Linker::FindLib(StringRef 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;
// there.
for (unsigned Index = 0; Index != LibPaths.size(); ++Index) {
sys::Path Directory(LibPaths[Index]);
- sys::Path FullPath = IsLibrary(Filename,Directory);
+ sys::Path FullPath = IsLibrary(Filename, Directory);
if (!FullPath.isEmpty())
return FullPath;
}
projects / oota-llvm.git / blobdiff