+ Add support for -Adefault.

  * Move help message for option -sT to the correct group of messages. 
  * Use shorter message to indicate switch to external asm. 
  * Adapted -sX messages because -sT doesn't force external assembler writer.

compiler/msg/errore.msg

@@ -3859,7 +3859,7 @@ F*0*_Only options valid for the default or selected platform are listed.
 **0*_Put + after a boolean switch option to enable it, - to disable it.
 **1@<x>_Read compiler options from <x> in addition to the default fpc.cfg
 # Assembler related options
-**1a_The compiler does not delete the generated assembler file
+**1a_The compiler does not delete the generated assembler file, automatically switches to external assembler writer
 **2a5_Don't generate Big Obj COFF files for GNU Binutils older than 2.25 (Windows, NativeNT)
 **2al_List sourcecode lines in assembler file
 **2an_List node info in assembler file (-dEXTDEBUG compiler)
@@ -4114,7 +4114,6 @@ F*2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipsel,powerpc,
 **2SI<x>_Set interface style to <x>
 **3SIcom_COM compatible interface (default)
 **3SIcorba_CORBA compatible interface
-**2sT_Generate script only to link on target
 **2Sm_Support macros like C (global)
 **2So_Same as -Mtp
 **2Sr_Transparent file names in ISO mode
@@ -4123,9 +4122,10 @@ F*2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipsel,powerpc,
 **2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)
 **2Sy_@<pointer> returns a typed pointer, same as $T+
 **1s_Do not call assembler and linker
-**2sh_Generate script to link on host
-**2st_Generate script to assemble and link on target
-**2sr_Skip register allocation phase (use with -alr)
+**2sh_Generate script to link on host, automatically switches to external assembler writer
+**2sT_Generate script only to link on target
+**2st_Generate script to assemble and link on target, automatically switches to external assembler writer
+**2sr_Skip register allocation phase (use with -alr), automatically switches to external assembler writer
 **1T<x>_Target operating system:
 # i386 targets
 3*2Tandroid_Android

compiler/msgidx.inc

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

compiler/msgtxt.inc

@@ -1,8 +1,8 @@
 const msgtxt_codepage=20127;
 {$ifdef Delphi}
