diff --git a/lib/CodeGen/InstrSelection/InstrSelection.cpp b/lib/CodeGen/InstrSelection/InstrSelection.cpp
index a666c5fe2e1..835169aeeb8 100644
--- a/lib/CodeGen/InstrSelection/InstrSelection.cpp
+++ b/lib/CodeGen/InstrSelection/InstrSelection.cpp
@@ -71,13 +71,10 @@ namespace {
     }
     
     bool runOnFunction(Function &F);
+    virtual const char *getPassName() const { return "Instruction Selection"; }
   };
 }
 
-// Register the pass...
-static RegisterLLC<InstructionSelection>
-X("instselect", "Instruction Selection", createInstructionSelectionPass);
-
 TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi,
                                Value *s1, Value *s2, const std::string &name)
   : Instruction(s1->getType(), Instruction::UserOp1, name)
@@ -384,6 +381,6 @@ InstructionSelection::PostprocessMachineCodeForTree(InstructionNode* instrNode,
 // createInstructionSelectionPass - Public entrypoint for instruction selection
 // and this file as a whole...
 //
-Pass *createInstructionSelectionPass(TargetMachine &T) {
+FunctionPass *createInstructionSelectionPass(TargetMachine &T) {
   return new InstructionSelection(T);
 }
diff --git a/lib/Target/Sparc/PeepholeOpts.cpp b/lib/Target/Sparc/PeepholeOpts.cpp
index 73e9ec942a3..3912f4e7629 100644
--- a/lib/Target/Sparc/PeepholeOpts.cpp
+++ b/lib/Target/Sparc/PeepholeOpts.cpp
@@ -68,12 +68,6 @@ public:
   bool runOnBasicBlock(BasicBlock &BB); // apply this pass to each BB
 };
 
-
-// Register the pass with llc only, and not opt...
-static RegisterLLC<PeepholeOpts>
-X("peephole", "Peephole Optimization", createPeepholeOptsPass);
-
-
 /* Apply a list of peephole optimizations to this machine instruction
  * within its local context.  They are allowed to delete MI or any
  * instruction before MI, but not 
@@ -128,7 +122,7 @@ PeepholeOpts::runOnBasicBlock(BasicBlock &BB)
 // createPeepholeOptsPass - Public entrypoint for peephole optimization
 // and this file as a whole...
 //
-Pass*
+FunctionPass*
 createPeepholeOptsPass(TargetMachine &T)
 {
   return new PeepholeOpts(T);