Browse Source

* Rename architecture to more neutral subtarget

Michael VAN CANNEYT 2 năm trước cách đây
mục cha
commit
13368ac5cc
6 tập tin đã thay đổi với 195 bổ sung189 xóa
  1. 2 2
      compiler/msg/errore.msg
  2. 3 3
      compiler/msgidx.inc
  3. 155 154
      compiler/msgtxt.inc
  4. 24 19
      compiler/options.pas
  5. 6 6
      compiler/ppcx64.lpi
  6. 5 5
      compiler/utils/fpc.pp

+ 2 - 2
compiler/msg/errore.msg

@@ -3629,9 +3629,9 @@ option_unsupported_fpu=11063_F_The selected FPU type "$1" is not supported by th
 % Not all instruction sets support all FPU types. For example on ARM, Thumb(-1) supports no FPU/VFP instruction set
 option_too_many_exception_modes=11064_E_Only one WebAssembly exception support mode can be specified.
 % Only one WebAssembly exception support mode (NOEXCEPTIONS, JSEXCEPTIONS, BFEXCEPTIONS or NATIVEEXCEPTIONS) can be specified.
-option_architecture_is_already_set=11065_W_Architecture is already set to: $1
+option_subtarget_is_already_set=11065_W_Subtarget is already set to: $1
 % Displayed if more than one \var{-t} option is specified.
-option_architecture_config_not_found=11066_W_Architecture $1 specified but no corresponding config file $2 found.
+option_subtarget_config_not_found=11066_W_Subtarget $1 specified but no corresponding config file $2 found.
 % Displayed if more than one \var{-t} option is specified.
 option_x_ignored=11067_N_Ignoring compiler executable suffix $1.
 % Displayed if more than one \var{-t} option is specified.

+ 3 - 3
compiler/msgidx.inc

@@ -1104,8 +1104,8 @@ const
   option_valgrind_heaptrc_mismatch=11062;
   option_unsupported_fpu=11063;
   option_too_many_exception_modes=11064;
-  option_architecture_is_already_set=11065;
-  option_architecture_config_not_found=11066;
+  option_subtarget_is_already_set=11065;
+  option_subtarget_config_not_found=11066;
   option_x_ignored=11067;
   wpo_cant_find_file=12000;
   wpo_begin_processing=12001;
