From d2a1f9cb200b2b2b7ee5219c16e4250b037cb043 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sat, 18 Jun 2022 20:13:03 +0200
Subject: [PATCH]   * get rid of cs_opt_none   * $O+ sets cs_opt_level2 instead
 of cs_opt_none which made no sense

---
 compiler/globtype.pas              | 4 ++--
 compiler/scandir.pas               | 1 +
 compiler/switches.pas              | 4 ++--
 compiler/utils/ppuutils/ppudump.pp | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/globtype.pas b/compiler/globtype.pas
index 87570f831f..e17381bba5 100644
--- a/compiler/globtype.pas
+++ b/compiler/globtype.pas
@@ -342,7 +342,7 @@ interface
 
      type
        { optimizer }
-       toptimizerswitch = (cs_opt_none,
+       toptimizerswitch = (
          cs_opt_level1,cs_opt_level2,cs_opt_level3,cs_opt_level4,
          cs_opt_regvar,cs_opt_uncertain,cs_opt_size,cs_opt_stackframe,
          cs_opt_peephole,cs_opt_loopunroll,cs_opt_tailrecursion,cs_opt_nodecse,
@@ -425,7 +425,7 @@ interface
        end;
 
     const
-       OptimizerSwitchStr : array[toptimizerswitch] of string[18] = ('',
+       OptimizerSwitchStr : array[toptimizerswitch] of string[18] = (
          'LEVEL1','LEVEL2','LEVEL3','LEVEL4',
          'REGVAR','UNCERTAIN','SIZE','STACKFRAME',
          'PEEPHOLE','LOOPUNROLL','TAILREC','CSE',
diff --git a/compiler/scandir.pas b/compiler/scandir.pas
index f4d9c2f3fb..2ab5663257 100644
--- a/compiler/scandir.pas
+++ b/compiler/scandir.pas
@@ -1076,6 +1076,7 @@ unit scandir;
         current_scanner.skipspace;
         { Support also the ON and OFF as switch }
         hs:=current_scanner.readid;
+        writeln(hs);
         if (hs='ON') then
           current_settings.optimizerswitches:=level2optimizerswitches
         else if (hs='OFF') then
diff --git a/compiler/switches.pas b/compiler/switches.pas
index 741522bbac..b2dd504a8b 100644
--- a/compiler/switches.pas
+++ b/compiler/switches.pas
@@ -89,7 +89,7 @@ const
    {L} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
    {M} (typesw:localsw; setsw:ord(cs_generate_rtti)),
    {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
-   {O} (typesw:optimizersw; setsw:ord(cs_opt_none)),
+   {O} (typesw:optimizersw; setsw:ord(cs_opt_level2)),
    {P} (typesw:modulesw; setsw:ord(cs_openstring)),
    {Q} (typesw:localsw; setsw:ord(cs_check_overflow)),
    {R} (typesw:localsw; setsw:ord(cs_check_range)),
@@ -131,7 +131,7 @@ const
    {L} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
    {M} (typesw:localsw; setsw:ord(cs_generate_rtti)),
    {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
-   {O} (typesw:optimizersw; setsw:ord(cs_opt_none)),
+   {O} (typesw:optimizersw; setsw:ord(cs_opt_level2)),
    {P} (typesw:modulesw; setsw:ord(cs_openstring)),
    {Q} (typesw:localsw; setsw:ord(cs_check_overflow)),
    {R} (typesw:localsw; setsw:ord(cs_check_range)),
diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp
index a49d32273f..6efe49725c 100644
--- a/compiler/utils/ppuutils/ppudump.pp
+++ b/compiler/utils/ppuutils/ppudump.pp
@@ -2443,8 +2443,7 @@ const
        );
        { optimizer }
        optimizerswitchname : array[toptimizerswitch] of string[50] =
-        ('cs_opt_none',
-         'cs_opt_level1',
+        ('cs_opt_level1',
          'cs_opt_level2',
          'cs_opt_level3',
          'cs_opt_level4',