* default to VFPv2 on Darwin/ARM (all iOS devices ever released until

now support it, and the VFPv2 code has been very stable for quite
    some time already)

git-svn-id: trunk@22120 -
This commit is contained in:
Jonas Maebe 2012-08-19 09:36:46 +00:00
parent 765fb18679
commit f5b1c64d36

View File

@ -3130,11 +3130,11 @@ begin
{ set Mac OS X version default macros if not specified explicitly } { set Mac OS X version default macros if not specified explicitly }
option.MaybeSetDefaultMacVersionMacro; option.MaybeSetDefaultMacVersionMacro;
{ force fpu emulation on arm/wince, arm/gba, arm/embedded, arm/nds and { force fpu emulation on arm/wince, arm/gba, arm/embedded and arm/nds
arm/darwin if fpu type not explicitly set } if fpu type not explicitly set }
if not(option.FPUSetExplicitly) and if not(option.FPUSetExplicitly) and
((target_info.system in [system_arm_wince,system_arm_gba,system_m68k_amiga, ((target_info.system in [system_arm_wince,system_arm_gba,system_m68k_amiga,
system_m68k_linux,system_arm_nds,system_arm_embedded,system_arm_darwin]) system_m68k_linux,system_arm_nds,system_arm_embedded])
{$ifdef arm} {$ifdef arm}
or (target_info.abi=abi_eabi) or (target_info.abi=abi_eabi)
{$endif arm} {$endif arm}
@ -3170,13 +3170,16 @@ begin
{$endif arm} {$endif arm}
{$ifdef arm} {$ifdef arm}
{ set default cpu type to ARMv6 for Darwin unless specified otherwise } { set default cpu type to ARMv6 for Darwin unless specified otherwise, and fpu
to VFPv2 }
if (target_info.system=system_arm_darwin) then if (target_info.system=system_arm_darwin) then
begin begin
if not option.CPUSetExplicitly then if not option.CPUSetExplicitly then
init_settings.cputype:=cpu_armv6; init_settings.cputype:=cpu_armv6;
if not option.OptCPUSetExplicitly then if not option.OptCPUSetExplicitly then
init_settings.optimizecputype:=cpu_armv6; init_settings.optimizecputype:=cpu_armv6;
if not option.FPUSetExplicitly then
init_settings.fputype:=fpu_vfpv2;
end; end;
{ set default cpu type to ARMv7 for ARMHF unless specified otherwise } { set default cpu type to ARMv7 for ARMHF unless specified otherwise }