* synchronized with trunk

git-svn-id: branches/wasm@46354 -
2025-08-24 22:29:25 +02:00 · 2020-08-11 02:59:57 +00:00 · 2020-08-11 02:59:57 +00:00 · abe3b7e2fe
commit abe3b7e2fe
parent e3cd60cd10 cfff96f44c
25 changed files with 135 additions and 128 deletions
--- a/compiler/msg/errorct.msg
+++ b/compiler/msg/errorct.msg
@ -2122,7 +2122,7 @@ Aquest programa ve sota la Llic
 Per a més informació llegiu COPYING.v2
 Comuniqueu les errades, suggeriments, etc a:
-  http://bugs.freepascal.org
+  https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errord.msg
+++ b/compiler/msg/errord.msg
@ -3834,12 +3834,12 @@ Dieses Programm unterliegt der GNU General Public Licence
 Weitere Informationen sind in COPYING.v2 zu finden
 Fehlerberichte bitte senden an:
-             http://bugs.freepascal.org
+             https://bugs.freepascal.org
 Weitere Informationen stehen auf unseren WWW Seiten (einschlieálich Links zu
 Mailing-Listen, auf denen Fragen gestellt und potentielle neue Features
 diskutiert werden k”nnen, usw.):
-                 http://www.freepascal.org
+                 https://www.freepascal.org
 ]
 #
--- a/compiler/msg/errorda.msg
+++ b/compiler/msg/errorda.msg
@ -3554,7 +3554,7 @@ Dette program dækkes af reglerne for GNU General Public License
 Læs COPYING.v2 for mere information
 Indsend fejlbeskrivelser, forslag, etc til
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 For kommentarer vedrørende den danske oversættelse, skriv til
                 chrivers@iversen-net.dk
--- a/compiler/msg/errordu.msg
+++ b/compiler/msg/errordu.msg
@ -3834,12 +3834,12 @@ Dieses Programm unterliegt der GNU General Public Licence
 Weitere Informationen sind in COPYING.v2 zu finden
 Fehlerberichte bitte senden an:
-             http://bugs.freepascal.org
+             https://bugs.freepascal.org
 Weitere Informationen stehen auf unseren WWW Seiten (einschließlich Links zu
 Mailing-Listen, auf denen Fragen gestellt und potentielle neue Features
 diskutiert werden können, usw.):
-                 http://www.freepascal.org
+                 https://www.freepascal.org
 ]
 #
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@ -3786,12 +3786,12 @@ This program comes under the GNU General Public Licence
 For more information read COPYING.v2
 Please report bugs in our bug tracker on:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 More information may be found on our WWW pages (including directions
 for mailing lists useful for asking questions or discussing potential
 new features, etc.):
-                 http://www.freepascal.org
+                 https://www.freepascal.org
 ]
 #
--- a/compiler/msg/errores.msg
+++ b/compiler/msg/errores.msg
@ -3502,7 +3502,7 @@ Este programa esta bajo la licencia GNU General Public Licence
 Para mas informació lea COPYING.v2
 Para informar de errores, sugerencias, etc:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorf.msg
+++ b/compiler/msg/errorf.msg
@ -1732,7 +1732,7 @@ This program comes under the GNU General Public Licence
 For more information read COPYING.v2
 Report bugs,suggestions etc to:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorfi.msg
+++ b/compiler/msg/errorfi.msg
@ -3513,7 +3513,7 @@ Optimisations support
 Ce programme est fourni sous la License Publique Générale GNU (GNU GPL).
 Pour plus d'informations, consultez le fichier COPYING.v2.
 Rapports de bogues, suggestions, etc. à:
-    http://bugs.freepascal.org
+    https://bugs.freepascal.org
 ]
 #
 # Help pages (option -? and -h)
@ -3571,12 +3571,12 @@ This program comes under the GNU General Public Licence
 For more information read COPYING.v2
 Please report bugs in our bug tracker on:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 More information may be found on our WWW pages (including directions
 for mailing lists useful for asking questions or discussing potential
 new features, etc.):
