Merge pull request #17 from lewurm/armv5-fix

[mono] respect FloatABIType, so it will work on armv5
mono · Nov 8, 2018 · 76f65d6 · 76f65d6
2 parents c975102 + a864c60
commit 76f65d6
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp
@@ -1623,13 +1623,14 @@ CCAssignFn *ARMTargetLowering::CCAssignFnForNode(CallingConv::ID CC,
     if (Return) {
       return CCAssignFnForNode(CallingConv::C, true, isVarArg);
     } else {
-      if (Subtarget->isAAPCS_ABI()) {
-          if (Subtarget->hasVFP2() && !Subtarget->isThumb1Only() && !isVarArg)
-              return CC_ARM_Mono_AAPCS_VFP;
-          else
-              return CC_ARM_Mono_AAPCS;
-      } else
-          return CC_ARM_Mono_APCS;
+      if (!Subtarget->isAAPCS_ABI())
+        return CC_ARM_Mono_APCS;
+      else if (Subtarget->hasVFP2() && !Subtarget->isThumb1Only() &&
+               getTargetMachine().Options.FloatABIType == FloatABI::Hard &&
+               !isVarArg)
+        return CC_ARM_Mono_AAPCS_VFP;
+      else
+        return CC_ARM_Mono_AAPCS;
     }
   }
 }