Merged revisions 8738-8741,8743,8747-8751,8766-8769,8773 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r8738 | florian | 2007-10-07 19:23:56 +0200 (So, 07 Okt 2007) | 3 lines
  
  * nice PentiumM string
  * fixed duplicate shortcuts
........
  r8739 | florian | 2007-10-07 19:31:29 +0200 (So, 07 Okt 2007) | 2 lines
  
  * fixed optimizer options for ide configuration creation
........
  r8740 | florian | 2007-10-07 19:52:14 +0200 (So, 07 Okt 2007) | 2 lines
  
  * fixed compilation
........
  r8741 | florian | 2007-10-07 19:57:48 +0200 (So, 07 Okt 2007) | 2 lines
  
  + fpcfg.inc target
........
  r8773 | florian | 2007-10-12 18:30:36 +0200 (Fr, 12 Okt 2007) | 2 lines
  
  * moved pre-configured tools to unused shift key combinations
........

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

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/08/29]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/05]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -2299,9 +2299,13 @@ ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
 	$(COMPILER) ppudump.pp -Fu../$(CPU_TARGET) -Fi..
 ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
 fpcsubst$(EXEEXT): fpcsubst.pp usubst.pp
-fpcmkcfg$(EXEEXT): fpcmkcfg.pp usubst.pp fpccfg.inc
+fpcmkcfg$(EXEEXT): fpcmkcfg.pp usubst.pp fpccfg.inc fpcfg.inc fpini.inc
 ifneq ($(DATA2INC),)
 fpccfg.inc: fpc.cft
 	$(DATA2INC) -b -s fpc.cft fpccfg.inc DefaultConfig
+fpcfg.inc : fpinc.cfg
+	$(DATA2INC) -b -s fpinc.cfg fpcfg.inc fpcfg
+fpini.inc : fpinc.ini
+	$(DATA2INC) -b -s fpinc.ini fpini.inc fpini
 endif
 unexport PPUFILES PPUMOVE

compiler/utils/Makefile.fpc

@@ -45,11 +45,17 @@ ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
 
 fpcsubst$(EXEEXT): fpcsubst.pp usubst.pp
 
-fpcmkcfg$(EXEEXT): fpcmkcfg.pp usubst.pp fpccfg.inc
+fpcmkcfg$(EXEEXT): fpcmkcfg.pp usubst.pp fpccfg.inc fpcfg.inc fpini.inc
 
 ifneq ($(DATA2INC),)
 fpccfg.inc: fpc.cft
         $(DATA2INC) -b -s fpc.cft fpccfg.inc DefaultConfig
+
+fpcfg.inc : fpinc.cfg
+        $(DATA2INC) -b -s fpinc.cfg fpcfg.inc fpcfg
+
+fpini.inc : fpinc.ini
+        $(DATA2INC) -b -s fpinc.ini fpini.inc fpini
 endif
 
 #

compiler/utils/fpcfg.inc

