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

---
 components/fpdebug/fpdebug.lpk                    | 15 +++++++++++++++
 .../lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk  | 15 +++++++++++++++
 lcl/lclbase.lpk                                   |  8 +++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/components/fpdebug/fpdebug.lpk b/components/fpdebug/fpdebug.lpk
index b973621f1f..47cd0e0270 100644
--- a/components/fpdebug/fpdebug.lpk
+++ b/components/fpdebug/fpdebug.lpk
@@ -12,6 +12,21 @@
         <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 19a600eb24..e6e5a06be4 100644
--- a/components/lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk
+++ b/components/lazdebuggers/lazdebuggerfp/lazdebuggerfp.lpk
@@ -9,6 +9,21 @@
       <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 2f7fed0b92..77ba458896 100644
--- a/lcl/lclbase.lpk
+++ b/lcl/lclbase.lpk
@@ -13,7 +13,13 @@
         <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Conditionals Value="if SrcOS&lt;>&apos;win&apos; then
-  UnitPath := &apos;nonwin32&apos;;"/>
+  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;"/>
       <Other>
         <Verbosity>
           <ShowNotes Value="False"/>