diff --git a/lib/Target/Mips/MipsISelLowering.cpp b/lib/Target/Mips/MipsISelLowering.cpp
index ff0064e68c8..2ff369cfab2 100644
--- a/lib/Target/Mips/MipsISelLowering.cpp
+++ b/lib/Target/Mips/MipsISelLowering.cpp
@@ -3793,7 +3793,7 @@ MipsTargetLowering::MipsCC::MipsCC(CallingConv::ID CallConv, bool IsVarArg,
     IntArgRegs = Mips64IntRegs;
     ShadowRegs = Mips64DPRegs;
     FixedFn = CC_MipsN;
-    VarFn = CC_MipsN_VarArg;
+    VarFn = IsVarArg ? CC_MipsN_VarArg : CC_MipsN;
   }
 
   if (CallConv == CallingConv::Fast) {
diff --git a/test/CodeGen/Mips/mips64-expand-libcall.ll b/test/CodeGen/Mips/mips64-expand-libcall.ll
new file mode 100644
index 00000000000..4a6721105c4
--- /dev/null
+++ b/test/CodeGen/Mips/mips64-expand-libcall.ll
@@ -0,0 +1,14 @@
+; RUN: llc -march=mips64el -mcpu=mips64r2 -O3 < %s | FileCheck %s
+
+; Check that %add is not passed in an integer register.
+;
+; CHECK-NOT: dmfc1 $4
+
+define double @callfloor(double %d) nounwind readnone {
+entry:
+  %add = fadd double %d, 1.000000e+00
+  %call = tail call double @floor(double %add) nounwind readnone
+  ret double %call
+}
+
+declare double @floor(double) nounwind readnone