* Rename architecture to more neutral subtarget

compiler/msg/errore.msg

@@ -4319,15 +4319,9 @@ 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
->>>>>>> a732046580 (* 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

@@ -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,6 +1160,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
   MsgTxtSize = 90570;
@@ -1169,6 +1170,9 @@ const
 =======
   MsgTxtSize = 90933;
 >>>>>>> 317064c473 (* Implement -x and -t options for fpc executable)
+=======
+  MsgTxtSize = 90927;
+>>>>>>> 13368ac5cc (* Rename architecture to more neutral subtarget)
 
   MsgIdxMax : array[1..20] of longint=(
     28,109,366,132,100,63,148,38,223,71,

compiler/ppcx64.lpi

@@ -28,7 +28,6 @@
       <Modes Count="1">
         <Mode0 Name="default">
           <local>
-            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
           </local>
         </Mode0>
       </Modes>