LinkModules is now in the Linker class

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18863 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/bugpoint/BugDriver.cpp b/tools/bugpoint/BugDriver.cpp
index 3a88bbb12e8809061440b54fdace96fa85fa8f95..4b6db0c08566d8345ac694c6bb95a6b596262ed4 100644 (file)
--- a/tools/bugpoint/BugDriver.cpp
+++ b/tools/bugpoint/BugDriver.cpp
@@ -105,7 +105,7 @@ bool BugDriver::addSources(const std::vector<std::string> &Filenames) {
 
     std::cout << "Linking in input file: '" << Filenames[i] << "'\n";
     std::string ErrorMessage;
-    if (LinkModules(Program, M.get(), &ErrorMessage)) {
+    if (Linker::LinkModules(Program, M.get(), &ErrorMessage)) {
       std::cerr << ToolName << ": error linking in '" << Filenames[i] << "': "
                 << ErrorMessage << '\n';
       return true;

diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp
index 6800c8e0ade756282e03300d888656e9fc7da191..e02cf6562c20fd466cff7ff1db61a468e3f2bd05 100644 (file)
--- a/tools/bugpoint/Miscompilation.cpp
+++ b/tools/bugpoint/Miscompilation.cpp
@@ -175,7 +175,7 @@ static bool TestMergedProgram(BugDriver &BD, Module *M1, Module *M2,
     M1 = CloneModule(M1);
     M2 = CloneModule(M2);
   }
-  if (LinkModules(M1, M2, &ErrorMsg)) {
+  if (Linker::LinkModules(M1, M2, &ErrorMsg)) {
     std::cerr << BD.getToolName() << ": Error linking modules together:"
               << ErrorMsg << '\n';
     exit(1);
@@ -304,7 +304,7 @@ static bool ExtractLoops(BugDriver &BD,
     // Replace the current program with the loop extracted version, and try to
     // extract another loop.
     std::string ErrorMsg;
-    if (LinkModules(ToNotOptimize, ToOptimizeLoopExtracted, &ErrorMsg)) {
+    if (Linker::LinkModules(ToNotOptimize, ToOptimizeLoopExtracted, &ErrorMsg)){
       std::cerr << BD.getToolName() << ": Error linking modules together:"
                 << ErrorMsg << '\n';
       exit(1);
@@ -438,7 +438,7 @@ static bool ExtractBlocks(BugDriver &BD,
                                                 I->getFunctionType()));
 
   std::string ErrorMsg;
-  if (LinkModules(ProgClone, Extracted, &ErrorMsg)) {
+  if (Linker::LinkModules(ProgClone, Extracted, &ErrorMsg)) {
     std::cerr << BD.getToolName() << ": Error linking modules together:"
               << ErrorMsg << '\n';
     exit(1);

diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp
index 1fcbf336e66c682a369d259e9f75e4ff1035452b..8d8bc4ae5b5d8b5349409b45cb5bd0acfd931c32 100644 (file)
--- a/tools/llvm-link/llvm-link.cpp
+++ b/tools/llvm-link/llvm-link.cpp
@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
 
     if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n";
 
-    if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
+    if (Linker::LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
       std::cerr << argv[0] << ": link error in '" << InputFilenames[i]
                 << "': " << ErrorMessage << "\n";
       return 1;