* Implement -t and -x options

compiler/msg/errore.msg

@@ -3632,7 +3632,8 @@ option_too_many_exception_modes=11064_E_Only one WebAssembly exception support m
 option_subtarget_is_already_set=11065_W_Subtarget is already set to: $1
 % Displayed if more than one \var{-t} option is specified.
 option_subtarget_config_not_found=11066_E_Subtarget $1 specified but no corresponding config file $2 found.
-% Displayed if more than one \var{-t} option is specified.
+% Displayed if \var{-t} option is specified and no config file is found for
+% the configuration.
 option_x_ignored=11067_N_Ignoring compiler executable suffix $1.
 % Displayed if more than one \var{-t} option is specified.
 %\end{description}
@@ -4319,9 +4320,15 @@ W*2Tembedded_Embedded
 W*2Twasi_The WebAssembly System Interface (WASI)
 # end of targets section
 **1t<x>_Target architecture
+<<<<<<< HEAD
 **2*_ * Defines FPC_SUBTARGET_<x> 
 **2*_ * Defines FPC_SUBTARGET as <arg>
 **2*_ * Additionally reads config file fpc-<subtarget>.cfg
+=======
+**2*_ * Defines FPC_ARCH_<x> 
+**2*_ * Defines FPC_ARCH as <arg>
+**2*_ * Additionally reads config file fpc-<arch>.cfg
+>>>>>>> 12c193974a (* Implement -t and -x options)
 **1u<x>_Undefines the symbol <x>
 **1U_Unit options:
 **2Un_Do not check where the unit name matches the file name

compiler/msgidx.inc

