#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Bytecode/Reader.h"
+#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Config/config.h"
-#include <iostream>
-
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/Streams.h"
+#include "llvm/Support/Compressor.h"
using namespace llvm;
+static const bool Bitcode = false;
+
Linker::Linker(const std::string& progname, const std::string& modname, unsigned flags)
: Composite(0)
, LibPaths()
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
std::auto_ptr<Module>
Linker::LoadObject(const sys::Path &FN) {
std::string ParseErrorMessage;
- Module *Result = ParseBytecodeFile(FN.toString(), &ParseErrorMessage);
+ Module *Result = 0;
+
+ const std::string &FNS = FN.toString();
+ if (Bitcode) {
+ std::auto_ptr<MemoryBuffer> Buffer(
+ MemoryBuffer::getFileOrSTDIN(&FNS[0], FNS.size()));
+ if (Buffer.get())
+ Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage);
+ else
+ ParseErrorMessage = "Error reading file '" + FNS + "'";
+
+ } else {
+ Result = ParseBytecodeFile(FNS, Compressor::decompressToNewBuffer,
+ &ParseErrorMessage);
+ }
if (Result)
return std::auto_ptr<Module>(Result);
Error = "Bytecode file '" + FN.toString() + "' could not be loaded";
sys::Path FullPath(Directory);
- // Make sure the directory actually is a directory in the file system.
- if (FullPath.isDirectory())
- {
- // Try the libX.a form
- FullPath.appendComponent("lib" + Name);
- FullPath.appendSuffix("a");
- if (FullPath.isArchive())
- return FullPath;
-
- // Try the libX.bca form
- FullPath.eraseSuffix();
- FullPath.appendSuffix("bca");
- if (FullPath.isArchive())
- return FullPath;
-
- // Try the libX.so form
- FullPath.eraseSuffix();
- FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
- if (FullPath.isDynamicLibrary()) // Native shared library?
- return FullPath;
- if (FullPath.isBytecodeFile()) // .so file containing bytecode?
- return FullPath;
-
- // Not found .. fall through
- }
+ // Try the libX.a form
+ FullPath.appendComponent("lib" + Name);
+ FullPath.appendSuffix("a");
+ if (FullPath.isArchive())
+ return FullPath;
+
+ // Try the libX.bca form
+ FullPath.eraseSuffix();
+ FullPath.appendSuffix("bca");
+ if (FullPath.isArchive())
+ return FullPath;
+
+ // Try the libX.so (or .dylib) form
+ FullPath.eraseSuffix();
+ FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
+ if (FullPath.isDynamicLibrary()) // Native shared library?
+ return FullPath;
+ if (FullPath.isBytecodeFile()) // .so file containing bytecode?
+ 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();
/// Path if no matching file can be found.
///
sys::Path
-Linker::FindLib(const std::string &Filename)
-{
+Linker::FindLib(const std::string &Filename) {
// Determine if the pathname can be found as it stands.
sys::Path FilePath(Filename);
if (FilePath.canRead() &&