Browse Source

show AT&T and Intel style assembler switches in i8086 and x86_64 help text. also fix Motorola name initials at several places for 68k

git-svn-id: trunk@34081 -
Károly Balogh 9 years ago
parent
commit
b0ca7e9594

+ 4 - 0
compiler/msg/errorct.msg

@@ -2259,6 +2259,10 @@ S*2Aas_assemblar utilitzant GNU AS
 **2Rdefault_utilitza l'assemblador predeterminat
 3*2Ratt_llegeix assemblador d'estil AT&T
 3*2Rintel_llegeix assemblador d'estil Intel
+4*2Ratt_llegeix assemblador d'estil AT&T
+4*2Rintel_llegeix assemblador d'estil Intel
+8*2Ratt_llegeix assemblador d'estil AT&T
+8*2Rintel_llegeix assemblador d'estil Intel
 6*2RMOT_llegeix assemblador d'estil Motorola
 **1S<x>_Opcions de sintaxi:
 **2S2_Igual que -Mobjfpc

+ 4 - 0
compiler/msg/errord.msg

@@ -3867,6 +3867,10 @@ F*2P<x>_Setze die Ziel-CPU (arm,avr,i386,i8086,jvm,m68k,mips,mipsel,powerpc,powe
 **2Rdefault_Benutze den voreingestellten Assembler
 3*2Ratt_Lese Assembler Code im AT&T-Format
 3*2Rintel_Lese Assembler im Intel-Format
+4*2Ratt_Lese Assembler Code im AT&T-Format
+4*2Rintel_Lese Assembler im Intel-Format
+8*2Ratt_Lese Assembler Code im AT&T-Format
+8*2Rintel_Lese Assembler im Intel-Format
 6*2RMOT_Lese Assembler im Motorola-Format
 **1S<x>_Syntax-Optionen:
 **2S2_Schalte einige der Delphi 2 Erweiterungen ein (wie -Mobjfpc)

+ 5 - 1
compiler/msg/errorda.msg

@@ -3700,6 +3700,10 @@ option_help_pages=11025_[
 3*1R<x>_Læsestil for assembler:
 3*2Ratt_Læs assemblerkode i AT&T-stil
 3*2Rintel_Læs assemblerkode i Intel-stil
+4*2Ratt_Læs assemblerkode i AT&T-stil
+4*2Rintel_Læs assemblerkode i Intel-stil
+8*2Ratt_Læs assemblerkode i AT&T-stil
+8*2Rintel_Læs assemblerkode i Intel-stil
 3*2Rdirect_Kopier assemblerkoden direkte ind i assemblerkildefilen
 3*1O<x>_Optimeringer:
 3*2Og_generér lille kode
@@ -3745,7 +3749,7 @@ option_help_pages=11025_[
 6*2O0_sæt målprocessor til MC68000
 6*2O2_sæt målprocessor til MC68020+ (standard)
 6*1R<x>_Læsestil for assembleren:
-6*2RMOT_Læs assemblerkode i motorola-stil
+6*2RMOT_Læs assemblerkode i Motorola-stil
 6*1T<x>_Mål-operativsystem:
 6*2Tamiga_Commodore Amiga
 6*2Tatari_Atari ST/STe/TT

+ 4 - 0
compiler/msg/errordu.msg

@@ -3867,6 +3867,10 @@ F*2P<x>_Setze die Ziel-CPU (arm,avr,i386,i8086,jvm,m68k,mips,mipsel,powerpc,powe
 **2Rdefault_Benutze den voreingestellten Assembler
 3*2Ratt_Lese Assembler Code im AT&T-Format
 3*2Rintel_Lese Assembler im Intel-Format
+4*2Ratt_Lese Assembler Code im AT&T-Format
+4*2Rintel_Lese Assembler im Intel-Format
+8*2Ratt_Lese Assembler Code im AT&T-Format
+8*2Rintel_Lese Assembler im Intel-Format
 6*2RMOT_Lese Assembler im Motorola-Format
 **1S<x>_Syntax-Optionen:
 **2S2_Schalte einige der Delphi 2 Erweiterungen ein (wie -Mobjfpc)

+ 5 - 1
compiler/msg/errore.msg

@@ -3821,7 +3821,11 @@ F*2P<x>_Set target CPU (arm,avr,i386,i8086,jvm,m68k,mips,mipsel,powerpc,powerpc6
 **2Rdefault_Use default assembler for target
 3*2Ratt_Read AT&T style assembler
 3*2Rintel_Read Intel style assembler
-6*2RMOT_Read motorola style assembler
+4*2Ratt_Read AT&T style assembler
+4*2Rintel_Read Intel style assembler
+8*2Ratt_Read AT&T style assembler
+8*2Rintel_Read Intel style assembler
+6*2RMOT_Read Motorola style assembler
 **1S<x>_Syntax options:
 **2S2_Same as -Mobjfpc
 **2Sc_Support operators like C (*=,+=,/= and -=)

+ 5 - 1
compiler/msg/errores.msg

@@ -3640,7 +3640,11 @@ S*2Aas_ensamblar usando GNU AS
 **2Rdefault_usar ensamblador por defecto
 3*2Ratt_leer ensamblador estilo AT&T
 3*2Rintel_leer ensamblador estilo Intel
-6*2RMOT_leer ensamblador estilo motorola
+4*2Ratt_leer ensamblador estilo AT&T
+4*2Rintel_leer ensamblador estilo Intel
+8*2Ratt_leer ensamblador estilo AT&T
+8*2Rintel_leer ensamblador estilo Intel
+6*2RMOT_leer ensamblador estilo Motorola
 **1S<x>_opciones de sintaxis:
 **2S2_igual que -Mobjfpc
 **2Sc_soportar operadores estilo C (*=,+=,/= and -=)

+ 6 - 2
compiler/msg/errorf.msg

@@ -1838,6 +1838,10 @@ option_help_pages=11025_[
 3*1R<x>_type lecture assembleur :
 3*2Ratt_lit l'assembleur AT&T
 3*2Rintel_lit l'assembleur Intel
+4*2Ratt_lit l'assembleur AT&T
+4*2Rintel_lit l'assembleur Intel
+8*2Ratt_lit l'assembleur AT&T
+8*2Rintel_lit l'assembleur Intel
 3*2Rdirect_copie le texte assembleur directement dans le fichier assembleur
 3*1O<x>_optimisations :
 3*2Og_g‚nŠre du code compact
@@ -1873,7 +1877,7 @@ option_help_pages=11025_[
 6*2Ox_optimize maximum (still BUGGY!!!)
 6*2O2_set target processor to a MC68020+
 6*1R<x>_styles d'assembleur :
-6*2RMOT_lire l'assembleur type motorola
+6*2RMOT_lire l'assembleur type Motorola
 6*1T<x>_SystŠme d'exploitation cible :
 6*2TAMIGA_Commodore Amiga
 6*2TATARI_Atari ST/STe/TT
@@ -1882,7 +1886,7 @@ option_help_pages=11025_[
 **1*_
 **1?_affiche cette aide
 6*1R<x>_version de l'assembleur lu
-6*2RMOT_read motorola style assembler
+6*2RMOT_read Motorola style assembler
 6*1T<x>_Target operating system:
 6*2TAMIGA_Commodore Amiga
 6*2TATARI_Atari ST/STe/TT

+ 5 - 1
compiler/msg/errorfi.msg

@@ -3727,7 +3727,11 @@ S*2Aas_assembler avec GNU AS
 3*1R<x>_type lecture assembleur :
 3*2Ratt_lit l'assembleur AT&T
 3*2Rintel_lit l'assembleur Intel
-6*2RMOT_lire l'assembleur type motorola
+4*2Ratt_lit l'assembleur AT&T
+4*2Rintel_lit l'assembleur Intel
+8*2Ratt_lit l'assembleur AT&T
+8*2Rintel_lit l'assembleur Intel
+6*2RMOT_lire l'assembleur type Motorola
 **1S<x>_options de syntaxe :
 **2S2_identique à -Mobjfpc
 **2Sa_include assertion code.

+ 4 - 0
compiler/msg/errorhe.msg

@@ -2579,6 +2579,10 @@ S*2Aas_
 **2Rdefault_השתמש במאסף ברירת מחדל
 3*2Ratt_קרא סגנון מקשר של AT&T
 3*2Rintel_קרא סגנון מקשר של Intel
+4*2Ratt_קרא סגנון מקשר של AT&T
+4*2Rintel_קרא סגנון מקשר של Intel
+8*2Ratt_קרא סגנון מקשר של AT&T
+8*2Rintel_קרא סגנון מקשר של Intel
 6*2RMOT_קרא סגנון מקשר של Motorola
 **1S<x>_אפשרויות תחביר:
 **2S2_זהה ל -Mobjfpc

+ 4 - 0
compiler/msg/errorheu.msg

@@ -3668,6 +3668,10 @@ S*2Aas_אסוף עם GNU AS
 **2Rdefault_השתמש במאסף ברירת מחדל
 3*2Ratt_קרא סגנון מקשר של AT&T
 3*2Rintel_קרא סגנון מקשר של Intel
+4*2Ratt_קרא סגנון מקשר של AT&T
+4*2Rintel_קרא סגנון מקשר של Intel
+8*2Ratt_קרא סגנון מקשר של AT&T
+8*2Rintel_קרא סגנון מקשר של Intel
 6*2RMOT_קרא סגנון מקשר של Motorola
 **1S<x>_אפשרויות תחביר:
 **2S2_זהה ל -Mobjfpc

+ 4 - 0
compiler/msg/errorid.msg

@@ -3675,6 +3675,10 @@ S*2Aas_Rangkai menggunakan GNU AS
 **2Rdefault_Gunakan assembler standar untuk target
 3*2Ratt_Baca gaya assembler AT&T
 3*2Rintel_Baca gaya assembler Intel
+4*2Ratt_Baca gaya assembler AT&T
+4*2Rintel_Baca gaya assembler Intel
+8*2Ratt_Baca gaya assembler AT&T
+8*2Rintel_Baca gaya assembler Intel
 6*2RMOT_Baca gaya assembler Motorola
 **1S<x>_Opsi sintaks:
 **2S2_Sama seperti -Mobjfpc

+ 6 - 2
compiler/msg/erroriu.msg

@@ -2895,8 +2895,12 @@ S*2Aas_Assembla con GNU AS
 **1R<x>_Stile di lettura assembler:
 **2Rdefault_Usa assembler di default per la destinazione
 3*2Ratt_Leggi assembler stile AT&T
-3*2Rintel_Leggi assembler stile Intel 
-6*2RMOT_Leggi assembler stile motorola
+3*2Rintel_Leggi assembler stile Intel
+4*2Ratt_Leggi assembler stile AT&T
+4*2Rintel_Leggi assembler stile Intel
+8*2Ratt_Leggi assembler stile AT&T
+8*2Rintel_Leggi assembler stile Intel
+6*2RMOT_Leggi assembler stile Motorola
 **1S<x>_Opzioni di sintassi:
 **2S2_Come -Mobjfpc
 **2Sc_Supporta operatori simil-C (*=,+=,/= e -=)

+ 5 - 1
compiler/msg/errorn.msg

@@ -3625,6 +3625,10 @@ option_help_pages=11025_[
 3*1R<x>_Geef de grammatica voor de assemblerlezer op:
 3*2Ratt_Lees assembler in AT&T-stijl
 3*2Rintel_Lees assembler in Intelstijl
+4*2Ratt_Lees assembler in AT&T-stijl
+4*2Rintel_Lees assembler in Intelstijl
+8*2Ratt_Lees assembler in AT&T-stijl
+8*2Rintel_Lees assembler in Intelstijl
 3*2Rdirect_Kopieer assemblercode rechtstreeks naar assemblerbestand
 **1O<x>_optimalisaties
 **2O1_Niveau 1 optimalisaties (snel en debug-vriendelijk )
@@ -3658,7 +3662,7 @@ option_help_pages=11025_[
 6*2Ox_Optimizeer maximaal (nog steeds BUGGY!!!)
 6*2O2_Stel doelprocessor in op MC68020+
 6*1R<x>_assembler reading style:
-6*2RMOT_read motorola style assembler
+6*2RMOT_read Motorola style assembler
 6*1T<x>_Target operating system:
 6*2TAMIGA_Commodore Amiga
 6*2TATARI_Atari ST/STe/TT

+ 4 - 0
compiler/msg/errorpl.msg

@@ -2282,6 +2282,10 @@ S*2Aas_asemblacja przy u
 **2Rdefault_u¾ycie domy˜lnego asemblera
 3*2Ratt_styl AT&T
 3*2Rintel_styl Intel
+4*2Ratt_styl AT&T
+4*2Rintel_styl Intel
+8*2Ratt_styl AT&T
+8*2Rintel_styl Intel
 6*2RMOT_styl Motorola
 **1S<x>_opcje skˆadni:
 **2S2_to samo co -Mobjfpc

+ 4 - 0
compiler/msg/errorpli.msg

@@ -2282,6 +2282,10 @@ S*2Aas_asemblacja przy u
 **2Rdefault_u¿ycie domy¶lnego asemblera
 3*2Ratt_styl AT&T
 3*2Rintel_styl Intel
+4*2Ratt_styl AT&T
+4*2Rintel_styl Intel
+8*2Ratt_styl AT&T
+8*2Rintel_styl Intel
 6*2RMOT_styl Motorola
 **1S<x>_opcje sk³adni:
 **2S2_to samo co -Mobjfpc

+ 5 - 1
compiler/msg/errorpt.msg

@@ -3287,7 +3287,11 @@ S*2Aas_Monta usando o GNU AS
 **2Rdefault_Use assembler padrÆo para alvo
 3*2Ratt_Leia assembler estilo AT&T
 3*2Rintel_Leia assembler estilo Intel
-6*2RMOT_Leia assembler estilo motorola
+4*2Ratt_Leia assembler estilo AT&T
+4*2Rintel_Leia assembler estilo Intel
+8*2Ratt_Leia assembler estilo AT&T
+8*2Rintel_Leia assembler estilo Intel
+6*2RMOT_Leia assembler estilo Motorola
 **1S<x>_Op‡äes sintaxe:
 **2S2_Mesmo que -Mobjfpc
 **2Sc_Suporte operadores similares C (*=,+=,/= and -=)

+ 5 - 1
compiler/msg/errorptu.msg

@@ -3715,7 +3715,11 @@ S*2Aas_Monta usando o GNU AS
 **2Rdefault_Use assembler padrão para alvo
 3*2Ratt_Leia assembler estilo AT&T
 3*2Rintel_Leia assembler estilo Intel
-6*2RMOT_Leia assembler estilo motorola
+4*2Ratt_Leia assembler estilo AT&T
+4*2Rintel_Leia assembler estilo Intel
+8*2Ratt_Leia assembler estilo AT&T
+8*2Rintel_Leia assembler estilo Intel
+6*2RMOT_Leia assembler estilo Motorola
 **1S<x>_Opções sintaxe:
 **2S2_Mesmo que -Mobjfpc
 **2Sc_Suporte operadores similares C (*=,+=,/= and -=)

+ 4 - 0
compiler/msg/errorr.msg

@@ -2696,6 +2696,10 @@ S*2Aas_
 **2Rdefault_€áᥬ¡«¥à ¯® 㬮«ç ­¨î ¤«ï 楫¥¢®© ¯« âä®à¬ë
 3*2Ratt_—⥭¨¥  áᥬ¡«¥à  ¢ á⨫¥ AT&T
 3*2Rintel_—⥭¨¥  áᥬ¡«¥à  ¢ á⨫¥ Intel
+4*2Ratt_—⥭¨¥  áᥬ¡«¥à  ¢ á⨫¥ AT&T
+4*2Rintel_—⥭¨¥  áᥬ¡«¥à  ¢ á⨫¥ Intel
+8*2Ratt_—⥭¨¥  áᥬ¡«¥à  ¢ á⨫¥ AT&T
+8*2Rintel_—⥭¨¥  áᥬ¡«¥à  ¢ á⨫¥ Intel
 6*2RMOT_—⥭¨¥  áᥬ¡«¥à  ¢ á⨫¥ Motorola
 **1S<x>_Ž¯æ¨¨ ᨭ⠪á¨á :
 **2S2_’® ¦¥, çâ® ¨ -Mobjfpc

+ 4 - 0
compiler/msg/errorru.msg

@@ -3577,6 +3577,10 @@ S*2Aas_Ассемблер GNU AS
 **2Rdefault_Ассемблер по умолчанию для целевой платформы
 3*2Ratt_Чтение ассемблера в стиле AT&T
 3*2Rintel_Чтение ассемблера в стиле Intel
+4*2Ratt_Чтение ассемблера в стиле AT&T
+4*2Rintel_Чтение ассемблера в стиле Intel
+8*2Ratt_Чтение ассемблера в стиле AT&T
+8*2Rintel_Чтение ассемблера в стиле Intel
 6*2RMOT_Чтение ассемблера в стиле Motorola
 **1S<x>_Опции синтаксиса:
 **2S2_То же, что и -Mobjfpc

+ 5 - 1
compiler/msg/errorues.msg

@@ -3634,7 +3634,11 @@ S*2Aas_ensamblar usando GNU AS
 **2Rdefault_usar ensamblador por defecto
 3*2Ratt_leer ensamblador estilo AT&T
 3*2Rintel_leer ensamblador estilo Intel
-6*2RMOT_leer ensamblador estilo motorola
+4*2Ratt_leer ensamblador estilo AT&T
+4*2Rintel_leer ensamblador estilo Intel
+8*2Ratt_leer ensamblador estilo AT&T
+8*2Rintel_leer ensamblador estilo Intel
+6*2RMOT_leer ensamblador estilo Motorola
 **1S<x>_opciones de sintaxis:
 **2S2_igual que -Mobjfpc
 **2Sc_soportar operadores estilo C (*=,+=,/= and -=)

+ 1 - 1
compiler/msgidx.inc

@@ -1058,7 +1058,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 78095;
+  MsgTxtSize = 78237;
 
   MsgIdxMax : array[1..20] of longint=(
     27,100,347,124,96,58,130,33,208,65,

+ 96 - 92
compiler/msgtxt.inc

@@ -1566,243 +1566,247 @@ const msgtxt : array[0..000325,1..240] of char=(
   '**2Rdefault_Use default assembler ','for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
-  '6*2RMOT_Read motorola 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+
+  '6*2RMOT_Read Mot','orola style assembler'#010+
   '**1S<x>_Syntax options:'#010+
   '**2S2_Same as -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_Turn on assertions',#010+
+  '**2Sa_Turn on assertions'#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*_<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+
-  '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc -'+
-  'ir for possible values)'#010+
+  '**3*_h : Compiler also halts after hints'#010+
+  '**2Sf_Enable certain features in compiler and RTL; see fpc -i o','r fpc'+
+  ' -ir for possible values)'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use reference counted strings (ansistring by d','efault) instead '+
-  'of shortstrings'#010+
-  '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
+  '**2Sh_Use reference counted strings (ansistring by default) instead of'+
+  ' shortstrings'#010+
+  '**2Si_Turn on inlining of procedures/functions declared as "inline','"'#010+
   '**2Sk_Load fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
-  '**3SIcorba_CORBA compatible interfac','e'#010+
+  '**3SIcorba_CORBA compatible interface'#010+
   '**2Sm_Support macros like C (global)'#010+
   '**2So_Same as -Mtp'#010+
-  '**2Ss_Constructor name must be init (destructor must be done)'#010+
+  '**2Ss_Constructor name must be init (des','tructor must be done)'#010+
   '**2Sv_Support vector processing (use CPU vector extensions if availabl'+
   'e)'#010+
-  '**2Sx_Enable exception keywords (default in Del','phi/ObjFPC modes)'#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+
+  '**1s_Do not call assembler',' and linker'#010+
   '**2sh_Generate script to link on host'#010+
   '**2st_Generate script to link on target'#010+
-  '**2sr_Skip register allocation phase (use with -alr)',#010+
+  '**2sr_Skip register allocation phase (use with -alr)'#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*2Tdarwin_Darwi','n/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_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Thaiku_Haiku'#010+
   '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+
-  'rwin)'#010+
+  'rwi','n)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnativent_Native NT API (experimental)'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Ne','tware Module (libc)'#010+
+  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
-  '3*2Tsymbian_Symbian OS'#010+
+  '3*2Tsym','bian_Symbian OS'#010+
   '3*2Tsolaris_Solaris'#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*2Tdarwin_Darwin/Mac OS X'#010+
   '4*2Tfreebsd_FreeBSD'#010+
   '4*2Tiphonesim_ iPhoneSimulator'#010+
-  '4*2Tlinux_Linux'#010+
+  '4*2Tlinux','_Linux'#010+
   '4*2Tnetbsd_NetBSD'#010+
   '4*2Topenbsd_OpenBSD'#010+
   '4*2Tsolaris_Solaris'#010+
   '4*2Twin64_Win64 (64 bit Windows systems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
-  '6*2Tatari_','Atari ST/STe/TT'#010+
+  '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux'#010+
   '6*2Tpalmos_PalmOS'#010+
   '8*2Tmsdos_MS-DOS (and compatible)'#010+
-  'a*2Tdarwin_Darwin/iOS'#010+
+  'a*2Tdarwin_Dar','win/iOS'#010+
   'A*2Tandroid_Android'#010+
   'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
   'A*2Tembedded_Embedded'#010+
   'A*2Tgba_Game Boy Advance'#010+
   'A*2Tlinux_Linux'#010+
-  'A*2Tnds_Nintendo DS'#010,
+  'A*2Tnds_Nintendo DS'#010+
   'A*2Tsymbian_Symbian'#010+
   'A*2Twince_Windows CE'#010+
   'J*2Tandroid_Android'#010+
   'J*2Tjava_Java'#010+
   'm*2Tembedded_Embedded'#010+
-  'M*2Tandroid_Android'#010+
+  'M','*2Tandroid_Android'#010+
   'M*2Tembedded_Embedded'#010+
   'M*2Tlinux_Linux'#010+
   'P*2Taix_AIX'#010+
   'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
   'P*2Tlinux_Linux'#010+
-  'P*2Tmacos_Ma','c OS (classic)'#010+
+  'P*2Tmacos_Mac OS (classic)'#010+
   'P*2Tmorphos_MorphOS'#010+
   'P*2Tnetbsd_NetBSD'#010+
   'P*2Twii_Wii'#010+
   'p*2Taix_AIX'#010+
-  'p*2Tdarwin_Darwin/Mac OS X'#010+
+  'p*2Tdarwin_Darwin/Mac',' OS X'#010+
   'p*2Tlinux_Linux'#010+
   'S*2Tsolaris_Solaris'#010+
   'S*2Tlinux_Linux'#010+
   'V*2Tembedded_Embedded'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do n','ot check where the unit name matches the file name'#010+
-  '**2Ur_Generate release unit files (never automatically recompiled)'#010+
+  '**2Un_Do not check where the unit name matches the file name'#010+
+  '**2Ur_Generate release unit files (never automa','tically 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 (defau','lt)       0 : Show nothing (except errors'+
-  ')'#010+
-  '**2*_w : Show warnings               u : Show unit info'#010+
+  '**2*_e : Show errors (default)       0 : Show nothing (except 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 gener','al info           d : Show debug info'#010+
-  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
+  '**2*_i : Show general info           d : Show debug info'#010+
+  '**2*_l : Show linenumbers            r : Rhide/GCC compatibi','lity mod'+
+  'e'#010+
   '**2*_s : Show time stamps            q : Show message numbers'#010+
-  '**2*_a : Show everything             x : Show info about invoked tools',
+  '**2*_a : Show everything             x : Show info about invoked tools'+
   #010+
   '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
   'e'#010+
-  '**2*_    with full path              v : Write fpcdebug.txt with'#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 n','umbered <x> and <y>'#010+
+  '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#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+
+  '**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_Sp','ecify 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+
   '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+
-  '4*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  '4*2Wb_Create a bundle instead of a lib','rary (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_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_Create a relocatable image (Window','s, Symbian)'#010+
   'A*2WB<x>_Set image base to <x> (Windows, Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  '4*2WC_Specify consol','e 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+
+  'P*2WC_Specify consol','e 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+
+  '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',' resources (Darwin)'#010+
   '4*2We_Use external resources (Darwin)'#010+
   'a*2We_Use external resources (Darwin)'#010+
   'A*2We_Use external resources (Darwin)'#010+
-  'P*2We_Us','e 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*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 (Windows)'#010+
-  'A*2WG_Sp','ecify 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+
+  '3','*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 ','(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+
+  '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 sec','tions (Windows)'#010+
+  'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '8*2Wm<x>_Set memory model'#010+
   '8*3WmTiny_Tiny memory model'#010+
-  '8*3WmSmall_Small memory model (default)'#010+
+  '8*3WmSmall_Small memory mode','l (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, ... (Dar'+
-  'win)'#010+
-  '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+  '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
+  '4*2WM<x>_Minimum Mac OS X deplo','yment 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 d','eployment 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 debu','gging (Windows'+
+  '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 de','bugging (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'+
   'le values'#010+
-  'm*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 ','poss'+
+  'm*','2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for poss'+
   'ible values'#010+
+  'V*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+
+  '4*2WP<x>_Mini','mum 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*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+
+  '4*2WR_Gener','ate 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 fi','le (default)'#010+
+  '8*3Wtexe_Create 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+
+  'P*2WT_Specify MPW tool t','ype application (Classic Mac OS)'#010+
   '**2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
-  '**2X9_Generate linkerscript for GNU Binutils l','d older than version 2'+
-  '.19.1 (Linux)'#010+
-  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
-  'ux)'#010+
+  '**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+
+  '9.1 (Linux)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, Free','BSD, L'+
+  'inux)'#010+
   '**2Xd_Do not search default library path (sometimes required for cross'+
   '-compiling when not using -XR)'#010+
   '**2Xe_Use external linker'#010+
-  '**2','Xf_Substitute pthread library name for linking (BSD)'#010+
-  '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
-  'to executable'#010+
+  '**2Xf_Substitute pthread library name for linking (BSD)'#010+
+  '**2Xg_Create debuginfo in a separate file and',' add a debuglink sectio'+
+  'n to executable'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
   '**2Xi_Use internal linker'#010+
-  '**2XLA_De','fine library substitutions for linking'#010+
+  '**2XLA_Define library substitutions for linking'#010+
   '**2XLO_Define order of library linking'#010+
-  '**2XLD_Exclude default order of standard libraries'#010+
+  '**2XLD_Exclude defau','lt order of standard libraries'#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 targe','t 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+
+  '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+
+  #010+
+  'F*2Xp<x>_First search for the compiler bin','ary 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',' co'+
-  'mpile, 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+
+  '**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+
   '**2Xs_Strip all symbols from executable'#010+
-  '**2XS_Try to link units statically (defa','ult, defines FPC_LINK_STATIC'+
-  ')'#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','_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_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'