diff --git a/compiler/arm/cpuinfo.pas b/compiler/arm/cpuinfo.pas
index 4526abf89f..7972995375 100644
--- a/compiler/arm/cpuinfo.pas
+++ b/compiler/arm/cpuinfo.pas
@@ -87,7 +87,7 @@ Const
 
    level1optimizerswitches = [cs_opt_level1];
    level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe];
-   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll];
+   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3{,cs_opt_loopunroll}];
 
 Implementation
 
diff --git a/compiler/i386/cpuinfo.pas b/compiler/i386/cpuinfo.pas
index 126d277563..2ef2eb111f 100644
--- a/compiler/i386/cpuinfo.pas
+++ b/compiler/i386/cpuinfo.pas
@@ -99,7 +99,7 @@ Const
 
    level1optimizerswitches = [cs_opt_level1,cs_opt_peephole];
    level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe,cs_opt_asmcse];
-   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll];
+   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3{,cs_opt_loopunroll}];
 
 Implementation
 
diff --git a/compiler/m68k/cpuinfo.pas b/compiler/m68k/cpuinfo.pas
index 195f9c99bf..92c3838dde 100644
--- a/compiler/m68k/cpuinfo.pas
+++ b/compiler/m68k/cpuinfo.pas
@@ -74,7 +74,7 @@ Const
 
    level1optimizerswitches = [cs_opt_level1];
    level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe];
-   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll];
+   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3{,cs_opt_loopunroll}];
 
 Implementation
 
diff --git a/compiler/powerpc/cpuinfo.pas b/compiler/powerpc/cpuinfo.pas
index e5c0fdf4f8..ad9f01bae7 100644
--- a/compiler/powerpc/cpuinfo.pas
+++ b/compiler/powerpc/cpuinfo.pas
@@ -71,7 +71,7 @@ Const
 
    level1optimizerswitches = [cs_opt_level1];
    level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar];
-   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll];
+   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3{,cs_opt_loopunroll}];
 
 Implementation
 
diff --git a/compiler/powerpc64/cpuinfo.pas b/compiler/powerpc64/cpuinfo.pas
index 186e6b74da..d10f55f8ed 100644
--- a/compiler/powerpc64/cpuinfo.pas
+++ b/compiler/powerpc64/cpuinfo.pas
@@ -65,7 +65,7 @@ const
 
    level1optimizerswitches = [cs_opt_level1];
    level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe];
-   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll];
+   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3{,cs_opt_loopunroll}];
 
 implementation
 
diff --git a/compiler/sparc/cpuinfo.pas b/compiler/sparc/cpuinfo.pas
index b078e009de..dbc6862798 100644
--- a/compiler/sparc/cpuinfo.pas
+++ b/compiler/sparc/cpuinfo.pas
@@ -75,7 +75,7 @@ const
 
    level1optimizerswitches = [cs_opt_level1];
    level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar];
-   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll];
+   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3{,cs_opt_loopunroll}];
 
 implementation
 
diff --git a/compiler/x86_64/cpuinfo.pas b/compiler/x86_64/cpuinfo.pas
index 28d339d9a1..a631fd2f87 100644
--- a/compiler/x86_64/cpuinfo.pas
+++ b/compiler/x86_64/cpuinfo.pas
@@ -84,7 +84,7 @@ Const
 
    level1optimizerswitches = [cs_opt_level1];
    level2optimizerswitches = level1optimizerswitches + [cs_opt_level2,cs_opt_regvar,cs_opt_stackframe];
-   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3,cs_opt_loopunroll];
+   level3optimizerswitches = level2optimizerswitches + [cs_opt_level3{,cs_opt_loopunroll}];
 
 Implementation