5 files changed, 9 insertions, 13 deletions
diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index b268edc9c2..59fcad041a 100644
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../..
 
 TOOLNAME = gccas
-USEDLIBS = asmparser bcwriter transforms.a scalaropts.a analysis.a target.a \
-           transformutils.a ipa.a vmcore support.a
+USEDLIBS = asmparser bcwriter transforms.a ipo.a scalaropts.a analysis.a \
+           target.a transformutils.a ipa.a vmcore support.a
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp
index e0b5cd51d1..c59b6ebe6a 100644
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -10,10 +10,8 @@
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Assembly/Parser.h"
-#include "llvm/Transforms/CleanupGCCOutput.h"
-#include "llvm/Transforms/LevelChange.h"
-#include "llvm/Transforms/ConstantMerge.h"
-#include "llvm/Transforms/ChangeAllocations.h"
+#include "llvm/Transforms/RaisePointerReferences.h"
+#include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
@@ -68,10 +66,10 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
   if (Verify) PM.add(createVerifierPass());
 
   addPass(PM, createFunctionResolvingPass());     // Resolve (...) functions
+  addPass(PM, createDeadTypeEliminationPass());   // Eliminate dead types
   addPass(PM, createConstantMergePass());         // Merge dup global constants
   addPass(PM, createDeadInstEliminationPass());   // Remove Dead code/vars
   addPass(PM, createRaiseAllocationsPass());      // call %malloc -> malloc inst
-  addPass(PM, createCleanupGCCOutputPass());      // Fix gccisms
   addPass(PM, createIndVarSimplifyPass());        // Simplify indvars
 
   // Level raise is eternally buggy/in need of enhancements.  Allow
diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp
index e5db8849dd..444cf635ef 100644
--- a/tools/gccld/gccld.cpp
+++ b/tools/gccld/gccld.cpp
@@ -19,11 +19,10 @@
 #include "llvm/PassManager.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
-#include "llvm/Transforms/CleanupGCCOutput.h"
-#include "llvm/Transforms/ConstantMerge.h"
-#include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/IPO/GlobalDCE.h"
 #include "llvm/Transforms/IPO/Internalize.h"
+#include "llvm/Transforms/Scalar.h"
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
 #include <fstream>
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index ecd56631a4..d69fb183a9 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -2,7 +2,7 @@ LEVEL = ../..
 TOOLNAME = llc
 USEDLIBS = sparc regalloc sched select sparc target \
            instrument.a livevar bcreader bcwriter analysis.a transforms.a \
-	   scalaropts.a transformutils.a vmcore support.a
+	   ipo.a scalaropts.a transformutils.a vmcore support.a
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index 785f0a624c..f5ba08c089 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -8,12 +8,11 @@
 #include "llvm/Target/Sparc.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/Instrumentation/TraceValues.h"
-#include "llvm/Transforms/ChangeAllocations.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/Linker.h"
 #include "llvm/Assembly/PrintModulePass.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
-#include "llvm/Transforms/ConstantMerge.h"
+#include "llvm/Transforms/IPO.h"
 #include "llvm/Module.h"
 #include "llvm/Function.h"
 #include "llvm/PassManager.h"