+ added the current WebAssembly exceptions mode to the .ppu module flags and

  perform a check to ensure all units are compiled in the same exceptions mode
  as the main program

compiler/fppu.pas

@@ -341,6 +341,21 @@ var
               exit;
             end;
 {$endif i8086}
+{$ifdef wasm}
+          { check WebAssembly exceptions mode flag }
+          if ((mf_wasm_no_exceptions in moduleflags) <>
+              (ts_wasm_no_exceptions in current_settings.targetswitches)) or
+             ((mf_wasm_bf_exceptions in moduleflags) <>
+              (ts_wasm_bf_exceptions in current_settings.targetswitches)) or
+             ((mf_wasm_js_exceptions in moduleflags) <>
+              (ts_wasm_js_exceptions in current_settings.targetswitches)) or
+             ((mf_wasm_native_exceptions in moduleflags) <>
+              (ts_wasm_native_exceptions in current_settings.targetswitches)) then
+            begin
+              Message(unit_u_ppu_invalid_wasm_exceptions_mode,@queuecomment);
+              exit;
+            end;
+{$endif}
           if {$ifdef llvm}not{$endif}(mf_llvm in moduleflags) then
             begin
               Message(unit_u_ppu_llvm_mismatch,@queuecomment);
@@ -1024,6 +1039,16 @@ var
         if current_settings.x86memorymodel in [mm_tiny,mm_small,mm_medium] then
           include(moduleflags,mf_i8086_ss_equals_ds);
 {$endif i8086}
+{$ifdef wasm}
+        if ts_wasm_no_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_no_exceptions);
+        if ts_wasm_native_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_native_exceptions);
+        if ts_wasm_js_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_js_exceptions);
+        if ts_wasm_bf_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_bf_exceptions);
+{$endif wasm}
 {$ifdef llvm}
         include(moduleflags,mf_llvm);
 {$endif}

compiler/globtype.pas

@@ -402,7 +402,11 @@ interface
          mf_package_deny,             { this unit must not be part of a package }
          mf_package_weak,             { this unit may be completely contained in a package }
          mf_llvm,                     { compiled for LLVM code generator, not compatible with regular compiler because of different nodes in inline functions }
-         mf_symansistr                { symbols are ansistrings (for ppudump) }
+         mf_symansistr,               { symbols are ansistrings (for ppudump) }
+         mf_wasm_no_exceptions,       { unit was compiled in WebAssembly 'no exceptions' mode }
+         mf_wasm_bf_exceptions,       { unit was compiled in WebAssembly 'branchful' exceptions mode }
+         mf_wasm_js_exceptions,       { unit was compiled in WebAssembly JavaScript-based exceptions mode }
+         mf_wasm_native_exceptions    { unit was compiled in WebAssembly native exceptions mode }
        );
        tmoduleflags = set of tmoduleflag;
 

compiler/msg/errore.msg

@@ -3197,7 +3197,7 @@ link_e_undefined_symbol=09222_E_Undefined symbol: $1
 #
 # Unit loading
 #
-# 10064 is the last used one
+# 10068 is the last used one
 #
 # BeginOfTeX
 % \section{Unit loading messages.}
@@ -3422,6 +3422,8 @@ cg_f_internal_type_does_not_match=10066_F_Internal type "$1" does not look as ex
 unit_u_ppu_llvm_mismatch=10067_U_Skipping unit, PPU and compiler have to be both compiled with or without LLVM support
 % Units compiled by a compiler built with the LLVM code generator cannot be used with a regular compiler,
 % and vice versa.
+unit_u_ppu_invalid_wasm_exceptions_mode=10068_U_PPU is compiled for another WebAssembly exceptions mode
+% This unit file was compiled for a different WebAssembly exceptions mode.
 % \end{description}
 # EndOfTeX
 

compiler/msgidx.inc

@@ -1029,6 +1029,7 @@ const
   cg_f_internal_type_not_found=10065;
   cg_f_internal_type_does_not_match=10066;
   unit_u_ppu_llvm_mismatch=10067;
+  unit_u_ppu_invalid_wasm_exceptions_mode=10068;
   option_usage=11000;
   option_only_one_source_support=11001;
   option_def_only_for_os2=11002;