@@ -1160,7 +1160,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 90933;
+  MsgTxtSize = 90927;
 
   MsgIdxMax : array[1..20] of longint=(
     28,109,366,132,100,63,148,38,223,71,

+ 155 - 154
compiler/msgtxt.inc

@@ -1352,68 +1352,68 @@ const msgtxt : array[0..000378,1..240] of char=(
   '11063_F_The selected FPU type "$1" is not supported by the selected in'+
   'struction set "$2"'#000+
   '11064_E_Only one WebAssembly exception support mode can be specified.'#000+
-  '11065_W_Architecture is already set to: $1'#000+
-  '11066_W_Architecture $1 ','specified but no corresponding config file $'+
-  '2 found.'#000+
+  '11065_W_Subtarget is already set to: $1'#000+
+  '11066_W_Subtarget $1 specif','ied but no corresponding config file $2 f'+
+  'ound.'#000+
   '11067_N_Ignoring compiler executable suffix $1.'#000+
   '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
   '12001_D_Processing whole program optimization information in wpo feedb'+
-  'ack',' file "$1"'#000+
+  'ack file ','"$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
   ' in wpo feedback file "$1"'#000+
   '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
   'ck file'#000+
-  '12004_W_No handler registered for whole program optimi','zation section'+
+  '12004_W_No handler registered for whole program optimization',' section'+
   ' "$2" at line $1 of wpo feedback file, ignoring'#000+
   '12005_D_Found whole program optimization section "$1" with information'+
   ' about "$2"'#000+
   '12006_F_The selected whole program optimizations require a previously '+
-  'generated feedback file (u','se -Fw to specify)'#000+
+  'generated feedback file (use -Fw',' to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
   'am optimization found'#000+
   '12008_F_Specify a whole program optimization feedback file to store th'+
   'e generated info in (using -FW)'#000+
-  '12009_E_Not generating any ','whole program optimization information, y'+
+  '12009_E_Not generating any whole ','program optimization information, y'+
   'et a feedback file was specified (using -FW)'#000+
   '12010_E_Not performing any whole program optimizations, yet an input f'+
   'eedback file was specified (using -Fw)'#000+
-  '12011_D_Skipping whole program optimization s','ection "$1", because no'+
+  '12011_D_Skipping whole program optimization section',' "$1", because no'+
   't needed by the requested optimizations'#000+
   '12012_W_Overriding previously read information for "$1" from feedback '+
   'input file using information in section "$2"'#000+
-  '12013_E_Cannot extract symbol liveness information from progra','m when'+
-  ' stripping symbols, use -Xs-'#000+
+  '12013_E_Cannot extract symbol liveness information from program when',' '+
+  'stripping symbols, use -Xs-'#000+
   '12014_E_Cannot extract symbol liveness information from program when w'+
   'hen not linking'#000+
   '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
   'n from linked program'#000+
-  '12016_E_Error during readin','g symbol liveness information produced by'+
+  '12016_E_Error during reading symb','ol liveness information produced by'+
   ' "$1"'#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
   'ion from linked program'#000+
   '12018_E_Collection of symbol liveness information can only help when u'+
-  'sing smart linking, use -CX -','XX'#000+
-  '12019_E_Cannot create specified whole program optimisation feedback fi'+
-  'le "$1"'#000+
+  'sing smart linking, use -CX -XX'#000+
+  '120','19_E_Cannot create specified whole program optimisation feedback '+
+  'file "$1"'#000+
   '13001_F_Can'#039't find package $1'#000+
   '13002_U_PCP file for package $1 found'#000+
   '13003_E_Duplicate package $1'#000+
   '13004_E_Unit $1 can not be part of a package'#000+
-  '13005_N_Unit $1 i','s implicitly imported into package $2'#000+
+  '13005_N_Unit $1 is impl','icitly imported into package $2'#000+
   '13006_F_Failed to create PCP file $2 for package $1'#000+
   '13007_F_Failed to read PCP file for package $1'#000+
   '13008_T_PCP loading $1'#000+
   '13009_U_PCP Name: $1'#000+
   '13010_U_PCP Flags: $1'#000+
   '13011_U_PCP Crc: $1'#000+
-  '13012_U_PCP Time:',' $1'#000+
-  '13013_U_PCP File too short'#000+
+  '13012_U_PCP Time: $1'#000+
+  '13','013_U_PCP File too short'#000+
   '13014_U_PCP Invalid Header (no PCP at the begin)'#000+
   '13015_U_PCP Invalid Version $1'#000+
   '13016_U_PCP is compiled for another processor'#000+
   '13017_U_PCP is compiled for another target'#000+
   '13018_U_Writing $1'#000+
-  '13019_F_Can'#039't Write P','CP-File'#000+
+  '13019_F_Can'#039't Write PCP-Fil','e'#000+
   '13020_F_Error reading PCP-File'#000+
   '13021_F_Unexpected end of PCP-File'#000+
   '13022_F_Invalid PCP-File entry: $1'#000+
@@ -1421,13 +1421,13 @@ const msgtxt : array[0..000378,1..240] of char=(
   'ode'#000+
   '13024_T_Packagesearch: $1'#000+
   '13025_U_Required package $1'#000+
-  '130','26_U_Contained unit $1'#000+
+  '13026_U_C','ontained unit $1'#000+
   '13027_E_Unit $1 is already contained in package $2'#000+
   '13028_W_Unit $1 is imported from indirectly required package $2'#000+
   '13029_U_PPL filename $1'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
-  'Copy','right (c) 1993-2023 by Florian Klaempfl and others'#000+
+  'Copyright ','(c) 1993-2023 by Florian Klaempfl and others'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler date      : $FPCDATE'#010+
@@ -1435,9 +1435,9 @@ const msgtxt : array[0..000378,1..240] of char=(
   #010+
   'Supported targets (targets marked with '#039'{*}'#039' are under develop'+
   'ment):'#010+
-  '  $OSTARGETS',#010+
+  '  $OSTARGETS'#010+
   #010+
-  'Supported CPU instruction sets:'#010+
+  'Supp','orted CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
@@ -1450,7 +1450,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   '  $FEATURELIST'#010+
   #010+
   'Recognized modeswitches:'#010+
-  '  $MO','DESWITCHES'#010+
+  '  $MODESWIT','CHES'#010+
   #010+
   'Supported ABI targets:'#010+
   '  $ABITARGETS'#010+
@@ -1465,7 +1465,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   'Code Generation Backend'#010+
   '  $CODEGENERATIONBACKEND'#010+
   #010+
-  'Supported LLVM/Xcode versions (o','nly available with LLVM Code Generat'+
+  'Supported LLVM/Xcode versions (only av','ailable with LLVM Code Generat'+
   'ion Backend)'#010+
   '  $LLVMVERSIONS'#010+
   #010+
@@ -1473,192 +1473,192 @@ const msgtxt : array[0..000378,1..240] of char=(
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.v2'#010+
   #010+
-  'Please report bugs in o','ur bug tracker on:'#010+
+  'Please report bugs in our bug',' tracker on:'#010+
   '                 https://bugs.freepascal.org'#010+
   #010+
   'More information may be found on our WWW pages (including directions'#010+
   'for mailing lists useful for asking questions or discussing potential'#010+
   'new features, etc.):'#010+
-  '               ','  https://www.freepascal.org'#000+
+  '                 http','s://www.freepascal.org'#000+
   '11025_F*0*_Only options valid for the default or selected platform are'+
   ' listed.'#010+
   '**0*_Put + after a boolean switch option to enable it, - to disable it'+
   '.'#010+
-  '**1@<x>_Read compiler options from <x> in addition to the de','fault fp'+
+  '**1@<x>_Read compiler options from <x> in addition to the default ','fp'+
   'c.cfg'#010+
   '**1a_The compiler does not delete the generated assembler file, automa'+
   'tically 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 source','code lines in assembler file'#010+
+  '**2al_List sourcecode l','ines in assembler file'#010+
   '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+
   '**2ao_Add an extra option to external assembler call (ignored for inte'+
   'rnal)'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List r','egister allocation/release info in assembler file'#010+
+  '**2ar_List registe','r allocation/release info in assembler file'#010+
   '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
-  '3*2Aas-darwin_Assemble Darwin Mach-O using GNU',' GAS'#010+
-  '3*2Acoff_COFF (Go32v2) using internal writer'#010+
+  '3*2Aas-darwin_Assemble Darwin Mach-O using GNU GAS'#010+
+  '3','*2Acoff_COFF (Go32v2) using internal writer'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
   '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
   '3*2Anasm_Assemble using Nasm'#010+
-  '3*2Anasmcoff_COF','F (Go32v2) file using Nasm'#010+
+  '3*2Anasmcoff_COFF (Go3','2v2) file using Nasm'#010+
   '3*2Anasmdarwin_macho32 object file using Nasm (experimental)'#010+
   '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_Obj file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
-  '3*2Anasmwin32_Win32 object fi','le using Nasm'#010+
+  '3*2Anasmwin32_Win32 object file usi','ng Nasm'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
   '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
   '3*2Ayasm_Assemble using Yasm (experimental)'#010+
   '4*2Aas_Assemble using GNU AS'#010+
-  '4*2Aas-darwin_Assemble Darw','in Mach-O using GNU GAS'#010+
+  '4*2Aas-darwin_Assemble Darwin Mac','h-O using GNU GAS'#010+
   '4*2Aelf_ELF (Linux 64 bit) using internal writer'#010+
   '4*2Agas_Assemble using GNU GAS'#010+
   '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
   '4*2Anasm_Assemble using Nasm (experimental)'#010+
-  '4*2Anasmdarwin_Assemble darwin macho64 obj','ect file using Nasm (exper'+
+  '4*2Anasmdarwin_Assemble darwin macho64 object fi','le using Nasm (exper'+
   'imental)'#010+
   '4*2Anasmelf_Assemble Linux 64 bit object file using Nasm (experimental'+
   ')'#010+
   '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+
   '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
-  '4*2Ayasm_Assemble',' using Yasm (experimental)'#010+
+  '4*2Ayasm_Assemble using',' Yasm (experimental)'#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+
   '8*2Anasm_Assemble using Nasm'#010+
-  '8*2Anasmobj_Assemble using',' Nasm'#010+
+  '8*2Anasmobj_Assemble using Nasm'#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*2Aas-clang_Assemble using clang for other tar','gets'#010+
-  'a*2Aclang_Assemble using clang for darwin/ios targets'#010+
+  'a*2Aas-clang_Assemble using clang for other targets'#010+
+  'a','*2Aclang_Assemble using clang for darwin/ios 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*2Awasm_Assemble using the internal object writer for wasm32 (ex','per'+
-  'imental)'#010+
+  'W*2Awasm_Assemble using the internal object writer for wasm32 (experim'+
+  'e','ntal)'#010+
   'W*2Abinaryen_Assemble using GNU AS for wasm32 (wasm-as) (experimental)'+
   #010+
   'W*2Allvm-mc-10_Assemble using llvm-mc-10'#010+
   'W*2Allvm-mc-11_Assemble using llvm-mc-11'#010+
   'W*2Allvm-mc-12_Assemble using llvm-mc-12'#010+
-  'W*2Allvm-mc-13_Assemble using llvm','-mc-13'#010+
+  'W*2Allvm-mc-13_Assemble using llvm-mc-13',#010+
   'W*2Allvm-mc_Assemble using llvm-mc (version 14 or later)'#010+
   'W*2Awabt_Assemble using wasa (experimental)'#010+
   'x*2Aas_Assemble using GNU AS'#010+
   'Z*2Asdcc-sdasz80_Assemble using SDCC-SDASZ80'#010+
   'Z*2Avasm_Assemble using Vasm'#010+
-  'Z*2Az80asm_Assemble using z80','asm'#010+
-  '**1b_Generate browser info'#010+
+  'Z*2Az80asm_Assemble using z80asm'#010+
+  '**','1b_Generate browser info'#010+
   '**2bl_Generate local symbol info'#010+
   '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
   '**2C3_Turn on ieee error checking for constants'#010+
   '**2Ca<x>_Select ABI; see fpc -i or fpc -ia for possible values'#010+
-  '**2Cb_Gen','erate code for a big-endian variant of the target architect'+
+  '**2Cb_Generate ','code for a big-endian variant of the target architect'+
   'ure'#010+
   '**2Cc<x>_Set default calling convention to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
-  '**2CE_Generate FPU code w','hich can raise exceptions'#010+
+  '**2CE_Generate FPU code which c','an 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 point constant precision (default, 32, 64)'#010+
   '**2Cg_Generate PIC code'#010+
-  '**2Ch<n>[,m]_<n> bytes min heap siz','e (between 1023 and 67107840) and'+
+  '**2Ch<n>[,m]_<n> bytes min heap size (bet','ween 1023 and 67107840) 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*3Clflto_Enable Link-time optimisation (needed both when compiling ','u'+
-  'nits and programs/libraries)'#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 bugs)'#010+
   'L*3Clflsanitize=address_Enable address sanitizer'#010+
-  'L*3Clv<x>_LLVM target version: Xcode-10.1, 7.0',', 8.0, .., 10.0'#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+
-  '**2Cp<x>_Select instruction set; see fpc -i or fpc -ic ','for possible '+
+  '**2Cp<x>_Select instruction set; see fpc -i or fpc -ic for po','ssible '+
   'values'#010+
   '**2CP<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 allo','cation: 0, 1 or DEFAULT or NORMAL, 2, '+
+  '**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+
   '**2Ct_Stack checking (for testing only, see manual)'#010+
-  '8*2CT<x>_Target-specific code generation',' options'#010+
+  '8*2CT<x>_Target-specific code generation optio','ns'#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+
-  'J*2CT<x>_Target-specific code gener','ation options'#010+
+  'J*2CT<x>_Target-specific code generation ','options'#010+
   'A*2CT<x>_Target-specific code generation options'#010+
   'W*2CT<x>_Target-specific code generation options'#010+
   'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
-  'P*3CTsmalltoc_ Generate smaller TOCs at the expense',' of execution spe'+
+  'P*3CTsmalltoc_ Generate smaller TOCs at the expense of ex','ecution 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 disables',')'#010+
-  '8*3CTcld_                 Emit a CLD instruction before using the x86 '+
-  'string instructions'#010+
+  'with prefix X (empty string disables)'#010+
+  '8*3C','Tcld_                 Emit a CLD instruction before using the x8'+
+  '6 string instructions'#010+
   '3*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
-  '4*3CTcld_                 Emit a CLD instruction before us','ing the x8'+
+  '4*3CTcld_                 Emit a CLD instruction before using th','e 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 constants'#010,
-  'J*3CTenumfieldinit_       Initialize enumeration fields in constructor'+
-  's to enumtype(0), after calling inherited constructors'#010+
+  'de for initializing integer array constants'#010+
+  'J*3CTe','numfieldinit_       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 uniniti','alized (slows down code'+
+  '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_ Generate Thumb interworking-safe code if possi'+
   'ble'#010+
-  'W*3CTnoexceptions_        Disable the exception su','pport. Raising an '+
+  'W*3CTnoexceptions_        Disable the exception support.',' Raising an '+
   'exception will abort the program.'#010+
   'W*3CTbfexceptions_        Enable the branchful exception support for W'+
   'ebAssembly'#010+
   'W*3CTjsexceptions_        Enable the JavaScript-based exception suppor'+
   't for WebAssembly (experimental)'#010+
-  'W*3C','Twasmexceptions_      Enable the native WebAssembly exceptions s'+
+  'W*3CTwasme','xceptions_      Enable the native WebAssembly exceptions s'+
   'upport'#010+
   'W*3CTwasmthreads_         Enable WebAssembly threads support (experime'+
   'ntal)'#010+
   'J*2Cv_Var/out parameter copy-out checking'#010+
   'A*2CV<x>_Set section threadvar model to <x>'#010+
-  '**2CX_C','reate also smartlinked library'#010+
+  '**2CX_Create ','also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
   '**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 ti','me string returned by %TIME% to x, it is not chec'+
+  '**2DT<x>_Set the time str','ing returned by %TIME% 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+
@@ -1666,174 +1666,174 @@ const msgtxt : array[0..000378,1..240] of char=(
   '**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 p'+
+  '**2Fa<x>','[,y]_(for a program) load units <x> and [y] before uses is p'+
   'arsed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
-  '**2FD<x>_Set the directory where to',' search for compiler utilities'#010+
+  '**2FD<x>_Set the directory where to searc','h 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-FreeRTOS)'#010+
-  '**2FF_Use fpcres as RC to RES compiler ','instead of windres or gorc'#010+
+  '**2FF_Use fpcres as RC to RES compiler instea','d 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 di'+
   'r'#010+
-  '**2FM<x>_Set the directory where to sear','ch for unicode binary files'#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 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 un','it output path to <x>, overrides -FE'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
   '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
-  '*g1g_Generate debug information (default format for ','target)'#010+
+  '*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 backtrace','s)'#010+
-  '*g2gm_Generate Microsoft CodeView debug information (experimental)'#010+
+  '*g2gl_Use line info unit (show more info with backtraces)'#010+
+  '*g2','gm_Generate Microsoft CodeView debug information (experimental)'#010+
   '*g2go<x>_Set debug information options'#010+
   '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
-  '*g','3godwarfomflinnum_ Generate line number information in OMF LINNUM '+
+  '*g3godwa','rfomflinnum_ Generate 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 (br',
-  'eaks gdb < 6.5)'#010+
+  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
+  'aks g','db < 6.5)'#010+
   '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
   #010+
   '*g2gp_Preserve case in stabs symbol names'#010+
   '*g2gs_Generate Stabs debug information'#010+
   '*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+
-  't'#039' ','changes the trashing value)'#010+
+  't'#039' change','s the trashing value)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
-  '*g2gw4_Generate DWARFv4',' debug information (experimental)'#010+
+  '*g2gw4_Generate DWARFv4 debug',' information (experimental)'#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+
   '**2iD_Return compiler date'#010+
-  '**2if_Return lis','t of supported FPU instruction sets'#010+
+  '**2if_Return list of s','upported FPU instruction sets'#010+
   '**2ii_Return list of supported inline assembler modes'#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 opti','mizations'#010+
+  '**2io_Return list of supported optimizati','ons'#010+
   '**2ir_Return list of recognized compiler and RTL features'#010+
   '**2iSO_Return compiler OS'#010+
   '**2iSP_Return compiler host processor'#010+
   '**2it_Return list of supported targets'#010+
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
-  '**2iu_Return l','ist of supported microcontroller types'#010+
+  '**2iu_Return list of',' supported microcontroller types'#010+
   '**2iV_Return short compiler version'#010+
   '**2iw_Return list of supported whole program optimizations'#010+
   '**2iW_Return full compiler version'#010+
   '**1I<x>_Add <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
-  '**1l_Wri','te logo'#010+
+  '**1l_Write log','o'#010+
   '**1M<x>_Set language mode to <x> / enable modeswitch <x> (see option -'+
   'im)'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
   '**2Mdelphiunicode_Delphi 2009 and later compatibility mode'#010+
   '**2Mextendedpascal_ISO 10206 mode'#010+
-  '**2Mfpc_Free Pascal dialec','t (default)'#010+
+  '**2Mfpc_Free Pascal dialect (def','ault)'#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+
-  '**2*_Each mode (as listed above) enables its default set of modeswi','t'+
-  'ches.'#010+
+  '**2*_Each mode (as listed above) enables its default set of modeswitch'+
+  'es.',#010+
   '**2*_Other modeswitches are disabled and need to be enabled one by ano'+
   'ther.'#010+
   '**1M<x>-_Disable modeswitch <x> (see option -im)'#010+
   '**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+
+  '**1O<x>_Optimi','zations:'#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 po'+
-  'ssible values'#010+
+  '**2Op<x>_Set target cpu for optimizing; see fpc -i or fpc -ic for po','s'+
+  'sible values'#010+
   '**2Os_Optimize for size rather than speed'#010+
   '**2Ow<x>_Perform whole-program optimization <x>; see fpc -i or fpc -iw'+
   ' for possible values'#010+
   '**2OW<x>_Generate whole-program optimization feedback for 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_Show default compiler binary'#010+
   'F*2PP_Show default target cpu'#010+
-  'F*2P<x>_Set target CPU (aarch64,arm,a','vr,i386,i8086,jvm,m68k,mips,mip'+
+  'F*2P<x>_Set target CPU (aarch64,arm,avr,i38','6,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+
-  '4*2Ratt_Read AT&T style ','assembler'#010+
+  '4*2Ratt_Read AT&T style assemb','ler'#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_Do not call assembler and linker'#010+
-  '**2sh_Generate script to link on host, automat','ically switches to ext'+
+  '**2sh_Generate script to link on host, automatically',' switches to ext'+
   'ernal assembler writer'#010+
   '**2sr_Skip register allocation phase (use with -alr), automatically sw'+
   'itches to external assembler writer'#010+
   '**2st_Generate script to assemble and link on target, automatically sw'+
-  'itches to external ','assembler writer'#010+
+  'itches to external assemb','ler writer'#010+
   '**2sT_Generate 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+
   '**2Sd_Same as -Mdelphi'#010+
-  '**2Se<x>_Error options. <x> is a c','ombination of the following:'#010+
+  '**2Se<x>_Error options. <x> is a combina','tion of the following:'#010+
   '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
   '**3*_h : Compiler also halts after hints'#010+
   '**3*_n : Compiler also halts after notes'#010+
   '**3*_w : Compiler also halts after warnings'#010+
-  '**2Sf_Enable certain fe','atures in compiler and RTL; see fpc -i or fpc'+
+  '**2Sf_Enable certain features',' in compiler and RTL; see fpc -i or fpc'+
   ' -ir for possible values)'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use reference counted strings (ansistring by default) instead of'+
   ' shortstrings'#010+
-  '**2Si_Turn on inlining of ','procedures/functions declared as "inline"'#010+
+  '**2Si_Turn on inlining of proced','ures/functions declared as "inline"'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
   '**2Sj_Allows typed constants to be writeable (default in all modes)'#010+
-  '**2Sk_Load f','pcylix unit'#010+
+  '**2Sk_Load fpcylix',' unit'#010+
   '**2Sm_Support macros like C (global)'#010+
   '**2So_Same as -Mtp'#010+
   '**2Sr_Transparent file names in ISO mode'#010+
   '**2Ss_Constructor name must be init (destructor must be done)'#010+
-  '**2Sv_Support vector processing (use CPU vector extensions if availab',
-  'le)'#010+
-  '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#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+
   '**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*2Tembed','ded_Embedded'#010+
+  '3*2Tembedded_Em','bedded'#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+
@@ -1841,7 +1841,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   '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*2Tnati','vent_Native NT API (experimental)'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
@@ -1849,7 +1849,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsolaris_Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2Twatco','m_Watcom compatible DOS extender'#010+
+  '3*2Twatcom_Watc','om compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 bit'#010+
   '3*2Twince_Windows CE'#010+
@@ -1859,7 +1859,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   '4*2Tdragonfly_DragonFly BSD'#010+
   '4*2Tembedded_Embedded'#010+
   '4*2Tfreebsd_FreeBSD'#010+
-  '4','*2Thaiku_Haiku'#010+
+  '4*2Thai','ku_Haiku'#010+
   '4*2Tiphonesim_iPhoneSimulator'#010+
   '4*2Tlinux_Linux'#010+
   '4*2Tnetbsd_NetBSD'#010+
@@ -1869,7 +1869,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tembedded_Embedded'#010+
-  '6*2Tli','nux_Linux'#010+
+  '6*2Tlinux_Li','nux'#010+
   '6*2Tnetbsd_NetBSD'#010+
   '6*2Tmacosclassic_Classic Mac OS'#010+
   '6*2Tpalmos_PalmOS'#010+
@@ -1879,8 +1879,8 @@ const msgtxt : array[0..000378,1..240] of char=(
   '8*2Twin16_Windows 16 bit'#010+
   'A*2Tandroid_Android'#010+
   'A*2Taros_AROS'#010+
-  'A*2Tembedded_Embedde','d'#010+
-  'A*2Tfreertos_FreeRTOS'#010+
+  'A*2Tembedded_Embedded'#010+
+  'A*2T','freertos_FreeRTOS'#010+
   'A*2Tgba_Game Boy Advance'#010+
   'A*2Tios_iOS'#010+
   'A*2Tlinux_Linux'#010+
@@ -1891,8 +1891,8 @@ const msgtxt : array[0..000378,1..240] of char=(
   '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*2Tfreebsd_FreeBSD'#010+
+  'a*2Ti','os_iOS'#010+
   'a*2Tlinux_Linux'#010+
   'a*2Twin64_Windows 64'#010+
   'J*2Tandroid_Android'#010+
@@ -1905,7 +1905,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   'P*2Taix_AIX'#010+
   'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
-  'P*2','Tembedded_Embedded'#010+
+  'P*2Tembed','ded_Embedded'#010+
   'P*2Tlinux_Linux'#010+
   'P*2Tmacosclassic_Classic Mac OS'#010+
   'P*2Tmorphos_MorphOS'#010+
@@ -1917,7 +1917,7 @@ const msgtxt : array[0..000378,1..240] of char=(
   'p*2Tlinux_Linux'#010+
   'R*2Tembedded_Embedded'#010+
   'R*2Tlinux_Linux'#010+
-  'r*2Tembe','dded_Embedded'#010+
+  'r*2Tembedded_E','mbedded'#010+
   'r*2Tlinux_Linux'#010+
   'S*2Tlinux_Linux'#010+
   'S*2Tsolaris_Solaris'#010+
@@ -1929,83 +1929,83 @@ const msgtxt : array[0..000378,1..240] of char=(
   'Z*2Tembedded_Embedded'#010+
   'Z*2Tamstradcpc_Amstrad CPC'#010+
   'Z*2Tmsxdos_MSX-DOS'#010+
-  'Z*2Tzxsp','ectrum_ZX Spectrum'#010+
+  'Z*2Tzxspectrum','_ZX Spectrum'#010+
   'W*2Tembedded_Embedded'#010+
   'W*2Twasi_The WebAssembly System Interface (WASI)'#010+
   '**1t<x>_Target architecture'#010+
   '**2*_ * Defines FPC_ARCH_<x> '#010+
   '**2*_ * Defines FPC_ARCH as <arg>'#010+
   '**2*_ * Additionally reads config file fpc-<arch>.cfg'#010+
-  '**1u','<x>_Undefines the symbol <x>'#010+
+  '**1u<x>_Un','defines the symbol <x>'#010+
   '**1U_Unit options:'#010+
   '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combina','tion of the following letters:'#010+
+  '**1v<x>_Be verbose. <x> is a combination o','f 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*_    with full path               s : Show time stamps'#010+
+  '**2*_   ',' with full path               s : Show time stamps'#010+
   '**2*_c : Show conditionals            t : Show tried/used files'#010+
   '**2*_d : Show debug info              u : Show unit info'#010+
-  '**2*_e : Show errors (default)        v : Write fpcdebug.txt w','ith'#010+
-  '**2*_h : Show hints                       lots of debugging info'#010+
+  '**2*_e : Show errors (default)        v : Write fpcdebug.txt with'#010+
+  '**','2*_h : Show hints                       lots of debugging info'#010+
   '**2*_i : Show general info            w : Show warnings'#010+
   '**2*_l : Show linenumbers             x : Show info about invoked tool'+
   's'#010+
-  '**2*_m<x>,<y> : Do not show messages number','ed <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 the used compiler binary name (e.g. f'+
   'or version)'#010+
   '**1W<x>_Target-specific options (targets)'#010+
-  '3*2WA_Specify native type application (Windo','ws)'#010+
-  '4*2WA_Specify native type application (Windows)'#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 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 l','ibrary (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+
   '3*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  '3*2WB<x>_Set ima','ge base to <x> (Windows, Symbian)'#010+
+  '3*2WB<x>_Set image bas','e 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<x>_Set image base to <x> (Windows, Symbian)'#010+
-  'Z*2WB<x>_Set image b','ase to <x> (ZX Spectrum)'#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 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+
+  '3*2WD_U','se DEFFILE to export functions of DLL or EXE (Windows)'#010+
   '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   '3*2We_Use external resources (Darwin)'#010+
-  '4*2We_Use externa','l resources (Darwin)'#010+
+  '4*2We_Use external reso','urces (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+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
-  '6*2WF<x>_Set',' TOS program flags to <x> (Atari)'#010+
+  '6*2WF<x>_Set TOS p','rogram flags to <x> (Atari)'#010+
   '3*2WG_Specify graphic type application (EMX, OS/2, 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 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 (Darwin)'#010+
-  '3*2W','I_Turn on/off the usage of import sections (Windows)'#010+
+  '3*2WI_Turn',' on/off the usage of import sections (Windows)'#010+
   '4*2WI_Turn on/off the usage of import sections (Windows)'#010+
   'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+
-  'e s','egment)'#010+
+  'e segment',')'#010+
   '8*2Wm<x>_Set memory model'#010+
   '8*3WmTiny_Tiny memory model'#010+
   '8*3WmSmall_Small memory model (default)'#010+
@@ -2013,88 +2013,89 @@ const msgtxt : array[0..000378,1..240] of char=(
   '8*3WmCompact_Compact memory model'#010+
   '8*3WmLarge_Large memory model'#010+
   '8*3WmHuge_Huge memory model'#010+
-  '3*2WM<x>_Minim','um Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+
+  '3*2WM<x>_Minimum Mac',' OS X deployment version: 10.4, 10.5.1, ... (Dar'+
   'win)'#010+
   '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
   'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  'P*2WM<x>_Minimum Mac OS X deploymen','t version: 10.4, 10.5.1, ... (Dar'+
+  'P*2WM<x>_Minimum Mac OS X deployment vers','ion: 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 (W','indows'+
-  ')'#010+
+  'A*2WN_Do not generate relocation code, needed for debugging (Windows',')'+
+  #010+
   'A*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
   'm*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
   'R*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
-  'le',' values'#010+
+  'le value','s'#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 values'#010+
   '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
-  '4*2','WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'+
+  '4*2WP<x>_','Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'+
   #010+
   'a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
-  'x*2WP<x>_Esp8266-rtos-sdk or esp-idf versi','on number: 3.3, 3.4 (esp82'+
+  'x*2WP<x>_Esp8266-rtos-sdk or esp-idf version num','ber: 3.3, 3.4 (esp82'+
   '66) or 4.2, 4.3 (esp32)'#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*3Wtcom_Create a DOS .CO','M 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 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 typ','e application (Classic Mac OS)'#010+
+  'P*2WT_Specify MPW tool type appl','ication (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+
-  '**1x<suff>_Set suffix',' for compiler executable (fpc command only).'#010+
+  '**1x<suff>_Set suffix for c','ompiler executable (fpc command only).'#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 on '+
-  '64 bit targets (Li','nux)'#010+
-  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
-  'ux)'#010+
+  '64 bit targets (Linux)'#010+
+  '*','*2Xc_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+
-  '**2XD_Try to link units dynamically      (defines FPC_LINK_D','YNAMIC)'#010+
+  '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC',')'#010+
   '**2Xe_Use external linker'#010+
   '**2Xf_Substitute pthread library name for linking (BSD)'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
   '**2Xi_Use internal linker'#010+
-  'L*2XlS<x>_LLVM utilties suffix (e.g. -7 ','in case clang is called clan'+
+  'L*2XlS<x>_LLVM utilties suffix (e.g. -7 in cas','e clang is called clan'+
   'g-7)'#010+
   '**2XLA_Define library substitutions for linking'#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 r','outine (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 li','nker'#039's rlink-path to <x> (needed for cross co'+
+  '**2Xr<x>_Set the linker'#039's',' rlink-path to <x> (needed for cross co'+
   'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
   '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
   ', Linux, Mac OS, Solaris)'#010+
-  '**2Xs_Strip all symbols from executabl','e'#010+
-  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
+  '**2Xs_Strip all symbols from executable'#010+
+  '**2X','S_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 c','alls'#010+
-  '**2XV_Use VLink as external linker       (default on Amiga, Atari, Sin'+
-  'clair QL)'#010+
+  '**2Xv_Generate table for Virtual Entry calls'#010+
+  '*','*2XV_Use VLink as external linker       (default on Amiga, Atari, S'+
+  'inclair QL)'#010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+

+ 24 - 19
compiler/options.pas

@@ -56,7 +56,7 @@ Type
     paratarget        : tsystem;
     paratargetasm     : tasm;
     paratargetdbg     : tdbg;
-    paratargetarch    : string;
+    parasubtarget    : string;
     LinkTypeSetExplicitly : boolean;
     LinkerSetExplicitly : boolean;
     Constructor Create;
@@ -124,10 +124,10 @@ const
 
 var
   option     : toption;
-  read_archfile,         { read architecture config file, set when a cfgfile is found }
+  read_subfile,         { read subtarget config file, set when a cfgfile is found }
   read_configfile,        { read config file, set when a cfgfile is found }
   disable_configfile : boolean;
-  archcfg,
+  subcfg,
   fpcdir,
   ppccfg,
   param_file    : string;   { file to compile specified on the commandline }
@@ -2760,10 +2760,10 @@ begin
                  Message1(option_missing_arg,'-t')
                else
                  begin
-                 if More<>upper(self.paratargetarch) then
-                    Message1(option_architecture_is_already_set,self.paratargetarch)
+                 if More<>upper(self.parasubtarget) then
+                    Message1(option_subtarget_is_already_set,self.parasubtarget)
                  else
-                    self.paratargetarch:=more;
+                    self.parasubtarget:=more;
                  end;
 
              end;
@@ -3746,6 +3746,7 @@ procedure toption.writequickinfo;
 var
   s : string;
   i : longint;
+  emptyOK : Boolean;
 
   procedure addinfo(const hs:string);
   begin
@@ -3756,6 +3757,7 @@ var
   end;
 
 begin
+  emptyOK:=False;
   s:='';
   i:=0;
   while (i<length(quickinfo)) do
@@ -3783,7 +3785,10 @@ begin
            'P' :
              AddInfo(target_cpu_string);
            'T' :
-             addinfo(lower(self.paratargetarch));
+             begin
+             addinfo(lower(self.parasubtarget));
+             emptyOK:=True;
+             end
            else
              IllegalPara('-i'+QuickInfo);
           end;
@@ -3800,7 +3805,7 @@ begin
         IllegalPara('-i'+QuickInfo);
     end;
   end;
-  if s<>'' then
+  if (s<>'') or EmptyOK then
    begin
      writeln(s);
      stopoptions(0);
@@ -4552,13 +4557,13 @@ begin
 
   { don't remove this, it's also for fpdoc necessary (FK) }
   def_system_macro('FPC_HAS_FEATURE_SUPPORT');
-  if (Option.paratargetarch<>'') then
+  if (Option.parasubtarget<>'') then
     begin
-    def_system_macro('FPC_ARCH_'+Option.paratargetarch);
+    def_system_macro('FPC_SUBTARGET_'+Option.parasubtarget);
     if cs_support_macro in init_settings.moduleswitches then
-      set_system_macro('FPC_ARCH',Option.paratargetarch)
+      set_system_macro('FPC_SUBTARGET',Option.parasubtarget)
     else
-      set_system_compvar('FPC_ARCH',Option.paratargetarch);
+      set_system_compvar('FPC_SUBTARGET',Option.parasubtarget);
     end;
 
   { make cpu makros available when reading the config files the second time }
@@ -4628,13 +4633,13 @@ begin
     read_configfile:=check_configfile(ppccfg,ppccfg)
   else
     read_configfile := false;
-  if (option.paratargetarch<>'') then
+  if (option.parasubtarget<>'') then
     begin
-    archcfg:='fpc-'+lower(option.paratargetarch)+'.cfg';
-    read_archfile:=check_configfile(archcfg,archcfg);
+    subcfg:='fpc-'+lower(option.parasubtarget)+'.cfg';
+    read_subfile:=check_configfile(subcfg,subcfg);
     // Warn if we didn't find an architecture-specific file
-    if not read_archfile then
-      message2(option_architecture_config_not_found,option.paratargetarch,archcfg);
+    if not read_subfile then
+      message2(option_subtarget_config_not_found,option.parasubtarget,subcfg);
     end;
 
 { Read commandline and configfile }
@@ -4643,8 +4648,8 @@ begin
   { read configfile }
   if read_configfile then
     option.interpret_file(ppccfg);
-  if read_archfile then
-    option.interpret_file(archcfg);
+  if read_subfile then
+    option.interpret_file(subcfg);
 
   { read parameters again to override config file }
   if cmd<>'' then

+ 6 - 6
compiler/ppcx64.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -9,9 +9,9 @@
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="ppcx64"/>
     </General>
     <BuildModes Count="1">
@@ -22,15 +22,15 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <CommandLineParams Value="\tmp\tasm2.pp"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <CommandLineParams Value="-iTP"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
       <FormatVersion Value="2"/>
       <Modes Count="1">
         <Mode0 Name="default">
           <local>
-            <CommandLineParams Value="\tmp\tasm2.pp"/>
-            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+            <CommandLineParams Value="-iTP"/>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
           </local>
         </Mode0>
       </Modes>

+ 5 - 5
compiler/utils/fpc.pp

@@ -114,7 +114,7 @@ program fpc;
   var
      s              : ansistring;
      tmp,
-     archsuffix,
+     subsuffix,
      exesuffix,
      cpusuffix,
      processorname,
@@ -209,7 +209,7 @@ program fpc;
             exesuffix:=copy(s,3,length(s)-2)
           else if pos('-t',s)=1 then
             begin
-            archsuffix:=copy(s,3,length(s)-2);
+            subsuffix:=copy(s,3,length(s)-2);
             ppccommandline[ppccommandlinelen]:=s;
             inc(ppccommandlinelen);
             end
@@ -331,10 +331,10 @@ program fpc;
      { find the full path to the specified exe }
      // If an architecture was defined, check that first.
      found:=false;
-     if archsuffix<>'' then
+     if subsuffix<>'' then
        begin
          tmp:=ppcbin;
-         ppcbin:=ppcbin+'-'+archsuffix;
+         ppcbin:=ppcbin+'-'+subsuffix;
          Found:=findexe(ppcbin);
          if not found then
            begin
@@ -343,7 +343,7 @@ program fpc;
                ppcbin:='ppc'+cpusuffix;
                if versionstr<>'' then
                  ppcbin:=ppcbin+'-'+versionstr;
-               ppcbin:=ppcbin+'-'+archsuffix;
+               ppcbin:=ppcbin+'-'+subsuffix;
                found:=findexe(ppcbin);
                end;
            end;