diff --git a/compiler/defutil.pas b/compiler/defutil.pas
index 908efd1803..46e319d0d4 100644
--- a/compiler/defutil.pas
+++ b/compiler/defutil.pas
@@ -1521,7 +1521,7 @@ implementation
           floatdef:
             if (cs_fp_emulation in current_settings.moduleswitches)
 {$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])
 {$endif xtensa}
               then
diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas
index a16ee5d625..e0e0e6dbc0 100644
--- a/compiler/ncgutil.pas
+++ b/compiler/ncgutil.pas
@@ -334,9 +334,9 @@ implementation
                          cg.a_jmp_flags(list,p.location.resflags,truelabel);
 
                          { 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);
-{$endif defined(NR_DEFAULTFLAGS)}
+{$endif xtensa}
                          cg.a_jmp_always(list,falselabel);
                        end;
 {$endif cpuflags}