summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Linker/LinkModules.cpp
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2004-11-14 23:27:04 +0000
committerReid Spencer <rspencer@reidspencer.com>2004-11-14 23:27:04 +0000
commit9b0ddbbe2ce8ce26fe28d159252694d8737bc9eb (patch)
tree11a6d5916671e4bdf2aa1688beccc3377c4953c5 /llvm/lib/Linker/LinkModules.cpp
parent6881623775e02331f050c6d1905ca0de50a88559 (diff)
downloadbcm5719-llvm-9b0ddbbe2ce8ce26fe28d159252694d8737bc9eb.tar.gz
bcm5719-llvm-9b0ddbbe2ce8ce26fe28d159252694d8737bc9eb.zip
Linker.h moved to include/llvm from include/llvm/Support.
llvm-svn: 17807
Diffstat (limited to 'llvm/lib/Linker/LinkModules.cpp')
-rw-r--r--llvm/lib/Linker/LinkModules.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index 6d732f11b8e..a6155707294 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -16,7 +16,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Support/Linker.h"
+#include "llvm/Linker.h"
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Module.h"
@@ -848,7 +848,6 @@ static bool LinkAppendingVars(Module *M,
// error occurs, true is returned and ErrorMsg (if not null) is set to indicate
// the problem. Upon failure, the Dest module could be in a modified state, and
// shouldn't be relied on to be consistent.
-//
bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) {
assert(Dest != 0 && "Invalid Destination module");
assert(Src != 0 && "Invalid Source Module");
OpenPOWER on IntegriCloud