+ set FPU* define properly

git-svn-id: trunk@6785 -
This commit is contained in:
florian 2007-03-11 17:16:23 +00:00
parent 7fb2a035e3
commit fb1afe0ea4
2 changed files with 4 additions and 3 deletions

View File

@ -2059,7 +2059,6 @@ begin
{$endif} {$endif}
{$ifdef arm} {$ifdef arm}
def_system_macro('CPUARM'); def_system_macro('CPUARM');
def_system_macro('FPUFPA');
def_system_macro('CPU32'); def_system_macro('CPU32');
def_system_macro('FPC_HAS_TYPE_DOUBLE'); def_system_macro('FPC_HAS_TYPE_DOUBLE');
def_system_macro('FPC_HAS_TYPE_SINGLE'); def_system_macro('FPC_HAS_TYPE_SINGLE');
@ -2159,6 +2158,8 @@ begin
{ CPU Define } { CPU Define }
def_system_macro('CPU'+Cputypestr[init_settings.cputype]); def_system_macro('CPU'+Cputypestr[init_settings.cputype]);
def_system_macro('FPU'+fputypestr[init_settings.fputype]);
{ Check file to compile } { Check file to compile }
if param_file='' then if param_file='' then
begin begin

View File

@ -383,10 +383,10 @@ implementation
procedure dir_fputype; procedure dir_fputype;
begin begin
current_scanner.skipspace; current_scanner.skipspace;
{ current_scanner.undef_macro('FPU'+fputypestr[current_settings.fputype]); } undef_system_macro('FPU'+fputypestr[current_settings.fputype]);
if not(SetFPUType(upper(current_scanner.readcomment),current_settings.fputype)) then if not(SetFPUType(upper(current_scanner.readcomment),current_settings.fputype)) then
comment(V_Error,'Illegal FPU type'); comment(V_Error,'Illegal FPU type');
{ current_scanner.def_macro('FPU'+fputypestr[current_settings.fputype]); } def_system_macro('FPU'+fputypestr[current_settings.fputype]);
end; end;
procedure dir_goto; procedure dir_goto;