5 files changed, 2 insertions, 18 deletions
diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
index 857d80b221..bc70ffe8d6 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
@@ -44,11 +44,6 @@ void X86ATTInstPrinter::printSSECC(const MCInst *MI, unsigned Op) {
   }
 }
 
-void X86ATTInstPrinter::printPICLabel(const MCInst *MI, unsigned Op) {
-  llvm_unreachable("This is only used for MOVPC32r,"
-                   "should lower before instruction printing!");
-}
-
 /// print_pcrel_imm - This is used to print an immediate value that ends up
 /// being encoded as a pc-relative value.  These print slightly differently, for
 /// example, a $ is not emitted.
diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
index 4aa738e61e..5f28fa46f5 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
@@ -37,7 +37,6 @@ public:
   void printMemReference(const MCInst *MI, unsigned Op);
   void printLeaMemReference(const MCInst *MI, unsigned Op);
   void printSSECC(const MCInst *MI, unsigned Op);
-  void printPICLabel(const MCInst *MI, unsigned Op);
   void print_pcrel_imm(const MCInst *MI, unsigned OpNo);
   
   void printopaquemem(const MCInst *MI, unsigned OpNo) {
diff --git a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp
index 8899c6b6e8..e7821956b3 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp
@@ -1,4 +1,4 @@
-//===-- X86IntelInstPrinter.cpp - AT&T assembly instruction printing --------===//
+//===-- X86IntelInstPrinter.cpp - AT&T assembly instruction printing ------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -45,11 +45,6 @@ void X86IntelInstPrinter::printSSECC(const MCInst *MI, unsigned Op) {
   }
 }
 
-void X86IntelInstPrinter::printPICLabel(const MCInst *MI, unsigned Op) {
-  llvm_unreachable("This is only used for MOVPC32r,"
-                   "should lower before instruction printing!");
-}
-
 /// print_pcrel_imm - This is used to print an immediate value that ends up
 /// being encoded as a pc-relative value.  These print slightly differently, for
 /// example, a $ is not emitted.
diff --git a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h
index cec61bf2f9..1976177eb1 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h
@@ -37,7 +37,6 @@ public:
   void printMemReference(const MCInst *MI, unsigned Op);
   void printLeaMemReference(const MCInst *MI, unsigned Op);
   void printSSECC(const MCInst *MI, unsigned Op);
-  void printPICLabel(const MCInst *MI, unsigned Op);
   void print_pcrel_imm(const MCInst *MI, unsigned OpNo);
   
   void printopaquemem(const MCInst *MI, unsigned OpNo) {
diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td
index 992b3900e2..331875ec03 100644
--- a/lib/Target/X86/X86InstrInfo.td
+++ b/lib/Target/X86/X86InstrInfo.td
@@ -226,10 +226,6 @@ def SSECC : Operand<i8> {
   let PrintMethod = "printSSECC";
 }
 
-def piclabel: Operand<i32> {
-  let PrintMethod = "printPICLabel";
-}
-
 def ImmSExt8AsmOperand : AsmOperandClass {
   let Name = "ImmSExt8";
   let SuperClass = ImmAsmOperand;
@@ -552,7 +548,7 @@ def INT : I<0xcd, RawFrm, (outs), (ins i8imm:$trap), "int\t$trap", []>;
 
 // PIC base
 let neverHasSideEffects = 1, isNotDuplicable = 1, Uses = [ESP] in
-  def MOVPC32r : Ii32<0xE8, Pseudo, (outs GR32:$reg), (ins piclabel:$label),
+  def MOVPC32r : Ii32<0xE8, Pseudo, (outs GR32:$reg), (ins i32imm:$label),
                       "call\t$label\n\t"
                       "pop{l}\t$reg", []>;