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: branches/fixes_2_2@6869 -

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

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;