@@ -1160,7 +1160,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 90959;
+  MsgTxtSize = 91149;
 
   MsgIdxMax : array[1..20] of longint=(
     28,109,366,132,100,63,148,38,223,71,

compiler/msgtxt.inc

@@ -1,8 +1,8 @@
 const msgtxt_codepage=20127;
 {$ifdef Delphi}
-const msgtxt : array[0..000378] of string[240]=(
+const msgtxt : array[0..000379] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000378,1..240] of char=(
+const msgtxt : array[0..000379,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -1935,168 +1935,174 @@ const msgtxt : array[0..000378,1..240] of char=(
   'W*2Tembedded_Embedded'#010+
   'W*2Twasi_The WebAssembly System Interface (WASI)'#010+
   '**1t<x>_Target architecture'#010+
+  '<<<<<<< HEAD'#010+
   '**2*_ * Defines FPC_SUBTARGET_<x> '#010+
   '**2*_ * Defines FPC_SUBTARGET as <arg>'#010+
-  '**2*_ * Additionally reads config fil','e fpc-<subtarget>.cfg'#010+
-  '**1u<x>_Undefines the symbol <x>'#010+
+  '**2*_ * Additionally rea','ds config file fpc-<subtarget>.cfg'#010+
+  '======='#010+
+  '**2*_ * Defines FPC_ARCH_<x> '#010+
+  '**2*_ * Defines FPC_ARCH as <arg>'#010+
+  '**2*_ * Additionally reads config file fpc-<arch>.cfg'#010+
+  '>>>>>>> 12c193974a (* Implement -t and -x options)'#010+
+  '**1u<x>_Undefines the symbol',' <x>'#010+
   '**1U_Unit options:'#010+
   '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_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 le','tters:'#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 mo'+
-  'de'#010+
-  '**2*_    with full path               s : Show time stamps'#010+
+  '**2*_b : Write file names messages    r : Rhide/GCC compatibility mode'+
+  #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 with'#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> : D','o not show messages numbered <x> and <y>'#010+
-  '**2*_n : Show notes                   z : Write output to stderr'#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 nati','ve type application (Windows)'#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_Crea','te a bundle instead of a library (Darwin)'#010+
-  'a*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'a*2Wb_Cr','eate 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 image base to <x> (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+
   'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  'A*2WB<x>_Set image base to <x> (Windows, Sym','bian)'#010+
-  'Z*2WB<x>_Set image base to <x> (ZX Spectrum)'#010+
+  'A*2WB<x>_Set image base to <x> (Windows, Symbian)'#010+
+  'Z*2WB<x>_Set image base to <x> (ZX Spectrum)',#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
   '4*2WC_Specify console type application (Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
-  'P*2WC_Specify console type appl','ication (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
+  'P*2WC_Specify console type application (Classic Mac OS)'#010+
+  '3*2WD_Use DEFFILE to expo','rt functions of DLL or EXE (Windows)'#010+
   '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  '3*2We_Use external resources ','(Darwin)'#010+
+  '3*2We_Use external resources (Darwin)'#010+
   '4*2We_Use external resources (Darwin)'#010+
-  'a*2We_Use external resources (Darwin)'#010+
+  'a*2','We_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 applicatio','n (EMX, OS/2)'#010+
-  '6*2WF<x>_Set TOS program flags to <x> (Atari)'#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+
   'A*2WG_Specify graphic type application (Windows)'#010+
-  'P*2WG_Specify graphic ','type application (Classic Mac OS)'#010+
-  '3*2Wi_Use internal resources (Darwin)'#010+
+  'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
+  '3*2Wi_Use intern','al 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 intern','al resources (Darwin)'#010+
-  '3*2WI_Turn on/off the usage of import sections (Windows)'#010+
+  'p*2Wi_Use internal resources (Darwin)'#010+
+  '3*2WI_Turn on/off the usage ','of import sections (Windows)'#010+
   '4*2WI_Turn on/off the usage of import sections (Windows)'#010+
   'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
-  '8*2Wh_Use huge code for units (ignored for mode','ls with CODE in a uni'+
-  'que segment)'#010+
-  '8*2Wm<x>_Set memory model'#010+
+  '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+
+  'e segment)'#010+
+  '8*2Wm<x>_Set mem','ory model'#010+
   '8*3WmTiny_Tiny memory model'#010+
   '8*3WmSmall_Small memory model (default)'#010+
   '8*3WmMedium_Medium memory model'#010+
   '8*3WmCompact_Compact memory model'#010+
   '8*3WmLarge_Large memory model'#010+
-  '8*3WmHuge_Huge m','emory model'#010+
-  '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
-  'n)'#010+
+  '8*3WmHuge_Huge memory model'#010+
+  '3*2WM<x>_Minimum Mac OS X deployment v','ersion: 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 deployment version: 10.4, 10.5.1, ... (Dar'+
+  'P*2WM<x>_Minimum Mac 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 cod','e, needed for debugging (Windows'+
-  ')'#010+
-  'A*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
-  'le values'#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 poss'+
+  'ible 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 poss'+
-  'ible values'#010+
-  'V*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
+  'R*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
+  'V*2Wp<x>_Specify',' the controller type; see fpc -i or fpc -iu for poss'+
+  'ible 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)'+
+  '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
+  '4*2WP<x>_Minimum iOS deploy','ment version: 8.0, 8.0.2, ... (iphonesim)'+
   #010+
-  '4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+
   'a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
-  'x*2WP<x>_Esp8266','-rtos-sdk or esp-idf version number: 3.3, 3.4 (esp82'+
+  'x*2WP<x>_Esp8266-rtos-sdk or esp-idf version number: 3.3, 3.4 (esp','82'+
   '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 .COM file (requires tiny memory model)'#010+
+  '8*2Wt<x>_Set the target executable format'#010+
+  '8*3Wtcom_Create a DOS .COM file (requires tiny me','mory 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 type application (Classic Mac OS)'#010+
+  '6*3Wtmint_Create a MiNT executable file'#010+
+  'P*2WT_Specify MPW tool type application (Classic M','ac 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 (Li','nux)'#010+
-  '**1x<suff>_Set suffix for compiler executable (fpc command only).'#010+
+  '**2WX_Enable executable stack (Linux)'#010+
+  '**1x<suff>_Set suffix for compiler 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 o'+
-  'n 64 bit targets (Linux)'#010+
-  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
-  'ux)'#010+
+  '**2Xa_Generate code which allows to use more than 2 GB static data on '+
+  '64 bit targets (Linux)'#010+
+  '**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 dynamicall','y      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xe_Use external linker'#010+
+  '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
+  '**2Xe_Use extern','al 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 case 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 na','me of the '#039'main'#039' program routine (default'+
-  ' is '#039'main'#039')'#010+
+  '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
+  's '#039'main',#039')'#010+
   '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+
   #010+
   'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
-  '**2XP<x>_Prepend the binutils names with the pref','ix <x>'#010+
-  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
-  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
+  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
+  '**2Xr<x>_Set the linker'#039's 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+
+  '**2Xs_Strip all symbols from executable'#010+
+  '**2XS_Try to link unit','s statically (default, defines FPC_LINK_STATIC'+
+  ')'#010+
   '**2Xt_Link with static libraries (-static is passed to linker)'#010+
   '**2Xu_Generate executable in UF2 format  (embedded targets only)'#010+
-  '**2Xv_Generate',' table for Virtual Entry calls'#010+
-  '**2XV_Use VLink as external linker       (default on Amiga, 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+