@@ -7,8 +7,7 @@ const fpcfg : array[0..3,1..240] of char=(
   ' -T%fpctargetos%'#013#010+
   ' -Sg'#013#010+
   ' -O1'#013#010+
-  ' -OG'#013#010+
-  ' -Op3'#013#010+
+  ' -Opentium3'#013#010+
   ' -Ratt'#013#010+
   ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
   ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
@@ -24,8 +23,7 @@ const fpcfg : array[0..3,1..240] of char=(
   ' -Cr'#013#010+
   ' -Ci'#013#010+
   ' -Co'#013#010+
-  ' -OG'#013#010+
-  ' -Op3'#013#010+
+  ' -Opentium3'#013#010+
   ' -Ratt'#013#010+
   ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
   ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
@@ -38,15 +36,13 @@ const fpcfg : array[0..3,1..240] of char=(
   '#IFDEF RELEASE'#013#010+
   ' -T%fpctargetos%'#013#010+
   ' -Sg'#013#010+
-  ' -O1'#013#010+
   ' -O2'#013#010+
-  ' -OG'#013#010+
-  ' -Op3'#013#010+
+  ' -Opentium3'#013#010+
   ' -Ratt'#013#010+
   ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
   ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#013,#010+
-  ' -g-'#013#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#013#010+
+  ' -g-'#013,#010+
   ' -p-'#013#010+
   ' -b-'#013#010+
   '#ENDIF'#013#010

compiler/utils/fpinc.cfg

@@ -2,6 +2,7 @@
  -T%fpctargetos%
  -Sg
  -O1
+ -Opentium3
  -Ratt
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
@@ -17,6 +18,7 @@
  -Cr
  -Ci
  -Co
+ -Opentium3
  -Ratt
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
@@ -30,6 +32,7 @@
  -T%fpctargetos%
  -Sg
  -O2
+ -Opentium3
  -Ratt
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%
  -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*

compiler/utils/fpinc.ini

@@ -46,20 +46,20 @@ OpenExts="*.pas;*.pp;*.inc"
 Title1="svn ~u~p (curr. dir)"
 Program1="svn"
 Params1="up $CAP_MSG()"
-HotKey1=22784
+HotKey1=23296
 Title2="svn c~i~ (curr. dir)"
 Program2="svn"
 Params2="ci $CAP_MSG()"
-HotKey2=23040
+HotKey2=23552
 Title3="svn ~d~iff"
 Program3="svn"
 Params3="diff $CAP_MSG() $EDNAME"
-HotKey3=23296
+HotKey3=23808
 Title4="svn ~l~og"
 Program4="svn"
 Params4="log $CAP_MSG() $EDNAME"
-HotKey4=23552
+HotKey4=34560
 Title5="svn ~b~lame"
 Program5="svn"
 Params5="blame $CAP_MSG() $EDNAME"
-HotKey5=23808
+HotKey5=34816

compiler/utils/fpini.inc

@@ -51,21 +51,21 @@ const fpini : array[0..4,1..240] of char=(
   'Title1="svn ~u~p (curr. dir)"'#013#010+
   'Program1="svn"'#013#010+
   'Params1="up $CAP_MSG()"'#013#010+
-  'HotKey1=22784'#013#010+
+  'HotKey1=23296'#013#010+
   'Title2="svn c~i~ (curr. dir)"'#013#010+
   'Program2="svn"'#013#010+
   'Params2="ci ','$CAP_MSG()"'#013#010+
-  'HotKey2=23040'#013#010+
+  'HotKey2=23552'#013#010+
   'Title3="svn ~d~iff"'#013#010+
   'Program3="svn"'#013#010+
   'Params3="diff $CAP_MSG() $EDNAME"'#013#010+
-  'HotKey3=23296'#013#010+
+  'HotKey3=23808'#013#010+
   'Title4="svn ~l~og"'#013#010+
   'Program4="svn"'#013#010+
   'Params4="log $CAP_MSG() $EDNAME"'#013#010+
-  'HotKey4=23552'#013#010+
+  'HotKey4=34560'#013#010+
   'Title5="svn ~b~lame"'#013#010+
   'Program5="svn"'#013#010+
   'Pa','rams5="blame $CAP_MSG() $EDNAME"'#013#010+
-  'HotKey5=23808'#013#010
+  'HotKey5=34816'#013#010
 );

ide/fpswitch.pas

@@ -261,10 +261,11 @@ const
       opt_level3optimizations = 'Level ~3~ optimizations';
       { optimization processor target }
       opt_i386486 = 'i~3~86/i486';
-      opt_pentium = 'Pentium (tm)';
+      opt_pentium = 'P~e~ntium (tm)';
       opt_pentiummmx = 'PentiumMM~X~ (tm)';
       opt_pentiumpro = '~P~entium2/PentiumM/AMD';
       opt_pentiumiv = 'Pentium~4~';
+      opt_pentiumm = 'Pentium~M~';
       opt_m68000 = 'm~6~8000';
       opt_m68020 = 'm680~2~0';
       { Assembler options }
@@ -1249,6 +1250,8 @@ begin
            st:=opt_pentiumpro;
          if st='PENTIUM4' then
            st:=opt_pentiumiv;
+         if st='PENTIUMM' then
+           st:=opt_pentiumM;
 {$endif not I386}
 {$ifdef m68k}
          if st='68000' then
@@ -1277,6 +1280,8 @@ begin
            st:=opt_pentiumpro;
          if st='PENTIUM4' then
            st:=opt_pentiumiv;
+         if st='PENTIUMM' then
+           st:=opt_pentiumM;
 {$endif not I386}
 {$ifdef m68k}
          if st='68000' then
@@ -1284,6 +1289,10 @@ begin
          if st='68020' then
            st:=opt_m68020;
 {$endif m68k}
+         { we use the string twice so kill duplicate highlights }
+         while pos('~',st)<>0 do
+           delete(st,pos('~',st),1);
+
          if st<>'' then
            AddSelectItem(st,'p'+cputypestr[cpu],idNone);
        end;