ソースを参照

Merged revisions 7962-7963 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7962 | hajny | 2007-07-05 21:19:07 +0200 (Thu, 05 Jul 2007) | 1 line

* don't use obsolete switches in default configuration files
........
r7963 | hajny | 2007-07-05 21:23:09 +0200 (Thu, 05 Jul 2007) | 1 line

* don't use obsolete switches in default configuration files
........

git-svn-id: branches/fixes_2_2@7998 -

joost 18 年 前
コミット
a543eb15ee
3 ファイル変更9 行追加31 行削除
  1. 1 1
      compiler/utils/fpc.cft
  2. 0 7
      compiler/utils/fpinc.cfg
  3. 8 23
      installer/install.dat

+ 1 - 1
compiler/utils/fpc.cft

@@ -22,7 +22,7 @@
 
 # For a release compile with optimizes and strip debuginfo
 #IFDEF RELEASE
-  -O2p3
+  -O2
   -Xs
   #WRITE Compiling Release Version
 #ENDIF

+ 0 - 7
compiler/utils/fpinc.cfg

@@ -2,8 +2,6 @@
  -T%fpctargetos%
  -Sg
  -O1
- -OG
- -Op3
  -Ratt
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
@@ -19,8 +17,6 @@
  -Cr
  -Ci
  -Co
- -OG
- -Op3
  -Ratt
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
@@ -33,10 +29,7 @@
 #IFDEF RELEASE
  -T%fpctargetos%
  -Sg
- -O1
  -O2
- -OG
- -Op3
  -Ratt
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*

+ 8 - 23
installer/install.dat

@@ -527,7 +527,7 @@ defaultcfg=
 
 # For a release compile with optimizes and strip debuginfo
 #IFDEF RELEASE
-  -OG2p3
+  -O3
   -Xs
   #WRITE Compiling Release Version
 #ENDIF
@@ -587,20 +587,9 @@ defaultcfg=
 #-Ct
 
 # Optimizer switches
-# -Og        generate smaller code
-# -OG        generate faster code (default)
-# -Or        keep certain variables in registers (still BUGGY!!!)
-# -Ou        enable uncertain optimizations (see docs)
-# -O1        level 1 optimizations (quick optimizations)
-# -O2        level 2 optimizations (-O1 + slower optimizations)
-# -O3        level 3 optimizations (same as -O2u)
-# -Op        target processor
-#     -Op1  set target processor to 386/486
-#     -Op2  set target processor to Pentium/PentiumMMX (tm)
-#     -Op3  set target processor to PPro/PII/c6x86/K6 (tm)
-
-# Optimize always for Size and PentiumII
-#-Og2p3
+# -O1        level 1 optimizations (quick and debugger friendly)
+# -O2        level 2 optimizations (-O1 + quick optimizations)
+# -O3        level 3 optimizations (-O2 + slow optimizations)
 
 
 # -----------------------
@@ -686,8 +675,7 @@ defaultidecfg=
  -T%targetos%
  -Sg
  -O1
- -OG
- -Op3
+ -OpPENTIUM
  -Ratt
  -Fu%basepath%\units\%fpctargetmacro%
  -Fu%basepath%\units\%fpctargetmacro%\*
@@ -703,8 +691,7 @@ defaultidecfg=
  -Cr
  -Ci
  -Co
- -OG
- -Op3
+ -OpPENTIUM
  -Ratt
  -Fu%basepath%\units\%fpctargetmacro%
  -Fu%basepath%\units\%fpctargetmacro%\*
@@ -717,10 +704,8 @@ defaultidecfg=
 #IFDEF RELEASE
  -T%targetos%
  -Sg
- -O1
- -O2
- -OG
- -Op3
+ -O3
+ -OpPENTIUM
  -Ratt
  -Fu%basepath%\units\%fpctargetmacro%
  -Fu%basepath%\units\%fpctargetmacro%\*