diff --git a/compiler/arm/cgcpu.pas b/compiler/arm/cgcpu.pas
index d1604516cb..8623c6a357 100644
--- a/compiler/arm/cgcpu.pas
+++ b/compiler/arm/cgcpu.pas
@@ -2084,7 +2084,8 @@ unit cgcpu;
 
               if not((def.typ=pointerdef) or
                     ((def.typ=orddef) and
-                     (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,pasbool]))) then
+                     (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,
+                                               pasbool8,pasbool16,pasbool32,pasbool64]))) then
                  ai.SetCondition(C_VC)
               else
                 if TAiCpu(List.Last).opcode in [A_RSB,A_RSC,A_SBC,A_SUB] then
diff --git a/compiler/avr/cgcpu.pas b/compiler/avr/cgcpu.pas
index bda1433851..103e940eb7 100644
--- a/compiler/avr/cgcpu.pas
+++ b/compiler/avr/cgcpu.pas
@@ -1567,7 +1567,8 @@ unit cgcpu;
         current_asmdata.getjumplabel(hl);
         if not ((def.typ=pointerdef) or
                ((def.typ=orddef) and
-                (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,pasbool]))) then
+                (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,
+                                          pasbool8,pasbool16,pasbool32,pasbool64]))) then
           cond:=C_VC
         else
           cond:=C_CC;
diff --git a/compiler/m68k/n68kadd.pas b/compiler/m68k/n68kadd.pas
index 1cc45742eb..0c243c55ca 100644
--- a/compiler/m68k/n68kadd.pas
+++ b/compiler/m68k/n68kadd.pas
@@ -358,12 +358,12 @@ implementation
         otl,ofl : tasmlabel;
       begin
 //        writeln('second_cmpboolean');
-        if (torddef(left.resultdef).ordtype in [pasbool,bool8bit]) or
-           (torddef(right.resultdef).ordtype in [pasbool,bool8bit]) then
+        if (torddef(left.resultdef).ordtype in [pasbool8,bool8bit]) or
+           (torddef(right.resultdef).ordtype in [pasbool8,bool8bit]) then
          cgsize:=OS_8
         else
-          if (torddef(left.resultdef).ordtype=bool16bit) or
-             (torddef(right.resultdef).ordtype=bool16bit) then
+          if (torddef(left.resultdef).ordtype in [pasbool16,bool16bit]) or
+             (torddef(right.resultdef).ordtype in [pasbool16,bool16bit]) then
            cgsize:=OS_16
         else
            cgsize:=OS_32;
diff --git a/compiler/ppcgen/cgppc.pas b/compiler/ppcgen/cgppc.pas
index c03e9a8215..d05123e396 100644
--- a/compiler/ppcgen/cgppc.pas
+++ b/compiler/ppcgen/cgppc.pas
@@ -580,7 +580,8 @@ unit cgppc;
       current_asmdata.getjumplabel(hl);
       if not ((def.typ=pointerdef) or
              ((def.typ=orddef) and
-              (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,pasbool]))) then
+              (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,
+                                        pasbool8,pasbool16,pasbool32,pasbool64]))) then
         begin
           if (current_settings.optimizecputype >= cpu_ppc970) or
              (current_settings.cputype >= cpu_ppc970) then
diff --git a/compiler/ppcgen/ngppcadd.pas b/compiler/ppcgen/ngppcadd.pas
index 44b8b98797..97895c59c3 100644
--- a/compiler/ppcgen/ngppcadd.pas
+++ b/compiler/ppcgen/ngppcadd.pas
@@ -177,12 +177,12 @@ implementation
         firstcomplex(self);
 
         cmpop:=false;
-        if (torddef(left.resultdef).ordtype in [pasbool,bool8bit]) or
-           (torddef(right.resultdef).ordtype in [pasbool,bool8bit]) then
+        if (torddef(left.resultdef).ordtype in [pasbool8,bool8bit]) or
+           (torddef(right.resultdef).ordtype in [pasbool8,bool8bit]) then
          cgsize:=OS_8
         else
-          if (torddef(left.resultdef).ordtype=bool16bit) or
-             (torddef(right.resultdef).ordtype=bool16bit) then
+          if (torddef(left.resultdef).ordtype in [pasbool16,bool16bit]) or
+             (torddef(right.resultdef).ordtype in [pasbool16,bool16bit]) then
            cgsize:=OS_16
         else
            cgsize:=OS_32;
diff --git a/compiler/sparc/cgcpu.pas b/compiler/sparc/cgcpu.pas
index ac90f2328b..634c912317 100644
--- a/compiler/sparc/cgcpu.pas
+++ b/compiler/sparc/cgcpu.pas
@@ -1052,7 +1052,8 @@ implementation
             begin
               if not((def.typ=pointerdef) or
                     ((def.typ=orddef) and
-                     (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,pasbool]))) then
+                     (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,
+                                               pasbool8,pasbool16,pasbool32,pasbool64]))) then
                 begin
                   ai:=TAiCpu.Op_sym(A_Bxx,hl);
                   ai.SetCondition(C_NO);
diff --git a/compiler/x86/cgx86.pas b/compiler/x86/cgx86.pas
index 06457ce78e..c5bed32bde 100644
--- a/compiler/x86/cgx86.pas
+++ b/compiler/x86/cgx86.pas
@@ -2208,7 +2208,8 @@ unit cgx86;
          current_asmdata.getjumplabel(hl);
          if not ((def.typ=pointerdef) or
                 ((def.typ=orddef) and
-                 (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,pasbool8,pasbool16,pasbool32,pasbool64]))) then
+                 (torddef(def).ordtype in [u64bit,u16bit,u32bit,u8bit,uchar,
+                                           pasbool8,pasbool16,pasbool32,pasbool64]))) then
            cond:=C_NO
          else
            cond:=C_NB;