diff --git a/lib/Target/SparcV9/SparcV9InstrInfo.cpp b/lib/Target/SparcV9/SparcV9InstrInfo.cpp
index 8bdb0f29669..331fd4608dc 100644
--- a/lib/Target/SparcV9/SparcV9InstrInfo.cpp
+++ b/lib/Target/SparcV9/SparcV9InstrInfo.cpp
@@ -441,9 +441,7 @@ UltraSparcInstrInfo::CreateCodeToLoadConst(const TargetMachine& target,
           uint64_t C = GetConstantValueAsUnsignedInt(val, isValidConstant);
           assert(isValidConstant && "Unrecognized constant");
 
-          if (opSize > destSize ||
-              (val->getType()->isSigned()
-               && destSize < target.getTargetData().getIntegerRegSize()))
+          if (opSize > destSize || (val->getType()->isSigned() && destSize < 8))
             { // operand is larger than dest,
               //    OR both are equal but smaller than the full register size
               //       AND operand is signed, so it may have extra sign bits:
diff --git a/lib/Target/SparcV9/SparcV9InstrSelection.cpp b/lib/Target/SparcV9/SparcV9InstrSelection.cpp
index 50e2fe23d4d..78fb2f20d98 100644
--- a/lib/Target/SparcV9/SparcV9InstrSelection.cpp
+++ b/lib/Target/SparcV9/SparcV9InstrSelection.cpp
@@ -758,8 +758,7 @@ CreateShiftInstructions(const TargetMachine& target,
   // 
   Value* shiftDest = destVal;
   unsigned opSize = target.getTargetData().getTypeSize(argVal1->getType());
-  if ((shiftOpCode == SLL || shiftOpCode == SLLX)
-      && opSize < target.getTargetData().getIntegerRegSize())
+  if ((shiftOpCode == SLL || shiftOpCode == SLLX) && opSize < 8)
     { // put SLL result into a temporary
       shiftDest = new TmpInstruction(argVal1, optArgVal2, "sllTmp");
       mcfi.addTemp(shiftDest);
@@ -2305,7 +2304,7 @@ GetInstructionsByRule(InstructionNode* subtreeRoot,
                                  .addReg(dest, MOTy::Def);
               mvec.push_back(M);
             }
-          else if (destSize < target.getTargetData().getIntegerRegSize())
+          else if (destSize < 8)
             assert(0 && "Unsupported type size: 32 < size < 64 bits");
         }
     }