From e2386ae876c8f9a0772be80ff7711499ca4d721e Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Wed, 24 Feb 2021 10:40:15 +0000
Subject: [PATCH]   * Remove obsolete -OG2p3 option for extcycle   + Add
 extoptcycle to cycle compiler with both -dEXTDEBUG and -dDEBUG_ALL_OPT

git-svn-id: trunk@48801 -
---
 compiler/Makefile     | 4 +++-
 compiler/Makefile.fpc | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/compiler/Makefile b/compiler/Makefile
index 6b24cf403d..f87d4ffcb4 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -5052,7 +5052,9 @@ endif
 cycledep:
 	$(MAKE) cycle USEDEPEND=1
 extcycle:
-	$(MAKE) cycle OPT="$(OPT) -n -OG2p3 -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1
+	$(MAKE) cycle OPT="$(OPT) -n -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1
+extoptcycle:
+	$(MAKE) cycle OPT="$(OPT) -n -glttt -CRriot -dEXTDEBUG -dDEBUG_ALL_OPT" ALLOW_WARNINGS=1
 cvstest:
 	$(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPT=-n -Se'
 ifeq ($(findstring -dFPC_SOFT_FPUX80,$(LOCALOPT)),)
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index 807868716d..ca4f258604 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -1024,7 +1024,10 @@ cycledep:
 # extcycle should still work, but generates
 # lots of warnings, so ALLOW_WARNINGS=1 is required
 extcycle:
-        $(MAKE) cycle OPT="$(OPT) -n -OG2p3 -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1
+        $(MAKE) cycle RTLOPT="$(RTLOPT) -n -glttt -CRriot -dEXTDEBUG" LOCALOPT="$(LOCALOPT) -n -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1
+
+extoptcycle:
+        $(MAKE) cycle RTLOPT="$(RTLOPT) -n -glttt -CRriot -dEXTDEBUG -dDEBUG_ALL_OPT" LOCALOPT="$(LOCALOPT) -n -glttt -CRriot -dEXTDEBUG -dDEBUG_ALL_OPT" ALLOW_WARNINGS=1
 
 cvstest:
         $(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPT=-n -Se'