[llvm-commits] CVS: llvm/tools/bugpoint/BugDriver.cpp Miscompilation.cpp

[Reid Spencer]

Changes in directory llvm/tools/bugpoint:

BugDriver.cpp updated: 1.38 -> 1.39
Miscompilation.cpp updated: 1.55 -> 1.56
---
Log message:

LinkModules is now in the Linker class

---
Diffs of the changes:  (+4 -4)

Index: llvm/tools/bugpoint/BugDriver.cpp
diff -u llvm/tools/bugpoint/BugDriver.cpp:1.38 llvm/tools/bugpoint/BugDriver.cpp:1.39
--- llvm/tools/bugpoint/BugDriver.cpp:1.38	Sun Nov 14 17:00:08 2004
+++ llvm/tools/bugpoint/BugDriver.cpp	Sun Dec 12 21:01:03 2004
@@ -105,7 +105,7 @@
 
     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;


Index: llvm/tools/bugpoint/Miscompilation.cpp
diff -u llvm/tools/bugpoint/Miscompilation.cpp:1.55 llvm/tools/bugpoint/Miscompilation.cpp:1.56
--- llvm/tools/bugpoint/Miscompilation.cpp:1.55	Fri Nov 19 01:09:40 2004
+++ llvm/tools/bugpoint/Miscompilation.cpp	Sun Dec 12 21:01:03 2004
@@ -175,7 +175,7 @@
     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 @@
     // 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 @@
                                                 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);