diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index d9dd66d848e..7a479599342 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -4187,9 +4187,6 @@ X86TargetLowering::getConstraintType(char ConstraintLetter) const {
   case 'S':
   case 'D':
   case 'c':
-  case 'g': //FIXME: This over-constrains g.  It should be replaced by rmi in
-            //       target independent code (I think this constraint is target
-            //       independent)
     return C_RegisterClass;
   default: return TargetLowering::getConstraintType(ConstraintLetter);
   }
@@ -4221,7 +4218,6 @@ getRegClassForInlineAsmConstraint(const std::string &Constraint,
       break;
     case 'r':   // GENERAL_REGS
     case 'R':   // LEGACY_REGS
-    case 'g':
       if (VT == MVT::i32)
         return make_vector<unsigned>(X86::EAX, X86::EDX, X86::ECX, X86::EBX,
                                      X86::ESI, X86::EDI, X86::EBP, X86::ESP, 0);