mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-05 17:43:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set version ARM_SoftFP

Browse source 
Set versions ARM_SoftFP & D_HardFloat instead of ARM_SoftFloat &
D_SoftFloat for option -mfloat-abi=softfp (function calls use soft float
ABI but using hardware floating point instruction).

(cherry picked from commit 5a19080e04cc775fe94ea2ef74c850b26bb8a469)
This commit is contained in:
Dan Olson 2015-01-28 00:38:02 -08:00
parent 136fe8dd03
commit 3c9da62ea3
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
driver/main.cpp
View file

@ -554,18 +554,25 @@ static void registerMipsABI()
} }
/// Register the float ABI. /// Register the float ABI.
/// Also defines D_SoftFloat or D_HardFloat depending on ABI type. /// Also defines D_HardFloat or D_SoftFloat depending if FPU should be used
static void registerPredefinedFloatABI(const char *soft, const char *hard) static void registerPredefinedFloatABI(const char *soft, const char *hard, const char *softfp=NULL)
{ {
// Use target floating point unit instead of s/w float routines
bool useFPU = !gTargetMachine->Options.UseSoftFloat;
VersionCondition::addPredefinedGlobalIdent(useFPU ? "D_HardFloat" : "D_SoftFloat");
if (gTargetMachine->Options.FloatABIType == llvm::FloatABI::Soft) if (gTargetMachine->Options.FloatABIType == llvm::FloatABI::Soft)
{ {
VersionCondition::addPredefinedGlobalIdent(soft); VersionCondition::addPredefinedGlobalIdent(useFPU && softfp ? softfp : soft);
VersionCondition::addPredefinedGlobalIdent("D_SoftFloat");
} }
if (gTargetMachine->Options.FloatABIType == llvm::FloatABI::Hard) else if (gTargetMachine->Options.FloatABIType == llvm::FloatABI::Hard)
{ {
assert(useFPU && "Should be using the FPU if using float-abi=hard");
VersionCondition::addPredefinedGlobalIdent(hard); VersionCondition::addPredefinedGlobalIdent(hard);
VersionCondition::addPredefinedGlobalIdent("D_HardFloat"); }
else
{
assert(0 && "FloatABIType neither Soft or Hard");
} }
} }
@ -607,14 +614,13 @@ static void registerPredefinedTargetVersions() {
case llvm::Triple::armeb: case llvm::Triple::armeb:
#endif #endif
VersionCondition::addPredefinedGlobalIdent("ARM"); VersionCondition::addPredefinedGlobalIdent("ARM");
// FIXME: What about ARM_SoftFP?. registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat", "ARM_SoftFP");
registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat");
break; break;
case llvm::Triple::thumb: case llvm::Triple::thumb:
VersionCondition::addPredefinedGlobalIdent("ARM"); VersionCondition::addPredefinedGlobalIdent("ARM");
VersionCondition::addPredefinedGlobalIdent("Thumb"); // For backwards compatibility. VersionCondition::addPredefinedGlobalIdent("Thumb"); // For backwards compatibility.
VersionCondition::addPredefinedGlobalIdent("ARM_Thumb"); VersionCondition::addPredefinedGlobalIdent("ARM_Thumb");
registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat"); registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat", "ARM_SoftFP");
break; break;
#if LDC_LLVM_VER == 305 #if LDC_LLVM_VER == 305
case llvm::Triple::arm64: case llvm::Triple::arm64:
@ -626,7 +632,7 @@ static void registerPredefinedTargetVersions() {
case llvm::Triple::aarch64_be: case llvm::Triple::aarch64_be:
#endif #endif
VersionCondition::addPredefinedGlobalIdent("AArch64"); VersionCondition::addPredefinedGlobalIdent("AArch64");
registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat"); registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat", "ARM_SoftFP");
break; break;
#endif #endif
case llvm::Triple::mips: case llvm::Triple::mips:

2
driver/targetmachine.cpp
View file

@ -393,6 +393,8 @@ llvm::TargetMachine* createTargetMachine(
floatABI = getARMFloatABI(triple, getLLVMArchSuffixForARM(cpu)); floatABI = getARMFloatABI(triple, getLLVMArchSuffixForARM(cpu));
break; break;
case llvm::Triple::thumb: case llvm::Triple::thumb:
// TODO: Not sure this is generally true. clang arm-apple-darwin seems
// to default to thumb and softfp. Need to look into it.
floatABI = FloatABI::Soft; floatABI = FloatABI::Soft;
break; break;
} }