@@ -1142,9 +1143,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 88633;
+  MsgTxtSize = 88697;
 
   MsgIdxMax : array[1..20] of longint=(
-    28,107,361,131,99,63,147,37,223,68,
+    28,107,361,131,99,63,147,37,223,69,
     65,20,30,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -1253,166 +1253,166 @@ const msgtxt : array[0..000369,1..240] of char=(
   ' the correct run t','ime library.'#000+
   '10067_U_Skipping unit, PPU and compiler have to be both compiled with '+
   'or without LLVM support'#000+
+  '10068_U_PPU is compiled for another WebAssembly exceptions mode'#000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file supported, changing source file to compil'+
-  'e from "$1" into "$2','"'#000+
+  '11001_W_Only one source fi','le supported, changing source file to comp'+
+  'ile from "$1" into "$2"'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_Nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
-  '11005_N_No option inside $1 config file'#000+
+  '11005_N_No option inside $1 config f','ile'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
-  '1','1008_F_Too many config files nested'#000+
+  '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
   '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
-  '11012_W_Shared libs not supported on DOS platform, reverting to static'+
-  #000+
-  '11013_F_In options file $','1 at line $2 too many #IF(N)DEFs encountere'+
-  'd'#000+
+  '11012_W_Shared libs not supporte','d on DOS platform, reverting to stat'+
+  'ic'#000+
+  '11013_F_In options file $1 at line $2 too many #IF(N)DEFs encountered'#000+
   '11014_F_In options file $1 at line $2 unexpected #ENDIFs encountered'#000+
   '11015_F_Open conditional at the end of the options file'#000+
-  '11016_W_Debug information generation is not supported by this executab',
-  'le'#000+
+  '11016_','W_Debug information generation is not supported by this execut'+
+  'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_W_You are using the obsolete switch $1'#000+
   '11019_W_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler output selected',' "$1" is not compatible with "$2"'#000+
+  '11020_N_Switching assembler to de','fault source writing assembler'#000+
+  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
-  '11028_D_Handling option "$1"'#000+
+  '11028_D_Handling option "$1','"'#000+
   '11029_O_*** press enter ***'#000+
-  '11030_H_Start of reading config fi','le $1'#000+
+  '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_Interpreting option "$1"'#000+
   '11036_D_Interpreting firstpass option "$1"'#000+
   '11033_D_Interpreting file option "$1"'#000+
-  '11034_D_Reading config file "$1"'#000+
+  '11034_D_Reading co','nfig file "$1"'#000+
   '11035_D_Found source file name "$1"'#000+
-  '11039_E_Unkno','wn codepage "$1"'#000+
+  '11039_E_Unknown codepage "$1"'#000+
   '11040_F_Config file $1 is a directory'#000+
   '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
   'ugging disabled'#000+
-  '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
-  '11043_F_In options file $1 at l','ine $2 #ELSE directive without #IF(N)'+
-  'DEF found'#000+
+  '11042_W_Use of ppc386.cfg is deprec','ated, please use fpc.cfg instead'#000+
+  '11043_F_In options file $1 at line $2 #ELSE directive without #IF(N)DE'+
+  'F found'#000+
   '11044_F_Option "$1" is not, or not yet, supported on the current targe'+
   't platform'#000+
-  '11045_F_The feature "$1" is not, or not yet, supported on the selected'+
-  ' target platform'#000+
-  '11046_N_DWARF debug infor','mation cannot be used with smart linking on'+
-  ' this target, switching to static linking'#000+
+  '11045_F_The feature "$1" is not, or not yet, sup','ported on the select'+
+  'ed target platform'#000+
+  '11046_N_DWARF debug information cannot be used with smart linking on t'+
+  'his target, switching to static linking'#000+
   '11047_W_Option "$1" is ignored for the current target platform.'#000+
-  '11048_W_Disabling external debug information because it is unsupported'+
-  ' for the selected tar','get/debug format combination.'#000+
+  '11048_W_Disabling external ','debug information because it is unsupport'+
+  'ed for the selected target/debug format combination.'#000+
   '11049_N_DWARF debug information cannot be used with smart linking with'+
   ' external assembler, disabling static library creation.'#000+
-  '11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+
-  'e: $1'#000+
-  '11051_E_','Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment var'+
-  'iable: $1'#000+
+  '11050_E_Invalid valu','e for MACOSX_DEPLOYMENT_TARGET environment varia'+
+  'ble: $1'#000+
+  '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment varia'+
+  'ble: $1'#000+
   '11052_E_You must use one of the VFP FPU types when using the EABIHF AB'+
   'I target'#000+
-  '11053_W_The selected debug format is not supported on the current targ'+
-  'et, not changing the ','current setting'#000+
+  '11053_W_The selected debug ','format is not supported on the current ta'+
+  'rget, not changing the current setting'#000+
   '11054_E_Argument to "$1" is missing'#000+
   '11055_E_Malformed parameter: $1'#000+
   '11056_W_Smart linking requires external linker'#000+
-  '11057_E_Creating .COM files is not supported in the current memory mod'+
-  'el. Only the tiny memory model supports',' making .COM files.'#000+
+  '11057_E_Creating .COM files is not supported ','in the current memory m'+
+  'odel. Only the tiny memory model supports making .COM files.'#000+
   '11058_W_Experimental CheckPointer option not enabled because it is inc'+
   'omptatible with -Ur option.'#000+
-  '11059_E_Unsupported target architecture -P$1, invoke the "fpc" compile'+
-  'r driver instead.'#000+
-  '11060_E_Feature switches are only ','supported while compiling the syst'+
-  'em unit.'#000+
+  '11059_E_Unsupported target architecture -P$1, invoke the "','fpc" compi'+
+  'ler driver instead.'#000+
+  '11060_E_Feature switches are only supported while compiling the system'+
+  ' unit.'#000+
   '11061_N_The selected debug format is not supported by the internal lin'+
   'ker, switching to external linking'#000+
-  '11062_E_You can not use both options ($1) ($2) at same time.'#000+
-  '11063_F_The selected FPU type "','$1" is not supported by the selected '+
-  'instruction set "$2"'#000+
+  '11062_E_You can not use both',' options ($1) ($2) at same time.'#000+
+  '11063_F_The selected FPU type "$1" is not supported by the selected in'+
+  'struction set "$2"'#000+
   '11064_E_Only one WebAssembly exception support mode can be specified.'#000+
-  '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
-  '12001_D_Processing whole program optimization ','information in wpo fee'+
-  'dback file "$1"'#000+
+  '12000_F_Cannot open whole program optimization f','eedback file "$1"'#000+
+  '12001_D_Processing whole program optimization information in wpo feedb'+
+  'ack file "$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
   ' in wpo feedback file "$1"'#000+
-  '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
-  'ck file'#000+
-  '12004_W_No handler register','ed for whole program optimization section'+
-  ' "$2" at line $1 of wpo feedback file, ignoring'#000+
+  '12003_E_Expected section header, but got ','"$2" at line $1 of wpo feed'+
+  'back file'#000+
+  '12004_W_No handler registered for whole program optimization section "'+
+  '$2" at line $1 of wpo feedback file, ignoring'#000+
   '12005_D_Found whole program optimization section "$1" with information'+
   ' about "$2"'#000+
-  '12006_F_The selected whole program optimizations require a previously',
-  ' generated feedback file (use -Fw to specify)'#000+
+  '12006','_F_The selected whole program optimizations require a previousl'+
+  'y generated feedback file (use -Fw to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
   'am optimization found'#000+
-  '12008_F_Specify a whole program optimization feedback file to store th'+
-  'e generated info in (using -FW)'#000,
+  '12008_F_Specify a whole program optimi','zation feedback file to store '+
+  'the generated info in (using -FW)'#000+
   '12009_E_Not generating any whole program optimization information, yet'+
   ' a feedback file was specified (using -FW)'#000+
-  '12010_E_Not performing any whole program optimizations, yet an input f'+
-  'eedback file was specified (using -Fw)'#000+
-  '12011_D_Skipping w','hole program optimization section "$1", because no'+
-  't needed by the requested optimizations'#000+
+  '12010_E_Not performing any whole program optimizations, yet an ','input'+
+  ' feedback file was specified (using -Fw)'#000+
+  '12011_D_Skipping whole program optimization section "$1", because not '+
+  'needed by the requested optimizations'#000+
   '12012_W_Overriding previously read information for "$1" from feedback '+
-  'input file using information in section "$2"'#000+
-  '12013_E_Cannot extract symbol liven','ess information from program when'+
-  ' stripping symbols, use -Xs-'#000+
+  'input file using',' information in section "$2"'#000+
+  '12013_E_Cannot extract symbol liveness information from program when s'+
+  'tripping symbols, use -Xs-'#000+
   '12014_E_Cannot extract symbol liveness information from program when w'+
   'hen not linking'#000+
-  '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
-  'n from linked program'#000,
+  '12015_F_Cannot find "$1" or ','"$2" to extract symbol liveness informat'+
+  'ion from linked program'#000+
   '12016_E_Error during reading symbol liveness information produced by "'+
   '$1"'#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
   'ion from linked program'#000+
-  '12018_E_Collection of symbol liveness information can only help when u'+
-  'si','ng smart linking, use -CX -XX'#000+
+  '12018_E_','Collection of symbol liveness information can only help when'+
+  ' using smart linking, use -CX -XX'#000+
   '12019_E_Cannot create specified whole program optimisation feedback fi'+
   'le "$1"'#000+
   '13001_F_Can'#039't find package $1'#000+
-  '13002_U_PCP file for package $1 found'#000+
+  '13002_U_PCP file for package $1 found'#000,
   '13003_E_Duplicate package $1'#000+
-  '13004_E_Unit $1 can not be part of ','a package'#000+
+  '13004_E_Unit $1 can not be part of a package'#000+
   '13005_N_Unit $1 is implicitely imported into package $2'#000+
   '13006_F_Failed to create PCP file $2 for package $1'#000+
   '13007_F_Failed to read PCP file for package $1'#000+
-  '13008_T_PCP loading $1'#000+
+  '13008_T_PCP',' loading $1'#000+
   '13009_U_PCP Name: $1'#000+
   '13010_U_PCP Flags: $1'#000+
-  '13011_U_P','CP Crc: $1'#000+
+  '13011_U_PCP Crc: $1'#000+
   '13012_U_PCP Time: $1'#000+
   '13013_U_PCP File too short'#000+
   '13014_U_PCP Invalid Header (no PCP at the begin)'#000+
   '13015_U_PCP Invalid Version $1'#000+
-  '13016_U_PCP is compiled for another processor'#000+
+  '13016_U_PCP is compiled for another p','rocessor'#000+
   '13017_U_PCP is compiled for another target'#000+
-  '13018_U_Writ','ing $1'#000+
+  '13018_U_Writing $1'#000+
   '13019_F_Can'#039't Write PCP-File'#000+
   '13020_F_Error reading PCP-File'#000+
   '13021_F_Unexpected end of PCP-File'#000+
   '13022_F_Invalid PCP-File entry: $1'#000+
-  '13023_U_Trying to use a unit which was compiled with a different FPU m'+
-  'ode'#000+
+  '13023_U_Trying to use a unit which was ','compiled with a different FPU'+
+  ' mode'#000+
   '13024_T_Packagesearch: $1'#000+
-  '130','25_U_Required package $1'#000+
+  '13025_U_Required package $1'#000+
   '13026_U_Contained unit $1'#000+
   '13027_E_Unit $1 is already contained in package $2'#000+
   '13028_W_Unit $1 is imported from indirectly required package $2'#000+
-  '13029_U_PPL filename $1'#000+
-  '11023_Free Pascal Compiler version $FPCFULLVERSION',' [$FPCDATE] for $F'+
-  'PCCPU'#010+
+  '13029_U_PP','L filename $1'#000+
+  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
+  'CPU'#010+
   'Copyright (c) 1993-2021 by Florian Klaempfl and others'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler date      : $FPCDATE'#010+
-  'Compiler CPU target: $FPCCPU'#010+
+  'Compiler CPU target',': $FPCCPU'#010+
   #010+
-  'Supported targets (targets marked with '#039'{*}'#039' are unde','r devel'+
-  'opment):'#010+
+  'Supported targets (targets marked with '#039'{*}'#039' are under develop'+
+  'ment):'#010+
   '  $OSTARGETS'#010+
   #010+
   'Supported CPU instruction sets:'#010+
@@ -1422,12 +1422,12 @@ const msgtxt : array[0..000369,1..240] of char=(
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
   'Supported inline assembler modes:'#010+
-  '  $ASMMODES'#010+
+  '  $AS','MMODES'#010+
   #010+
   'Recognized compiler and RTL features:'#010+
   '  $FEATURELIST'#010+
   #010+
-  'Re','cognized modeswitches:'#010+
+  'Recognized modeswitches:'#010+
   '  $MODESWITCHES'#010+
   #010+
   'Supported ABI targets:'#010+
@@ -1438,385 +1438,382 @@ const msgtxt : array[0..000369,1..240] of char=(
   #010+
   'Supported Whole Program Optimizations:'#010+
   '  All'#010+
-  '  $WPOPTIMIZATIONS'#010+
+  '  $WPOPTIM','IZATIONS'#010+
   #010+
   'Code Generation Backend'#010+
   '  $CODEGENERATIONBACKEND'#010+
   #010+
-  'Supp','orted Microcontroller types:$\n  $CONTROLLERTYPES$\n'#010+
+  'Supported Microcontroller types:$\n  $CONTROLLERTYPES$\n'#010+
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.v2'#010+
   #010+
-  'Please report bugs in our bug tracker on:'#010+
+  'Please report bugs in our bug',' tracker on:'#010+
   '                 https://bugs.freepascal.org'#010+
   #010+
-  'More ','information may be found on our WWW pages (including directions'+
-  #010+
+  'More information may be found on our WWW pages (including directions'#010+
   'for mailing lists useful for asking questions or discussing potential'#010+
   'new features, etc.):'#010+
-  '                 https://www.freepascal.org'#000+
-  '11025_F*0*_Only options valid for the def','ault or selected platform a'+
-  're listed.'#010+
+  '                 http','s://www.freepascal.org'#000+
+  '11025_F*0*_Only options valid for the default or selected platform are'+
+  ' listed.'#010+
   '**0*_Put + after a boolean switch option to enable it, - to disable it'+
   '.'#010+
-  '**1@<x>_Read compiler options from <x> in addition to the default fpc.'+
-  'cfg'#010+
-  '**1a_The compiler does not delete the generated assemble','r file, auto'+
-  'matically switches to external assembler writer'#010+
+  '**1@<x>_Read compiler options from <x> in addition to the default ','fp'+
+  'c.cfg'#010+
+  '**1a_The compiler does not delete the generated assembler file, automa'+
+  'tically switches to external assembler writer'#010+
   '**2a5_Don'#039't generate Big Obj COFF files for GNU Binutils older tha'+
   'n 2.25 (Windows, NativeNT)'#010+
-  '**2al_List sourcecode lines in assembler file'#010+
-  '**2an_List node info in assembler file (-','dEXTDEBUG compiler)'#010+
+  '**2al_List sourcecode l','ines in assembler file'#010+
+  '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+
   '**2ao_Add an extra option to external assembler call (ignored for inte'+
   'rnal)'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List register allocation/release info in assembler file'#010+
-  '**2at_List temp allo','cation/release info in assembler file'#010+
+  '**2ar_List registe','r allocation/release info in assembler file'#010+
+  '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
   '3*2Aas-darwin_Assemble Darwin Mach-O using GNU GAS'#010+
-  '3*2Acoff_COFF (Go32v2) using internal writer'#010+
-  '3*2Aelf_ELF (Linux) ','using internal writer'#010+
+  '3','*2Acoff_COFF (Go32v2) using internal writer'#010+
+  '3*2Aelf_ELF (Linux) using internal writer'#010+
   '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
   '3*2Anasm_Assemble using Nasm'#010+
-  '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
-  '3*2Anasmdarwin_macho32 object file using Na','sm (experimental)'#010+
+  '3*2Anasmcoff_COFF (Go3','2v2) file using Nasm'#010+
+  '3*2Anasmdarwin_macho32 object file using Nasm (experimental)'#010+
   '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_Obj file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
-  '3*2Anasmwin32_Win32 object file using Nasm'#010+
+  '3*2Anasmwin32_Win32 object file usi','ng Nasm'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
-  '3*2Atas','m_Obj file using Tasm (Borland)'#010+
+  '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
   '3*2Ayasm_Assemble using Yasm (experimental)'#010+
   '4*2Aas_Assemble using GNU AS'#010+
-  '4*2Aas-darwin_Assemble Darwin Mach-O using GNU GAS'#010+
-  '4*2Aelf_ELF (Linux-64bit) using internal write','r'#010+
+  '4*2Aas-darwin_Assemble Darwin Mac','h-O using GNU GAS'#010+
+  '4*2Aelf_ELF (Linux-64bit) using internal writer'#010+
   '4*2Agas_Assemble using GNU GAS'#010+
   '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
   '4*2Anasm_Assemble using Nasm (experimental)'#010+
-  '4*2Anasmdarwin_Assemble darwin macho64 object file using Nasm (experim'+
-  'ental)'#010+
-  '4*2Anasmelf_Assemble Linux-64bit obj','ect file using Nasm (experimenta'+
-  'l)'#010+
+  '4*2Anasmdarwin_Assemble darwin macho64 object fil','e using Nasm (exper'+
+  'imental)'#010+
+  '4*2Anasmelf_Assemble Linux-64bit object file using Nasm (experimental)'+
+  #010+
   '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+
   '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
-  '4*2Ayasm_Assemble using Yasm (experimental)'#010+
+  '4*2Ayasm_Assemble using Y','asm (experimental)'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Agas_GNU M','otorola assembler'#010+
+  '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*2Avasm_Use vasm to assemble'#010+
   '8*2Anasm_Assemble using Nasm'#010+
   '8*2Anasmobj_Assemble using Nasm'#010+
-  'A*2Aas_Assemble using GNU AS'#010+
-  'A*2Aas-darwin_Assemble using GNU AS f','or Darwin targets'#010+
+  'A*','2Aas_Assemble using GNU AS'#010+
+  'A*2Aas-darwin_Assemble using GNU AS for Darwin targets'#010+
   'A*2Aclang_Assemble using clang'#010+
   'A*2Aelf_Assemble using internal ELF writer'#010+
   'a*2Aas_Assemble using GNU AS'#010+
   'a*2Aas-clang_Assemble using clang for other targets'#010+
-  'a*2Aclang_Assemble using clang for darwin/ios targets'#010+
-  'P*2Aas_Assemb','le using GNU AS'#010+
+  'a*2','Aclang_Assemble using clang for darwin/ios targets'#010+
+  'P*2Aas_Assemble using GNU AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
   's*2Aas_Assemble using GNU AS'#010+
   'v*2Aas_Assemble using GNU AS'#010+
   'W*2Abinaryen_Assemble using GNU AS for wasm32 (wasm-as)'#010+
-  'W*2Allvm-mc_Assemble using llvm-mc'#010+
+  'W*2Allvm-mc_Assem','ble using llvm-mc'#010+
   'W*2Awabt_Assemble using wasa'#010+
-  'x*2Aas_Assemble u','sing GNU AS'#010+
+  'x*2Aas_Assemble using GNU AS'#010+
   'Z*2Asdcc-sdasz80_Assemble using SDCC-SDASZ80'#010+
   'Z*2Avasm_Assemble using Vasm'#010+
   'Z*2Az80asm_Assemble using z80asm'#010+
   '**1b_Generate browser info'#010+
-  '**2bl_Generate local symbol info'#010+
+  '**2bl_Generate local symbol in','fo'#010+
   '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
-  '**2C3','_Turn on ieee error checking for constants'#010+
+  '**2C3_Turn on ieee error checking for constants'#010+
   '**2Ca<x>_Select ABI; see fpc -i or fpc -ia for possible values'#010+
-  '**2Cb_Generate code for a big-endian variant of the target architectur'+
+  '**2Cb_Generate code for a big-endian variant of the target architectur',
   'e'#010+
   '**2Cc<x>_Set default calling convention to <x>'#010+
-  '**2CD_Create al','so dynamic library (not supported)'#010+
+  '**2CD_Create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
   '**2CE_Generate FPU code which can raise exceptions'#010+
-  '**2Cf<x>_Select fpu instruction set to use; see fpc -i or fpc -if for '+
-  'possible values'#010+
-  '**2CF<x>_Mini','mal floating point constant precision (default, 32, 64)'+
-  #010+
+  '**2Cf<x>_Select fpu instruction set',' to use; see fpc -i or fpc -if fo'+
+  'r possible values'#010+
+  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>[,m]_<n> bytes min heap size (between 1023 and 67107840) and o'+
-  'ptionally [m] max heap size'#010+
+  'ptionally [m] max heap siz','e'#010+
   '**2Ci_IO-checking'#010+
-  'A*2CI<x>_Select instruction set on ARM: ARM ','or THUMB'#010+
+  'A*2CI<x>_Select instruction set on ARM: ARM or THUMB'#010+
   'L*2Cl<x>_LLVM code generation options'#010+
   'L*3Clflto_Enable Link-time optimisation (needed both when compiling un'+
   'its and programs/libraries)'#010+
-  'L*3Clfltonosystem_Disable LTO for the system unit (needed with at leas'+
-  't Xcode 10.2 and earlier ','due to linker bugs)'#010+
+  'L*3Clfltonosystem_Disable LTO f','or the system unit (needed with at le'+
+  'ast Xcode 10.2 and earlier due to linker bugs)'#010+
   'L*3Clv<x>_LLVM target version: Xcode-10.1, 7.0, 8.0, .., 10.0'#010+
   '**2Cn_Omit linking stage'#010+
   'P*2CN_Generate nil-pointer checks (AIX-only)'#010+
-  '**2Co_Check overflow of integer operations'#010+
-  '**2CO_Check for possible overflow of integer ','operations'#010+
+  '**2Co_Check overflow of ','integer operations'#010+
+  '**2CO_Check for possible overflow of integer operations'#010+
   '**2Cp<x>_Select instruction set; see fpc -i or fpc -ic for possible va'+
   'lues'#010+
   '**2CP<x>=<y>_ packing settings'#010+
-  '**3CPPACKENUM=<y>_ <y> enum packing: 0, 1, 2 and 4 or DEFAULT or NORMA'+
-  'L'#010+
-  '**3CPPACKRECORD=<y>_ <y> record packing: 0 or DEFAU','LT or NORMAL, 1, '+
-  '2, 4, 8, 16 and 32'#010+
+  '**3CPPACKENUM=<y>_ <y> enum packing: 0, 1, 2 and 4 or DEFAU','LT or NOR'+
+  'MAL'#010+
+  '**3CPPACKRECORD=<y>_ <y> record packing: 0 or DEFAULT or NORMAL, 1, 2,'+
+  ' 4, 8, 16 and 32'#010+
   '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
-  '**2Cs<n>_Set stack checking size to <n>'#010+
-  '**2Ct_Stack checking (for ','testing only, see manual)'#010+
+  '**','2Cs<n>_Set stack checking size to <n>'#010+
+  '**2Ct_Stack checking (for testing only, see manual)'#010+
   '8*2CT<x>_Target-specific code generation options'#010+
   '3*2CT<x>_Target-specific code generation options'#010+
   '4*2CT<x>_Target-specific code generation options'#010+
-  'p*2CT<x>_Target-specific code generation options'#010+
-  'P*2CT<x>_Target-sp','ecific code generation options'#010+
+  'p*2','CT<x>_Target-specific code generation options'#010+
+  'P*2CT<x>_Target-specific code generation options'#010+
   'J*2CT<x>_Target-specific code generation options'#010+
   'A*2CT<x>_Target-specific code generation options'#010+
-  'W*2CT<x>_Target-specific code generation options'#010+
-  'p*3CTsmalltoc_ Generate smaller TOCs at the expense of executi','on spe'+
-  'ed (AIX)'#010+
+  'W*2CT<x>_Target-specific code generation option','s'#010+
+  'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
+  ' (AIX)'#010+
   'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
   'J*3CTautogetterprefix=X_  Automatically create getters for properties '+
+  'with prefix X ','(empty string disables)'#010+
+  'J*3CTautosetterprefix=X_  Automatically create setters for properties '+
   'with prefix X (empty string disables)'#010+
-  'J*3CTautosetterprefix=X_  Automatically ','create setters for propertie'+
-  's with prefix X (empty string disables)'#010+
   '8*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
-  '3*3CTcld_                 Emit a CLD instruction before using the x86 '+
-  'string instr','uctions'#010+
+  '3*3CTcld_         ','        Emit a CLD instruction before using the x8'+
+  '6 string instructions'#010+
   '4*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
   '8*3CTfarprocspushoddbp_       Increment BP before pushing it in the pr'+
-  'ologue of far functions'#010+
-  'J*3CTcompactintarrayinit_ Generate smaller (but ','potentially slower) '+
-  'code for initializing integer array constants'#010+
+  'ologue o','f far functions'#010+
+  'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+
+  'de for initializing integer array constants'#010+
   'J*3CTenumfieldinit_       Initialize enumeration fields in constructor'+
-  's to enumtype(0), after calling inherited constructors'#010+
-  'J*3CTinitlocals_          Initialize local variab','les that trigger a '+
-  'JVM bytecode verification error if used uninitialized (slows down code'+
-  ')'#010+
+  's to enumtype(0), after calling inherite','d constructors'#010+
+  'J*3CTinitlocals_          Initialize local variables that trigger a JV'+
+  'M bytecode verification error if used uninitialized (slows down code)'#010+
   'J*3CTlowercaseprocstart_  Lowercase the first character of procedure/f'+
-  'unction/method names'#010+
-  'A*3CTthumbinterworking_ Generate Thumb interworking-safe c','ode if pos'+
-  'sible'#010+
+  'unction/method ','names'#010+
+  'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possi'+
+  'ble'#010+
   'W*3CTnoexceptions_        Disable the exception support. Raising an ex'+
   'ception will abort the program.'#010+
-  'W*3CTbfexceptions_        Enable the branchful exception support for W'+
-  'ebAssembly'#010+
-  'W*3CTjsexceptions_        Enable the Java','Script-based exception supp'+
-  'ort for WebAssembly'#010+
+  'W*3CTbfexceptions_        Enable the branchful exception s','upport for'+
+  ' WebAssembly'#010+
+  'W*3CTjsexceptions_        Enable the JavaScript-based exception suppor'+
+  't for WebAssembly'#010+
   'W*3CTwasmexceptions_      Enable the native WebAssembly exceptions sup'+
   'port'#010+
   'J*2Cv_Var/out parameter copy-out checking'#010+
-  'A*2CV<x>_Set section threadvar model to <x>'#010+
-  '**2CX_Create also smartlinked li','brary'#010+
+  'A*2CV<x>_Set',' section threadvar model to <x>'#010+
+  '**2CX_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
   '**2DD<x>_Set the date string returned by %DATE% to x, it is not checke'+
-  'd for being a valid date string'#010+
-  '**2DT<x>_Set the time string returned by %TI','ME% to x, it is not chec'+
-  'ked for being a valid time string'#010+
+  'd for being ','a valid date string'#010+
+  '**2DT<x>_Set the time string returned by %TIME% to x, it is not checke'+
+  'd for being a valid time string'#010+
   '**2Dv<x>_Set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
-  '**1fPIC_Same as -Cg'#010+
+  '**1fPIC_Same as -','Cg'#010+
   '**1F<x>_Set file names and paths:'#010+
-  '**2Fa<x>[,y]_(for a program',') load units <x> and [y] before uses is p'+
-  'arsed'#010+
+  '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
+  'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
-  '**2Fd_Disable the compiler'#039's internal directory cache'#010+
-  '**2FD<x>_Set the directory where to search for compiler util','ities'#010+
+  '**2Fd_Disable the compiler'#039's internal directory ca','che'#010+
+  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
   '**2Ff<x>_Add <x> to framework path (Darwin only), or set IDF path to <'+
-  'x> (Xtensa-FreeRTOS)'#010+
-  '**2FF_Use fpcres as RC to RES compiler instead of windres or gor','c'#010+
+  'x> (Xtensa-FreeRTOS)'#010,
+  '**2FF_Use fpcres as RC to RES compiler instead of windres or gorc'#010+
   '**2Fi<x>_Add <x> to include path'#010+
   '**2Fl<x>_Add <x> to library path'#010+
   '**2FL<x>_Use <x> as dynamic linker'#010+
   '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
   'r'#010+
-  '**2FM<x>_Set the directory where to search for unicode binary fil','es'#010+
+  '*','*2FM<x>_Set the directory where to search for unicode binary files'#010+
   '**2FN<x>_Add <x> to list of default unit scopes (namespaces)'#010+
   '**2Fo<x>_Add <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
-  '**2FR<x>_Set resource (.res) linker to <x>'#010+
+  '**2FR<x>_Set resource (.res) linker to <x>'#010,
   '**2Fu<x>_Add <x> to unit path'#010+
-  '**2FU<x>_Set unit output path to <','x>, overrides -FE'#010+
+  '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
   '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
-  '*g1g_Generate debug information (default format for target)'#010+
-  '*g2gc_Generate ch','ecks for pointers (experimental, only available on '+
-  'some targets, might generate false positive)'#010+
+  '*g1g_Generate',' debug information (default format for target)'#010+
+  '*g2gc_Generate checks for pointers (experimental, only available on so'+
+  'me targets, might generate false positive)'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*g2gl_Use line info unit (show more info with backtraces)'#010+
-  '*g2gm_Generate Microso','ft CodeView debug information (experimental)'#010+
+  '*g2gl_Use line i','nfo unit (show more info with backtraces)'#010+
+  '*g2gm_Generate Microsoft CodeView debug information (experimental)'#010+
   '*g2go<x>_Set debug information options'#010+
   '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+
-  '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
-  'ame'#010+
-  '*g3godwarfomflinnum_ Genera','te line number information in OMF LINNUM '+
-  'records in MS LINK format in addition to the DWARF debug information ('+
-  'Open Watcom Debugger/Linker compatibility)'#010+
-  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
-  'aks gdb < 6.5)'#010+
-  '*g3gostab','sabsincludes_ Store absolute/full include file paths in Sta'+
-  'bs'#010+
+  '*g3godwarfmethodclassprefix_ Prefix m','ethod names in DWARF with class'+
+  ' name'#010+
+  '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+
+  'cords in MS LINK format in addition to the DWARF debug information (Op'+
+  'en Watcom Debugger/Linker compatibility)'#010+
+  '*g3godwarfsets_ Enable',' DWARF '#039'set'#039' type debug information (b'+
+  'reaks gdb < 6.5)'#010+
+  '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
+  #010+
   '*g2gp_Preserve case in stabs symbol names'#010+
   '*g2gs_Generate Stabs debug information'#010+
-  '*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+
-  't'#039' changes the trashing valu','e)'#010+
+  '*g2gt_Trash local variables (to d','etect uninitialized uses; multiple '+
+  #039't'#039' changes the trashing value)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
-  '*g2gw3_Generate DWARFv3 debug information'#010+
-  '*g2gw4_Generate DWARFv4 debug information (exper','imental)'#010+
+  '*g2gw3_Generate DWARFv3 de','bug information'#010+
+  '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
   '**1i_Information'#010+
   '**2ia_Return list of supported ABI targets'#010+
   '**2ib_Return the used code generation backend type'#010+
   '**2ic_Return list of supported CPU instruction sets'#010+
-  '**2iD_Return compiler date'#010+
-  '**2if_Return list of supported FPU instru','ction sets'#010+
+  '**2i','D_Return compiler date'#010+
+  '**2if_Return list of supported FPU instruction sets'#010+
   '**2ii_Return list of supported inline assembler modes'#010+
   '**2im_Return list of supported modeswitches'#010+
   '**2io_Return list of supported optimizations'#010+
-  '**2ir_Return list of recognized compiler and RTL features'#010+
+  '**2ir_Return list of r','ecognized compiler and RTL features'#010+
   '**2iSO_Return compiler OS'#010+
-  '**','2iSP_Return compiler host processor'#010+
+  '**2iSP_Return compiler host processor'#010+
   '**2it_Return list of supported targets'#010+
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
-  '**2iu_Return list of supported microcontroller types'#010+
+  '**2iu_Return list of supported microcontroller',' types'#010+
   '**2iV_Return short compiler version'#010+
-  '**2iw_Return list of ','supported whole program optimizations'#010+
+  '**2iw_Return list of supported whole program optimizations'#010+
   '**2iW_Return full compiler version'#010+
   '**1I<x>_Add <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_Write logo'#010+
-  '**1M<x>_Set language mode to <x> / enable modeswitch <x> (see option -'+
-  'im)'#010+
-  '**2Mdelphi_Del','phi 7 compatibility mode'#010+
+  '**1M<x>_Set language mod','e to <x> / enable modeswitch <x> (see option'+
+  ' -im)'#010+
+  '**2Mdelphi_Delphi 7 compatibility mode'#010+
   '**2Mdelphiunicode_Delphi 2009 and later compatibility mode'#010+
   '**2Mextendedpascal_ISO 10206 mode'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
-  '**2Miso_ISO 7185 mode'#010+
+  '**2Miso_ISO 7185 mod','e'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
-  '**2Mob','jfpc_FPC mode with Object Pascal support'#010+
+  '**2Mobjfpc_FPC mode with Object Pascal support'#010+
   '**2Mtp_TP/BP 7.0 compatibility mode'#010+
   '**2*_Each mode (as listed above) enables its default set of modeswitch'+
   'es.'#010+
-  '**2*_Other modeswitches are disabled and need to be enabled one by ano'+
-  'ther.'#010+
-  '**1M<x>-_Disa','ble modeswitch <x> (see option -im)'#010+
+  '**2*_Other modeswitches a','re disabled and need to be enabled one by a'+
+  'nother.'#010+
+  '**1M<x>-_Disable modeswitch <x> (see option -im)'#010+
   '**1n_Do not read the default config files'#010+
   '**1o<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
-  '**2O-_Disable optimizations'#010+
-  '**2O1_Level 1 optimizations (quick and debugger frien','dly)'#010+
+  '**2O-_Disable opt','imizations'#010+
+  '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
-  '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+
-  'pected side effects)'#010+
+  '**2O4_Level 4 optimizations (-O3 + optimizations which might',' have un'+
+  'expected side effects)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[','NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io '+
-  'for possible values'#010+
+  '**2Oo[NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io fo'+
+  'r possible values'#010+
   '**2Op<x>_Set target cpu for optimizing; see fpc -i or fpc -ic for poss'+
   'ible values'#010+
-  '**2Os_Optimize for size rather than speed'#010+
-  '**2Ow<x>_Perform whole-program opt','imization <x>; see fpc -i or fpc -'+
-  'iw for possible values'#010+
+  '**2Os_Optimi','ze for size rather than speed'#010+
+  '**2Ow<x>_Perform whole-program optimization <x>; see fpc -i or fpc -iw'+
+  ' for possible values'#010+
   '**2OW<x>_Generate whole-program optimization feedback for optimization'+
   ' <x>; see fpc -i or fpc -iw for possible values'#010+
-  '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
-  'F*1P<','x>_Target CPU / compiler related options:'#010+
+  '*','*1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
+  'F*1P<x>_Target CPU / compiler related options:'#010+
   'F*2PB_Show default compiler binary'#010+
   'F*2PP_Show default target cpu'#010+
-  'F*2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipse'+
-  'l,powerpc,powerpc64,sparc,x86_64)'#010+
-  '**1R<x>_Assembler reading sty','le:'#010+
+  'F*2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mips',
+  'el,powerpc,powerpc64,sparc,x86_64)'#010+
+  '**1R<x>_Assembler reading style:'#010+
   '**2Rdefault_Use default assembler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
   '4*2Ratt_Read AT&T style assembler'#010+
-  '4*2Rintel_Read Intel style assembler'#010+
+  '4*2Rintel_Read Intel s','tyle assembler'#010+
   '8*2Ratt_Read AT&T style assembler'#010+
-  '8*2Rintel_Read ','Intel style assembler'#010+
+  '8*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read Motorola style assembler'#010+
   '**1s_Do not call assembler and linker'#010+
   '**2sh_Generate script to link on host, automatically switches to exter'+
-  'nal assembler writer'#010+
-  '**2sr_Skip register allocation phase (use with -alr','), automatically '+
-  'switches to external assembler writer'#010+
+  'nal asse','mbler writer'#010+
+  '**2sr_Skip register allocation phase (use with -alr), automatically sw'+
+  'itches to external assembler writer'#010+
   '**2st_Generate script to assemble and link on target, automatically sw'+
   'itches to external assembler writer'#010+
-  '**2sT_Generate script only to link on target'#010+
+  '**2sT_Generate ','script only to link on target'#010+
   '**1S<x>_Syntax options:'#010+
-  '**2S2_Same',' as -Mobjfpc'#010+
+  '**2S2_Same as -Mobjfpc'#010+
   '**2Sa_Turn on assertions'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
   '**2Sd_Same as -Mdelphi'#010+
   '**2Se<x>_Error options. <x> is a combination of the following:'#010+
-  '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
-  '**3*_','h : Compiler also halts after hints'#010+
+  '**3','*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
+  '**3*_h : Compiler also halts after hints'#010+
   '**3*_n : Compiler also halts after notes'#010+
   '**3*_w : Compiler also halts after warnings'#010+
-  '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc -'+
-  'ir for possible values)'#010+
-  '**2Sg_Enable LABEL and GO','TO (default in -Mtp and -Mdelphi)'#010+
+  '**2Sf_Enable certain features in compiler and RTL; see ','fpc -i or fpc'+
+  ' -ir for possible values)'#010+
+  '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use reference counted strings (ansistring by default) instead of'+
   ' shortstrings'#010+
-  '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
+  '**2Si_Turn on inlining of procedures/functions declared as',' "inline"'#010+
   '**2SI<x>_Set interface style to <x>'#010+
-  '**3SIcom_COM compa','tible interface (default)'#010+
+  '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
   '**2Sj_Allows typed constants to be writeable (default in all modes)'#010+
   '**2Sk_Load fpcylix unit'#010+
-  '**2Sm_Support macros like C (global)'#010+
+  '**2Sm_Support macros',' like C (global)'#010+
   '**2So_Same as -Mtp'#010+
-  '**2Sr_Transparent file names',' in ISO mode'#010+
+  '**2Sr_Transparent file names in ISO mode'#010+
   '**2Ss_Constructor name must be init (destructor must be done)'#010+
   '**2Sv_Support vector processing (use CPU vector extensions if availabl'+
   'e)'#010+
-  '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
-  '**2Sy_@<pointer> returns a ','typed pointer, same as $T+'#010+
+  '**2Sx_Enable exception keywo','rds (default in Delphi/ObjFPC modes)'#010+
+  '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
   '**1T<x>_Target operating system:'#010+
   '3*2Tandroid_Android'#010+
   '3*2Taros_AROS'#010+
   '3*2Tbeos_BeOS'#010+
   '3*2Tdarwin_Darwin/Mac OS X'#010+
   '3*2Tembedded_Embedded'#010+
-  '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
+  '3*2Temx_OS/2 via EM','X (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Ve','rsion 2 of DJ Delorie DOS extender'#010+
+  '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Thaiku_Haiku'#010+
   '3*2Tiphonesim_iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tdar'+
   'win)'#010+
   '3*2Tlinux_Linux'#010+
-  '3*2Tnativent_Native NT API (experimental)'#010+
+  '3*2Tnativent_Native NT API (experi','mental)'#010+
   '3*2Tnetbsd_NetBSD'#010+
-  '3*2Tnetware_Novell Netware Module (cli','b)'#010+
+  '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsolaris_Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2Twatcom_Watcom compatible DOS extender'#010+
+  '3*2Twatcom_Watcom compatible DOS extender',#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
-  '3*2Twince','_Windows CE'#010+
+  '3*2Twince_Windows CE'#010+
   '4*2Tandroid_Android'#010+
   '4*2Taros_AROS'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
@@ -1824,10 +1821,10 @@ const msgtxt : array[0..000369,1..240] of char=(
   '4*2Tembedded_Embedded'#010+
   '4*2Tfreebsd_FreeBSD'#010+
   '4*2Thaiku_Haiku'#010+
-  '4*2Tiphonesim_iPhoneSimulator'#010+
+  '4*2Tiphonesim_iPh','oneSimulator'#010+
   '4*2Tlinux_Linux'#010+
   '4*2Tnetbsd_NetBSD'#010+
-  '4*2Topenbsd_OpenB','SD'#010+
+  '4*2Topenbsd_OpenBSD'#010+
   '4*2Tsolaris_Solaris'#010+
   '4*2Twin64_Win64 (64 bit Windows systems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
@@ -1835,9 +1832,9 @@ const msgtxt : array[0..000369,1..240] of char=(
   '6*2Tembedded_Embedded'#010+
   '6*2Tlinux_Linux'#010+
   '6*2Tnetbsd_NetBSD'#010+
-  '6*2Tmacosclassic_Classic Mac OS'#010+
+  '6*2T','macosclassic_Classic Mac OS'#010+
   '6*2Tpalmos_PalmOS'#010+
-  '6*2Tsinclairql_Sin','clair QL'#010+
+  '6*2Tsinclairql_Sinclair QL'#010+
   '8*2Tembedded_Embedded'#010+
   '8*2Tmsdos_MS-DOS (and compatible)'#010+
   '8*2Twin16_Windows 16 Bit'#010+
@@ -1845,10 +1842,10 @@ const msgtxt : array[0..000369,1..240] of char=(
   'A*2Taros_AROS'#010+
   'A*2Tembedded_Embedded'#010+
   'A*2Tfreertos_FreeRTOS'#010+
-  'A*2Tgba_Game Boy Advance'#010+
+  'A*2Tgba_','Game Boy Advance'#010+
   'A*2Tios_iOS'#010+
   'A*2Tlinux_Linux'#010+
-  'A*2Tnds_Nintendo DS',#010+
+  'A*2Tnds_Nintendo DS'#010+
   'A*2Tnetbsd_NetBSD'#010+
   'A*2Tpalmos_PalmOS'#010+
   'A*2Tsymbian_Symbian'#010+
@@ -1858,10 +1855,10 @@ const msgtxt : array[0..000369,1..240] of char=(
   'a*2Tfreebsd_FreeBSD'#010+
   'a*2Tios_iOS'#010+
   'a*2Tlinux_Linux'#010+
-  'a*2Twin64_Windows 64'#010+
+  'a*2','Twin64_Windows 64'#010+
   'J*2Tandroid_Android'#010+
   'J*2Tjava_Java'#010+
-  'm*2Tandroid_','Android'#010+
+  'm*2Tandroid_Android'#010+
   'm*2Tembedded_Embedded'#010+
   'm*2Tlinux_Linux'#010+
   'M*2Tembedded_Embedded'#010+
@@ -1870,10 +1867,10 @@ const msgtxt : array[0..000369,1..240] of char=(
   'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
   'P*2Tembedded_Embedded'#010+
-  'P*2Tlinux_Linux'#010+
+  'P*2Tlinux_Lin','ux'#010+
   'P*2Tmacosclassic_Classic Mac OS'#010+
   'P*2Tmorphos_MorphOS'#010+
-  'P*2Tnetbs','d_NetBSD'#010+
+  'P*2Tnetbsd_NetBSD'#010+
   'P*2Twii_Wii'#010+
   'p*2Taix_AIX'#010+
   'p*2Tdarwin_Darwin/Mac OS X'#010+
@@ -1883,10 +1880,10 @@ const msgtxt : array[0..000369,1..240] of char=(
   'R*2Tlinux_Linux'#010+
   'r*2Tembedded_Embedded'#010+
   'r*2Tlinux_Linux'#010+
-  'S*2Tlinux_Linux'#010+
+  'S*','2Tlinux_Linux'#010+
   'S*2Tsolaris_Solaris'#010+
   's*2Tlinux_Linux'#010+
-  'V*2Tembedded_E','mbedded'#010+
+  'V*2Tembedded_Embedded'#010+
   'x*2Tembedded_Embedded'#010+
   'x*2Tfreertos_FreeRTOS'#010+
   'x*2Tlinux_Linux'#010+
@@ -1894,158 +1891,160 @@ const msgtxt : array[0..000369,1..240] of char=(
   'Z*2Tmsxdos_MSX-DOS'#010+
   'Z*2Tzxspectrum_ZX Spectrum'#010+
   'W*2Tembedded_Embedded'#010+
-  'W*2Twasi_The WebAssembly System Interface (WASI)'#010+
-  '**1u<x>_Undefines the symbol <x>'#010,
+  'W*2Twasi_The WebAs','sembly System Interface (WASI)'#010+
+  '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
   '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters',':'#010+
+  '*','*1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_0 : Show nothing (except errors) p : Write tree.log with parse tr'+
   'ee'#010+
   '**2*_a : Show everything              q : Show message numbers'#010+
-  '**2*_b : Write file names messages    r : Rhide/GCC compatibility mode'+
-  #010+
-  '**2*_    with full path        ','       s : Show time stamps'#010+
+  '**2*_b : Write file names messages    ','r : Rhide/GCC compatibility mo'+
+  'de'#010+
+  '**2*_    with full path               s : Show time stamps'#010+
   '**2*_c : Show conditionals            t : Show tried/used files'#010+
   '**2*_d : Show debug info              u : Show unit info'#010+
-  '**2*_e : Show errors (default)        v : Write fpcdebug.txt with'#010+
-  '**2*_h : Show hints      ','                 lots of debugging info'#010+
+  '**2*_e : Show errors (defau','lt)        v : Write fpcdebug.txt with'#010+
+  '**2*_h : Show hints                       lots of debugging info'#010+
   '**2*_i : Show general info            w : Show warnings'#010+
   '**2*_l : Show linenumbers             x : Show info about invoked tool'+
   's'#010+
-  '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
-  '**2*_n : Show ','notes                   z : Write output to stderr'#010+
+  '**2*_m<x','>,<y> : Do not show messages numbered <x> and <y>'#010+
+  '**2*_n : Show notes                   z : Write output to stderr'#010+
   'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
   'or version)'#010+
   '**1W<x>_Target-specific options (targets)'#010+
-  '3*2WA_Specify native type application (Windows)'#010+
-  '4*2WA_Specify native type',' application (Windows)'#010+
+  '3*2WA_Spe','cify native type application (Windows)'#010+
+  '4*2WA_Specify native type application (Windows)'#010+
   'A*2WA_Specify native type application (Windows)'#010+
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'a*2Wb_Create ','a bundle instead of a library (Darwin)'#010+
+  'p','*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'a*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'A*2Wb_Create a bundle instead of a library (Darwin)'#010+
   '4*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  '3*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  '3*2WB<x>_Set image base to <x> (Windows, Symb','ian)'#010+
+  '3*2WB_Create a relocatable image ','(Windows, Symbian)'#010+
+  '3*2WB<x>_Set image base to <x> (Windows, Symbian)'#010+
   '4*2WB_Create a relocatable image (Windows)'#010+
   '4*2WB<x>_Set image base to <x> (Windows)'#010+
   'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  'A*2WB<x>_Set image base to <x> (Windows, Symbian)'#010+
+  'A*2WB<x>_Set image base to <x> (Win','dows, Symbian)'#010+
   'Z*2WB<x>_Set image base to <x> (ZX Spectrum)'#010+
-  '3*2W','C_Specify console type application (EMX, OS/2, Windows)'#010+
+  '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
   '4*2WC_Specify console type application (Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
-  'P*2WC_Specify console type application (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to export fu','nctions of DLL or EXE (Windows)'#010+
+  'P*2WC_Specify console ','type application (Classic Mac OS)'#010+
+  '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  '3*2We_Use external resources (Darwin)'#010+
+  '3*2We_Use external r','esources (Darwin)'#010+
   '4*2We_Use external resources (Darwin)'#010+
-  'a*2We_Us','e external resources (Darwin)'#010+
+  'a*2We_Use external resources (Darwin)'#010+
   'A*2We_Use external resources (Darwin)'#010+
   'P*2We_Use external resources (Darwin)'#010+
   'p*2We_Use external resources (Darwin)'#010+
-  '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
-  '3*2WG_Specify graphic type application (E','MX, OS/2, Windows)'#010+
+  '3*2WF_Specify full-screen type a','pplication (EMX, OS/2)'#010+
+  '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
   '4*2WG_Specify graphic type application (Windows)'#010+
   'A*2WG_Specify graphic type application (Windows)'#010+
   'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
-  '3*2Wi_Use internal resources (Darwin)'#010+
-  '4*2Wi_Use internal resources ','(Darwin)'#010+
+  '3*2','Wi_Use internal resources (Darwin)'#010+
+  '4*2Wi_Use internal resources (Darwin)'#010+
   'a*2Wi_Use internal resources (Darwin)'#010+
   'A*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
   'p*2Wi_Use internal resources (Darwin)'#010+
-  '3*2WI_Turn on/off the usage of import sections (Windows)'#010+
-  '4*2WI_Turn on/off the ','usage of import sections (Windows)'#010+
+  '3*2WI_Turn on/o','ff the usage of import sections (Windows)'#010+
+  '4*2WI_Turn on/off the usage of import sections (Windows)'#010+
   'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+
   'e segment)'#010+
-  '8*2Wm<x>_Set memory model'#010+
+  '8*2','Wm<x>_Set memory model'#010+
   '8*3WmTiny_Tiny memory model'#010+
-  '8*3WmSmall_Sm','all memory model (default)'#010+
+  '8*3WmSmall_Small memory model (default)'#010+
   '8*3WmMedium_Medium memory model'#010+
   '8*3WmCompact_Compact memory model'#010+
   '8*3WmLarge_Large memory model'#010+
   '8*3WmHuge_Huge memory model'#010+
-  '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
-  'n)'#010+
-  '4*2WM<x>_Minimum',' Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+
+  '3*2WM<x>_Minimum Mac OS X',' deployment version: 10.4, 10.5.1, ... (Dar'+
   'win)'#010+
-  'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+  '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+  'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '3*2WN_Do not generate relocation code',', needed for debugging (Windows'+
-  ')'#010+
+  'P*2WM<x>_Minimum Mac OS X deployment version: ','10.4, 10.5.1, ... (Dar'+
+  'win)'#010+
+  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for pos','s'+
+  'A*2','Wp<x>_Specify the controller type; see fpc -i or fpc -iu for poss'+
   'ible values'#010+
   'm*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
   'R*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
-  'V*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for pos','s'+
+  'V*2','Wp<x>_Specify the controller type; see fpc -i or fpc -iu for poss'+
   'ible values'#010+
   'x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
   '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
-  '4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+
-  'a*2WP<x>_','Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
+  '4*2WP<x>_Minim','um iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'+
+  #010+
+  'a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
-  '4*2WR_Generate relocation code (Windows)'#010+
-  'A*2WR_Generate relocation code (Win','dows)'#010+
+  '4*2WR_Genera','te relocation code (Windows)'#010+
+  'A*2WR_Generate relocation code (Windows)'#010+
   '8*2Wt<x>_Set the target executable format'#010+
   '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
   '8*3Wtexe_Create a DOS .EXE file (default)'#010+
-  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
-  '6*2WQ<x>_Set executable metadata',' format (Sinclair QL)'#010+
+  'P*2WT_Specify MPW tool ty','pe application (Classic Mac OS)'#010+
+  '6*2WQ<x>_Set executable metadata format (Sinclair QL)'#010+
   '6*3WQqhdr_Set metadata to QDOS File Header style (default)'#010+
   '6*3WQxtcc_Set metadata to XTcc style'#010+
   '**2WX_Enable executable stack (Linux)'#010+
-  '**1X_Executable options:'#010+
-  '**2X9_Generate linkerscript for GNU Binutils ld older than ','version 2'+
-  '.19.1 (Linux)'#010+
+  '**1X_Executable opti','ons:'#010+
+  '**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+
+  '9.1 (Linux)'#010+
   '**2Xa_Generate code which allows to use more than 2 GB static data on '+
   '64 Bit targets (Linux)'#010+
-  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
-  'ux)'#010+
-  '**2Xd_Do not search default library path (sometime','s required for cro'+
-  'ss-compiling when not using -XR)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, Fr','eeBSD, L'+
+  'inux)'#010+
+  '**2Xd_Do not search default library path (sometimes required for cross'+
+  '-compiling when not using -XR)'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
   '**2Xe_Use external linker'#010+
-  '**2Xf_Substitute pthread library name for linking (BSD)'#010+
-  '**2Xg_Create debuginfo in a separate fi','le and add a debuglink sectio'+
-  'n to executable'#010+
+  '**2Xf_Substitute pthread librar','y name for linking (BSD)'#010+
+  '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
+  'to executable'#010+
   '**2Xi_Use internal linker'#010+
   'L*2XlS<x>_LLVM utilties suffix (e.g. -7 in case clang is called clang-'+
   '7)'#010+
-  '**2XLA_Define library substitutions for linking'#010+
-  '**2XLD_Exclude default order of standard librari','es'#010+
+  '**2XLA_Define library substituti','ons for linking'#010+
+  '**2XLD_Exclude default order of standard libraries'#010+
   '**2XLO_Define order of library linking'#010+
   '**2Xm_Generate link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+
-  #010+
-  'F*2Xp<x>_First search for the c','ompiler binary in the directory <x>'#010+
+  '**2Xn_Use target system native linker ','instead of GNU ld (Solaris, AI'+
+  'X)'#010+
+  'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
   '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
-  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
-  '**2XR<x>_Prepend <x> to',' all linker search paths (BeOS, Darwin, FreeB'+
-  'SD, Linux, Mac OS, Solaris)'#010+
+  'ile, see the ld ma','nual for more information) (BeOS, Linux)'#010+
+  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
+  ', Linux, Mac OS, Solaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
-  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
-  '**2Xt_Link with static libraries (-static is passed to li','nker)'#010+
+  '**2XS_Try to link units statically (default, defines FPC_LINK_S','TATIC'+
+  ')'#010+
+  '**2Xt_Link with static libraries (-static is passed to linker)'#010+
   '**2Xu_Generate executable in UF2 format  (embedded targets only)'#010+
   '**2Xv_Generate table for Virtual Entry calls'#010+
-  '**2XV_Use VLink as external linker       (default on Amiga, MorphOS)'#010+
-  '**2XX_Try to smartlink units             (defines FPC_L','INK_SMART)'#010+
+  '**2XV_Use VLink as external linker       (default on Amiga, ','MorphOS)'+
+  #010+
+  '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'