Skip to content
This repository was archived by the owner on Dec 20, 2019. It is now read-only.

Commit 76f65d6

Browse files
authored
Merge pull request #17 from lewurm/armv5-fix
[mono] respect FloatABIType, so it will work on armv5
2 parents c975102 + a864c60 commit 76f65d6

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

lib/Target/ARM/ARMISelLowering.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,13 +1623,14 @@ CCAssignFn *ARMTargetLowering::CCAssignFnForNode(CallingConv::ID CC,
16231623
if (Return) {
16241624
return CCAssignFnForNode(CallingConv::C, true, isVarArg);
16251625
} else {
1626-
if (Subtarget->isAAPCS_ABI()) {
1627-
if (Subtarget->hasVFP2() && !Subtarget->isThumb1Only() && !isVarArg)
1628-
return CC_ARM_Mono_AAPCS_VFP;
1629-
else
1630-
return CC_ARM_Mono_AAPCS;
1631-
} else
1632-
return CC_ARM_Mono_APCS;
1626+
if (!Subtarget->isAAPCS_ABI())
1627+
return CC_ARM_Mono_APCS;
1628+
else if (Subtarget->hasVFP2() && !Subtarget->isThumb1Only() &&
1629+
getTargetMachine().Options.FloatABIType == FloatABI::Hard &&
1630+
!isVarArg)
1631+
return CC_ARM_Mono_AAPCS_VFP;
1632+
else
1633+
return CC_ARM_Mono_AAPCS;
16331634
}
16341635
}
16351636
}

0 commit comments

Comments
 (0)