diff options
author | peter <peter@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-03-15 07:24:08 +0000 |
---|---|---|
committer | peter <peter@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-03-15 07:24:08 +0000 |
commit | eb5d636c465e86c2beacdd5649e66ea8a0f68649 (patch) | |
tree | f353c15e4ada28b0134a02afa617488fc0e1e2de | |
parent | 58c626721acf5f9bd696e33768eed2908553a7dd (diff) | |
download | fpc-eb5d636c465e86c2beacdd5649e66ea8a0f68649.tar.gz |
Merged revisions 6715,6785 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk
........
r6715 | florian | 2007-03-04 20:16:28 +0100 (Sun, 04 Mar 2007) | 2 lines
* regenerated
........
r6785 | florian | 2007-03-11 18:16:23 +0100 (Sun, 11 Mar 2007) | 2 lines
+ set FPU* define properly
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@6869 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | compiler/options.pas | 3 | ||||
-rw-r--r-- | compiler/scandir.pas | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler/options.pas b/compiler/options.pas index 71b0a285d7..c46f09eb1f 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -2061,7 +2061,6 @@ begin {$endif} {$ifdef arm} def_system_macro('CPUARM'); - def_system_macro('FPUFPA'); def_system_macro('CPU32'); def_system_macro('FPC_HAS_TYPE_DOUBLE'); def_system_macro('FPC_HAS_TYPE_SINGLE'); @@ -2148,6 +2147,8 @@ begin { CPU Define } def_system_macro('CPU'+Cputypestr[init_settings.cputype]); + + def_system_macro('FPU'+fputypestr[init_settings.fputype]); { Check file to compile } if param_file='' then begin diff --git a/compiler/scandir.pas b/compiler/scandir.pas index de512d9ff3..7fe0b6f3b7 100644 --- a/compiler/scandir.pas +++ b/compiler/scandir.pas @@ -383,10 +383,10 @@ implementation procedure dir_fputype; begin 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 comment(V_Error,'Illegal FPU type'); - { current_scanner.def_macro('FPU'+fputypestr[current_settings.fputype]); } + def_system_macro('FPU'+fputypestr[current_settings.fputype]); end; procedure dir_goto; |