+ introduced WebAssembly branchful exceptions

compiler/globtype.pas

@@ -313,6 +313,8 @@ interface
          ts_x86_far_procs_push_odd_bp,
          { no exception support. Raising an exception will abort the program. }
          ts_wasm_no_exceptions,
+         { Branchful exceptions support. A global threadvar is checked after each function call. }
+         ts_wasm_bf_exceptions,
          { JavaScript-based exception support }
          ts_wasm_js_exceptions,
          { native WebAssembly exceptions support:
@@ -445,6 +447,7 @@ interface
          (name: 'CLD';                 hasvalue: false; isglobal: true ; define: 'FPC_ENABLED_CLD'),
          (name: 'FARPROCSPUSHODDBP';   hasvalue: false; isglobal: false; define: 'FPC_FAR_PROCS_PUSH_ODD_BP'),
          (name: 'NOEXCEPTIONS';        hasvalue: false; isglobal: true ; define: 'FPC_WASM_NO_EXCEPTIONS'),
+         (name: 'BFEXCEPTIONS';        hasvalue: false; isglobal: true ; define: 'FPC_WASM_BRANCHFUL_EXCEPTIONS'),
          (name: 'JSEXCEPTIONS';        hasvalue: false; isglobal: true ; define: 'FPC_WASM_JS_EXCEPTIONS'),
          (name: 'WASMEXCEPTIONS';      hasvalue: false; isglobal: true ; define: 'FPC_WASM_NATIVE_EXCEPTIONS')
        );

compiler/msg/errore.msg

@@ -3588,7 +3588,7 @@ option_valgrind_heaptrc_mismatch=11062_E_You can not use both options ($1) ($2)
 option_unsupported_fpu=11063_F_The selected FPU type "$1" is not supported by the selected instruction set "$2"
 % Not all instruction sets support all FPU types. For example on ARM, Thumb(-1) supports no FPU/VFP instruction set
 option_too_many_exception_modes=11064_E_Only one WebAssembly exception support mode can be specified.
-% Only one WebAssembly exception support mode (NOEXCEPTIONS, JSEXCEPTIONS or NATIVEEXCEPTIONS) can be specified.
+% Only one WebAssembly exception support mode (NOEXCEPTIONS, JSEXCEPTIONS, BFEXCEPTIONS or NATIVEEXCEPTIONS) can be specified.
 %\end{description}
 # EndOfTeX
 
@@ -3986,6 +3986,7 @@ J*3CTinitlocals_          Initialize local variables that trigger a JVM bytecode
 J*3CTlowercaseprocstart_  Lowercase the first character of procedure/function/method names
 A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possible
 W*3CTnoexceptions_        Disable the exception support. Raising an exception will abort the program.
+W*3CTbfexceptions_        Enable the branchful exception support for WebAssembly
 W*3CTjsexceptions_        Enable the JavaScript-based exception support for WebAssembly
 W*3CTwasmexceptions_      Enable the native WebAssembly exceptions support
 J*2Cv_Var/out parameter copy-out checking

compiler/msgidx.inc

