Browse Source

* compilation fixed

git-svn-id: trunk@44545 -
florian 5 years ago
parent
commit
3705f95b92
2 changed files with 3 additions and 3 deletions
  1. 1 1
      compiler/defutil.pas
  2. 2 2
      compiler/ncgutil.pas

+ 1 - 1
compiler/defutil.pas

@@ -1521,7 +1521,7 @@ implementation
           floatdef:
           floatdef:
             if (cs_fp_emulation in current_settings.moduleswitches)
             if (cs_fp_emulation in current_settings.moduleswitches)
 {$ifdef xtensa}
 {$ifdef xtensa}
-              or not(tfloatdef(def).floattype=s32real) or
+              or not(tfloatdef(def).floattype=s32real)
               or not(FPUXTENSA_SINGLE in fpu_capabilities[current_settings.fputype])
               or not(FPUXTENSA_SINGLE in fpu_capabilities[current_settings.fputype])
 {$endif xtensa}
 {$endif xtensa}
               then
               then

+ 2 - 2
compiler/ncgutil.pas

@@ -334,9 +334,9 @@ implementation
                          cg.a_jmp_flags(list,p.location.resflags,truelabel);
                          cg.a_jmp_flags(list,p.location.resflags,truelabel);
 
 
                          { e.g. xtensa has no default flags but uses a boolean register }
                          { e.g. xtensa has no default flags but uses a boolean register }
-{$if defined(NR_DEFAULTFLAGS)}
+{$ifndef xtensa}
                          cg.a_reg_dealloc(list,NR_DEFAULTFLAGS);
                          cg.a_reg_dealloc(list,NR_DEFAULTFLAGS);
-{$endif defined(NR_DEFAULTFLAGS)}
+{$endif xtensa}
                          cg.a_jmp_always(list,falselabel);
                          cg.a_jmp_always(list,falselabel);
                        end;
                        end;
 {$endif cpuflags}
 {$endif cpuflags}