--- Merging r44789 into '.':

U    utils/fpcm/fpcmake.ini
--- Recording mergeinfo for merge of r44789 into '.':
 U   .

# revisions: 44789
r44789 | jonas | 2020-04-18 17:44:49 +0200 (Sat, 18 Apr 2020) | 1 line
Changed paths:
   M /trunk/utils/fpcm/fpcmake.ini

  - removed FPC pre-2.1 optimization options

git-svn-id: branches/fixes_3_2@45870 -

utils/fpcm/fpcmake.ini

@@ -1348,18 +1348,8 @@ endif
 
 # Release mode
 # (strip, optimize and don't load fpc.cfg)
-# fpc 2.1 has -O2 for all targets
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif