diff --git a/compiler/aoptbase.pas b/compiler/aoptbase.pas
index 7ff191d1b9..06ad0413c0 100644
--- a/compiler/aoptbase.pas
+++ b/compiler/aoptbase.pas
@@ -188,11 +188,11 @@ unit aoptbase;
       Current := tai(Current.Next);
       While Assigned(Current) And
             ((Current.typ In SkipInstr) or
-{$if defined(SPARC) or defined(MIPS)}
+{$if defined(SPARCGEN) or defined(MIPS)}
              ((Current.typ=ait_instruction) and
               (taicpu(Current).opcode=A_NOP)
              ) or
-{$endif SPARC or MIPS}
+{$endif SPARCGEN or MIPS}
              ((Current.typ = ait_label) And
               labelCanBeSkipped(Tai_Label(Current)))) Do
         Current := tai(Current.Next);
diff --git a/compiler/aoptobj.pas b/compiler/aoptobj.pas
index 34f55db2f0..866990ef9f 100644
--- a/compiler/aoptobj.pas
+++ b/compiler/aoptobj.pas
@@ -1049,7 +1049,7 @@ Unit AoptObj;
         Repeat
           While Assigned(StartPai) And
                 ((StartPai.typ in (SkipInstr - [ait_regAlloc])) Or
-{$if defined(MIPS) or defined(SPARC)}
+{$if defined(MIPS) or defined(SPARCGEN)}
                 ((startpai.typ=ait_instruction) and (taicpu(startpai).opcode=A_NOP)) or
 {$endif MIPS or SPARC}
                  ((StartPai.typ = ait_label) and