[AVR] Add command line options to selectively remove portions of the RTL startup code.

compiler/globtype.pas

@@ -232,6 +232,7 @@ interface
          cs_link_native,
          cs_link_pre_binutils_2_19,
          cs_link_vlink,
+         cs_link_discard_start,cs_link_discard_zeroreg_sp,cs_link_discard_copydata,cs_link_discard_jmp_main,
          { disable LTO for the system unit (needed to work around linker bugs on macOS) }
          cs_lto_nosystem,
          cs_assemble_on_target,

compiler/msg/errore.msg

@@ -4021,6 +4021,11 @@ Z*2Az80asm_Assemble using z80asm
 **2Ca<x>_Select ABI; see fpc -i or fpc -ia for possible values
 **2Cb_Generate code for a big-endian variant of the target architecture
 **2Cc<x>_Set default calling convention to <x>
+V*2Cd<x>_Discard selected RTL startup sections (use with caution)
+V*3Cdc_Discard initializing data. Data defaults to noinit section
+V*3Cdj_Discard jump to PASCALMAIN. Use only if PASCALMAIN follows directly after startup code
+V*3Cds_Discard _START code. Use only if all interrupts are disabled
+V*3Cdz_Discard code initializing the zero register and stack pointer
 **2CD_Create also dynamic library (not supported)
 **2Ce_Compilation with emulated floating point opcodes
 **2CE_Generate FPU code which can raise exceptions

compiler/msgidx.inc

