diff --git a/llvm/lib/Target/X86/InstSelectSimple.cpp b/llvm/lib/Target/X86/InstSelectSimple.cpp
index 55bf65b2f58b..2f701ed8d3df 100644
--- a/llvm/lib/Target/X86/InstSelectSimple.cpp
+++ b/llvm/lib/Target/X86/InstSelectSimple.cpp
@@ -430,6 +430,20 @@ ISel::visitCallInst (CallInst & CI)
   // Adjust the stack by `bytesPushed' amount if non-zero
   if (bytesPushed > 0)
     BuildMI (BB, X86::ADDri32, 2).addReg(X86::ESP).addZImm(bytesPushed);
+
+  // If there is a return value, scavenge the result from the location the call
+  // leaves it in...
+  //
+  switch (getClass(CI.getType())) {
+  case cInt:
+    BuildMI(BB, X86::MOVrr32, 1, getReg(CI)).addReg(X86::EAX);
+    break;
+
+  default:
+    std::cerr << "Cannot get return value for call of type '"
+              << *CI.getType() << "'\n";
+    visitInstruction(CI);
+  }
 }
 
 /// visitSimpleBinary - Implement simple binary operators for integral types...