-const msgtxt : array[0..000365] of string[240]=(
+const msgtxt : array[0..000366] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000365,1..240] of char=(
+const msgtxt : array[0..000366,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -1454,335 +1454,338 @@ const msgtxt : array[0..000365,1..240] of char=(
   '.'#010+
   '**1@<x>_Read compiler options from <x> in addition to the default fpc.'+
   'cfg'#010+
-  '**1a_The compiler d','oes not delete the generated assembler file'#010+
+  '**1a_The compiler d','oes not delete the generated assembler file, auto'+
+  'matically switches to external assembler writer'#010+
   '**2a5_Don'#039't generate Big Obj COFF files for GNU Binutils older tha'+
   'n 2.25 (Windows, NativeNT)'#010+
   '**2al_List sourcecode lines in assembler file'#010+
-  '**2an_List node info in assembler file (-dEXTDEBUG compil','er)'#010+
+  '**2a','n_List node info in assembler file (-dEXTDEBUG compiler)'#010+
   '**2ao_Add an extra option to external assembler call (ignored for inte'+
   'rnal)'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List register allocation/release info in assembler file'#010+
-  '**2at_List temp allocation/release i','nfo in assembler file'#010+
+  '**2ar_List register allocation/release info i','n 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+
-  '8*2Anasm_Assemble u','sing Nasm'#010+
+  '3*2Amacho_Mach-O (Darwin, In','tel 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 file using Nasm'#010+
-  '3*2Anasmwdosx_Win32/WDOSX object file usi','ng 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*2Atasm_Obj file using Tasm (Borland)'#010+
-  '3*2Aelf_ELF (Linux) u','sing internal writer'#010+
+  '3*2Atas','m_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 GNU AS',#010+
   '4*2Agas_Assemble using GNU GAS'#010+
-  '4*2Aas-darwin_Assembl','e Darwin Mach-O 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*2Anasm_Assemble u','sing Nasm (experimental)'#010+
+  '4*2Ayasm_A','ssemble 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_Assemble darwin macho64 object file using Nasm (experim'+
-  'ental)'#010,
+  '4*2Anasmdarwin_Assemble ','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 AS'#010+
-  'A*2Aas-darwin_Assemble using GNU AS for Darwin target','s'#010+
+  'A*2Aas_Assemble using GNU AS'#010,
+  'A*2Aas-darwin_Assemble using GNU AS for Darwin targets'#010+
   'A*2Aclang_Assemble using clang'#010+
   'A*2Aelf_Assemble using internal ELF writer'#010+
   'a*2Aas_Assemble using GNU AS'#010+
   'a*2Aclang_Assemble using clang for darwin/ios targets'#010+
-  'a*2Aas-clang_Assemble using clang for other targets '#010+
-  'P*2Aas_Assemble using GNU AS',#010+
+  'a*2Aas-clang_Assemble using ','clang for other targets '#010+
+  'P*2Aas_Assemble using GNU AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
   's*2Aas_Assemble using GNU AS'#010+
   'v*2Aas_Assemble using GNU AS'#010+
   'W*2Abinaryen_Assemble using GNU AS for wasm32 (wasm-as)'#010+
   'W*2Allvm-mc_Assemble using llvm-mc'#010+
-  'W*2Awabt_Assemble using wasa'#010+
+  'W*2Awabt','_Assemble using wasa'#010+
   'x*2Aas_Assemble using GNU AS'#010+
-  'Z*2','Asdcc-sdasz80_Assemble using SDCC-SDASZ80'#010+
+  'Z*2Asdcc-sdasz80_Assemble using SDCC-SDASZ80'#010+
   'Z*2Az80asm_Assemble using z80asm'#010+
   'Z*2Avasm_Assemble using Vasm'#010+
   '**1b_Generate browser info'#010+
   '**2bl_Generate local symbol info'#010+
-  '**1B_Build all modules'#010+
+  '**1B_Build all modules'#010,
   '**1C<x>_Code generation options:'#010+
-  '**2C3_Turn on ieee e','rror checking for constants'#010+
+  '**2C3_Turn on ieee error checking for constants'#010+
   '**2Ca<x>_Select ABI; see fpc -i or fpc -ia for possible values'#010+
   '**2Cb_Generate code for a big-endian variant of the target architectur'+
   'e'#010+
-  '**2Cc<x>_Set default calling convention to <x>'#010+
-  '**2CD_Create also dynamic libr','ary (not supported)'#010+
+  '**2Cc<x>_Set default cal','ling convention to <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 values'#010+
-  '**2CF<x>_Minimal floating po','int constant precision (default, 32, 64)'+
-  #010+
+  '**2Cf<x>_Select fpu instruction set to use; see fpc -i or fpc',' -if fo'+
+  'r possible values'#010+
+  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>[,m]_<n> bytes min heap size (between 1023 and 67107840) and o'+
   'ptionally [m] max heap size'#010+
   '**2Ci_IO-checking'#010+
-  'A*2CI<x>_Select instruction set on ARM: ARM or THUMB'#010+
-  'L*2Cl<','x>_LLVM code generation options'#010+
+  'A*2CI<','x>_Select instruction set on ARM: ARM or THUMB'#010+
+  'L*2Cl<x>_LLVM code generation options'#010+
   'L*3Clflto_Enable Link-time optimisation (needed both when compiling un'+
   'its and programs/libraries)'#010+
-  'L*3Clfltonosystem_Disable LTO for the system unit (needed with at leas'+
-  't Xcode 10.2 and earlier due to linker b','ugs)'#010+
+  'L*3Clfltonosystem_Disable LTO for the system unit (needed',' with at le'+
+  'ast Xcode 10.2 and earlier due to linker bugs)'#010+
   'L*3Clv<x>_LLVM target version: Xcode-10.1, 7.0, 8.0, .., 10.0'#010+
   '**2Cn_Omit linking stage'#010+
   'P*2CN_Generate nil-pointer checks (AIX-only)'#010+
   '**2Co_Check overflow of integer operations'#010+
-  '**2CO_Check for possible overflow of integer operations'#010+
-  '**2C','p<x>_Select instruction set; see fpc -i or fpc -ic for possible '+
-  'values'#010+
+  '**2CO_C','heck 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'+
+  '**3CPPACK','ENUM=<y>_ <y> enum 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_Stack checking (for testing only, s','ee manual)'#010+
+  '**2Cs<n>_Set stack checking ','size to <n>'#010+
+  '**2Ct_Stack checking (for testing only, see manual)'#010+
   '8*2CT<x>_Target-specific code generation options'#010+
   '3*2CT<x>_Target-specific code generation options'#010+
   '4*2CT<x>_Target-specific code generation options'#010+
-  'p*2CT<x>_Target-specific code generation options'#010+
-  'P*2CT<x>_Target-specific code gen','eration options'#010+
+  'p*2CT<x>_Target-specific code',' generation options'#010+
+  'P*2CT<x>_Target-specific code generation options'#010+
   'J*2CT<x>_Target-specific code generation options'#010+
   'A*2CT<x>_Target-specific code generation options'#010+
   'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
+  ' (A','IX)'#010+
+  'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
-  'P*3CTsmalltoc_ Generate smaller TOCs at the expen','se 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 '+
-  'with prefix X (empty string disabl','es)'#010+
+  'J*3CTautosetterprefix=X_  Automatically create sett','ers for propertie'+
+  's with prefix X (empty string disables)'#010+
   '8*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
   '3*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
-  '4*3CTcld_                 Emit a CLD instruction before ','using the x8'+
+  '4*3','CTcld_                 Emit a CLD instruction before using the x8'+
   '6 string instructions'#010+
   '8*3CTfarprocspushoddbp_       Increment BP before pushing it in the pr'+
   'ologue of far functions'#010+
-  'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+
-  'de for initializing integer array constant','s'#010+
+  'J*3CTcompactintarrayinit_ Generate smaller (but potentially',' slower) '+
+  'code 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 bytecode verification error if used unini','tialized (slows down code'+
+  'J*3CTinitlocals_          Initialize local variables that tr','igger a '+
+  'JVM bytecode verification error if used uninitialized (slows down code'+
   ')'#010+
   'J*3CTlowercaseprocstart_  Lowercase the first character of procedure/f'+
   'unction/method names'#010+
-  'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possi'+
-  'ble'#010+
+  'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if poss',
+  'ible'#010+
   'J*2Cv_Var/out parameter copy-out checking'#010+
-  'A*2CV<','x>_Set section threadvar model to <x>'#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 the date string returned by %DATE% to x, it is not checke'+
-  'd for being a valid date string'#010+
-  '**2Dd<','x>_Set description to <x>'#010+
+  '**2DD<x>_Set the date string returned by %DATE% to x, i','t is not chec'+
+  'ked for being a valid date string'#010+
+  '**2Dd<x>_Set description to <x>'#010+
   '**2DT<x>_Set the time string returned by %TIME% to x, it is not checke'+
   'd for being a valid time string'#010+
   '**2Dv<x>_Set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
-  '**1e<x>_Set path to executable'#010+
+  '**1e<x','>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
-  '**1fPIC_Sam','e as -Cg'#010+
+  '**1fPIC_Same as -Cg'#010+
   '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
-  '**2FC<x>_Set RC compiler binary name to <x>'#010+
-  '**2Fd_Disable the compiler'#039's internal direct','ory cache'#010+
+  '**2FC<x>_Set RC compiler binary nam','e 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+
   '**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-Free','RTOS)'#010+
+  '**2Ff<x>_Add <x> to framework pa','th (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+
   '**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',' '+
+  '**2Fm<x>_Load ','unicode conversion table from <x>.txt in the compiler '+
   'dir'#010+
   '**2FM<x>_Set the directory where to search for unicode binary files'#010+
   '**2FN<x>_Add <x> to list of default unit scopes (namespaces)'#010+
   '**2Fo<x>_Add <x> to object path'#010+
-  '**2Fr<x>_Load error message file <x>'#010+
-  '**2FR<x>_Set resource (.res) linker t','o <x>'#010+
+  '**2Fr<x>_Load error m','essage 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>_Store generated whole-program optimization feedback in <x>'#010+
-  '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
-  'om <x>'#010+
-  '*g1g_Ge','nerate debug information (default format for target)'#010+
+  '**2Fw<x>_Load previously stored',' whole-program optimization feedback '+
+  'from <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 false positive)'#010+
-  '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*g2gl_Use ','line info unit (show more info with backtraces)'#010+
+  '*g2gh_Use heaptrace u','nit (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 options'#010+
-  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
+  '*g3godwarfsets_ Enable DWARF '#039'set',#039' type debug information (bre'+
   'aks gdb < 6.5)'#010+
-  '*g3gostab','sabsincludes_ Store absolute/full include file paths in Sta'+
-  'bs'#010+
+  '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
+  #010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
-  '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+
-  '*g3godwarfomflinnum_ Generate line number informa','tion in OMF LINNUM '+
-  'records in MS LINK format in addition to the DWARF debug information ('+
-  'Open Watcom Debugger/Linker compatibility)'#010+
+  '*g3godwarfcpp_ Simulate C++ debug information in DW','ARF'#010+
+  '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+
+  'cords in MS LINK format in addition to the DWARF debug information (Op'+
+  'en Watcom Debugger/Linker compatibility)'#010+
   '*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+
+  '*g2gs_Generat','e Stabs debug information'#010+
+  '*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+
+  't'#039' changes the trashing value)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
-  '*g2gw2_Generate DWARFv2 debug information'#010+
-  '*g2gw3_Generate DWAR','Fv3 debug information'#010+
+  '*g2gw2_Ge','nerate DWARFv2 debug information'#010+
+  '*g2gw3_Generate DWARFv3 debug information'#010+
   '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
   '**1i_Information'#010+
   '**2iD_Return compiler date'#010+
   '**2iSO_Return compiler OS'#010+
-  '**2iSP_Return compiler host processor'#010+
+  '**2iSP_Return compiler host processor'#010,
   '**2iTO_Return target OS'#010+
-  '**2iTP_Return target processo','r'#010+
+  '**2iTP_Return target processor'#010+
   '**2iV_Return short compiler version'#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+
+  '**2ic_Return list of',' supported CPU instruction sets'#010+
+  '**2if_Return list of supported FPU instruction sets'#010+
   '**2ii_Return list of supported inline assembler modes'#010+
   '**2im_Return list of supported modeswitches'#010+
   '**2io_Return list of supported optimizations'#010+
-  '**2ir_Return list of recognized compiler and RTL features'#010+
-  '**2it_Re','turn list of supported targets'#010+
+  '**2ir_Return ','list of recognized compiler and RTL features'#010+
+  '**2it_Return list of supported targets'#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+
+  '**1k<x>_Pass',' <x> to the linker'#010+
   '**1l_Write logo'#010+
-  '**1M<x>_Set langua','ge mode to <x> / enable modeswitch <x> (see option'+
-  ' -im)'#010+
+  '**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 Pas','cal dialects compatibility mode'#010+
+  '**2Mtp_','TP/BP 7.0 compatibility mode'#010+
+  '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
   '**2Miso_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 modeswit','ches are disabled and need to be enabled one by a'+
-  'nother.'#010+
+  '**2*_Each mode (as listed above) enables',' its default set of modeswit'+
+  'ches.'#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+
   '**1n_Do not read the default config files'#010+
-  '**1o<x>_Change the name of the executable produced to <x>'#010+
+  '**1o<x>_Change the name of the executab','le produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
-  '**2O-_Disab','le optimizations'#010+
+  '**2O-_Disable optimizations'#010+
   '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
-  '**2O4_Level 4 optimizations (-O3 + optimizations which',' might have un'+
+  '*','*2O4_Level 4 optimizations (-O3 + optimizations which might have un'+
   'expected side effects)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
   '**2Oo[NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io 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'+
-  'on <x>; see fpc -i or fpc -iw for possible values'#010+
+  '**2Op<x>_Set target cpu for optimiz','ing; see fpc -i or fpc -ic for po'+
+  'ssible values'#010+
+  '**2OW<x>_Generate whole-program optimization feedback for optimization'+
+  ' <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 s','peed'#010+
+  ' for ','possible values'#010+
+  '**2Os_Optimize for size rather than speed'#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,mip','s,mip'+
+  'F*2P<x>_Se','t target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mip'+
   'sel,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+
+  '3*2Rintel_Read Intel style assembl','er'#010+
   '4*2Ratt_Read AT&T style assembler'#010+
-  '4*2Rintel_Read I','ntel 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 Motorola 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+
+  '**2Sc_Supp','ort operators like C (*=,+=,/= and -=)'#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*_w : Compiler also halts after warnings'#010+
-  '**3*_n : Compiler also halts after no','tes'#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+
-  '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use reference counted strings (ansis','tring by default) instead '+
-  'of shortstrings'#010+
+  '**2Sg_Enable LABEL and GOTO (default in -Mtp and',' -Mdelphi)'#010+
+  '**2Sh_Use reference counted strings (ansistring by default) instead of'+
+  ' shortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
   '**2Sj_Allows typed constants to be writeable (default in all modes)'#010+
-  '**2Sk_Load fpcylix unit'#010+
+  '**2Sk_Loa','d fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
-  '**','3SIcom_COM compatible interface (default)'#010+
+  '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2sT_Generate script only to link on target'#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+
+  '**2Ss_Cons','tructor name must be init (destructor must be done)'#010+
   '**2Sv_Support vector processing (use CPU vector extensions if availabl'+
   'e)'#010+
   '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
-  '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
-  '**1s','_Do not call assembler and linker'#010+
-  '**2sh_Generate script to link on host'#010+
-  '**2st_Generate script to assemble and link on target'#010+
-  '**2sr_Skip register allocation phase (use with -alr)'#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, automatically switches to exter'+
+  'nal assembler writer'#010+
+  '**2sT_Generate script only to link on target'#010+
+  '**2st_Generate script to assemble and link on target, automati','cally '+
+  'switches to external assembler writer'#010+
+  '**2sr_Skip register allocation phase (use with -alr), automatically sw'+
+  'itches to external assembler writer'#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*2Tdarwi','n_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*2Thaiku_Haiku'#010+
-  '3*2Tiphonesim_iPhoneSimulator from iOS',' SDK 3.2+ (older versions: -Td'+
+  '3*2Tiphonesim_iPhoneSimulator from iOS SDK 3.2+ (older versions: -','Td'+
   'arwin)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnativent_Native NT API (experimental)'#010+
@@ -1790,9 +1793,9 @@ const msgtxt : array[0..000365,1..240] of char=(
   '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
-  '3*2Tos2_OS/2 / eComStati','on'#010+
+  '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2Tsolaris_Solaris'#010+
+  '3*','2Tsolaris_Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
@@ -1800,8 +1803,8 @@ const msgtxt : array[0..000365,1..240] of char=(
   '4*2Tandroid_Android'#010+
   '4*2Taros_AROS'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
-  '4*2Tdragonfly_Dr','agonFly BSD'#010+
-  '4*2Tembedded_Embedded'#010+
+  '4*2Tdragonfly_DragonFly BSD'#010+
+  '4*2Tembedded_Emb','edded'#010+
   '4*2Tfreebsd_FreeBSD'#010+
   '4*2Thaiku_Haiku'#010+
   '4*2Tiphonesim_iPhoneSimulator'#010+
@@ -1810,9 +1813,9 @@ const msgtxt : array[0..000365,1..240] of char=(
   '4*2Topenbsd_OpenBSD'#010+
   '4*2Tsolaris_Solaris'#010+
   '4*2Twin64_Win64 (64 bit Windows systems)'#010+
-  '6*2Tamiga_Commodore Amiga',#010+
+  '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
-  '6*2Tembedded_Embedded'#010+
+  '6','*2Tembedded_Embedded'#010+
   '6*2Tlinux_Linux'#010+
   '6*2Tnetbsd_NetBSD'#010+
   '6*2Tmacosclassic_Classic Mac OS'#010+
@@ -1820,9 +1823,9 @@ const msgtxt : array[0..000365,1..240] of char=(
   '6*2Tsinclairql_Sinclair QL'#010+
   '8*2Tembedded_Embedded'#010+
   '8*2Tmsdos_MS-DOS (and compatible)'#010+
-  '8*2Twin16_Windows 16 Bit',#010+
+  '8*2Twin16_Windows 16 Bit'#010+
   'A*2Tandroid_Android'#010+
-  'A*2Taros_AROS'#010+
+  'A*2Taro','s_AROS'#010+
   'A*2Tembedded_Embedded'#010+
   'A*2Tfreertos_FreeRTOS'#010+
   'A*2Tgba_Game Boy Advance'#010+
@@ -1833,8 +1836,8 @@ const msgtxt : array[0..000365,1..240] of char=(
   'A*2Tpalmos_PalmOS'#010+
   'A*2Tsymbian_Symbian'#010+
   'A*2Twince_Windows CE'#010+
-  'a*2Tandroid','_Android'#010+
-  'a*2Tdarwin_Darwin/Mac OS X'#010+
+  'a*2Tandroid_Android'#010+
+  'a*2Tdarwin_Darwin/M','ac OS X'#010+
   'a*2Tfreebsd_FreeBSD'#010+
   'a*2Tios_iOS'#010+
   'a*2Tlinux_Linux'#010+
@@ -1846,9 +1849,9 @@ const msgtxt : array[0..000365,1..240] of char=(
   'm*2Tlinux_Linux'#010+
   'M*2Tembedded_Embedded'#010+
   'M*2Tlinux_Linux'#010+
-  'P*2Ta','ix_AIX'#010+
+  'P*2Taix_AIX'#010+
   'P*2Tamiga_AmigaOS'#010+
-  'P*2Tdarwin_Darwin/Mac OS X'#010+
+  'P*2','Tdarwin_Darwin/Mac OS X'#010+
   'P*2Tembedded_Embedded'#010+
   'P*2Tlinux_Linux'#010+
   'P*2Tmacosclassic_Classic Mac OS'#010+
@@ -1858,9 +1861,9 @@ const msgtxt : array[0..000365,1..240] of char=(
   'p*2Taix_AIX'#010+
   'p*2Tdarwin_Darwin/Mac OS X'#010+
   'p*2Tembedded_Embedded'#010+
-  'p*2Tlin','ux_Linux'#010+
+  'p*2Tlinux_Linux'#010+
   'R*2Tlinux_Linux'#010+
-  'R*2Tembedded_Embedded'#010+
+  'R*2','Tembedded_Embedded'#010+
   'r*2Tlinux_Linux'#010+
   'r*2Tembedded_Embedded'#010+
   'S*2Tlinux_Linux'#010+
@@ -1870,161 +1873,164 @@ const msgtxt : array[0..000365,1..240] of char=(
   'x*2Tembedded_Embedded'#010+
   'x*2Tfreertos_FreeRTOS'#010+
   'x*2Tlinux_Linux'#010+
-  'Z*2Tembedded_Embedded',#010+
-  'Z*2Tzxspectrum_ZX Spectrum'#010+
+  'Z*2Tembedded_Embedded'#010+
+  'Z*2Tzxspectrum_ZX Spectrum'#010,
   'Z*2Tmsxdos_MSX-DOS'#010+
   'W*2Tembedded_Embedded'#010+
   'W*2Twasi_The WebAssembly System Interface (WASI)'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
   '**2Un_Do not check where the unit name matches the file name'#010+
-  '**2Ur_Gen','erate release unit files (never automatically recompiled)'#010+
+  '**2Ur_Generate release unit files (ne','ver 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 (except errors)'#010+
-  '**2*_w : Show war','nings               u : Show unit info'#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*_l : Show linenumb','ers            r : Rhide/GCC compatibility mod'+
+  '**2*_l : Show linenumbers            r : Rhide/GCC',' compatibility mod'+
   'e'#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 messages   p : Write tree.log wit','h parse t'+
-  'ree'#010+
-  '**2*_    with full path              v : Write fpcdebug.txt with'#010+
+  '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
+  'e'#010+
+  '**2*_    with f','ull 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>_Append '#039'-<x>'#039' to the used compil','er binary name (e.g.'+
-  ' for version)'#010+
+  'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
+  'or ver','sion)'#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 (Windows)'#010+
-  '3*2Wb_Create a bundl','e instead of a library (Darwin)'#010+
+  '3*2Wb_Create a bundle instead of a library (Darw','in)'#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,
-  '4*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 instea','d 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 image base to <x> (Windows)'#010+
-  'A*','2WB_Create a relocatable image (Windows, Symbian)'#010+
+  'A*2WB_Create a relocatable ima','ge (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 type applicat','ion (Windows)'#010+
-  'A*2WC_Specify 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 functions of DLL or EXE (Window','s)'#010+
-  'A*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 expo','rt 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 (Darwin)'#010+
-  'P*2We_Use external reso','urces (Darwin)'#010+
-  'p*2We_Use external resources (Darwin)'#010+
+  'P*2We_Use external resources (Darwin)'#010+
+  'p*2We_Use ext','ernal 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 (Windows)'#010+
-  'A*2WG_Specify graphic t','ype application (Windows)'#010+
-  'P*2WG_Specify graphic type application (Classic Mac OS)'#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 internal resources (Darwin)'#010+
-  'P*2Wi_','Use internal resources (Darwin)'#010+
+  'P*2Wi_Use internal resources (Darw','in)'#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+
-  '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+
-  'e segment)'#010+
+  'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
+  '8*2Wh_Use huge code for uni','ts (ignored for models with CODE in a uni'+
+  'que 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*3WmCompact_Compact memory mode','l'#010+
-  '8*3WmLarge_Large memory model'#010+
+  '8*3WmCompact_Compact memory model'#010+
+  '8*3WmLarge_Large memory mo','del'#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 deployme','nt version: 10.4, 10.5.1, ... (Dar'+
+  'p*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+
   '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  '4*2WN_Do not generate relocation code, needed for debuggin','g (Windows'+
+  '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
+  'A*2WN_Do not gen','erate 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 value','s'#010+
-  'R*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
+  'R*2Wp<x>_Specify the contr','oller 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+
   'x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
-  'le value','s'#010+
-  '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
+  'le values'#010+
+  '3*2WP<x>_Minimum iOS deplo','yment 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 ve','rsion: 3.0, 5.0.1, ... (Darwin)'#010+
+  'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darw','in)'#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','*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
+  '8*3Wtcom_Create a DOS .COM fi','le (requires tiny memory model)'#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*3WQxtcc_','Set metadata to XTcc style'#010+
-  '**2WX_Enable executable stack (Linux)'#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 static data o','n'+
-  ' 64 Bit targets (Linux)'#010+
-  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
-  'ux)'#010+
+  '**2Xa_Generate code which allows to use more than 2 GB static data on '+
+  '64 Bit targets (Linux)'#010+
+  '**2','Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, 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+
-  '**2Xf_Substitu','te pthread library name for linking (BSD)'#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 linker'#010+
-  'L*2XlS<x>_LLVM utilt','ies suffix (e.g. -7 in case clang is called clan'+
+  'L*2XlS<x>_LLVM utilties suffix (e.g. -7 in case ','clang is called clan'+
   'g-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<x>_Set the name of ','the '#039'main'#039' program routine (default'+
+  '**2XM<x>_Set the name of the '#039'main'#039' program routine (','default'+
   ' is '#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+
-  '**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+
+  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
+  '**2Xr<x>_Set the linker'#039's r','link-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+
-  '**2Xs_Strip all sy','mbols from executable'#010+
-  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#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+
   '**2Xu_Generate executable in UF2 format  (embedded targets only)'#010+
-  '**2Xv_Generate table',' for Virtual Entry calls'#010+
-  '**2XV_Use VLink as external linker       (default on Amiga, MorphOS)'#010+
+  '**2Xv_Generate table for Virtual Entry calls'#010+
+  '**2','XV_Use VLink as external linker       (default on Amiga, MorphOS)'+
+  #010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+

compiler/options.pas

@@ -1356,7 +1356,10 @@ begin
 
            'A' :
              begin
-               paratargetasm:=find_asm_by_string(More);
+               if CompareText(More,'DEFAULT') = 0 then
+                 paratargetasm:=as_default
+               else
+                 paratargetasm:=find_asm_by_string(More);
                if paratargetasm=as_none then
                  IllegalPara(opt);
              end;
@@ -4423,6 +4426,10 @@ begin
   { maybe override assembler }
   if (option.paratargetasm<>as_none) then
     begin
+      if (option.paratargetasm=as_default) then
+        begin
+          option.paratargetasm:=target_info.assem;
+        end;
       if not set_target_asm(option.paratargetasm) then
         begin
           if assigned(asminfos[option.paratargetasm]) then

compiler/systems.inc

@@ -209,6 +209,7 @@
 
      type
        tasm = (as_none
+             ,as_default
              ,as_gas                   { standard gnu assembler }
              ,as_i386_as_aout
              ,as_i386_nasmcoff

compiler/systems.pas

@@ -218,7 +218,7 @@ interface
           newline      : string[2];
           dirsep       : char;
           assem        : tasm;
-          assemextern  : tasm; { external assembler, used by -a }
+          assemextern  : tasm; { external assembler, used by -a and -s }
           link         : tlink;
           linkextern   : tlink;  { external linker, used by -s }
           ar           : tar;