* remove duplicate entry, resolves #40359

utils/fpcmkcfg/fpc.cft

@@ -202,12 +202,6 @@
 #undef NEEDCROSSBINUTILS
 #endif
 
-# never need cross-prefix when targeting the i8086
-# (no native compiler, always cross-compiling)
-#ifdef cpujvm
-#undef NEEDCROSSBINUTILS
-#endif
-
 # binutils prefix for cross compiling
 #IFDEF FPC_CROSSCOMPILING
 #IFDEF NEEDCROSSBINUTILS

utils/fpcmkcfg/fpccfg.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const DefaultConfig : array[0..30] of string[240]=(
+const DefaultConfig : array[0..29] of string[240]=(
 {$else Delphi}
-const DefaultConfig : array[0..30,1..240] of char=(
+const DefaultConfig : array[0..29,1..240] of char=(
 {$endif Delphi}
   '#'#010+
   '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#010+
@@ -223,14 +223,8 @@ const DefaultConfig : array[0..30,1..240] of char=(
   '#undef NEEDCROSSBINUTILS'#010+
   '#endif'#010+
   #010+
-  '# never need cross-prefix when targeting the i8086'#010+
-  '#',' (no native compiler, always cross-compiling)'#010+
-  '#ifdef cpujvm'#010+
-  '#undef NEEDCROSSBINUTILS'#010+
-  '#endif'#010+
-  #010+
   '# binutils prefix for cross compiling'#010+
-  '#IFDEF FPC_CROSSCOMPILING'#010+
+  '#IFDEF FPC_CRO','SSCOMPILING'#010+
   '#IFDEF NEEDCROSSBINUTILS'#010+
   '  -XP$FPCTARGET-'#010+
   '#ENDIF'#010+
@@ -238,28 +232,28 @@ const DefaultConfig : array[0..30,1..240] of char=(
   #010+
   #010+
   '# -------------'#010+
-  '# Linking',#010+
+  '# Linking'#010+
   '# -------------'#010+
   #010+
   '# generate always debugging information for GDB (slows down the compil'+
   'ing'#010+
   '# process)'#010+
-  '#      -gc        generate checks for pointers'#010+
+  '#      -gc        generate checks for poin','ters'#010+
   '#      -gd        use dbx'#010+
   '#      -gg        use gsym'#010+
-  '#      -gh        use heap trace unit',' (for memory leak debugging)'#010+
+  '#      -gh        use heap trace unit (for memory leak debugging)'#010+
   '#      -gl        use line info unit to show more info for backtraces'#010+
-  '#      -gv        generates programs tracable with valgrind'#010+
+  '#      -gv        generates programs tracable ','with valgrind'#010+
   '#      -gw        generate dwarf debugging info'#010+
   '#'#010+
-  '# Enable debuginfo and use the ','line info unit by default'#010+
+  '# Enable debuginfo and use the line info unit by default'#010+
   '#-gl'#010+
   #010+
   '# always pass an option to the linker'#010+
   '#-k-s'#010+
   #010+
-  '# Always use smartlinking on i8086, because the system unit exceeds th'+
-  'e 64kb'#010+
+  '# Always use smartlinking on i8086, because the system unit exceeds ','t'+
+  'he 64kb'#010+
   '# code limit'#010+
   '#ifdef cpui8086'#010+
   '-CX'#010+
@@ -269,27 +263,27 @@ const DefaultConfig : array[0..30,1..240] of char=(
   #010+
   '# -------------'#010+
   '# Miscellaneous'#010+
-  '# ------','-------'#010+
+  '# -------------'#010+
   #010+
   '# Write always a nice FPC logo ;)'#010+
   '-l'#010+
   #010+
   '# Verbosity'#010+
   '#      e : Show errors (default)       d : Show debug info'#010+
-  '#      w : Show warnings               u : Show unit info'#010+
-  '#      n : Show notes                  t : Show tried/used files',#010+
+  '#      w : Show warnings   ','            u : Show unit info'#010+
+  '#      n : Show notes                  t : Show tried/used files'#010+
   '#      h : Show hints                  s : Show time stamps'#010+
   '#      i : Show general info           q : Show message numbers'#010+
-  '#      l : Show linenumbers            c : Show conditionals'#010+
-  '#      a : Show everything             0 : Show nothin','g (except erro'+
-  'rs)'#010+
+  '#      l : Show line','numbers            c : Show conditionals'#010+
+  '#      a : Show everything             0 : Show nothing (except errors'+
+  ')'#010+
   '#      b : Write file names messages   r : Rhide/GCC compatibility mod'+
   'e'#010+
-  '#          with full path              x : Executable info (Win32 only'+
-  ')'#010+
+  '#          with full path              x : Executable i','nfo (Win32 on'+
+  'ly)'#010+
   '#      v : write fpcdebug.txt with     p : Write tree.log with parse t'+
   'ree'#010+
-  '#   ','       lots of debugging info'#010+
+  '#          lots of debugging info'#010+
   '#'#010+
   '# Display Info, Warnings and Notes'#010+
   '-viwn'#010+