* regenerate fpccfg.inc after r29434

git-svn-id: trunk@29453 -

utils/fpcmkcfg/fpccfg.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const DefaultConfig : array[0..29] of string[240]=(
+const DefaultConfig : array[0..30] of string[240]=(
 {$else Delphi}
-const DefaultConfig : array[0..29,1..240] of char=(
+const DefaultConfig : array[0..30,1..240] of char=(
 {$endif Delphi}
   '#'#013#010+
   '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#013#010+
@@ -169,12 +169,18 @@ const DefaultConfig : array[0..29,1..240] of char=(
   '-Fu%basepath%/units/$fpctarget/*'#013#010+
   '-Fu%basepath%/units/$fpctarget/rtl'#013#010+
   #013#010+
+  '#ifdef cpui8086'#013#010+
+  '-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel'#013#010+
+  '-Fu%basepath%/units/$fpctarget/$fpc','subarch-$fpcmemorymodel/*'#013#010+
+  '-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/rtl'#013#010+
+  '#endif'#013#010+
+  #013#010+
   '#IFDEF FPCAPACHE_1_3'#013#010+
   '-Fu%basepath%/units/$fpctarget/httpd13/'#013#010+
   '#ELSE'#013#010+
   '#IFDEF FPCAPACHE_2_0'#013#010+
-  '-Fu%basepath%/units/','$fpctarget/httpd20'#013#010+
-  '#ELSE'#013#010+
+  '-Fu%basepath%/units/$fpctarget/httpd20'#013#010+
+  '#ELSE'#013#010,
   '-Fu%basepath%/units/$fpctarget/httpd22'#013#010+
   '#ENDIF'#013#010+
   '#ENDIF'#013#010+
@@ -186,8 +192,8 @@ const DefaultConfig : array[0..29,1..240] of char=(
   '%gcclibpath%'#013#010+
   #013#010+
   '# searchpath for libraries'#013#010+
-  '#','-Fl%basepath%/lib'#013#010+
-  '#-Fl/lib;/usr/lib'#013#010+
+  '#-Fl%basepath%/lib'#013#010+
+  '#-Fl/lib',';/usr/lib'#013#010+
   '-Fl%basepath%/lib/$FPCTARGET'#013#010+
   #013#010+
   '# searchpath for tools'#013#010+
@@ -196,8 +202,8 @@ const DefaultConfig : array[0..29,1..240] of char=(
   '%NEEDCROSSBINUTILSIFDEF%'#013#010+
   #013#010+
   '# never need cross-prefix when targeting the JVM'#013#010+
-  '# (no native compiler, always cross-','compiling)'#013#010+
-  '#ifdef cpujvm'#013#010+
+  '# (no native compiler, always cross-compiling)'#013#010+
+  '#ifdef cpujvm'#013#010,
   '#undef NEEDCROSSBINUTILS'#013#010+
   '#endif'#013#010+
   #013#010+
@@ -208,8 +214,8 @@ const DefaultConfig : array[0..29,1..240] of char=(
   #013#010+
   '# binutils prefix for cross compiling'#013#010+
   '#IFDEF FPC_CROSSCOMPILING'#013#010+
-  '#IFDEF NEEDC','ROSSBINUTILS'#013#010+
-  '  -XP$FPCTARGET-'#013#010+
+  '#IFDEF NEEDCROSSBINUTILS'#013#010+
+  '  -XP$FPCTARG','ET-'#013#010+
   '#ENDIF'#013#010+
   '#ENDIF'#013#010+
   #013#010+
@@ -222,13 +228,13 @@ const DefaultConfig : array[0..29,1..240] of char=(
   'ing'#013#010+
   '# process)'#013#010+
   '#      -gc        generate checks for pointers'#013#010+
-  '#     ',' -gd        use dbx'#013#010+
-  '#      -gg        use gsym'#013#010+
+  '#      -gd        use dbx'#013#010+
+  '#     ',' -gg        use gsym'#013#010+
   '#      -gh        use heap trace unit (for memory leak debugging)'#013#010+
   '#      -gl        use line info unit to show more info for backtraces'#013+
   #010+
-  '#      -gv        generates programs tracable with va','lgrind'#013#010+
-  '#      -gw        generate dwarf debugging info'#013#010+
+  '#      -gv        generates programs tracable with valgrind'#013#010+
+  '#      -gw        g','enerate dwarf debugging info'#013#010+
   '#'#013#010+
   '# Enable debuginfo and use the line info unit by default'#013#010+
   '#-gl'#013#010+
@@ -239,7 +245,7 @@ const DefaultConfig : array[0..29,1..240] of char=(
   '# Always strip debuginfo from the executable'#013#010+
   '-Xs'#013#010+
   #013#010+
-  '# Always use ','smartlinking on i8086, because the system unit exceeds '+
+  '# Always use smartlinking on i8086, beca','use the system unit exceeds '+
   'the 64kb'#013#010+
   '# code limit'#013#010+
   '#ifdef cpui8086'#013#010+
@@ -256,24 +262,24 @@ const DefaultConfig : array[0..29,1..240] of char=(
   '-l'#013#010+
   #013#010+
   '# Verbosity'#013#010+
-  '#      e : Show',' errors (default)       d : Show debug info'#013#010+
+  '#      e : Show errors (default)       d :',' Show debug info'#013#010+
   '#      w : Show warnings               u : Show unit info'#013#010+
   '#      n : Show notes                  t : Show tried/used files'#013#010+
   '#      h : Show hints                  s : Show time stamps'#013#010+
-  '#      i ',': Show general info           q : Show message numbers'#013#010+
+  '#      i : Show general info        ','   q : Show message numbers'#013#010+
   '#      l : Show linenumbers            c : Show conditionals'#013#010+
   '#      a : Show everything             0 : Show nothing (except errors'+
   ')'#013#010+
-  '#      b : Write file names messages   r : Rhide/','GCC compatibility m'+
-  'ode'#013#010+
-  '#          with full path              x : Executable info (Win32 only'+
-  ')'#013#010+
+  '#      b : Write file names messages   r : Rhide/GCC compatibility mod'+
+  'e'#013#010+
+  '#  ','        with full path              x : Executable info (Win32 on'+
+  'ly)'#013#010+
   '#      v : write fpcdebug.txt with     p : Write tree.log with parse t'+
   'ree'#013#010+
   '#          lots of debugging info'#013#010+
   '#'#013#010+
-  '# Display Info, Warnings and N','otes'#013#010+
+  '# Display Info, Warnings and Notes'#013#010+
   '-viwn'#013#010+
-  '# If you don'#039't want so much verbosity use'#013#010+
+  '# If you don'#039't',' want so much verbosity use'#013#010+
   '#-vw'#013#010
 );