From ad741a8d7a4f904ae77641d5d5f318409d51b0bf Mon Sep 17 00:00:00 2001
From: Martin <laz.git@mfriebe.de>
Date: Sat, 16 Oct 2021 13:41:59 +0200
Subject: [PATCH] Revert "Disable PEEPHOLE opt in fpc 3.2.0 to fpc 3.2.3 =>
 there is a bug that can cause crashed in fpdebug/lazutils"

This reverts commit 78bb88de35f1272b2616a49def60b6839189c7ad.
---
 components/fpdebug/fpdebug.lpk                    | 15 ---------------
 .../lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk  | 15 ---------------
 lcl/lclbase.lpk                                   |  8 +-------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/components/fpdebug/fpdebug.lpk b/components/fpdebug/fpdebug.lpk
index 47cd0e0270..b973621f1f 100644
--- a/components/fpdebug/fpdebug.lpk
+++ b/components/fpdebug/fpdebug.lpk
@@ -12,21 +12,6 @@
         <OtherUnitFiles Value="."/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Conditionals Value="if(GetProjValue(&apos;FPC_FULLVERSION&apos;) > 30200) and
-  (GetProjValue(&apos;FPC_FULLVERSION&apos;) &lt; 30204)
-then begin
-CustomOptions := &apos;-OoNOPEEPHOLE&apos; ;
-end;
-
-// example for adding linker options on Mac OS X
-//if TargetOS=&apos;darwin&apos; then
-//  LinkerOptions := &apos; -framework OpenGL&apos;;
-
-// example for adding a unit and include path on Windows
-//if SrcOS=&apos;win&apos; then begin
-//  UnitPath += &apos;;win&apos;;
-//  IncPath += &apos;;win&apos;;
-//end;"/>
       <Other>
         <Verbosity>
           <ShowWarn Value="False"/>
diff --git a/components/lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk b/components/lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk
index e6e5a06be4..19a600eb24 100644
--- a/components/lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk
+++ b/components/lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk
@@ -9,21 +9,6 @@
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Conditionals Value="if(GetProjValue(&apos;FPC_FULLVERSION&apos;) > 30200) and
-  (GetProjValue(&apos;FPC_FULLVERSION&apos;) &lt; 30204)
-then begin
-CustomOptions := &apos;-OoNOPEEPHOLE&apos; ;
-end;
-
-// example for adding linker options on Mac OS X
-//if TargetOS=&apos;darwin&apos; then
-//  LinkerOptions := &apos; -framework OpenGL&apos;;
-
-// example for adding a unit and include path on Windows
-//if SrcOS=&apos;win&apos; then begin
-//  UnitPath += &apos;;win&apos;;
-//  IncPath += &apos;;win&apos;;
-//end;"/>
       <Other>
         <CompilerMessages>
           <IgnoredMessages idx6058="True" idx3123="True"/>
diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk
index f674819e69..8ce53f914b 100644
--- a/lcl/lclbase.lpk
+++ b/lcl/lclbase.lpk
@@ -13,13 +13,7 @@
         <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Conditionals Value="if SrcOS&lt;>&apos;win&apos; then
-  UnitPath := &apos;nonwin32&apos;;
-
-if(GetProjValue(&apos;FPC_FULLVERSION&apos;) > 30200) and
-  (GetProjValue(&apos;FPC_FULLVERSION&apos;) &lt; 30204)
-then begin
-CustomOptions := &apos;-OoNOPEEPHOLE&apos; ;
-end;"/>
+  UnitPath := &apos;nonwin32&apos;;"/>
       <Other>
         <Verbosity>
           <ShowNotes Value="False"/>