-                 http://www.freepascal.org
+                 https://www.freepascal.org
 ]
 #
--- a/compiler/msg/errorhe.msg
+++ b/compiler/msg/errorhe.msg
@ -2435,7 +2435,7 @@ Free Pascal Compiler version $FPCVERSION
 למידע נוסף יש לקרוא את COPYING.v2
 דיווח על תקלות (באגים), הצעות וכו':
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorheu.msg
+++ b/compiler/msg/errorheu.msg
@ -3524,7 +3524,7 @@ Free Pascal Compiler version $FPCVERSION
 למידע נוסף יש לקרוא את COPYING.v2
 דיווח על תקלות (באגים), הצעות וכו':
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorid.msg
+++ b/compiler/msg/errorid.msg
@ -3532,7 +3532,7 @@ Program ini datang bersama GNU General Public Licence
 Untuk informasi lebih jauh baca COPYING.v2
 Laporkan bugs, saran, dll ke:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/erroriu.msg
+++ b/compiler/msg/erroriu.msg
@ -2731,7 +2731,7 @@ Questo programma
 Per ulteriori informazioni leggere il file COPYING.v2
 Riferire difetti, suggerimenti ecc. a:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorn.msg
+++ b/compiler/msg/errorn.msg
@ -3498,7 +3498,7 @@ Dit programma wordt verspreid onder de GNU General Public Licence
 Voor meer informatie, lees COPYING.v2. Hiervan is helaas geen
 Nederlandse vertaling beschikbaar.
-                http://bugs.freepascal.org
+                https://bugs.freepascal.org
 ]
 #
 # Help pages (option -? and -h)
--- a/compiler/msg/errorpl.msg
+++ b/compiler/msg/errorpl.msg
@ -2144,7 +2144,7 @@ Ten program jest oparty na GNU General Public Licence
 Przeczytaj COPYING.v2 aby dowiedzie† si© wi©cej
 Zg<EFBFBD>aszanie b<>©d˘w, sugestii itp.
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorpli.msg
+++ b/compiler/msg/errorpli.msg
@ -2144,7 +2144,7 @@ Ten program jest oparty na GNU General Public Licence
 Przeczytaj COPYING.v2 aby dowiedzieć się więcej
 Zgłaszanie błędów, sugestii itp.
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorpt.msg
+++ b/compiler/msg/errorpt.msg
@ -3124,7 +3124,7 @@ Este programa
 Para maiores informa‡äes leia COPYING.v2
 Reportar falhas, sugestäes, etc. para:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorptu.msg
+++ b/compiler/msg/errorptu.msg
@ -3552,7 +3552,7 @@ Este programa é oferecido sob a Licença Geral Pública GNU
 Para maiores informações leia COPYING.v2
 Reportar falhas, sugestões, etc. para:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorr.msg
+++ b/compiler/msg/errorr.msg
@ -2544,7 +2544,7 @@ This program comes under the GNU General Public Licence
 For more information read COPYING.v2
 Report bugs, suggestions, etc. to:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorru.msg
+++ b/compiler/msg/errorru.msg
@ -3425,7 +3425,7 @@ This program comes under the GNU General Public Licence
 For more information read COPYING.v2
 Report bugs, suggestions, etc. to:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msg/errorues.msg
+++ b/compiler/msg/errorues.msg
@ -3496,7 +3496,7 @@ Este programa esta bajo la licencia GNU General Public Licence
 Para mas informació lea COPYING.v2
 Para informar de errores, sugerencias, etc:
-                 http://bugs.freepascal.org
+                 https://bugs.freepascal.org
 ]
 #
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@ -1126,7 +1126,7 @@ const
  option_info=11024;
  option_help_pages=11025;
