2
0
Эх сурвалжийг харах

+ added command line option for language mode -M<x>
+ helpinfo powerpc targets

olle 22 жил өмнө
parent
commit
f891435ca0

+ 14 - 4
compiler/msg/errore.msg

@@ -2102,22 +2102,29 @@ option_help_pages=11025_[
 **1I<x>_adds <x> to include path
 **1k<x>_Pass <x> to the linker
 **1l_write logo
+**1M<x>_set language mode to <x>
+**2Mfpc_free pascal dialect (default)
+**2Mobjfpc_switch some Delphi 2 extensions on
+**2Mdelphi_tries to be Delphi compatible
+**2Mtp_tries to be TP/BP 7.0 compatible
+**2Mgpc_tries to be gpc compatible
+**2Mmac_tries to be compatible to the macintosh pascal dialects
 **1n_don't read the default config file
 **1o<x>_change the name of the executable produced to <x>
 **1pg_generate profile code for gprof (defines FPC_PROFILE)
 *L1P_use pipes instead of creating temporary assembler files
 **1S<x>_syntax options:
-**2S2_switch some Delphi 2 extensions on
+**2S2_same as -Mobjfpc
 **2Sc_supports operators like C (*=,+=,/= and -=)
 **2Sa_include assertion code.
-**2Sd_tries to be Delphi compatible
+**2Sd_same as -Mdelphi
 **2Se<x>_compiler stops after the <x> errors (default is 1)
 **2Sg_allow LABEL and GOTO
 **2Sh_Use ansistrings
 **2Si_support C++ styled INLINE
 **2Sm_support macros like C (global)
-**2So_tries to be TP/BP 7.0 compatible
-**2Sp_tries to be gpc compatible
+**2So_same as -Mtp
+**2Sp_same as -Mgpc
 **2Ss_constructor name must be init (destructor must be done)
 **2St_allow static keyword in objects
 **1s_don't call assembler and linker (only with -a)
@@ -2212,6 +2219,9 @@ option_help_pages=11025_[
 6*2TMACOS_Macintosh m68k
 6*2TLINUX_Linux-68k
 6*2TPALMOS_PalmOS
+P*1T<x>_Target operating system:
+P*2Tmacos_MacOS (classic) on PowerPC
+P*2Tlinux_Linux on PowerPC
 **1*_
 **1?_shows this help
 **1h_shows this help without waiting

+ 1 - 1
compiler/msgidx.inc

@@ -628,7 +628,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 35334;
+  MsgTxtSize = 35664;
 
   MsgIdxMax : array[1..20] of longint=(
     17,63,195,52,57,44,98,19,35,60,

+ 38 - 28
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000147] of string[240]=(
+const msgtxt : array[0..000148] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000147,1..240] of char=(
+const msgtxt : array[0..000148,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -741,27 +741,34 @@ const msgtxt : array[0..000147,1..240] of char=(
   '**1I<x>_adds <x> to ','include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
+  '**1M<x>_set language mode to <x>'#010+
+  '**2Mfpc_free pascal dialect (default)'#010+
+  '**2Mobjfpc_switch some Delphi 2 extensions on'#010+
+  '**2Mdelphi_tries to be Delphi compatible'#010+
+  '**2Mtp_tries to be TP/','BP 7.0 compatible'#010+
+  '**2Mgpc_tries to be gpc compatible'#010+
+  '**2Mmac_tries to be compatible to the macintosh pascal dialects'#010+
   '**1n_don'#039't read the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
-  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '*L1P_use pipes instead',' of creating temporary assembler files'#010+
+  '**1pg_generate profile co','de for gprof (defines FPC_PROFILE)'#010+
+  '*L1P_use pipes instead of creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
-  '**2S2_switch some Delphi 2 extensions on'#010+
+  '**2S2_same as -Mobjfpc'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
-  '**2Sd_tries to be Delphi compatible'#010+
-  '**2Se<x>_compiler st','ops after the <x> errors (default is 1)'#010+
+  '**2Sd_same as -Md','elphi'#010+
+  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
-  '**2So_tries to be TP/BP 7.0 compatible'#010+
-  '**2Sp_tries to be gpc compatible'#010+
-  '**2Ss_cons','tructor name must be init (destructor must be done)'#010+
+  '**2So_same as -Mtp'#010+
+  '**2Sp_same as -Mgpc'#010+
+  '**2Ss_constructor',' name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
   '**1s_don'#039't call assembler and linker (only with -a)'#010+
   '**2sh_Generate script to link on host'#010+
-  '**2sr_Skip register allocation phase (optimizations will be ','disabled'+
+  '**2sr_Skip register allocation phase (optimizations will be disable','d'+
   ')'#010+
   '**2st_Generate script to link on target'#010+
   '**1u<x>_undefines the symbol <x>'#010+
@@ -769,55 +776,55 @@ const msgtxt : array[0..000147,1..240] of char=(
   '**2Un_don'#039't check the unit name'#010+
   '**2Ur_generate release unit files'#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 fol','lowing letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  m : ','Show defined macros'#010+
+  '**2*_h : Show hints                  m : Show de','fined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
   '**2*_l : Show linenumbers            c : Show conditionals'#010+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
-  '**2*_b : Show all procedu','re          r : Rhide/GCC compatibility mod'+
+  '**2*_b : Show all procedure     ','     r : Rhide/GCC compatibility mod'+
   'e'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
   '**2*_    occurs'#010+
   '**1V_write fpcdebug.txt file with lots of debugging info'#010+
   '**1X_executable options:'#010+
-  '*L2Xc_link with the c libra','ry'#010+
-  '**2Xs_strip all symbols from executable'#010+
+  '*L2Xc_link with the c library'#010+
+  '**2X','s_strip all symbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
-  '**0*_Processor',' specific options:'#010+
+  '**0*_Processor specif','ic options:'#010+
   '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Awasm_obj file using Wasm (Watcom)'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
-  '3*2Amasm_obj f','ile using Masm (Microsoft)'#010+
+  '3*2Amasm_obj file usi','ng Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
   '3*1R<x>_assembler reading style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
-  '3*2Rintel_read',' Intel style assembler'#010+
+  '3*2Rintel_read Intel ','style assembler'#010+
   '3*2Rdirect_copy assembler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
   '3*2Or_keep certain variables in registers'#010+
-  '3*2Ou_enable uncertain optimi','zations (see docs)'#010+
+  '3*2Ou_enable uncertain optimizations',' (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
-  '3*3Op1_set target processor t','o 386/486'#010+
+  '3*3Op1_set target processor to 386/4','86'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
   '3*2TEMX_OS/2 via EMX (including EMX/RSX extender)'#010+
-  '3*2TGO32V2_Version 2 of DJ Delorie DOS',' extender'#010+
+  '3*2TGO32V2_Version 2 of DJ Delorie DOS extend','er'#010+
   '3*2TWATCOM_Watcom compatible DOS extender'#010+
   '3*2TLINUX_Linux'#010+
   '3*2TNETWARE_Novell Netware Module (clib)'#010+
@@ -825,26 +832,26 @@ const msgtxt : array[0..000147,1..240] of char=(
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWDOSX_WDOSX DOS extender'#010+
   '3*2TWIN32_Windows 32 Bit'#010+
-  '3*1W<x>_Win32-like target ','options'#010+
+  '3*1W<x>_Win32-like target options',#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WF_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Specify graphic type applicatio','n'#010+
-  '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
+  '3*2WG_Specify graphic type application'#010+
+  '3*2WN','_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#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 ass','embler'#010+
+  '6*2Amot_Standard Motorola assembler'#010,
   '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O0_set target processor to a MC68000'#010+
-  '6*2O2_set target processor to a MC68020+',' (default)'#010+
+  '6*2O2_set target processor to a MC68020+ (defau','lt)'#010+
   '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
@@ -853,7 +860,10 @@ const msgtxt : array[0..000147,1..240] of char=(
   '6*2TMACOS_Macintosh m68k'#010+
   '6*2TLINUX_Linux-68k'#010+
   '6*2TPALMOS_PalmOS'#010+
+  'P*1T<x>_Target op','erating system:'#010+
+  'P*2Tmacos_MacOS (classic) on PowerPC'#010+
+  'P*2Tlinux_Linux on PowerPC'#010+
   '**1*_'#010+
-  '**1?','_shows this help'#010+
+  '**1?_shows this help'#010+
   '**1h_shows this help without waiting'#000
 );