diff --git a/lib/Target/X86/X86ISelPattern.cpp b/lib/Target/X86/X86ISelPattern.cpp
index 0de651c6266..71870f0b86f 100644
--- a/lib/Target/X86/X86ISelPattern.cpp
+++ b/lib/Target/X86/X86ISelPattern.cpp
@@ -66,6 +66,12 @@ namespace {
       setOperationAction(ISD::FP_ROUND_INREG   , MVT::f32  , Expand);
       setOperationAction(ISD::SEXTLOAD         , MVT::i1   , Expand);
       setOperationAction(ISD::SREM             , MVT::f64  , Expand);
+      setOperationAction(ISD::CTPOP            , MVT::i8   , Expand);
+      setOperationAction(ISD::CTTZ             , MVT::i8   , Expand);
+      setOperationAction(ISD::CTLZ             , MVT::i8   , Expand);
+      setOperationAction(ISD::CTPOP            , MVT::i16  , Expand);
+      setOperationAction(ISD::CTTZ             , MVT::i16  , Expand);
+      setOperationAction(ISD::CTLZ             , MVT::i16  , Expand);
       setOperationAction(ISD::CTPOP            , MVT::i32  , Expand);
       setOperationAction(ISD::CTTZ             , MVT::i32  , Expand);
       setOperationAction(ISD::CTLZ             , MVT::i32  , Expand);