-  MsgTxtSize = 85622;
+  MsgTxtSize = 85624;
  MsgIdxMax : array[1..20] of longint=(
    28,106,356,129,99,63,143,36,223,68,
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@ -1429,68 +1429,68 @@ const msgtxt : array[0..000356,1..240] of char=(
  'For more information read COPYING.v2'#010,
  #010+
  'Please report bugs in our bug tracker on:'#010+
-  '                 http://bugs.freepascal.org'#010+
+  '                 https://bugs.freepascal.org'#010+
  #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+
+  'new features',', etc.):'#010+
-  '                 http://www.freepascal.org'#000+
+  '                 https://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 fp'+
+  '**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'#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+
+  '**2al_List sourcecode lines in assembler file'#010,
-  '**','2an_List node info in assembler file (-dEXTDEBUG compiler)'#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+
+  '**2ar_List register allocation/release in','fo 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*2Amacho_Mach-O (Darwin, ','Intel 32 bit) using internal writer'#010+
+  '3*2Amacho_Mach-O (Darwin',', Intel 32 bit) using internal writer'#010+
  '8*2Anasm_Assemble using Nasm'#010+
  '8*2Anasmobj_Assemble using Nasm'#010+
  '3*2Anasm_Assemble using Nasm'#010+
  '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
  '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
-  '3*2Anasmwin32_Win32 object fi','le using Nasm'#010+
+  '3*2Anasmwin32_Win32 object ','file using Nasm'#010+
  '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
  '3*2Anasmdarwin_macho32 object file using Nasm (experimental)'#010+
  '3*2Awasm_Obj file using Wasm (Watcom)'#010+
  '3*2Anasmobj_Obj file using Nasm'#010+
  '3*2Amasm_Obj file using Masm (Microsoft)'#010+
-  '3*2At','asm_Obj file using Tasm (Borland)'#010+
+  '3*2','Atasm_Obj file using Tasm (Borland)'#010+
  '3*2Aelf_ELF (Linux) using internal writer'#010+
  '3*2Acoff_COFF (Go32v2) using internal writer'#010+
  '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
  '3*2Ayasm_Assemble using Yasm (experimental)'#010+
-  '4*2Aas_Assemble using GNU ','AS'#010+
+  '4*2Aas_Assemble using GN','U AS'#010+
  '4*2Agas_Assemble using GNU GAS'#010+
  '4*2Aas-darwin_Assemble Darwin Mach-O using GNU GAS'#010+
  '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
  '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
  '4*2Aelf_ELF (Linux-64bit) using internal writer'#010+
-  '4*2Ayasm','_Assemble using Yasm (experimental)'#010+
+  '4*2Aya','sm_Assemble using Yasm (experimental)'#010+
  '4*2Anasm_Assemble using Nasm (experimental)'#010+
  '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+
  '4*2Anasmelf_Assemble Linux-64bit object file using Nasm (experimental)'+
  #010+
-  '4*2Anasmdarwin_Assembl','e darwin macho64 object file using Nasm (exper'+
+  '4*2Anasmdarwin_Assem','ble darwin macho64 object file using Nasm (exper'+
  'imental)'#010+
  '6*2Aas_Unix o-file using GNU AS'#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+
-  'A*2Aas_Assemble using GNU A','S'#010+
+  'A*2Aas_Assemble using GNU',' AS'#010+
  'P*2Aas_Assemble using GNU AS'#010+
  'S*2Aas_Assemble using GNU AS'#010+
  'Z*2Asdcc-sdasz80_Assemble using SDCC-SDASZ80'#010+
@ -1498,60 +1498,60 @@ const msgtxt : array[0..000356,1..240] of char=(
  '**1b_Generate browser info'#010+
  '**2bl_Generate local symbol info'#010+
  '**1B_Build all modules'#010+
-  '**1C<x>_Code genera','tion options:'#010+
+  '**1C<x>_Code gene','ration options:'#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'+
  'e'#010+
-  '**2Cc<x>_Set default calling convention to ','<x>'#010+
+  '**2Cc<x>_Set default calling convention t','o <x>'#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 v','alues'#010+
+  '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+
  '**2Ci_IO-checking'#010+
-  'A*2CI<x>_Select instructi','on set on ARM: ARM or THUMB'#010+
+  'A*2CI<x>_Select instruc','tion 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 Xcod','e 10.2 and earlier due to linker bugs)'#010+
+  't Xc','ode 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 o','verflow 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+
  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
  'and 8'#010+
-  '**3CPPACKENUM=<y>_ <y> enum ','packing: 0, 1, 2 and 4 or DEFAULT or NOR'+
+  '**3CPPACKENUM=<y>_ <y> enu','m packing: 0, 1, 2 and 4 or DEFAULT or NOR'+
  'MAL'#010+
  '**3CPPACKRECORD=<y>_ <y> record packing: 0 or DEFAULT or NORMAL, 1, 2,'+
  ' 4, 8, 16 and 32'#010+
  '**2Cr_Range checking'#010+
  '**2CR_Verify object method call validity'#010+
  '**2Cs<n>_Set stack checking size to <n>'#010+
-  '**2Ct_S','tack checking (for testing only, see manual)'#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-specific code generation optio','ns'#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+
  'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
  ' (AIX)'#010+
-  'P*3CTsmalltoc_ ','Generate smaller TOCs at the expense of execution spe'+
+  'P*3CTsmalltoc','_ Generate smaller TOCs at the expense of execution spe'+
  'ed (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 ',
+  '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+
@ -1562,24 +1562,24 @@ const msgtxt : array[0..000356,1..240] of char=(
  '8*3CTfarprocspushoddbp_       Increment BP before pushing it in the pr'+
  'ologue of far functions'#010+
  'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+
-  'de for i','nitializing integer array constants'#010+
+  '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 variables that trigger a JV'+
-  'M bytecod','e verification error if used uninitialized (slows down code'+
+  'M bytec','ode 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 code if possi'+
  'ble'#010+
-  'J*2Cv_Var/out ','parameter copy-out checking'#010+
+  'J*2Cv_Var/ou','t parameter copy-out checking'#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+
  '**2Dv<x>_Set DLL version to <x>'#010+
-  '*O2Dw_PM a','pplication'#010+
+  '*O2Dw_PM',' application'#010+
  '**1e<x>_Set path to executable'#010+
  '**1E_Same as -Cn'#010+
  '**1fPIC_Same as -Cg'#010+
@ -1587,122 +1587,122 @@ const msgtxt : array[0..000356,1..240] of char=(
  '**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 co','mpiler binary name 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+
  '**2Fe<x>_Redirect error output to <x>'#010+
  '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
-  '**2FE<x','>_Set exe/unit output path to <x>'#010+
+  '**2FE','<x>_Set exe/unit output path to <x>'#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 files'#010+
+  '**2FM<x>_Set the directory wher','e 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+
-  '**2Fu<x>_Add <x> to unit path'#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>_Store generated whole-program optimization feedback in <x>'#010+
  '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
  'om <x>'#010+
-  '*g1g_Generate debug information (default form','at for target)'#010+
+  '*g1g_Generate debug information (default fo','rmat 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 ba','cktraces)'#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 options'#010+
  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
  'aks gdb < 6.5)'#010+
-  '*g3gostabsabsincludes_ Store absolute/full incl','ude file paths in Sta'+
+  '*g3gostabsabsincludes_ Store absolute/full in','clude file paths in Sta'+
  'bs'#010+
  '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
  'ame'#010+
  '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+
  '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+
-  'cords in MS LINK ','format in addition to the DWARF debug information ('+
+  'cords in MS LIN','K format in addition to the DWARF debug information ('+
  'Open Watcom Debugger/Linker compatibility)'#010+
  '*g2gp_Preserve case in stabs symbol names'#010+
  '*g2gs_Generate Stabs debug information'#010+
-  '*g2gt_Trash local variables (to detect uninitialized uses; multip','le '+
+  '*g2gt_Trash local variables (to detect uninitialized uses; mult','iple '+
  #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 (experimental)'#010+
+  '*g2gw4_Generat','e DWARFv4 debug information (experimental)'#010+
  '**1i_Information'#010+
  '**2iD_Return compiler date'#010+
  '**2iSO_Return compiler OS'#010+
  '**2iSP_Return compiler host processor'#010+
  '**2iTO_Return target OS'#010+
  '**2iTP_Return target processor'#010+
-  '**2iV_Return short compiler version'#010,
+  '**2iV_Return short compiler versio','n'#010+
  '**2iW_Return full compiler version'#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+
  '**2if_Return list of supported FPU instruction sets'#010+
-  '**2ii_R','eturn list of supported inline assembler modes'#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+
  '**2it_Return list of supported targets'#010+
-  '**2iu_R','eturn list of supported microcontroller types'#010+
+  '**2iu','_Return list of supported microcontroller types'#010+
  '**2iw_Return list of supported whole program optimizations'#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'+
+  '**1M<x>_Set language mode to <x> / enable modeswitch <','x> (see option'+
  ' -im)'#010+
  '**2Mfpc_Free Pascal dialect (default)'#010+
  '**2Mobjfpc_FPC mode with Object Pascal support'#010+
  '**2Mdelphi_Delphi 7 compatibility mode'#010+
  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
  '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
-  '**2Mis','o_ISO 7185 mode'#010+
+  '**2M','iso_ISO 7185 mode'#010+
  '**2Mextendedpascal_ISO 10206 mode'#010+
  '**2Mdelphiunicode_Delphi 2009 and later 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 enabl','ed one by a'+
+  '**2*_Other modeswitches are disabled and need to be ena','bled 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 optimiz','ations (quick and debugger friendly)'#010+
+  '**2O1_Level 1 optim','izations (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+
+  'pected side effects)',#010+
-  '*','*2Oa<x>=<y>_Set alignment'#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+
  '**2Op<x>_Set target cpu for optimizing; see fpc -i or fpc -ic for poss'+
  'ible values'#010+
-  '**2OW<x>_Generate whole-program optimization',' feedback for optimizati'+
+  '**2OW<x>_Generate whole-program optimizati','on feedback for optimizati'+
  'on <x>; see fpc -i or fpc -iw for possible values'#010+
  '**2Ow<x>_Perform whole-program optimization <x>; see fpc -i or fpc -iw'+
  ' for possible values'#010+
  '**2Os_Optimize for size rather than speed'#010+
-  '**1pg_Generate profile code for g','prof (defines FPC_PROFILE)'#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_6','4)'#010+
+  'l,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+
-  '8*2Ratt_Read AT&T',' style assembler'#010+
+  '8*2Ratt_Read AT','&T style assembler'#010+
  '8*2Rintel_Read Intel style assembler'#010+
  '6*2RMOT_Read Motorola style assembler'#010+
  '**1S<x>_Syntax options:'#010+
@ -1710,33 +1710,33 @@ const msgtxt : array[0..000356,1..240] of char=(
  '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
  '**2Sa_Turn on assertions'#010+
  '**2Sd_Same as -Mdelphi'#010+
-  '**2S','e<x>_Error options. <x> is a combination of the following:'#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*_w : Compiler also halts after warnings'#010+
  '**3*_n : Compiler also halts after notes'#010+
-  '**3*_h : Compiler also halts after',' hints'#010+
+  '**3*_h : Compiler also halts aft','er hints'#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'+
-  ' shortstri','ngs'#010+
+  ' shortst','rings'#010+
  '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
  '**2Sj_Allows typed constants to be writeable (default in all modes)'#010+
  '**2Sk_Load fpcylix unit'#010+
  '**2SI<x>_Set interface style to <x>'#010+
-  '**3SIcom_COM compatible interface (defau','lt)'#010+
+  '**3SIcom_COM compatible interface (def','ault)'#010+
  '**3SIcorba_CORBA compatible interface'#010+
  '**2Sm_Support macros like C (global)'#010+
  '**2So_Same as -Mtp'#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 CP','U vector extensions if availa'+
+  '**2Sv_Support vector processing (use ','CPU vector extensions if availa'+
  'ble)'#010+
  '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
  '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
  '**1s_Do not call assembler and linker'#010+
  '**2sh_Generate script to link on host'#010+
-  '**2st_Gener','ate script to link on target'#010+
+  '**2st_Gen','erate script to link on target'#010+
  '**2sr_Skip register allocation phase (use with -alr)'#010+
  '**1T<x>_Target operating system:'#010+
  '3*2Tandroid_Android'#010+
@ -1744,15 +1744,15 @@ const msgtxt : array[0..000356,1..240] of char=(
  '3*2Tbeos_BeOS'#010+
  '3*2Tdarwin_Darwin/Mac OS X'#010+
  '3*2Tembedded_Embedded'#010+
-  '3*2Temx_OS/2 via EMX (includ','ing EMX/RSX extender)'#010+
+  '3*2Temx_OS/2 via EMX (incl','uding EMX/RSX extender)'#010+
  '3*2Tfreebsd_FreeBSD'#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 (experimental)',#010+
-  '3','*2Tnetbsd_NetBSD'#010+
+  '3*2Tnetbsd_NetBSD'#010+
  '3*2Tnetware_Novell Netware Module (clib)'#010+
  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
  '3*2Topenbsd_OpenBSD'#010+
@ -1760,7 +1760,7 @@ const msgtxt : array[0..000356,1..240] of char=(
  '3*2Tsymbian_Symbian OS'#010+
  '3*2Tsolaris_Solaris'#010+
  '3*2Twatcom_Watcom compatible DOS extender'#010+
-  '3*2Twdos','x_WDOSX DOS extender'#010+
+  '3*2Twd','osx_WDOSX DOS extender'#010+
  '3*2Twin32_Windows 32 Bit'#010+
  '3*2Twince_Windows CE'#010+
  '4*2Tandroid_Android'#010+
@ -1770,7 +1770,7 @@ const msgtxt : array[0..000356,1..240] of char=(
  '4*2Tembedded_Embedded'#010+
  '4*2Tfreebsd_FreeBSD'#010+
  '4*2Thaiku_Haiku'#010+
-  '4*2Tiphonesim_iPhoneSimula','tor'#010+
+  '4*2Tiphonesim_iPhoneSimu','lator'#010+
  '4*2Tlinux_Linux'#010+
  '4*2Tnetbsd_NetBSD'#010+
  '4*2Topenbsd_OpenBSD'#010+
@ -1781,7 +1781,7 @@ const msgtxt : array[0..000356,1..240] of char=(
  '6*2Tembedded_Embedded'#010+
  '6*2Tlinux_Linux'#010+
  '6*2Tnetbsd_NetBSD'#010+
-  '6*2Tmacosclas','sic_Classic Mac OS'#010+
+  '6*2Tmacoscl','assic_Classic Mac OS'#010+
  '6*2Tpalmos_PalmOS'#010+
  '8*2Tembedded_Embedded'#010+
  '8*2Tmsdos_MS-DOS (and compatible)'#010+
@ -1791,7 +1791,7 @@ const msgtxt : array[0..000356,1..240] of char=(
  'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
  'A*2Tembedded_Embedded'#010+
  'A*2Tfreertos_FreeRTOS'#010+
-  'A*2Tgba_Game ','Boy Advance'#010+
+  'A*2Tgba_Gam','e Boy Advance'#010+
  'A*2Tlinux_Linux'#010+
  'A*2Tnds_Nintendo DS'#010+
  'A*2Tnetbsd_NetBSD'#010+
@ -1803,8 +1803,8 @@ const msgtxt : array[0..000356,1..240] of char=(
  'a*2Tlinux_Linux'#010+
  'a*2Twin64_Windows 64'#010+
  'J*2Tandroid_Android'#010+
-  'J*2Tjava_Java'#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+
@ -1815,7 +1815,7 @@ const msgtxt : array[0..000356,1..240] of char=(
  'P*2Tembedded_Embedded'#010+
  'P*2Tlinux_Linux'#010+
  'P*2Tmacosclassic_Classic Mac OS'#010+
-  'P*2Tmorphos_MorphOS',#010+
+  'P*2Tmorphos_Morph','OS'#010+
  'P*2Tnetbsd_NetBSD'#010+
  'P*2Twii_Wii'#010+
  'p*2Taix_AIX'#010+
@ -1829,7 +1829,7 @@ const msgtxt : array[0..000356,1..240] of char=(
  'S*2Tlinux_Linux'#010+
  'S*2Tsolaris_Solaris'#010+
  's*2Tlinux_Linux'#010+
-  'V*2T','embedded_Embedded'#010+
+  'V*','2Tembedded_Embedded'#010+
  'x*2Tembedded_Embedded'#010+
  'x*2Tfreertos_FreeRTOS'#010+
  'x*2Tlinux_Linux'#010+
@ -1838,148 +1838,148 @@ const msgtxt : array[0..000356,1..240] of char=(
  'Z*2Tmsxdos_MSX-DOS'#010+
  '**1u<x>_Undefines the symbol <x>'#010+
  '**1U_Unit options:'#010+
-  '**2Un_Do not check where the unit name mat','ches the file name'#010+
+  '**2Un_Do not check where the unit name m','atches 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+
-  '**2*_e : Show errors (default)       0 : Show nothing (exce','pt errors'+
+  '**2*_e : Show errors (default)       0 : Show nothing (ex','cept errors'+
  ')'#010+
  '**2*_w : Show warnings               u : Show unit info'#010+
  '**2*_n : Show notes                  t : Show tried/used files'#010+
  '**2*_h : Show hints                  c : Show conditionals'#010+
-  '**2*_i : Show general info           d : Show debug',' info'#010+
+  '**2*_i : Show general info           d : Show deb','ug info'#010+
  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
  '**2*_s : Show time stamps            q : Show message numbers'#010+
  '**2*_a : Show everything             x : Show info about invoked tools'+
  #010+
-  '**2*_b : Write file names messa','ges   p : Write tree.log with parse t'+
+  '**2*_b : Write file names mes','sages   p : Write tree.log with parse t'+
  'ree'#010+
  '**2*_    with full path              v : Write fpcdebug.txt with'#010+
  '**2*_z : Write output to stderr          lots of debugging info'#010+
  '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
-  'F*1V<x>_Appe','nd '#039'-<x>'#039' to the used compiler binary name (e.g.'+
+  'F*1V<x>_Ap','pend '#039'-<x>'#039' to the used compiler binary name (e.g.'+
  ' for 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+
-  'A*2WA_Specify native type application (W','indows)'#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+
-  'A*2Wb_Create a bundle in','stead 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+
  '4*2WB_Create a relocatable image (Windows)'#010+
-  '4*2WB<x>_Set im','age base to <x> (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+
  'Z*2WB<x>_Set image base to <x> (ZX Spectrum)'#010+
  '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  '4*2WC_S','pecify console type application (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 fun','ctions of DLL or EXE (Windows)'#010+
+  '4*2WD_Use DEFFILE to export f','unctions 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_Use external resources (Dar','win)'#010+
+  'A*2We_Use external resources (D','arwin)'#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+
-  '4*2WG_Specify graphic type application (Wind','ows)'#010+
+  '4*2WG_Specify graphic type application (Wi','ndows)'#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+
  'a*2Wi_Use internal resources (Darwin)'#010+
-  'A*2Wi_Use intern','al resources (Darwin)'#010+
+  'A*2Wi_Use inte','rnal 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+
+  'A*2WI_Turn on/off the usag','e 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*3WmMedium_Medium memory model'#010+
-  '8*3W','mCompact_Compact 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, ... (Darwi'+
  'n)'#010+
-  'p*2WM<','x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+
+  'p*2W','M<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+
  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  '4*2WN_Do not generate relocati','on code, needed for debugging (Windows'+
+  '4*2WN_Do not generate reloca','tion 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'+
  'le values'#010+
-  'm*2Wp<x>_Specify the controller type; see fpc -i o','r fpc -iu for poss'+
+  'm*2Wp<x>_Specify the controller type; see fpc -i',' or fpc -iu for poss'+
  'ible 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'+
  'le values'#010+
-  'x*2Wp<x>_Specify the controller type; see fpc -i o','r fpc -iu for poss'+
+  'x*2Wp<x>_Specify the controller type; see fpc -i',' or fpc -iu for poss'+
  'ible 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 deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
+  'A*2W','P<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+
  '8*2Wt<x>_Set the target executable format'#010+
-  '8*3Wtexe_Create',' a DOS .EXE file (default)'#010+
+  '8*3Wtexe_Crea','te a DOS .EXE file (default)'#010+
  '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
  '**2WX_Enable executable stack (Linux)'#010+
  '**1X_Executable options:'#010+
-  '**2X9_Generate linkerscript for ','GNU Binutils ld older than version 2'+
+  '**2X9_Generate linkerscript fo','r GNU Binutils ld older than version 2'+
  '.19.1 (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+
-  '**2Xe_Use exter','nal linker'#010+
+  '**2Xe_Use ext','ernal 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+
  '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xi_Use internal li','nker'#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+
  '**2XLO_Define order of library linking'#010+
  '**2XLD_Exclude default order of standard libraries'#010+
-  '**2Xm_Generate link map'#010,
+  '**2Xm_Generate link ma','p'#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+
+  '**2XP<x>_Prepend the binutil','s 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, So','laris)'#010+
+  ', 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+
  '**2Xv_Generate table for Virtual Entry calls'#010+
-  '**2XV_Use VLink',' as external linker       (default on Amiga, MorphOS)'+
+  '**2XV_Use VLi','nk as external linker       (default on Amiga, MorphOS)'+
  #010+
  '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
  '**1*_'#010+
--- a/packages/fcl-passrc/src/paswrite.pp
+++ b/packages/fcl-passrc/src/paswrite.pp
@ -819,7 +819,9 @@ begin
    end;
  AddLn(Temp);
  IncIndent;
  IncDeclSectionLevel;
  WriteMembers(AType.Members,visPublic);
  DecDeclSectionLevel;
  DecIndent;
  Add('end');
 end;
--- a/packages/winunits-jedi/src/jwawinsock2.pas
+++ b/packages/winunits-jedi/src/jwawinsock2.pas
@ -115,7 +115,7 @@ type
 //
 type
-  TSocket = Cardinal;
+  TSocket = UINT_PTR;
 //
 // Select uses arrays of SOCKETs.  These macros manipulate such
--- a/rtl/inc/fexpand.inc
+++ b/rtl/inc/fexpand.inc
@ -306,7 +306,12 @@ begin
            S := BasePath;
 {$ENDIF FPC_FEXPAND_SYSUTILS and not SYSUTILSUNICODE}
            if not FileNameCasePreserving then
-              S := UpCase(S);
+              S := UpCase(S)
            else
            { Always uppercase driveletter }
            if (Length (S) > 1) and CharInSet(S [1], ['a'..'z']) and
              (S [2] = DriveSeparator) and (DriveSeparator <> DirectorySeparator) then
                S [1] := Chr (Ord (S [1]) and not ($20));
 {$IFDEF FPC_FEXPAND_VOLUMES}
 {$IFDEF FPC_FEXPAND_DRIVESEP_IS_ROOT}