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

[Robert Bocchino]

Changes in directory llvm/tools/bugpoint:

Makefile updated: 1.12.4.1 -> 1.12.4.2
Miscompilation.cpp updated: 1.71 -> 1.71.2.1
bugpoint.cpp updated: 1.25 -> 1.25.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+7 -5)

 Makefile           |    8 ++++----
 Miscompilation.cpp |    2 +-
 bugpoint.cpp       |    2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)


Index: llvm/tools/bugpoint/Makefile
diff -u llvm/tools/bugpoint/Makefile:1.12.4.1 llvm/tools/bugpoint/Makefile:1.12.4.2
--- llvm/tools/bugpoint/Makefile:1.12.4.1	Tue Oct 18 14:21:59 2005
+++ llvm/tools/bugpoint/Makefile	Wed Nov 16 12:33:33 2005
@@ -10,11 +10,11 @@
 
 TOOLNAME = bugpoint
 
-OPTLIBS  = LLVMTransforms LLVMInstrumentation LLVMProfilePaths
-ANALIBS  = LLVMDataStructure LLVMipa LLVMTarget.a 
+OPTLIBS  = LLVMTransforms.a LLVMInstrumentation.a
+ANALIBS  = LLVMDataStructure LLVMipa.a LLVMTarget.a 
 
-USEDLIBS = LLVMipo LLVMScalarOpts LLVMAnalysis $(OPTLIBS) $(ANALIBS) \
-	   LLVMTransformUtils \
+USEDLIBS = LLVMipo.a LLVMScalarOpts.a LLVMVectorOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
+	   LLVMTransformUtils.a \
 	   LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
 	   LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a #LLVMVectorOpts
 


Index: llvm/tools/bugpoint/Miscompilation.cpp
diff -u llvm/tools/bugpoint/Miscompilation.cpp:1.71 llvm/tools/bugpoint/Miscompilation.cpp:1.71.2.1
--- llvm/tools/bugpoint/Miscompilation.cpp:1.71	Tue Aug  2 18:25:56 2005
+++ llvm/tools/bugpoint/Miscompilation.cpp	Wed Nov 16 12:33:33 2005
@@ -666,7 +666,7 @@
   Function *resolverFunc =
     Safe->getOrInsertFunction("getPointerToNamedFunction",
                               PointerType::get(Type::SByteTy),
-                              PointerType::get(Type::SByteTy), 0);
+                              PointerType::get(Type::SByteTy), (Type *)0);
 
   // Use the function we just added to get addresses of functions we need.
   for (Module::iterator F = Safe->begin(), E = Safe->end(); F != E; ++F) {


Index: llvm/tools/bugpoint/bugpoint.cpp
diff -u llvm/tools/bugpoint/bugpoint.cpp:1.25 llvm/tools/bugpoint/bugpoint.cpp:1.25.2.1
--- llvm/tools/bugpoint/bugpoint.cpp:1.25	Mon Aug  1 21:16:17 2005
+++ llvm/tools/bugpoint/bugpoint.cpp	Wed Nov 16 12:33:33 2005
@@ -14,6 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "BugDriver.h"
+#include "llvm/Analysis/LinkAllAnalyses.h"
+#include "llvm/Transforms/LinkAllPasses.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/Support/ToolRunner.h"
 #include "llvm/Support/CommandLine.h"