projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Close list item tag, to conform with the style in this file. It's optional
[oota-llvm.git]
/
lib
/
Linker
/
Linker.cpp
diff --git
a/lib/Linker/Linker.cpp
b/lib/Linker/Linker.cpp
index 077bcd7ba68fe9f1a6a570e12c6002bca52aec6f..d6737721d25fb74a5330e386737496a5cb8d3348 100644
(file)
--- a/
lib/Linker/Linker.cpp
+++ b/
lib/Linker/Linker.cpp
@@
-2,8
+2,8
@@
//
// The LLVM Compiler Infrastructure
//
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by Reid Spencer and is distributed under th
e
-//
University of Illinois Open Source
License. See LICENSE.TXT for details.
+// This file
is distributed under the University of Illinois Open Sourc
e
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
//
@@
-19,7
+19,8
@@
#include "llvm/Support/Streams.h"
using namespace llvm;
#include "llvm/Support/Streams.h"
using namespace llvm;
-Linker::Linker(const std::string& progname, const std::string& modname, unsigned flags)
+Linker::Linker(const std::string& progname, const std::string& modname,
+ unsigned flags)
: Composite(0)
, LibPaths()
, Flags(flags)
: Composite(0)
, LibPaths()
, Flags(flags)
@@
-53,7
+54,7
@@
Linker::error(const std::string& message) {
bool
Linker::warning(const std::string& message) {
Error = message;
bool
Linker::warning(const std::string& message) {
Error = message;
- if (!(Flags&Quiet
Error
s))
+ if (!(Flags&Quiet
Warning
s))
cerr << ProgramName << ": warning: " << message << "\n";
return false;
}
cerr << ProgramName << ": warning: " << message << "\n";
return false;
}
@@
-80,7
+81,7
@@
Linker::addPaths(const std::vector<std::string>& paths) {
void
Linker::addSystemPaths() {
void
Linker::addSystemPaths() {
- sys::Path::GetB
yte
codeLibraryPaths(LibPaths);
+ sys::Path::GetB
it
codeLibraryPaths(LibPaths);
LibPaths.insert(LibPaths.begin(),sys::Path("./"));
}
LibPaths.insert(LibPaths.begin(),sys::Path("./"));
}
@@
-94,7
+95,7
@@
Linker::releaseModule() {
return result;
}
return result;
}
-// LoadObject - Read in and parse the b
yte
code file named by FN and return the
+// LoadObject - Read in and parse the b
it
code 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>
// module it contains (wrapped in an auto_ptr), or auto_ptr<Module>() and set
// Error if an error occurs.
std::auto_ptr<Module>
@@
-103,8
+104,7
@@
Linker::LoadObject(const sys::Path &FN) {
Module *Result = 0;
const std::string &FNS = FN.toString();
Module *Result = 0;
const std::string &FNS = FN.toString();
- std::auto_ptr<MemoryBuffer> Buffer(
- MemoryBuffer::getFileOrSTDIN(&FNS[0], FNS.size()));
+ std::auto_ptr<MemoryBuffer> Buffer(MemoryBuffer::getFileOrSTDIN(FNS.c_str()));
if (Buffer.get())
Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage);
else
if (Buffer.get())
Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage);
else
@@
-112,7
+112,7
@@
Linker::LoadObject(const sys::Path &FN) {
if (Result)
return std::auto_ptr<Module>(Result);
if (Result)
return std::auto_ptr<Module>(Result);
- Error = "B
yte
code file '" + FN.toString() + "' could not be loaded";
+ Error = "B
it
code file '" + FN.toString() + "' could not be loaded";
if (ParseErrorMessage.size())
Error += ": " + ParseErrorMessage;
return std::auto_ptr<Module>();
if (ParseErrorMessage.size())
Error += ": " + ParseErrorMessage;
return std::auto_ptr<Module>();
@@
-142,8
+142,6
@@
static inline sys::Path IsLibrary(const std::string& Name,
FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
if (FullPath.isDynamicLibrary()) // Native shared library?
return FullPath;
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;
if (FullPath.isBitcodeFile()) // .so file containing bitcode?
return FullPath;