@@ -1170,7 +1170,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 91785;
+  MsgTxtSize = 92148;
 
   MsgIdxMax : array[1..20] of longint=(
     28,109,371,135,102,63,148,38,223,71,

compiler/msgtxt.inc

@@ -1,8 +1,8 @@
 const msgtxt_codepage=20127;
 {$ifdef Delphi}
-const msgtxt : array[0..000382] of string[240]=(
+const msgtxt : array[0..000383] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000382,1..240] of char=(
+const msgtxt : array[0..000383,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -1587,534 +1587,540 @@ const msgtxt : array[0..000382,1..240] of char=(
   '**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 library (no','t supported)'#010+
+  'V*2Cd<x>_Discard selected RTL startup',' sections (use with caution)'#010+
+  'V*3Cdc_Discard initializing data. Data defaults to noinit section'#010+
+  'V*3Cdj_Discard jump to PASCALMAIN. Use only if PASCALMAIN follows dire'+
+  'ctly after startup code'#010+
+  'V*3Cds_Discard _START code. Use only if all interru','pts are disabled'#010+
+  'V*3Cdz_Discard code initializing the zero register and stack pointer'#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+
+  '**2CE_Generate FPU code which can raise exception','s'#010+
   '**2Cf<x>_Select fpu instruction set to use; see fpc -i or fpc -if for '+
   'possible values'#010+
-  '**2CF<x>_Minimal floating point con','stant precision (default, 32, 64)'+
-  #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+
+  '**2Ch<n>[,m]_<n> bytes min heap size (between 1023 and 6710','7840) and'+
+  ' optionally [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+
+  'L*2Cl<x>_LLVM code generation options'#010+
   'L*3Clflto_Enable Link-time optimisation (needed both when compiling un'+
-  'its and programs/libraries)'#010+
+  'its and programs/libra','ries)'#010+
   'L*3Clfltonosystem_Disable LTO for the system unit (needed with at leas'+
   't Xcode 10.2 and earlier due to linker bugs)'#010+
-  'L*','3Clflsanitize=address_Enable address sanitizer'#010+
+  'L*3Clflsanitize=address_Enable address sanitizer'#010+
   'L*3Clv<x>_LLVM target version: Xcode-10.1, 7.0, 8.0, .., 10.0'#010+
-  '**2Cn_Omit linking stage'#010+
+  '**2Cn_Om','it linking stage'#010+
   'P*2CN_Generate nil-pointer checks (AIX-only)'#010+
   '**2Co_Check overflow of integer operations'#010+
-  '**2CO_Check for po','ssible overflow of integer operations'#010+
+  '**2CO_Check for possible overflow of integer operations'#010+
   '**2Cp<x>_Select instruction set; see fpc -i or fpc -ic for possible va'+
   'lues'#010+
-  '**2CP<x>=<y>_ packing settings'#010+
+  '**2C','P<x>=<y>_ packing settings'#010+
   '**3CPPACKENUM=<y>_ <y> enum packing: 0, 1, 2 and 4 or DEFAULT or NORMA'+
   'L'#010+
-  '**3CPPACKRECORD=<y>_ <y>',' record packing: 0 or DEFAULT or NORMAL, 1, '+
-  '2, 4, 8, 16 and 32'#010+
-  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
-  'and 8'#010+
+  '**3CPPACKRECORD=<y>_ <y> record packing: 0 or DEFAULT or NORMAL, 1, 2,'+
+  ' 4, 8, 16 and 32'#010+
+  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT ','or NORMAL, 2, '+
+  '4 and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
-  '**2Cs<n>_Set stack checking size to <n>',#010+
+  '**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+
+  '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 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+
+  'A*2CT<x>_T','arget-specific code generation options'#010+
   'W*2CT<x>_Target-specific code generation options'#010+
-  'p*3CTsmalltoc_ Generate smaller TOC','s at the expense of execution spe'+
-  'ed (AIX)'#010+
-  'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
+  'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
+  'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
+  ' (AIX',')'#010+
   'J*3CTautogetterprefix=X_  Automatically create getters for properties '+
   'with prefix X (empty string disables)'#010+
-  'J*3CTautosett','erprefix=X_  Automatically create setters for propertie'+
-  's with prefix X (empty string disables)'#010+
-  '8*3CTcld_                 Emit a CLD instruction before using the x86 '+
-  'string instructions'#010+
-  '3*3CTcld_                 Emit a CLD instruction before',' using the x8'+
+  'J*3CTautosetterprefix=X_  Automatically create setters for properties '+
+  'with prefix X (empty string disables)'#010+
+  '8*3CTcld_             ','    Emit a CLD instruction before using the x8'+
   '6 string instructions'#010+
-  '4*3CTcld_                 Emit a CLD instruction before using the x86 '+
+  '3*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
+  '4*3CTcld_                 Emit a CLD instruction before using the x86 '+
+  'string instr','uctions'#010+
   '8*3CTfarprocspushoddbp_       Increment BP before pushing it in the pr'+
   'ologue of far functions'#010+
-  'J*3CTcompactintarrayi','nit_ 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 '+
-  'JVM bytecode verification error if used uninitialized (slows down code'+
-  ')'#010+
+  'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+
+  'de for initializing integer array constants'#010+
+  'J*3CTenumfieldinit_     ','  Initialize enumeration fields in construct'+
+  'ors to enumtype(0), after calling inherited constructors'#010+
+  'J*3CTinitlocals_          Initialize local variables that trigger a JV'+
+  'M bytecode verification error if used uninitialized (slows down code)',
+  #010+
   'J*3CTlowercaseprocstart_  Lowercase the first character of procedure/f'+
   'unction/method names'#010+
-  'A*3CTthumbinterworking_ Generat','e Thumb interworking-safe code if pos'+
-  'sible'#010+
+  'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possi'+
+  'ble'#010+
   'W*3CTnoexceptions_        Disable the exception support. Raising an ex'+
-  'ception will abort the program.'#010+
+  'cept','ion will abort the program.'#010+
   'W*3CTbfexceptions_        Enable the branchful exception support for W'+
   'ebAssembly'#010+
-  'W*3CTjsexcepti','ons_        Enable the JavaScript-based exception supp'+
-  'ort for WebAssembly (experimental)'#010+
-  'W*3CTwasmexceptions_      Enable the native WebAssembly exceptions sup'+
-  'port'#010+
+  'W*3CTjsexceptions_        Enable the JavaScript-based exception suppor'+
+  't for WebAssembly (experimental)'#010+
+  'W*3CTwasmexceptions_      En','able the native WebAssembly exceptions s'+
+  'upport'#010+
   'W*3CTwasmthreads_         Enable WebAssembly threads support (experime'+
-  'ntal)'#010,
+  'ntal)'#010+
   'J*2Cv_Var/out parameter copy-out checking'#010+
   'A*2CV<x>_Set section threadvar model to <x>'#010+
-  '**2CX_Create also smartlinked library'#010+
+  '**2CX_Create also smartlinked l','ibrary'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
-  '**2DD<x>_Set the date string',' returned by %DATE% to x, it is not chec'+
-  'ked for being a valid date string'#010+
-  '**2DT<x>_Set the time string returned by %TIME% to x, it is not checke'+
-  'd for being a valid time string'#010+
+  '**2DD<x>_Set the date string returned by %DATE% to x, it is not checke'+
+  'd for being a valid date string'#010+
+  '**2DT<x>_Set the time string returned by %T','IME% to x, it is not chec'+
+  'ked for being a valid time string'#010+
   '**2Dv<x>_Set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
-  '**1e<x>_Set',' path to executable'#010+
+  '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
   '**1fPIC_Same as -Cg'#010+
   '**1F<x>_Set file names and paths:'#010+
-  '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
-  'sed'#010+
+  '**2Fa<x>[,y]_(for a progra','m) load units <x> and [y] before uses is p'+
+  'arsed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
-  '**2FC<x>_Set RC compiler binary name to ','<x>'#010+
+  '**2FC<x>_Set RC compiler binary name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
-  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
+  '**2FD<x>_Set the directory where to search for compiler uti','lities'#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 (D','arwin only), or set IDF path to'+
-  ' <x> (Xtensa-FreeRTOS)'#010+
-  '**2FF_Use fpcres as RC to RES compiler instead of windres or gorc'#010+
+  '**2Ff<x>_Add <x> to framework path (Darwin only), or set IDF path to <'+
+  'x> (Xtensa-FreeRTOS)'#010+
+  '**2FF_Use fpcres as RC to RES compiler instead of windres or go','rc'#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 unico','de conversion table from <x>.txt in the compiler '+
-  'dir'#010+
-  '**2FM<x>_Set the directory where to search for unicode binary files'#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 fi','les'#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 messag','e file <x>'#010+
+  '**2Fr<x>_Load error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker to <x>'#010+
   '**2Fu<x>_Add <x> to unit path'#010+
-  '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
+  '**2FU<x>_Set unit output path to ','<x>, overrides -FE'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
-  '**2FW<x>_Store generated wh','ole-program optimization feedback in <x>'#010+
+  '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
   '*g1g_Generate debug information (default format for target)'#010+
-  '*g2gc_Generate checks for pointers (experimental, only available on so'+
-  'me targets, might generate false positive)'#010+
-  '*g2gh_Use heaptrace unit (','for memory leak/corruption debugging)'#010+
+  '*g2gc_Generate c','hecks for pointers (experimental, only available on '+
+  'some targets, might generate false positive)'#010+
+  '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
   '*g2gl_Use line info unit (show more info with backtraces)'#010+
-  '*g2gm_Generate Microsoft CodeView debug information (experimental)'#010+
+  '*g2gm_Generate Micros','oft CodeView debug information (experimental)'#010+
   '*g2go<x>_Set debug information options'#010+
-  '*g3godwarfcpp_ Simulate C++ debug info','rmation in DWARF'#010+
+  '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
-  '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+
-  'cords in MS LINK format in addition to the DWARF debug information (Op'+
-  'en Watcom',' Debugger/Linker compatibility)'#010+
+  '*g3godwarfomflinnum_ Gener','ate line number information in OMF LINNUM '+
+  'records in MS LINK format in addition to the DWARF debug information ('+
+  'Open Watcom Debugger/Linker compatibility)'#010+
   '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
   'aks gdb < 6.5)'#010+
-  '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
-  #010+
+  '*g3gosta','bsabsincludes_ Store absolute/full include file paths in Sta'+
+  'bs'#010+
   '*g2gp_Preserve case in stabs symbol names'#010+
-  '*g2gs_Generate Sta','bs debug information'#010+
+  '*g2gs_Generate Stabs debug information'#010+
   '*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+
-  't'#039' changes the trashing value)'#010+
+  't'#039' changes the trashing val','ue)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
-  '*g2gw2_Generat','e DWARFv2 debug information'#010+
+  '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
-  '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
+  '*g2gw4_Generate DWARFv4 debug information (expe','rimental)'#010+
   '**1i_Information'#010+
   '**2ia_Return list of supported ABI targets'#010+
   '**2ib_Return the used code generation backend type'#010+
-  '**','2ic_Return list of supported CPU instruction sets'#010+
+  '**2ic_Return list of supported CPU instruction sets'#010+
   '**2iD_Return compiler date'#010+
-  '**2if_Return list of supported FPU instruction sets'#010+
+  '**2if_Return list of supported FPU instr','uction sets'#010+
   '**2ii_Return list of supported inline assembler modes'#010+
-  'L*2il_Return list of supported LLVM/Xcode versions by the',' LLVM backe'+
-  'nd'#010+
+  'L*2il_Return list of supported LLVM/Xcode versions by the LLVM backend'+
+  #010+
   '**2im_Return list of supported modeswitches'#010+
   '**2io_Return list of supported optimizations'#010+
-  '**2ir_Return list of recognized compiler and RTL features'#010+
+  '**2ir_Return l','ist of recognized compiler and RTL features'#010+
   '**2iSO_Return compiler OS'#010+
   '**2iSP_Return compiler host processor'#010+
-  '**2it_Return li','st of supported targets'#010+
+  '**2it_Return list of supported targets'#010+
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
-  '**2iu_Return list of supported microcontroller types'#010+
+  '**2iu_Return list of supported microco','ntroller types'#010+
   '**2iV_Return short compiler version'#010+
   '**2iw_Return list of supported whole program optimizations'#010+
-  '**2iW_Return ','full compiler version'#010+
+  '**2iW_Return full compiler version'#010+
   '**1I<x>_Add <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_Write logo'#010+
-  '**1M<x>_Set language mode to <x> / enable modeswitch <x> (see option -'+
-  'im)'#010+
+  '**1M<x>_Set lang','uage mode to <x> / enable modeswitch <x> (see option'+
+  ' -im)'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
-  '**2Mdelphiunicode_Delphi 2','009 and later compatibility mode'#010+
+  '**2Mdelphiunicode_Delphi 2009 and later compatibility mode'#010+
   '**2Mextendedpascal_ISO 10206 mode'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
-  '**2Miso_ISO 7185 mode'#010+
+  '**2Miso_ISO ','7185 mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
   '**2Mobjfpc_FPC mode with Object Pascal support'#010+
-  '**2Mtp_TP/','BP 7.0 compatibility mode'#010+
+  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
   '**2*_Each mode (as listed above) enables its default set of modeswitch'+
   'es.'#010+
-  '**2*_Other modeswitches are disabled and need to be enabled one by ano'+
-  'ther.'#010+
+  '**2*_Other modesw','itches are disabled and need to be enabled one by a'+
+  'nother.'#010+
   '**1M<x>-_Disable modeswitch <x> (see option -im)'#010+
-  '**1n_Do not rea','d the default config files'#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+
+  '**2O-_Dis','able optimizations'#010+
   '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
-  '**2O2_Level 2 optimizations (-O1 + quick optim','izations)'#010+
+  '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
-  '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+
-  'pected side effects)'#010+
+  '**2O4_Level 4 optimizations (-O3 + optimizations whi','ch might have un'+
+  'expected side effects)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable or disable optimizations; see fpc -i ','or fpc -io '+
-  'for possible values'#010+
+  '**2Oo[NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io fo'+
+  'r possible values'#010+
   '**2Op<x>_Set target cpu for optimizing; see fpc -i or fpc -ic for poss'+
   'ible values'#010+
-  '**2Os_Optimize for size rather than speed'#010+
+  '**2O','s_Optimize for size rather than speed'#010+
   '**2Ow<x>_Perform whole-program optimization <x>; see fpc -i or fpc -iw'+
-  ' for possible v','alues'#010+
+  ' for possible values'#010+
   '**2OW<x>_Generate whole-program optimization feedback for optimization'+
-  ' <x>; see fpc -i or fpc -iw for possible values'#010+
+  ' <x>; see fpc -i or fpc -iw for possible ','values'#010+
   '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
   'F*1P<x>_Target CPU / compiler related options:'#010+
-  'F*2PB_Sho','w default compiler binary'#010+
+  'F*2PB_Show default compiler binary'#010+
   'F*2PP_Show default target cpu'#010+
-  'F*2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipse'+
-  'l,powerpc,powerpc64,sparc,x86_64)'#010+
+  'F*2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,m','ips,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*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
   '4*2Ratt_Read AT&T style assembler'#010+
-  '4*2Rintel_Read Intel style assembler'#010+
+  '4*2Rintel_Read',' Intel style assembler'#010+
   '8*2Ratt_Read AT&T style assembler'#010+
   '8*2Rintel_Read Intel style assembler'#010+
-  '6*2RMOT_Read Motorola style a','ssembler'#010+
+  '6*2RMOT_Read Motorola style assembler'#010+
   '**1s_Do not call assembler and linker'#010+
-  '**2sh_Generate script to link on host, automatically switches to exter'+
+  '**2sh_Generate script to link on host, automatically switches to exter',
   'nal assembler writer'#010+
   '**2sr_Skip register allocation phase (use with -alr), automatically sw'+
-  'itches to external assembler wri','ter'#010+
+  'itches to external assembler writer'#010+
   '**2st_Generate script to assemble and link on target, automatically sw'+
   'itches to external assembler writer'#010+
-  '**2sT_Generate script only to link on target'#010+
+  '**2sT_G','enerate script only to link on target'#010+
   '**1S<x>_Syntax options:'#010+
   '**2S2_Same as -Mobjfpc'#010+
   '**2Sa_Turn on assertions'#010+
-  '**2Sc_Support',' operators like C (*=,+=,/= and -=)'#010+
+  '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
   '**2Sd_Same as -Mdelphi'#010+
-  '**2Se<x>_Error options. <x> is a combination of the following:'#010+
+  '**2Se<x>_Error options. <x> is a combination of the follow','ing:'#010+
   '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
   '**3*_h : Compiler also halts after hints'#010+
-  '**3*_n : Compil','er also halts after notes'#010+
+  '**3*_n : Compiler also halts after notes'#010+
   '**3*_w : Compiler also halts after warnings'#010+
-  '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc -'+
-  'ir for possible values)'#010+
+  '**2Sf_Enable certain features in compiler and R','TL; see fpc -i or fpc'+
+  ' -ir for possible values)'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use referen','ce counted strings (ansistring by default) 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 dec','lared as "inline"'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
-  '**3SIcorba_CORBA compatib','le interface'#010+
+  '**3SIcorba_CORBA compatible interface'#010+
   '**2Sj_Allows typed constants to be writeable (default in all modes)'#010+
   '**2Sk_Load fpcylix unit'#010+
-  '**2Sm_Support macros like C (global)'#010+
+  '**2Sm_Suppor','t 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 name must be "Done'+
-  '")'#010+
+  '**2Ss_Constructor name must be "Init" (destructor name 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+
+  '**2Sx_Enabl','e exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
-  '**1T<x>_Target ','operating system:'#010+
+  '**1T<x>_Target operating system:'#010+
   '3*2Tandroid_Android'#010+
   '3*2Taros_AROS'#010+
   '3*2Tbeos_BeOS'#010+
   '3*2Tdarwin_Darwin/Mac OS X'#010+
   '3*2Tembedded_Embedded'#010+
-  '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
+  '3*','2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
   '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
-  '3*2Thai','ku_Haiku'#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_Nati','ve NT API (experimental)'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Netware Module (lib','c)'#010+
+  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsolaris_Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2Twatcom_Watcom compatible DOS extender'#010+
+  '3*2Twatcom_Watcom compat','ible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 bit'#010+
   '3*2Twince_Windows CE'#010+
   '4*2Tandroid_Android'#010+
-  '4*2Taros_A','ROS'#010+
+  '4*2Taros_AROS'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
   '4*2Tdragonfly_DragonFly BSD'#010+
   '4*2Tembedded_Embedded'#010+
   '4*2Tfreebsd_FreeBSD'#010+
-  '4*2Thaiku_Haiku'#010+
+  '4*2Thaiku_Haiku'#010,
   '4*2Tiphonesim_iPhoneSimulator'#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+
+  '4*2Twin64_Win64 (64 bit Windows systems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tembedded_Embedded'#010+
   '6*2Tlinux_Linux'#010+
-  '6*2Tnetbsd_NetBSD'#010+
+  '6*2Tn','etbsd_NetBSD'#010+
   '6*2Tmacosclassic_Classic Mac OS'#010+
   '6*2Tpalmos_PalmOS'#010+
   '6*2Tsinclairql_Sinclair QL'#010+
   '8*2Tembedded_Embedded'#010+
-  '8*2Tmsdos_M','S-DOS (and compatible)'#010+
+  '8*2Tmsdos_MS-DOS (and compatible)'#010+
   '8*2Twin16_Windows 16 bit'#010+
   'A*2Tandroid_Android'#010+
   'A*2Taros_AROS'#010+
   'A*2Tembedded_Embedded'#010+
-  'A*2Tfreertos_FreeRTOS'#010+
+  'A*2Tfreertos_','FreeRTOS'#010+
   'A*2Tgba_Game Boy Advance'#010+
   'A*2Tios_iOS'#010+
   'A*2Tlinux_Linux'#010+
   'A*2Tnds_Nintendo DS'#010+
   'A*2Tnetbsd_NetBSD'#010+
   'A*2Tpalmos_PalmOS'#010+
-  'A*2Ts','ymbian_Symbian'#010+
+  'A*2Tsymbian_Symbian'#010+
   'A*2Twince_Windows CE'#010+
   'a*2Tandroid_Android'#010+
   'a*2Tdarwin_Darwin/Mac OS X'#010+
   'a*2Tfreebsd_FreeBSD'#010+
   'a*2Tios_iOS'#010+
-  'a*2Tlinux_Linux'#010+
+  'a*','2Tlinux_Linux'#010+
   'a*2Twin64_Windows 64'#010+
   'J*2Tandroid_Android'#010+
   'J*2Tjava_Java'#010+
   'l*2Tlinux_Linux'#010+
   'm*2Tandroid_Android'#010+
-  'm*2Tembedded_Embed','ded'#010+
+  'm*2Tembedded_Embedded'#010+
   'm*2Tlinux_Linux'#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*2Tembedded_Embedded'#010+
+  'P*','2Tembedded_Embedded'#010+
   'P*2Tlinux_Linux'#010+
   'P*2Tmacosclassic_Classic Mac OS'#010+
   'P*2Tmorphos_MorphOS'#010+
   'P*2Tnetbsd_NetBSD'#010+
   'P*2Twii_Wii'#010+
-  'p*2Ta','ix_AIX'#010+
+  'p*2Taix_AIX'#010+
   'p*2Tdarwin_Darwin/Mac OS X'#010+
   'p*2Tembedded_Embedded'#010+
   'p*2Tlinux_Linux'#010+
   'R*2Tembedded_Embedded'#010+
   'R*2Tlinux_Linux'#010+
-  'r*2Tembedded_Embedded'#010+
+  'r*2Temb','edded_Embedded'#010+
   'r*2Tlinux_Linux'#010+
   'S*2Tlinux_Linux'#010+
   'S*2Tsolaris_Solaris'#010+
   's*2Tlinux_Linux'#010+
   'V*2Tembedded_Embedded'#010+
-  'x*2Tembedded_Embed','ded'#010+
+  'x*2Tembedded_Embedded'#010+
   'x*2Tfreertos_FreeRTOS'#010+
   'x*2Tlinux_Linux'#010+
   'Z*2Tembedded_Embedded'#010+
   'Z*2Tamstradcpc_Amstrad CPC'#010+
   'Z*2Tmsxdos_MSX-DOS'#010+
-  'Z*2Tzxspectrum_ZX Spectrum'#010+
+  'Z*2Tzxs','pectrum_ZX Spectrum'#010+
   'W*2Tembedded_Embedded'#010+
   'W*2Twasi_The WebAssembly System Interface (WASI)'#010+
   '**1t<x>_Target architecture'#010+
-  '**2*','_ * Defines FPC_SUBTARGET_<x> '#010+
+  '**2*_ * Defines FPC_SUBTARGET_<x> '#010+
   '**2*_ * Defines FPC_SUBTARGET as <arg>'#010+
-  '**2*_ * Additionally reads config file fpc-<subtarget>.cfg'#010+
+  '**2*_ * Additionally reads config file fpc-<sub','target>.cfg'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do not check where the unit name matches the file nam','e'#010+
+  '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
+  '**1v<x>_Be verbose. ','<x> is a combination of the following letters:'#010+
   '**2*_0 : Show nothing (except errors) p : Write tree.log with parse tr'+
   'ee'#010+
-  '**2','*_a : Show everything              q : Show message numbers'#010+
-  '**2*_b : Write file names messages    r : Rhide/GCC compatibility mode'+
-  #010+
+  '**2*_a : Show everything              q : Show message numbers'#010+
+  '**2*_b : Write file names messages    r : Rhide/GCC compa','tibility mo'+
+  'de'#010+
   '**2*_    with full path               s : Show time stamps'#010+
-  '**2*_c : Show conditionals            t : Show tri','ed/used files'#010+
+  '**2*_c : Show conditionals            t : Show tried/used files'#010+
   '**2*_d : Show debug info              u : Show unit info'#010+
-  '**2*_e : Show errors (default)        v : Write fpcdebug.txt with'#010+
+  '**2*_e : Show errors (default)        v : Writ','e fpcdebug.txt with'#010+
   '**2*_h : Show hints                       lots of debugging info'#010+
-  '**2*_i : Show general info            ','w : Show warnings'#010+
+  '**2*_i : Show general info            w : Show warnings'#010+
   '**2*_l : Show linenumbers             x : Show info about invoked tool'+
   's'#010+
-  '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
+  '**2*_m<x>,<y> : Do not show',' messages numbered <x> and <y>'#010+
   '**2*_n : Show notes                   z : Write output to stderr'#010+
-  'F*1V<x>_Append '#039'-<x>'#039' to th','e used compiler binary name (e.g.'+
-  ' for version)'#010+
+  'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
+  'or version)'#010+
   '**1W<x>_Target-specific options (targets)'#010+
-  '3*2WA_Specify native type application (Windows)'#010+
+  '3*2WA_Specify native type ap','plication (Windows)'#010+
   '4*2WA_Specify native type application (Windows)'#010+
   'A*2WA_Specify native type application (Windows)'#010+
-  '3*2Wb_C','reate a bundle instead of a library (Darwin)'#010+
+  '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'p*2Wb_Create a bundl','e 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 libr','ary (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_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+
+  '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+
+  'Z*2W','B<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 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 console type application (C','lassic 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 o','r EXE (Windows)'#010+
+  '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   '3*2We_Use external resources (Darwin)'#010+
-  '4*2We_Use external resources (Darwin)'#010+
+  '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 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+
   '6*2WF<x>_Set TOS program flags to <x> (Atari)'#010+
   '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
-  '4*2WG_Specify',' graphic type application (Windows)'#010+
+  '4*2WG_Specify graphic type application (Windows)'#010+
   'A*2WG_Specify graphic type application (Windows)'#010+
-  'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
+  'P*2WG_Specify graphic type appli','cation (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
   '4*2Wi_Use internal resources (Darwin)'#010+
-  'a*2Wi_Use internal reso','urces (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+
+  'p*2Wi_Use internal resourc','es (Darwin)'#010+
   '3*2WI_Turn on/off the usage of import sections (Windows)'#010+
-  '4*2WI_Turn on/off the usage of import sections (Window','s)'#010+
+  '4*2WI_Turn on/off the usage of import sections (Windows)'#010+
   'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
-  '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+
-  'e segment)'#010+
+  '8*2Wh_Use huge code for units (ignored for models with CO','DE 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*3Wm','Medium_Medium memory model'#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+
+  '8*3WmHuge_Huge memory mode','l'#010+
   '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '4*2WM<x>_Minimum Mac OS X deployment version: 10','.4, 10.5.1, ... (Dar'+
-  'win)'#010+
-  'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+  '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+  'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '3*2WN_Do not generate relocation code, needed for debugging (Windows)',
-  #010+
+  'P*2WM<x>_Minimum Ma','c OS X deployment version: 10.4, 10.5.1, ... (Dar'+
+  'win)'#010+
+  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
+  'A*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 th','e 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'+
+  'm*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
+  'R*2Wp<x>_Specify the controller type; see fpc -i or fpc ','-iu for 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 th','e 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+
+  'x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
+  'le values'#010+
+  '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ...',' (iphonesim)'+
+  #010+
   '4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+
-  'a*2WP<x>_Minimum iOS deployment version: ','7.0, 7.1.2, ... (Darwin)'#010+
+  '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+
-  'x*2WP<x>_Esp8266-rtos-sdk or esp-idf version number: 3.3, 3.4 (esp8266'+
-  ') or 4.2, 4.3 (esp32)'#010+
+  'x*2WP<x>_Esp8266-rtos-sdk ','or esp-idf version number: 3.3, 3.4 (esp82'+
+  '66) or 4.2, 4.3 (esp32)'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
-  '4*2WR_Generate r','elocation 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*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
+  '8*3Wtcom_','Create a DOS .COM file (requires tiny memory model)'#010+
   '8*3Wtexe_Create a DOS .EXE file (default)'#010+
-  '6*2Wt<x>_Set the target execu','table format (Atari)'#010+
+  '6*2Wt<x>_Set the target executable format (Atari)'#010+
   '6*3Wttos_Create TOS executable file (default)'#010+
   '6*3Wtmint_Create a MiNT executable file'#010+
-  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
+  'P*2WT_Spec','ify 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*3WQqhdr_Set metadata to QDOS File Header style (default)'#010+
   '6*3WQxtcc_Set metadata to XTcc style'#010+
   '**2WX_Enable executable stack (Linux)'#010+
-  '**1x<suff>_Set suffix for compiler executable (fpc command only)'#010+
+  '**1x<','suff>_Set suffix for compiler executable (fpc command only)'#010+
   '**1X_Executable options:'#010+
-  '**2X9_Generate linkerscript for GNU Bi','nutils ld older than version 2'+
-  '.19.1 (Linux)'#010+
+  '**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+
+  '9.1 (Linux)'#010+
   '**2Xa_Generate code which allows to use more than 2 GB static data on '+
-  '64 bit targets (Linux)'#010+
+  '64 ','bit targets (Linux)'#010+
   '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
   'ux)'#010+
-  '**2Xd_Do not search default l','ibrary path (sometimes required for cro'+
-  'ss-compiling when not using -XR)'#010+
-  '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
+  '**2Xd_Do not search default library path (sometimes required for cross'+
+  '-compiling when not using -XR)'#010+
+  '**2XD_Try to link units dynamically      (def','ines FPC_LINK_DYNAMIC)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xf_Substitute pthread library name for linking (BSD)'#010+
-  '**2Xg_Create debug','info in a separate file and add a debuglink sectio'+
-  'n to executable'#010+
+  '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
+  'to executable'#010+
   '**2Xi_Use internal linker'#010+
-  'L*2XlS<x>_LLVM utilties suffix (e.g. -7 in case clang is called clang-'+
-  '7)'#010+
+  'L*2XlS<x>_LLVM utilties s','uffix (e.g. -7 in case clang is called clan'+
+  'g-7)'#010+
   '**2XLA_Define library substitutions for linking'#010+
-  '**2XLD_Exclude default orde','r of standard libraries'#010+
+  '**2XLD_Exclude default order of standard libraries'#010+
   '**2XLO_Define order of library linking'#010+
   '**2Xm_Generate link map'#010+
-  '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
-  's '#039'main'#039')'#010+
+  '**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>_F','irst search for the compiler binary in the directory <x>'#010+
+  'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
   '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
-  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
-  '**','2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeB'+
-  'SD, Linux, Mac OS, Solaris)'#010+
-  '**2Xs_Strip all symbols from executable'#010+
+  '**2X','r<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+
+  '**2Xs_Strip all symbols',' from executable'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
-  '**2Xt_Link with static libraries (-s','tatic is passed to linker)'#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_Generate table for ','Virtual Entry calls'#010+
   '**2XV_Use VLink as external linker       (default on Amiga, Atari, Sin'+
   'clair QL)'#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'

compiler/options.pas

@@ -131,6 +131,9 @@ Type
 {$ifdef llvm}
     procedure LLVMEnableSanitizers(sanitizers: TCmdStr);
 {$endif llvm}
+{$ifdef AVR}
+    function ParseLinkerDiscardOptions(const s:TCmdStr):boolean;
+{$endif AVR}
     procedure VerifyTargetProcessor;
   end;
 
@@ -1467,6 +1470,30 @@ procedure TOption.LLVMEnableSanitizers(sanitizers: TCmdStr);
   end;
 {$endif}
 
+{$ifdef AVR}
+function TOption.ParseLinkerDiscardOptions(const s: TCmdStr): boolean;
+var
+  i: Integer;
+  c: char;
+begin
+  i:=2;
+  while i<=length(s) do
+   begin
+     c:=upcase(s[i]);
+     case c of
+      'C' : include(init_settings.globalswitches,cs_link_discard_copydata);
+      'J' : include(init_settings.globalswitches,cs_link_discard_jmp_main);
+      'S' : include(init_settings.globalswitches,cs_link_discard_start);
+      'Z' : include(init_settings.globalswitches,cs_link_discard_zeroreg_sp);
+     else
+      exit(false);
+     end;
+     inc(i);
+   end;
+  result:=true;
+end;
+{$endif AVR}
+
 {$ifdef XTENSA}
 procedure TOption.MaybeSetIdfVersionMacro;
 begin
@@ -2449,6 +2476,14 @@ begin
              IllegalPara(opt);
             break;
           end;
+{$ifdef AVR}
+       'd' :
+          begin
+            if not ParseLinkerDiscardOptions(more) then
+              IllegalPara(opt);
+            break;
+          end;
+{$endif AVR}
 {$ifdef cpufpemu}
        'e' :
           begin

compiler/systems/t_embed.pas

@@ -1051,6 +1051,24 @@ begin
       Add('  .rela.bss      : { *(.rela.bss)		}');
       Add('  .rel.plt       : { *(.rel.plt)		}');
       Add('  .rela.plt      : { *(.rela.plt)		}');
+      if [cs_link_discard_start,cs_link_discard_zeroreg_sp,cs_link_discard_copydata,
+          cs_link_discard_jmp_main]*current_settings.globalswitches<>[] then
+        begin
+          Add('  /DISCARD/ :');
+          Add('  { /* Discard RTL startup code */');
+          if cs_link_discard_start in current_settings.globalswitches then
+            begin
+              Add('    *(.init)  /* vector table */');
+              Add('    *(.text.*_default_irq_handler)');
+            end;
+          if cs_link_discard_zeroreg_sp in current_settings.globalswitches then
+            Add('    *(.init2) /* _FPC_init_zeroreg_SP */');
+          if cs_link_discard_copydata in current_settings.globalswitches then
+            Add('    *(.init4) /* _FPC_copy_data */');
+          if cs_link_discard_jmp_main in current_settings.globalswitches then
+            Add('    *(.init9) /* _FPC_jmp_main */');
+          Add('  }');
+        end;
       Add('  /* Internal text space or external memory.  */');
       Add('  .text   :');
       Add('  {');
@@ -1127,36 +1145,55 @@ begin
       Add('    KEEP (*(.fini0))');
       Add('     _etext = . ;');
       Add('  }  > text');
-      Add('  .data	  : AT (ADDR (.text) + SIZEOF (.text))');
-      Add('  {');
-      Add('     PROVIDE (__data_start = .) ;');
-      Add('    *(.data)');
-      Add('    *(.data*)');
-      Add('    *(.rodata)  /* We need to include .rodata here if gcc is used */');
-      Add('    *(.rodata*) /* with -fdata-sections.  */');
-      Add('    *(.gnu.linkonce.d*)');
-      Add('    . = ALIGN(2);');
-      Add('     _edata = . ;');
-      Add('     PROVIDE (__data_end = .) ;');
-      Add('  }  > data');
-      Add('  .bss   : AT (ADDR (.bss))');
-      Add('  {');
-      Add('     PROVIDE (__bss_start = .) ;');
-      Add('    *(.bss)');
-      Add('    *(.bss*)');
-      Add('    *(COMMON)');
-      Add('     PROVIDE (__bss_end = .) ;');
-      Add('  }  > data');
-      Add('   __data_load_start = LOADADDR(.data);');
-      Add('   __data_load_end = __data_load_start + SIZEOF(.data);');
-      Add('  /* Global data not cleared after reset.  */');
-      Add('  .noinit  :');
-      Add('  {');
-      Add('     PROVIDE (__noinit_start = .) ;');
-      Add('    *(.noinit*)');
-      Add('     PROVIDE (__noinit_end = .) ;');
-      Add('     _end = . ;');
-      Add('     PROVIDE (__heap_start = .) ;');
+      if not(cs_link_discard_copydata in current_settings.globalswitches) then
+        begin
+          Add('  .data	  : AT (ADDR (.text) + SIZEOF (.text))');
+          Add('  {');
+          Add('     PROVIDE (__data_start = .) ;');
+          Add('    *(.data)');
+          Add('    *(.data*)');
+          Add('    *(.rodata)  /* We need to include .rodata here if gcc is used */');
+          Add('    *(.rodata*) /* with -fdata-sections.  */');
+          Add('    *(.gnu.linkonce.d*)');
+          Add('    . = ALIGN(2);');
+          Add('     _edata = . ;');
+          Add('     PROVIDE (__data_end = .) ;');
+          Add('  }  > data');
+          Add('  .bss   : AT (ADDR (.bss))');
+          Add('  {');
+          Add('     PROVIDE (__bss_start = .) ;');
+          Add('    *(.bss)');
+          Add('    *(.bss*)');
+          Add('    *(COMMON)');
+          Add('     PROVIDE (__bss_end = .) ;');
+          Add('  }  > data');
+          Add('   __data_load_start = LOADADDR(.data);');
+          Add('   __data_load_end = __data_load_start + SIZEOF(.data);');
+          Add('  /* Global data not cleared after reset.  */');
+          Add('  .noinit  :');
+          Add('  {');
+          Add('     PROVIDE (__noinit_start = .) ;');
+          Add('    *(.noinit*)');
+          Add('     PROVIDE (__noinit_end = .) ;');
+          Add('     _end = . ;');
+          Add('     PROVIDE (__heap_start = .) ;');
+        end
+      else
+        begin
+          { Move all data into noinit section }
+          Add('  /* Global data not cleared after reset.  */');
+          Add('  .noinit  :');
+          Add('  {');
+          Add('    *(.data)');
+          Add('    *(.data*)');
+          Add('    *(.rodata)');
+          Add('    *(.rodata*)');
+          Add('    *(.gnu.linkonce.d*)');
+          Add('    *(.bss)');
+          Add('    *(.bss*)');
+          Add('    *(COMMON)');
+          Add('    *(.noinit*)');
+        end;
       Add('  }  > data');
       Add('  .eeprom  :');
       Add('  {');

compiler/utils/ppuutils/ppudump.pp

@@ -2339,6 +2339,10 @@ const
         'Link using native linker', {cs_link_native}
         'Link for GNU linker version <=2.19', {cs_link_pre_binutils_2_19}
         'Link using vlink', {cs_link_vlink}
+        'Discard _START code', {cs_link_discard_start}
+        'Discard code initializing the zero register and stack pointer', {cs_link_discard_zeroreg_sp}
+        'Discard initializing data', {cs_link_discard_copydata}
+        'Discard jump to PASCALMAIN', {cs_link_discard_jmp_main}
         'Link-Time Optimization disabled for system unit', {cs_lto_nosystem}
         'Assemble on target OS', {cs_asemble_on_target}
         'Use a memory model to support >2GB static data on 64 Bit target', {cs_large}

tests/test/cpu8/avr/tdiscard_options.pp

@@ -0,0 +1,11 @@
+{ %cpu=avr }
+{ %NORUN }
+{ %OPT=-Cdcjsz }
+
+program tdiscard_options;
+
+{ Test compiler with all discard options active. }
+
+begin
+end.
+