@@ -1142,7 +1142,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 88552;
+  MsgTxtSize = 88633;
 
   MsgIdxMax : array[1..20] of longint=(
     28,107,361,131,99,63,147,37,223,68,

compiler/msgtxt.inc

@@ -1,8 +1,8 @@
 const msgtxt_codepage=20127;
 {$ifdef Delphi}
-const msgtxt : array[0..000368] of string[240]=(
+const msgtxt : array[0..000369] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000368,1..240] of char=(
+const msgtxt : array[0..000369,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -1610,235 +1610,237 @@ const msgtxt : array[0..000368,1..240] of char=(
   'sible'#010+
   'W*3CTnoexceptions_        Disable the exception support. Raising an ex'+
   'ception will abort the program.'#010+
-  'W*3CTjsexceptions_        Enable the JavaScript-based exception suppor'+
-  't for WebAssembly'#010+
-  'W*3CTwasmexceptions_      Enable t','he native WebAssembly exceptions s'+
-  'upport'#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*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 library'#010+
+  '**2CX_Create also smartlinked li','brary'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
-  '**2Dd<x>_Set descri','ption to <x>'#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 %TIME% to x, it is not checke'+
-  'd for being a valid time string'#010+
-  '**2Dv<x>_Set DLL versio','n to <x>'#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+
+  '**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+
   '**1F<x>_Set file names and paths:'#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+
+  '**2Fa<x>[,y]_(for a program',') load units <x> and [y] before uses is p'+
+  'arsed'#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 utilities'#010+
+  '**2FD<x>_Set the directory where to search for compiler util','ities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
-  '**2FE<x>_Set exe/unit output path 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 gorc'#010+
+  '**2FF_Use fpcres as RC to RES compiler instead of windres or gor','c'#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+
+  '**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 files'#010+
+  '**2FM<x>_Set the directory where to search for unicode binary fil','es'#010+
   '**2FN<x>_Add <x> to list of default unit scopes (namespaces)'#010+
-  '**2Fo<x>_Add <x> ','to object path'#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+
   '**2Fu<x>_Add <x> to unit path'#010+
-  '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
-  '**2Fw<x>_Load previously stored whole-program optimization feed','back '+
-  'from <x>'#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 checks for pointers (experimental, only available on so'+
-  'me targets, might generate f','alse positive)'#010+
+  '*g2gc_Generate ch','ecks for pointers (experimental, only available on '+
+  'some 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 Microsoft CodeView debug information (experimental)'#010+
-  '*g2go<x>_Set debug information optio','ns'#010+
+  '*g2gm_Generate Microso','ft 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_ Generate line number information in OMF LINNUM re'+
-  'cords in MS LINK format in addition to',' the DWARF debug information ('+
+  '*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+
-  '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
-  #010+
-  '*g2gp_Preserve case',' in stabs symbol names'#010+
+  '*g3gostab','sabsincludes_ Store absolute/full include file paths in Sta'+
+  'bs'#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 value)'#010+
+  't'#039' changes the trashing valu','e)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
-  '*g2gw_Generate DWARFv2 debug ','information (same as -gw2)'#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 (experimental)'#010+
+  '*g2gw4_Generate DWARFv4 debug information (exper','imental)'#010+
   '**1i_Information'#010+
   '**2ia_Return list of supported ABI targets'#010+
-  '**2ib_Return',' the used code generation backend type'#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 instruction sets'#010+
+  '**2if_Return list of supported FPU instru','ction sets'#010+
   '**2ii_Return list of supported inline assembler modes'#010+
-  '**2im_Return lis','t of supported modeswitches'#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+
   '**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+
+  '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#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+
+  '**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_Delphi 7 compatibility mode'#010+
-  '**2Mdelphiunicode_Delphi 2009 and later compatibility mo','de'#010+
+  '**2Mdelphi_Del','phi 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+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
-  '**2Mobjfpc_FPC mode with Object Pascal support'#010+
+  '**2Mob','jfpc_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 modeswit'+
-  'ches.'#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>-_Disable modeswitch <x> (see option -im)'#010+
+  '**1M<x>-_Disa','ble modeswitch <x> (see option -im)'#010+
   '**1n_Do not read the default config files'#010+
-  '**1','o<x>_Change the name of the executable produced to <x>'#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 friendly)'#010+
+  '**2O1_Level 1 optimizations (quick and debugger frien','dly)'#010+
   '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
-  '**2O3_Level 3 optimi','zations (-O2 + slow optimizations)'#010+
+  '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+
   'pected side effects)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io fo'+
-  'r possible values',#010+
+  '**2Oo[','NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io '+
+  'for 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 optimization <x>; see fpc -i or fpc -iw'+
-  ' for possible values'#010+
-  '**2OW<x>_Generate whole-','program optimization feedback for optimizati'+
-  'on <x>; see fpc -i or fpc -iw for possible values'#010+
+  '**2Ow<x>_Perform whole-program opt','imization <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+
+  'F*1P<','x>_Target CPU / compiler related options:'#010+
   'F*2PB_Show default compiler binary'#010+
-  'F*2P','P_Show default target cpu'#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 style:'#010+
+  '**1R<x>_Assembler reading sty','le:'#010+
   '**2Rdefault_Use default assembler for target'#010+
-  '3*2Ratt_Read AT&T style assemble','r'#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+
   '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 asse','mbler and linker'#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 sw'+
-  'itches to external assembler writer'#010+
-  '**2st_Generate script to a','ssemble and link on target, automatically '+
+  '**2sr_Skip register allocation phase (use with -alr','), automatically '+
   'switches 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+
   '**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 (*=,+=,/= an','d -=)'#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*_','h : Compiler also halts after hints'#010+
   '**3*_n : Compiler also halts after notes'#010+
-  '**3*','_w : Compiler also halts after warnings'#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 GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use reference counted strings (ansistring',' by default) instead '+
-  'of shortstrings'#010+
+  '**2Sg_Enable LABEL and GO','TO (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<x>_Set interface style to <x>'#010+
-  '**3SIcom_COM compatible interface (default)'#010+
+  '**3SIcom_COM compa','tible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2Sj_Allows type','d constants to be writeable (default in all modes)'#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+
   '**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 availa'+
-  'ble)'#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+
+  '**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*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*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
+  '3*2Tgo32v2_Ve','rsion 2 of DJ Delorie DOS extender'#010+
   '3*2Thaiku_Haiku'#010+
-  '3*2Tiphonesim_iPhoneSimulator ','from iOS SDK 3.2+ (older versions: -Td'+
-  'arwin)'#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*2Tnetbsd_NetBSD'#010+
-  '3*2Tnetware_Novell Netware Module (clib)'#010+
+  '3*2Tnetware_Novell Netware Module (cli','b)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
-  '3*2Tos2_OS/2 / e','ComStation'#010+
+  '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsolaris_Solaris'#010+
   '3*2Tsymbian_Symbian OS'#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+
-  '4*2Tdrag','onfly_DragonFly BSD'#010+
+  '4*2Tdragonfly_DragonFly BSD'#010+
   '4*2Tembedded_Embedded'#010+
   '4*2Tfreebsd_FreeBSD'#010+
   '4*2Thaiku_Haiku'#010+
   '4*2Tiphonesim_iPhoneSimulator'#010+
   '4*2Tlinux_Linux'#010+
   '4*2Tnetbsd_NetBSD'#010+
-  '4*2Topenbsd_OpenBSD'#010+
+  '4*2Topenbsd_OpenB','SD'#010+
   '4*2Tsolaris_Solaris'#010+
   '4*2Twin64_Win64 (64 bit Windows systems)'#010+
-  '6*2Tamiga_Commodo','re Amiga'#010+
+  '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tembedded_Embedded'#010+
   '6*2Tlinux_Linux'#010+
   '6*2Tnetbsd_NetBSD'#010+
   '6*2Tmacosclassic_Classic Mac OS'#010+
   '6*2Tpalmos_PalmOS'#010+
-  '6*2Tsinclairql_Sinclair QL'#010+
+  '6*2Tsinclairql_Sin','clair QL'#010+
   '8*2Tembedded_Embedded'#010+
   '8*2Tmsdos_MS-DOS (and compatible)'#010+
-  '8*2Twin16_Window','s 16 Bit'#010+
+  '8*2Twin16_Windows 16 Bit'#010+
   'A*2Tandroid_Android'#010+
   'A*2Taros_AROS'#010+
   'A*2Tembedded_Embedded'#010+
@@ -1846,12 +1848,12 @@ const msgtxt : array[0..000368,1..240] of char=(
   '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+
   'A*2Twince_Windows CE'#010+
-  'a*2','Tandroid_Android'#010+
+  'a*2Tandroid_Android'#010+
   'a*2Tdarwin_Darwin/Mac OS X'#010+
   'a*2Tfreebsd_FreeBSD'#010+
   'a*2Tios_iOS'#010+
@@ -1859,11 +1861,11 @@ const msgtxt : array[0..000368,1..240] of char=(
   'a*2Twin64_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+
-  'M*2Tlinux_Lin','ux'#010+
+  'M*2Tlinux_Linux'#010+
   'P*2Taix_AIX'#010+
   'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
@@ -1871,11 +1873,11 @@ const msgtxt : array[0..000368,1..240] of char=(
   'P*2Tlinux_Linux'#010+
   'P*2Tmacosclassic_Classic Mac OS'#010+
   'P*2Tmorphos_MorphOS'#010+
-  'P*2Tnetbsd_NetBSD'#010+
+  'P*2Tnetbs','d_NetBSD'#010+
   'P*2Twii_Wii'#010+
   'p*2Taix_AIX'#010+
   'p*2Tdarwin_Darwin/Mac OS X'#010+
-  'p*2Tembedded_Embedded',#010+
+  'p*2Tembedded_Embedded'#010+
   'p*2Tlinux_Linux'#010+
   'R*2Tembedded_Embedded'#010+
   'R*2Tlinux_Linux'#010+
@@ -1884,166 +1886,166 @@ const msgtxt : array[0..000368,1..240] of char=(
   'S*2Tlinux_Linux'#010+
   'S*2Tsolaris_Solaris'#010+
   's*2Tlinux_Linux'#010+
-  'V*2Tembedded_Embedded'#010+
+  'V*2Tembedded_E','mbedded'#010+
   'x*2Tembedded_Embedded'#010+
   'x*2Tfreertos_FreeRTOS'#010+
   'x*2Tlinux_Linux'#010+
-  'Z*2Tembedded_','Embedded'#010+
+  'Z*2Tembedded_Embedded'#010+
   '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+
+  '**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+
+  '**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*_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*_c : Show conditionals            t : Show tried/','used files'#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*_i : Show general info            w :',' Show warnings'#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+
-  'F*1V<x>_Append '#039'-<x>'#039' to the u','sed compiler binary name (e.g.'+
-  ' for version)'#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+
+  '4*2WA_Specify native type',' application (Windows)'#010+
   'A*2WA_Specify native type application (Windows)'#010+
-  '3*2Wb_Crea','te a bundle instead of a library (Darwin)'#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+
-  'A*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, Symbian)'#010+
+  '3*2WB<x>_Set image base to <x> (Windows, Symb','ian)'#010+
   '4*2WB_Create a relocatable image (Windows)'#010+
-  '4*2WB<x>_Set image base to <x> (W','indows)'#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+
   'Z*2WB<x>_Set image base to <x> (ZX Spectrum)'#010+
-  '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  '4*2WC_Specify console typ','e application (Windows)'#010+
+  '3*2W','C_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 functions of DLL or EXE (Windows)'#010+
-  '4*2WD_Use DEFFILE to export functions of DLL or E','XE (Windows)'#010+
+  '3*2WD_Use DEFFILE to export fu','nctions 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+
   '4*2We_Use external resources (Darwin)'#010+
-  'a*2We_Use external resources (Darwin)'#010+
+  'a*2We_Us','e external resources (Darwin)'#010+
   'A*2We_Use external resources (Darwin)'#010+
-  'P*2We_Use ext','ernal 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 (EMX, OS/2, Windows)'#010+
+  '3*2WG_Specify graphic type application (E','MX, OS/2, Windows)'#010+
   '4*2WG_Specify graphic type application (Windows)'#010+
-  'A*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+
+  '4*2Wi_Use internal resources ','(Darwin)'#010+
   'a*2Wi_Use internal resources (Darwin)'#010+
-  'A*2Wi_Use internal resources (Darw','in)'#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+
-  'A*2WI_Turn on/off 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*3WmTiny_Tiny memory model'#010+
-  '8*3WmSmall_Small memory model (default)'#010+
+  '8*3WmSmall_Sm','all memory model (default)'#010+
   '8*3WmMedium_Medium memory model'#010+
-  '8*3WmCompact_Compact m','emory 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, ... (Darwi'+
-  'n)'#010+
-  'p*2WM<x>_Minimum Mac OS ','X deployment version: 10.4, 10.5.1, ... (Dar'+
+  '4*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'+
+  'n)'#010+
   '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+
-  '4*2WN_Do not generate relocation code, needed fo','r debugging (Windows'+
+  '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 possib'+
+  'A*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for pos','s'+
+  'ible values'#010+
+  'm*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
-  'm*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for poss','i'+
-  'ble 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 possib'+
+  'V*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for pos','s'+
+  'ible values'#010+
+  'x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
-  'x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for poss','i'+
-  'ble 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+
-  'A*2WP<x>_Minimum iOS dep','loyment version: 3.0, 5.0.1, ... (Darwin)'#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 (Windows)'#010+
+  'A*2WR_Generate relocation code (Win','dows)'#010+
   '8*2Wt<x>_Set the target executable format'#010+
-  '8*3Wtcom_Create a DOS .COM file (','requires tiny memory model)'#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+
-  '6*3WQqhdr_Set metadata to QDOS File Header style (default)'#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.1'+
-  '9.1 (Linux)'#010+
-  '**2Xa_Generate code which allows to use more than 2 GB sta','tic data o'+
-  'n 64 Bit targets (Linux)'#010+
+  '**2X9_Generate linkerscript for GNU Binutils ld older than ','version 2'+
+  '.19.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 (sometimes required for cross'+
-  '-compiling when not using -XR)'#010+
-  '**2XD_Try to link units dynami','cally      (defines FPC_LINK_DYNAMIC)'#010+
+  '**2Xd_Do not search default library path (sometime','s required for cro'+
+  'ss-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 file and add a debuglink section '+
-  'to executable'#010+
+  '**2Xg_Create debuginfo in a separate fi','le and add a debuglink sectio'+
+  'n to executable'#010+
   '**2Xi_Use internal linker'#010+
-  'L*2XlS<x>_','LLVM utilties suffix (e.g. -7 in case clang is called clan'+
-  'g-7)'#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 libraries'#010+
+  '**2XLD_Exclude default order of standard librari','es'#010+
   '**2XLO_Define order of library linking'#010+
   '**2Xm_Generate link map'#010+
-  '**2XM<x>_Set th','e name of the '#039'main'#039' program routine (default'+
-  ' is '#039'main'#039')'#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 compiler binary in the directory <x>'#010+
-  '**2XP<x>_Prepend the binutils names with the ','prefix <x>'#010+
+  'F*2Xp<x>_First search for the c','ompiler 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, FreeBSD'+
-  ', Linux, Mac OS, Solaris)'#010+
-  '**2Xs_St','rip all symbols from executable'#010+
+  '**2XR<x>_Prepend <x> to',' all linker search paths (BeOS, Darwin, FreeB'+
+  'SD, 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 linker)'#010+
+  '**2Xt_Link with static libraries (-static is passed to li','nker)'#010+
   '**2Xu_Generate executable in UF2 format  (embedded targets only)'#010+
-  '**2Xv_Gene','rate table for Virtual Entry calls'#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_LINK_SMART)'#010+
+  '**2XX_Try to smartlink units             (defines FPC_L','INK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'