Browse Source

* palmos support from v10 merged

peter 24 years ago
parent
commit
fd8e5fa78c

+ 10 - 1
compiler/globals.pas

@@ -231,6 +231,12 @@ interface
        { for error info in pp.pas }
        parser_current_file : string = '';
 
+{$ifdef m68k}
+       { PalmOS resources }
+       palmos_applicationname : string = 'FPC Application';
+       palmos_applicationid : string[4] = 'FPCA';
+{$endif m68k}
+
 
     procedure abstract;
 
@@ -1327,7 +1333,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.40  2001-08-04 10:23:54  peter
+  Revision 1.41  2001-08-19 11:22:22  peter
+    * palmos support from v10 merged
+
+  Revision 1.40  2001/08/04 10:23:54  peter
     * updates so it works with the ide
 
   Revision 1.39  2001/07/01 20:16:15  peter

+ 6 - 2
compiler/link.pas

@@ -27,7 +27,8 @@ unit link;
 
 { Needed for LFN support in path to the executable }
 {$ifdef GO32V2}
-  {$define ALWAYSSHELL}
+  { define ALWAYSSHELL, obsolete as go32v2 Dos.Exec
+    now handles LFN names and converts them to SFN PM }
 {$endif}
 
 interface
@@ -482,7 +483,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.20  2001-08-13 19:26:03  peter
+  Revision 1.21  2001-08-19 11:22:22  peter
+    * palmos support from v10 merged
+
+  Revision 1.20  2001/08/13 19:26:03  peter
     * fixed ordering of object and libraries
 
   Revision 1.19  2001/08/07 18:47:12  peter

+ 6 - 1
compiler/msg/errore.msg

@@ -261,7 +261,7 @@ scan_w_unsupported_app_type=02044_W_Unsupported application type: "$1"
 % with the directive \var{\{\$APPTYPE\}}
 scan_w_app_type_not_support=02045_W_APPTYPE isn't support by the target OS
 % The \var{\{\$APPTYPE\}} directive is supported by win32 applications only.
-scan_w_decription_not_support=02046_W_DESCRIPTION is only supported for OS2 and Win32
+scan_w_description_not_support=02046_W_DESCRIPTION is only supported for OS2 and Win32
 % The \var{\{\$DESCRIPTION\}} directive is only supported for OS2 and Win32 targets.
 scan_n_version_not_support=02047_N_VERSION is not supported by target OS.
 % The \var{\{\$VERSION\}} directive is only supported by win32 target.
@@ -296,6 +296,11 @@ scan_w_macro_support_turned_off=02057_W_Macro support has been turned off
 % so the declaration will be ignored. To turn macro support on compile with
 % -Sm on the commandline or add {$MACRO ON} in the source
 scan_e_invalid_interface_type=02058_E_Illegal interface type specified. Valids are COM, CORBA or DEFAULT.
+% The interface type that was specified is not supported
+scan_w_appid_not_support=02059_W_APPID is only supported for PalmOS
+% The \var{\{\$APPID\}} directive is only supported for the PalmOS target.
+scan_w_appname_not_support=02060_W_APPNAME is only supported for PalmOS
+% The \var{\{\$APPNAME\}} directive is only supported for the PalmOS target.
 % \end{description}
 #
 # Parser

+ 5 - 3
compiler/msgidx.inc

@@ -62,7 +62,7 @@ const
   scan_t_back_in=02043;
   scan_w_unsupported_app_type=02044;
   scan_w_app_type_not_support=02045;
-  scan_w_decription_not_support=02046;
+  scan_w_description_not_support=02046;
   scan_n_version_not_support=02047;
   scan_n_only_exe_version=02048;
   scan_w_wrong_version_ignored=02049;
@@ -75,6 +75,8 @@ const
   scan_w_only_one_resourcefile_supported=02056;
   scan_w_macro_support_turned_off=02057;
   scan_e_invalid_interface_type=02058;
+  scan_w_appid_not_support=02059;
+  scan_w_appname_not_support=02060;
   parser_e_syntax_error=03000;
   parser_w_proc_far_ignored=03001;
   parser_w_proc_near_ignored=03002;
@@ -592,9 +594,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 33103;
+  MsgTxtSize = 33191;
 
   MsgIdxMax : array[1..20] of longint=(
-    17,59,179,37,41,41,98,14,35,42,
+    17,61,179,37,41,41,98,14,35,42,
     30,1,1,1,1,1,1,1,1,1
   );

+ 276 - 274
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000137] of string[240]=(
+const msgtxt : array[0..000138] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000137,1..240] of char=(
+const msgtxt : array[0..000138,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -83,568 +83,569 @@ const msgtxt : array[0..000137,1..240] of char=(
   '02057_W_Macro support has been turned off'#000+
   '02058_E_Illegal interface typ','e specified. Valids are COM, CORBA or D'+
   'EFAULT.'#000+
+  '02059_W_APPID is only supported for PalmOS'#000+
+  '02060_W_APPNAME is only supported for PalmOS'#000+
   '03000_E_Parser - Syntax Error'#000+
   '03001_W_Procedure type FAR ignored'#000+
   '03002_W_Procedure type NEAR ignored'#000+
-  '03003_W_Procedure type INTERRUPT ignored for not i386'#000+
-  '03004_E_INTERRUPT procedure can'#039't be n','ested'#000+
+  '0300','3_W_Procedure type INTERRUPT ignored for not i386'#000+
+  '03004_E_INTERRUPT procedure can'#039't be nested'#000+
   '03005_W_Procedure type "$1" ignored'#000+
   '03006_E_Not all declarations of "$1" are declared with OVERLOAD'#000+
   '03007_E_No DLL File specified'#000+
-  '03008_E_Duplicate exported function name "$1"'#000+
+  '03008_E_Duplicat','e exported function name "$1"'#000+
   '03009_E_Duplicate exported function index $1'#000+
-  '03010_E_Inval','id index for exported function'#000+
+  '03010_E_Invalid index for exported function'#000+
   '03011_W_Relocatable DLL or executable $1 debug info does not work, dis'+
   'abled.'#000+
-  '03012_W_To allow debugging for win32 code you need to disable relocati'+
-  'on with -WN option'#000+
+  '03012_W_To allow debugging for win32 code yo','u need to disable reloca'+
+  'tion with -WN option'#000+
   '03013_E_Constructor name must be INIT'#000+
-  '03014','_E_Destructor name must be DONE'#000+
+  '03014_E_Destructor name must be DONE'#000+
   '03015_E_Illegal open parameter'#000+
   '03016_E_Procedure type INLINE not supported'#000+
-  '03017_W_Private methods shouldn'#039't be VIRTUAL'#000+
+  '03017_W_Private methods shouldn'#039't be VIRTUAL'#000,
   '03018_W_Constructor should be public'#000+
   '03019_W_Destructor should be public'#000+
-  '03020_N_Class s','hould have one destructor only'#000+
+  '03020_N_Class should have one destructor only'#000+
   '03021_E_Local class definitions are not allowed'#000+
   '03022_F_Anonym class definitions are not allowed'#000+
-  '03023_E_The object "$1" has no VMT'#000+
+  '03023_E_The object "$1" ','has no VMT'#000+
   '03024_E_Illegal parameter list'#000+
-  '03025_E_Wrong parameter type specified for arg',' no. "$1"'#000+
+  '03025_E_Wrong parameter type specified for arg no. "$1"'#000+
   '03026_E_Wrong amount of parameters specified'#000+
   '03027_E_overloaded identifier "$1" isn'#039't a function'#000+
-  '03028_E_overloaded functions have the same parameter list'#000+
+  '03028_E_overloaded functions have the same pa','rameter list'#000+
   '03029_E_function header doesn'#039't match the forward declaration "$1"'+
   #000+
-  '03030_E_','function header "$1" doesn'#039't match forward : var name ch'+
-  'anges $2 => $3'#000+
+  '03030_E_function header "$1" doesn'#039't match forward : var name chan'+
+  'ges $2 => $3'#000+
   '03031_N_Values in enumeration types have to be ascending'#000+
-  '03032_N_Interface and implementation names are different "$1" => "$2"'#000+
-  '03033_E_With can not be used for variables',' in a different segment'#000+
+  '03032_N_Interface and im','plementation names are different "$1" => "$2'+
+  '"'#000+
+  '03033_E_With can not be used for variables in a different segment'#000+
   '03034_E_function nesting > 31'#000+
   '03035_E_range check error while evaluating constants'#000+
-  '03036_W_range check error while evaluating constants'#000+
+  '03036_W_range check error while evaluating co','nstants'#000+
   '03037_E_duplicate case label'#000+
-  '03038_E_Upper bound of case range is less than lowe','r bound'#000+
+  '03038_E_Upper bound of case range is less than lower bound'#000+
   '03039_E_typed constants of classes are not allowed'#000+
   '03040_E_functions variables of overloaded functions are not allowed'#000+
-  '03041_E_string length must be a value from 1 to 255'#000+
-  '03042_W_use extended syntax of NEW and DISPOSE for instances ','of obje'+
-  'cts'#000+
+  '03041_E_string length mus','t be a value from 1 to 255'#000+
+  '03042_W_use extended syntax of NEW and DISPOSE for instances of object'+
+  's'#000+
   '03043_W_use of NEW or DISPOSE for untyped pointers is meaningless'#000+
   '03044_E_use of NEW or DISPOSE is not possible for untyped pointers'#000+
-  '03045_E_class identifier expected'#000+
+  '03045_E_','class identifier expected'#000+
   '03046_E_type identifier not allowed here'#000+
-  '03047_E_method identi','fier expected'#000+
+  '03047_E_method identifier expected'#000+
   '03048_E_function header doesn'#039't match any method of this class "$1'+
   '"'#000+
   '03049_P_procedure/function $1'#000+
-  '03050_E_Illegal floating point constant'#000+
+  '03050_E_Illegal floating point constant'#000,
   '03051_E_FAIL can be used in constructors only'#000+
-  '03052_E_Destructors can'#039't have parameters'#000,
+  '03052_E_Destructors can'#039't have parameters'#000+
   '03053_E_Only class methods can be referred with class references'#000+
   '03054_E_Only class methods can be accessed in class methods'#000+
-  '03055_E_Constant and CASE types do not match'#000+
+  '03055_E_Constant and CASE t','ypes do not match'#000+
   '03056_E_The symbol can'#039't be exported from a library'#000+
-  '03057_W_An inherit','ed method is hidden by "$1"'#000+
+  '03057_W_An inherited method is hidden by "$1"'#000+
   '03058_E_There is no method in an ancestor class to be overridden: "$1"'+
   #000+
   '03059_E_No member is provided to access property'#000+
-  '03060_W_Stored prorperty directive is not yet implemented'#000+
-  '03061_E_Illegal symbol for propert','y access'#000+
+  '0306','0_W_Stored prorperty directive is not yet implemented'#000+
+  '03061_E_Illegal symbol for property access'#000+
   '03062_E_Cannot access a protected field of an object here'#000+
   '03063_E_Cannot access a private field of an object here'#000+
-  '03064_W_overloaded method of virtual method should be virtual: "$1"'#000+
-  '03065_W_overloaded method of non-virtual method s','hould be non-virtua'+
-  'l: "$1"'#000+
+  '03064_W_overloaded method of ','virtual method should be virtual: "$1"'#000+
+  '03065_W_overloaded method of non-virtual method should be non-virtual:'+
+  ' "$1"'#000+
   '03066_E_overridden methods must have the same return type: "$2" is ove'+
   'rriden by "$1" which has another return type'#000+
-  '03067_E_EXPORT declared functions can'#039't be nested'#000+
+  '03067_E_EX','PORT declared functions can'#039't be nested'#000+
   '03068_E_methods can'#039't be EXPORTed'#000+
-  '03069_E_call b','y var parameters have to match exactly: Got "$1" expec'+
-  'ted "$2"'#000+
+  '03069_E_call by var parameters have to match exactly: Got "$1" expecte'+
+  'd "$2"'#000+
   '03070_E_Class isn'#039't a parent class of the current class'#000+
-  '03071_E_SELF is only allowed in methods'#000+
+  '03071_E_SELF is only allowed in m','ethods'#000+
   '03072_E_methods can be only in other methods called direct with type i'+
-  'dentifier o','f the class'#000+
+  'dentifier of the class'#000+
   '03073_E_Illegal use of '#039':'#039#000+
   '03074_E_range check error in set constructor or duplicate set element'#000+
   '03075_E_Pointer to object expected'#000+
-  '03076_E_Expression must be constructor call'#000+
+  '03076_E_','Expression must be constructor call'#000+
   '03077_E_Expression must be destructor call'#000+
-  '03078_E_I','llegal order of record elements'#000+
+  '03078_E_Illegal order of record elements'#000+
   '03079_E_Expression type must be class or record type'#000+
   '03080_E_Procedures can'#039't return a value'#000+
-  '03081_E_constructors and destructors must be methods'#000+
+  '03081_E_constructors and de','structors must be methods'#000+
   '03082_E_Operator is not overloaded'#000+
-  '03083_E_Impossible to overl','oad assignment for equal types'#000+
+  '03083_E_Impossible to overload assignment for equal types'#000+
   '03084_E_Impossible operator overload'#000+
   '03085_E_Re-raise isn'#039't possible there'#000+
-  '03086_E_The extended syntax of new or dispose isn'#039't allowed for a '+
-  'class'#000+
+  '03086_E_The extended syntax of new or dispose ','isn'#039't allowed for '+
+  'a class'#000+
   '03087_E_Assembler incompatible with function return type'#000+
-  '03088','_E_Procedure overloading is switched off'#000+
+  '03088_E_Procedure overloading is switched off'#000+
   '03089_E_It is not possible to overload this operator (overload = inste'+
   'ad)'#000+
-  '03090_E_Comparative operator must return a boolean value'#000+
+  '03090_E_Comparative operator must ret','urn a boolean value'#000+
   '03091_E_Only virtual methods can be abstract'#000+
-  '03092_F_Use of unsuppor','ted feature!'#000+
+  '03092_F_Use of unsupported feature!'#000+
   '03093_E_The mix of different kind of objects (class, object, interface'+
   ', raw interface etc) isn'#039't allowed'#000+
-  '03094_W_Unknown procedure directive had to be ignored: "$1"'#000+
+  '03094_W_Unknown procedure directiv','e had to be ignored: "$1"'#000+
   '03095_E_absolute can only be associated to ONE variable'#000+
-  '03096_','E_absolute can only be associated a var or const'#000+
+  '03096_E_absolute can only be associated a var or const'#000+
   '03097_E_Only ONE variable can be initialized'#000+
-  '03098_E_Abstract methods shouldn'#039't have any definition (with funct'+
-  'ion body)'#000+
+  '03098_E_Abstract methods shouldn'#039't have any definition (wi','th fun'+
+  'ction body)'#000+
   '03099_E_This overloaded function can'#039't be local (must be exported)'+
   #000+
-  '031','00_W_Virtual methods are used without a constructor in "$1"'#000+
+  '03100_W_Virtual methods are used without a constructor in "$1"'#000+
   '03101_M_Macro defined: $1'#000+
   '03102_M_Macro undefined: $1'#000+
   '03103_M_Macro $1 set to $2'#000+
-  '03104_I_Compiling $1'#000+
+  '03104_I_Com','piling $1'#000+
   '03105_U_Parsing interface of unit $1'#000+
   '03106_U_Parsing implementation of $1'#000+
-  '0310','7_D_Compiling $1 for the second time'#000+
+  '03107_D_Compiling $1 for the second time'#000+
   '03108_E_Array properties aren'#039't allowed here'#000+
   '03109_E_No property found to override'#000+
-  '03110_E_Only one default property is allowed, found inherited default '+
-  'property in class "$1"'#000+
-  '03111_E_The default propert','y must be an array property'#000+
+  '03110_E_Only one default propert','y is allowed, found inherited defaul'+
+  't property in class "$1"'#000+
+  '03111_E_The default property must be an array property'#000+
   '03112_E_Virtual constructors are only supported in class object model'#000+
   '03113_E_No default property available'#000+
-  '03114_E_The class can'#039't have a published section, use the {$M+} sw'+
-  'itch'#000+
-  '03115_E_Forward declaration of cl','ass "$1" must be resolved here to u'+
-  'se the class as ancestor'#000+
+  '03114_E_The clas','s can'#039't have a published section, use the {$M+} '+
+  'switch'#000+
+  '03115_E_Forward declaration of class "$1" must be resolved here to use'+
+  ' the class as ancestor'#000+
   '03116_E_Local operators not supported'#000+
-  '03117_E_Procedure directive "$1" not allowed in interface section'#000+
+  '03117_E_Procedure directive "$1" not allowed in interf','ace section'#000+
   '03118_E_Procedure directive "$1" not allowed in implementation section'+
   #000+
-  '03119','_E_Procedure directive "$1" not allowed in procvar declaration'#000+
+  '03119_E_Procedure directive "$1" not allowed in procvar declaration'#000+
   '03120_E_Function is already declared Public/Forward "$1"'#000+
-  '03121_E_Can'#039't use both EXPORT and EXTERNAL'#000+
+  '03121_E_Can'#039't use both EXPORT an','d EXTERNAL'#000+
   '03122_E_NAME keyword expected'#000+
-  '03123_W_"$1" not yet supported inside inline pr','ocedure/function'#000+
+  '03123_W_"$1" not yet supported inside inline procedure/function'#000+
   '03124_W_Inlining disabled'#000+
   '03125_I_Writing Browser log $1'#000+
   '03126_H_may be pointer dereference is missing'#000+
-  '03127_F_Selected assembler reader not supported'#000+
+  '03127_F_Selected assembler reade','r not supported'#000+
   '03128_E_Procedure directive "$1" has conflicts with other directives'#000+
-  '031','29_E_Calling convention doesn'#039't match forward'#000+
+  '03129_E_Calling convention doesn'#039't match forward'#000+
   '03130_E_Register calling (fastcall) not supported'#000+
   '03131_E_Property can'#039't have a default value'#000+
-  '03132_E_The default value of a property must be constant'#000+
-  '03133_E_Symbol can'#039't be published, can be o','nly a class'#000+
+  '03132_E_The ','default value of a property must be constant'#000+
+  '03133_E_Symbol can'#039't be published, can be only a class'#000+
   '03134_E_That kind of property can'#039't be published'#000+
   '03135_W_Empty import name specified'#000+
   '03136_W_An import name is required'#000+
-  '03137_E_Function internal name changed after use of function'#000+
+  '03137_E_Function int','ernal name changed after use of function'#000+
   '03138_E_Division by zero'#000+
-  '03139_E_Invalid floati','ng point operation'#000+
+  '03139_E_Invalid floating point operation'#000+
   '03140_E_Upper bound of range is less than lower bound'#000+
   '03141_W_string "$1" is longer than "$2"'#000+
-  '03142_E_string length is larger than array of char length'#000+
+  '03142_E_string length is larger than ar','ray of char length'#000+
   '03143_E_Illegal expression after message directive'#000+
-  '03144_E_Message ha','ndlers can take only one call by ref. parameter'#000+
+  '03144_E_Message handlers can take only one call by ref. parameter'#000+
   '03145_E_Duplicate message label: "$1"'#000+
-  '03146_E_Self can be only an explicit parameter in message handlers'#000+
+  '03146_E_Self can be only an explicit parameter in message handlers',#000+
   '03147_E_Threadvars can be only static or global'#000+
-  '03148_F_Direct assembler not supported ','for binary output format'#000+
+  '03148_F_Direct assembler not supported for binary output format'#000+
   '03149_W_Don'#039't load OBJPAS unit manual, use {$mode objfpc} or {$mod'+
   'e delphi} instead'#000+
   '03150_E_OVERRIDE can'#039't be used in objects'#000+
-  '03151_E_Data types which requires initialization/finalization can'#039't'+
-  ' be used in variant re','cords'#000+
+  '0','3151_E_Data types which requires initialization/finalization can'#039+
+  't be used in variant records'#000+
   '03152_E_Resourcestrings can be only static or global'#000+
   '03153_E_Exit with argument can'#039't be used here'#000+
-  '03154_E_The type of the storage symbol must be boolean'#000+
+  '03154_E_The type of the storage symbol must be ','boolean'#000+
   '03155_E_This symbol isn'#039't allowed as storage symbol'#000+
-  '03156_E_Only class which are',' compiled in $M+ mode can be published'#000+
+  '03156_E_Only class which are compiled in $M+ mode can be published'#000+
   '03157_E_Procedure directive expected'#000+
   '03158_E_The value for a property index must be of an ordinal type'#000+
-  '03159_E_Procedure name to short to be exported'#000+
-  '03160_E_No DEFFILE entry can be generated for unit ','global vars'#000+
+  '03159_E_Pr','ocedure name to short to be exported'#000+
+  '03160_E_No DEFFILE entry can be generated for unit global vars'#000+
   '03161_E_Compile without -WD option'#000+
   '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+
   'ule'#000+
-  '03163_E_Can'#039't export with index under $1'#000+
+  '03163_E_Can'#039't export with index',' under $1'#000+
   '03164_E_Exporting of variables is not supported under $1'#000+
-  '03165_E_Improper GUID',' syntax'#000+
+  '03165_E_Improper GUID syntax'#000+
   '03166_F_An interface can'#039't have variables'#000+
   '03167_F_An interface can'#039't have constructor or destructor'#000+
-  '03168_W_Procedure named "$1" not found that is suitable for implementi'+
-  'ng the $2.$3'#000+
+  '03168_W_Procedure named "$1" not found that ','is suitable for implemen'+
+  'ting the $2.$3'#000+
   '03169_E_interface identifier expected'#000+
-  '03170_E_Typ','e "$1" can'#039't be used as array index type'#000+
+  '03170_E_Type "$1" can'#039't be used as array index type'#000+
   '03171_E_Con- and destructors aren'#039't allowed in interfaces'#000+
-  '03172_E_Access specifiers can'#039't be used in INTERFACES'#000+
+  '03172_E_Access specifiers can'#039't be used in INTERFACES',#000+
   '03173_E_An interface can'#039't contain fields'#000+
-  '03174_E_Can'#039't declare local procedure as EXTE','RNAL'#000+
+  '03174_E_Can'#039't declare local procedure as EXTERNAL'#000+
   '03175_W_Some fields coming before "$1" weren'#039't initialized'#000+
   '03176_E_Some fields coming before "$1" weren'#039't initialized'#000+
-  '03177_H_Some fields coming after "$1" weren'#039't initialized'#000+
+  '03177_H_Some fields coming af','ter "$1" weren'#039't initialized'#000+
   '03178_E_VarArgs directive without CDecl and External'#000+
-  '04000_','E_Type mismatch'#000+
+  '04000_E_Type mismatch'#000+
   '04001_E_Incompatible types: got "$1" expected "$2"'#000+
   '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
-  '04004_E_Variable identifier expected'#000+
+  '04004_E_','Variable identifier expected'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
-  '04006_E_B','oolean expression expected, but got "$1"'#000+
+  '04006_E_Boolean expression expected, but got "$1"'#000+
   '04007_E_Ordinal expression expected'#000+
   '04008_E_pointer type expected, but got "$1"'#000+
-  '04009_E_class type expected, but got "$1"'#000+
+  '04009_E_class type expected, bu','t got "$1"'#000+
   '04010_E_Variable or type indentifier expected'#000+
-  '04011_E_Can'#039't evaluate constant',' expression'#000+
+  '04011_E_Can'#039't evaluate constant expression'#000+
   '04012_E_Set elements are not compatible'#000+
   '04013_E_Operation not implemented for sets'#000+
-  '04014_W_Automatic type conversion from floating type to COMP which is '+
-  'an integer type'#000+
+  '04014_W_Automatic type conversion from floating type to C','OMP which i'+
+  's an integer type'#000+
   '04015_H_use DIV instead to get an integer result'#000+
-  '04016_E_st','ring types doesn'#039't match, because of $V+ mode'#000+
+  '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
   '04017_E_succ or pred on enums with assignments not possible'#000+
-  '04018_E_Can'#039't read or write variables of this type'#000+
+  '04018_E_Can'#039't read or write variables of this ','type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
-  '04020_E_Can'#039't use read or write o','n untyped file.'#000+
+  '04020_E_Can'#039't use read or write on untyped file.'#000+
   '04021_E_Type conflict between set elements'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
-  '04023_E_Integer or real expression expected'#000+
+  '04023_E_Integer or real express','ion expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
-  '04025_E_Incompatible type for ','arg no. $1: Got "$2", expected "$3"'#000+
+  '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
   '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
-  '04027_E_Illegal constant passed to internal math function'#000+
+  '04027_E_Illegal constant passed to internal ma','th function'#000+
   '04028_E_Can'#039't get the address of constants'#000+
-  '04029_E_Argument can'#039't be assigne','d to'#000+
+  '04029_E_Argument can'#039't be assigned to'#000+
   '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
   'e'#000+
   '04031_E_Can'#039't assign values to an address'#000+
-  '04032_E_Can'#039't assign values to const variable'#000+
+  '04032_E_Can'#039't assign values to const ','variable'#000+
   '04033_E_Array type required'#000+
   '04034_E_interface type expected, but got "$1"'#000+
-  '04035','_W_Mixing signed expressions and cardinals gives a 64bit result'+
-  #000+
+  '04035_W_Mixing signed expressions and cardinals gives a 64bit result'#000+
   '04036_W_Mixing signed expressions and cardinals here may cause a range'+
   ' check error'#000+
-  '05000_E_Identifier not found "$1"'#000+
+  '05000','_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
-  '05002_E_Duplicate',' identifier "$1"'#000+
+  '05002_E_Duplicate identifier "$1"'#000+
   '05003_H_Identifier already defined in $1 at line $2'#000+
   '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
-  '05006_F_Identifier type already defined as type'#000+
+  '05006_F','_Identifier type already defined as type'#000+
   '05007_E_Error in type definition'#000+
-  '05008_E_Type i','dentifier not defined'#000+
+  '05008_E_Type identifier not defined'#000+
   '05009_E_Forward type not resolved "$1"'#000+
   '05010_E_Only static variables can be used in static methods or outside'+
   ' methods'#000+
-  '05011_E_Invalid call to tvarsym.mangledname()'#000+
+  '05011_E_Inva','lid call to tvarsym.mangledname()'#000+
   '05012_F_record or class type expected'#000+
-  '05013_E_Instance','s of classes or objects with an abstract method are '+
-  'not allowed'#000+
+  '05013_E_Instances of classes or objects with an abstract method are no'+
+  't allowed'#000+
   '05014_W_Label not defined "$1"'#000+
   '05015_E_Label used but not defined "$1"'#000+
-  '05016_E_Illegal label declaration'#000+
+  '05016_E_Illegal l','abel declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
-  '05018_E_Label',' not found'#000+
+  '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
-  '05022_E_Forward class definition not resolved "$1"'#000+
+  '05022_E_Forward class definit','ion not resolved "$1"'#000+
   '05023_H_Unit "$1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
-  '0','5025_N_Local variable "$1" not used'#000+
+  '05025_N_Local variable "$1" not used'#000+
   '05026_H_Value parameter "$1" is assigned but never used'#000+
   '05027_N_Local variable "$1" is assigned but never used'#000+
-  '05028_H_Local $1 "$2" is not used'#000+
+  '05028','_H_Local $1 "$2" is not used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
-  '05030_N_Private',' field "$1.$2" is assigned but never used'#000+
+  '05030_N_Private field "$1.$2" is assigned but never used'#000+
   '05031_N_Private method "$1.$2" never used'#000+
   '05032_E_Set type expected'#000+
-  '05033_W_Function result does not seem to be set'#000+
+  '05033_W_Function result does not seem to b','e set'#000+
   '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
-  '05035_E_Unknown',' record field identifier "$1"'#000+
+  '05035_E_Unknown record field identifier "$1"'#000+
   '05036_W_Local variable "$1" does not seem to be initialized'#000+
   '05037_W_Variable "$1" does not seem to be initialized'#000+
-  '05038_E_identifier idents no member "$1"'#000+
+  '05038_E_','identifier idents no member "$1"'#000+
   '05039_B_Found declaration: $1'#000+
-  '05040_E_Data segment too ','large (max. 2GB)'#000+
+  '05040_E_Data segment too large (max. 2GB)'#000+
   '06000_E_BREAK not allowed'#000+
   '06001_E_CONTINUE not allowed'#000+
   '06002_E_Expression too complicated - FPU stack overflow'#000+
-  '06003_E_Illegal expression'#000+
+  '06003_E_Illegal expressi','on'#000+
   '06004_E_Invalid integer expression'#000+
   '06005_E_Illegal qualifier'#000+
-  '06006_E_High range limit',' < low range limit'#000+
+  '06006_E_High range limit < low range limit'#000+
   '06007_E_Illegal counter variable'#000+
   '06008_E_Can'#039't determine which overloaded function to call'#000+
-  '06009_E_Parameter list size exceeds 65535 bytes'#000+
+  '06009_E_Parameter list size exceeds 65535 ','bytes'#000+
   '06010_E_Illegal type conversion'#000+
-  '06011_D_Conversion between ordinals and pointers i','s not portable acr'+
-  'oss platforms'#000+
+  '06011_D_Conversion between ordinals and pointers is not portable acros'+
+  's platforms'#000+
   '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
-  '06014_E_illegal call by reference parameters'#000+
+  '06014_E_illegal call by r','eference parameters'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible i','llegal call of constructor or destructor (doesn'#039+
-  't match to this context)'#000+
+  '06016_W_Possible illegal call of constructor or destructor (doesn'#039't'+
+  ' match to this context)'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
-  '06019_E_procedure call with stackframe ESP/SP'#000+
+  '06019_E_procedure call with s','tackframe ESP/SP'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06021_F_Internal Erro','r in getfloatreg(), allocation failure'#000+
+  '06021_F_Internal Error in getfloatreg(), allocation failure'#000+
   '06022_F_Unknown float type'#000+
   '06023_F_SecondVecn() base defined twice'#000+
   '06024_F_Extended cg68k not supported'#000+
-  '06025_F_32-bit unsigned not supported in MC68000 mode'#000+
+  '06025_F_3','2-bit unsigned not supported in MC68000 mode'#000+
   '06026_F_Internal Error in secondinline()'#000+
-  '06','027_D_Register $1 weight $2 $3'#000+
+  '06027_D_Register $1 weight $2 $3'#000+
   '06028_E_Stack limit excedeed in local routine'#000+
   '06029_D_Stack frame is omitted'#000+
-  '06031_E_Object or class methods can'#039't be inline.'#000+
+  '06031_E_Object or class methods can'#039't be inl','ine.'#000+
   '06032_E_Procvar calls can'#039't be inline.'#000+
-  '06033_E_No code for inline procedure stored'#000,
+  '06033_E_No code for inline procedure stored'#000+
   '06034_E_Direct call of interrupt procedure "$1" is not possible'#000+
   '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'sed, use (set)length instead'#000+
+  'sed, use (set)length i','nstead'#000+
   '06036_E_Include and exclude not implemented in this case'#000+
-  '06037_E_Constructors or ','destructors can not be called inside a '#039'w'+
-  'ith'#039' clause'#000+
+  '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
+  'th'#039' clause'#000+
   '06038_E_Cannot call message handler method directly'#000+
-  '06039_E_Jump in or outside of an exception block'#000+
+  '06039_E_Jump in or outside of an exception bloc','k'#000+
   '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
-  '07000_D_Starting $1 ','styled assembler parsing'#000+
+  '07000_D_Starting $1 styled assembler parsing'#000+
   '07001_D_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07003_W_Override operator not supported'#000+
-  '07004_E_Error building record offset'#000+
+  '07004','_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
-  '07006_E_TYPE used',' without identifier'#000+
+  '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
-  '07010_E_Cannot use multiple relocatable symbols'#000+
+  '07010_E_Cannot use m','ultiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
-  '07012_E_Invalid',' constant expression'#000+
+  '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
-  '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
-  '07017_E_Invalid base and index register us','age'#000+
+  '07016_E_Loca','l symbols/labels aren'#039't allowed as references'#000+
+  '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
-  '07021_E_Invalid operand type'#000+
+  '07021_E_Invalid operand t','ype'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
-  '0','7024_E_Null label references are not allowed'#000+
+  '07024_E_Null label references are not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
-  '07028_E_Invalid symbol reference'#000+
+  '0702','8_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
-  '0703','0_W_$1 without operand translated into $1P'#000+
+  '07030_W_$1 without operand translated into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '07032_W_Calling an overload function in assembler'#000+
+  '07032_W_Calling an overload function in assembler'#000,
   '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
-  '07035_E','_Error converting decimal $1'#000+
+  '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
-  '07039_H_$1 translated to $2'#000+
+  '07039_H_$1 tra','nslated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
-  '07041_E_Cannot use SELF',' outside a method'#000+
+  '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
-  '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and d','estination or source size do not match'#000+
+  '0','7045_E_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07049_E_Assembler syntax error in operand'#000+
+  '07049_E_Assembler syntax error ','in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
-  '07051_E_Invalid String expression'#000,
+  '07051_E_Invalid String expression'#000+
   '07052_bit constant created for address'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
-  '07055_E_Invalid combination of prefix and opcode: $1'#000+
+  '07055_E_Invalid combination of prefix and opcode',': $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
-  '07057_E_Too many operands on',' line'#000+
+  '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
-  '07063_E_Invalid register name'#000+
+  '0','7063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
-  '07065_E_NOR no','t supported'#000+
+  '07065_E_NOR not supported'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
-  '07069_E_Wrong symbol type'#000+
+  '07069_E_Wrong symbol type'#000,
   '07070_E_Cannot index a local var or parameter with a register'#000+
-  '07071_E_Invalid segment ov','erride expression'#000+
+  '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
-  '07075_E_assembler code not returned to text section'#000+
+  '07075_E_assembler',' code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
-  '07077_E_Us','ing a defined name as a local label'#000+
+  '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
-  '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't access fields directly for parameters',#000+
+  '07080_N_.align is targ','et specific, use .balign or .p2align'#000+
+  '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
   'ands'#000+
-  '07084_E_Cannot use RESULT in this function'#000+
+  '07084_E_Cannot use R','ESULT in this function'#000+
   '07085_H_RESULT is register $1'#000+
-  '07086_W_"$1" without operand transl','ated into "$1 %st,%st(1)"'#000+
+  '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
-  '07089_E_Char < not allowed here'#000+
+  '07089_E_Char < not all','owed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07091_W_XDEF not supported'#000+
-  '07092_E_Invalid XDE','F syntax'#000+
+  '07092_E_Invalid XDEF syntax'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
-  '07097_E_68020 mode required'#000+
+  '07097_E','_68020 mode required'#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected assembler output ','not supported'#000+
+  '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
-  '08005_F_No binary writer selected'#000+
+  '08005_F','_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_Asm: $1 invalid c','ombination of opcode and operands'#000+
+  '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
-  '08010_E_Asm: Immediate or reference expected'#000+
+  '08010_E_Asm: Immediate or referenc','e expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: Short jump is out of ran','ge $1'#000+
+  '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assember file: $1'#000+
-  '09003_E_Can'#039't create object file: $1'#000+
+  '0900','3_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_E_Assembler',' $1 not found, switching to external assembling'#000+
+  '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
-  'ssembling'#000+
+  '09008_E_Can'#039't call the assembler,',' error $1 switching to external'+
+  ' assembling'#000+
   '09009_I_Assembling $1'#000+
-  '09010_I_Assembling smar','tlink $1'#000+
+  '09010_I_Assembling smartlink $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call the linker, switching to external linking'#000+
+  '09014_E_Can'#039't call',' the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
-  '09016_E_Util $1 not found,',' switching to external linking'#000+
+  '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
+  '09019_E_Creation of Dynamic/Shared Libraries not supp','orted'#000+
   '09020_I_Closing script $1'#000+
-  '09021_E_resource compiler not found, switching to extern','al mode'#000+
+  '09021_E_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be static linked, switching to smart linking'+
   #000+
-  '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
-  #000+
+  '09024_T_unit $1 can'#039't be smart linked, switchin','g to static linki'+
+  'ng'#000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
-  'g'#000,
+  'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
-  '09029_F_Can'#039't open executable $1'#000+
+  '09029_F_Can'#039't ','open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
-  '09031_X_Size of initialized data: $1 b','ytes'#000+
+  '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
   '09034_X_Stack space commited: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
-  '10001_T_PPU Loading $1'#000+
+  '1','0001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
-  '100','05_U_PPU Time: $1'#000+
+  '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for an other processor'#000+
+  '10009_U_PPU is compiled for',' an other processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
-  '1','0012_U_Writing $1'#000+
+  '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
-  '10017_F_PPU Dbx count problem'#000+
+  '1001','7_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_C','ircular unit reference between $1 and $2'#000+
+  '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
-  '10023_W_Unit $1 was not found but $2 exists'#000+
+  '10023_W_Unit $1 was not found bu','t $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Compiling the system unit requ','ires the -Us switch'#000+
+  '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
-  '10028_U_Recompiling $1, checksum changed for $2'#000+
+  '10028_U_Recompiling $1, checksum changed f','or $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Recompiling unit, static lib is ','older than ppufile'#000+
+  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Recompiling unit, obj is older than asm'#000+
+  '10033_U_Recom','piling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
-  '10035_U_Parsing imple','mentation of $1'#000+
+  '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10038_H_Conditional $1 was not set at startup in last compilation of $'+
+  '10038_H_Conditional $1 was not set at startup in last compilation of $',
   '2'#000+
   '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
-  '10040_W_Can'#039't reco','mpile unit $1, but found modifed include files'+
-  #000+
+  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
   '10041_H_File $1 is newer than Release PPU file $2'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file supported'#000+
+  '11001_W_Only o','ne source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested re','sponse files are not supported'#000+
+  '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
-  '11007_H_-? writes help pages'#000+
+  '11007_H','_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
-  '11009_F_Unable to open file $','1'#000+
+  '11009_F_Unable to open file $1'#000+
   '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
-  '11013_F_too many IF(N)DEFs'#000+
+  '11','013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
-  '11015_F_open conditional at the end of ','the file'#000+
+  '11015_F_open conditional at the end of the file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
-  '11018_E_You are using the obsolete switch $1'#000+
+  '11018_E_You are using the obsolete ','switch $1'#000+
   '11019_E_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching ','assembler to default source writing assembler'#000+
+  '11020_N_Switching assembler to default source writing assembler'#000+
   '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
-  '11026_T_Reading options from file $1'#000+
+  '11026','_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
-  '11028_D_Hand','ling option "$1"'#000+
+  '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
-  'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
+  'Copyright (c) 1993-2000 by Florian Klae','mpfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
-  'Compiler Targ','et: $FPCTARGET'#010+
+  'Compiler Target: $FPCTARGET'#010+
   #010+
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
@@ -652,162 +653,163 @@ const msgtxt : array[0..000137,1..240] of char=(
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
-  'Report bugs,suggestions etc to:'#010+
+  'Report b','ugs,suggestions etc to:'#010+
   '                 [email protected]'#000+
-  '11025_**0*_put + after a ','boolean switch option to enable it, - to di'+
-  'sable it'#010+
+  '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
+  'ble it'#010+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
-  '**2al_list sourcecode lines in assembler file'#010+
+  '**2al_list sourcecode lines in assembl','er file'#010+
   '**2ar_list register allocation/release info in assembler file'#010+
-  '**2at_list temp al','location/release info in assembler file'#010+
+  '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
-  '**1C<x>_code generation options:'#010+
+  '**1C<x>_code generation optio','ns:'#010+
   '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ch<n>_<n> bytes heap (between 1','023 and 67107840)'#010+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
-  '**2Cs<n>_set stack size to <n>'#010+
+  '**2Cs<n>_set stack size to ','<n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
-  '**1d<x>_defines the symbo','l <x>'#010+
+  '**1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
   '*O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
-  '**1F<x>_set file names and paths:'#010+
+  '**1F<x>_set file nam','es and paths:'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#010+
-  '**2Fe<x','>_redirect error output to <x>'#010+
+  '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
-  '*L2FL<x>_uses <x> as dynamic linker'#010+
+  '*L2FL<x>_use','s <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
-  '**2Fr<x>_load error message fil','e <x>'#010+
+  '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gg_use gsym'#010+
-  '*g2gd_use dbx'#010+
+  '*g2gd_use db','x'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
-  '*g2gl_use line info unit to show',' more info for backtraces'#010+
+  '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
-  '**2iSO_return compiler OS'#010+
+  '**2iSO_return com','piler OS'#010+
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
-  '**2iTP_return target p','rocessor'#010+
+  '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#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_PR','OFILE)'#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+
   '**1S<x>_syntax options:'#010+
   '**2S2_switch some Delphi 2 extensions on'#010+
-  '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
+  '**2Sc_supports oper','ators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
-  '**2Sd_tries to be Delphi co','mpatible'#010+
+  '**2Sd_tries to be Delphi compatible'#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+
+  '**','2Sm_support macros like C (global)'#010+
   '**2So_tries to be TP/BP 7.0 compatible'#010+
-  '**2Sp_tries to',' be gpc compatible'#010+
+  '**2Sp_tries to be gpc compatible'#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+
+  '**1s_don'#039't call assembler and lin','ker (only with -a)'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
-  '**2Un_don'#039't check',' the unit name'#010+
+  '**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+
-  '**2*_e : Show errors (default)       d : Show debug info'#010+
-  '**2*_w : Show warnings               u ',': Show unit info'#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*_i : Show general info           p : Show compiled procedures'#010+
-  '**2*_l : Show linenumbers        ','    c : Show conditionals'#010+
+  '**2*_i : Sh','ow 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 procedure          r : Rhide/GCC compatibility mode'#010+
+  '**2*_b : Show all procedure          r : Rhide/GCC compa','tibility mod'+
+  'e'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
-  '**2*','_    occurs'#010+
+  '**2*_    occurs'#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
+  '**2XD_try to link dynamic          (defines F','PC_LINK_DYNAMIC)'#010+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2XX_try ','to link smart            (defines FPC_LINK_SMART)'#010+
+  '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
-  '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
+  '3*2Aasaout_assemb','le using GNU AS for aout (Go32v1)'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf','_elf32 (Linux) file using Nasm'#010+
+  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
-  '3*2Acoff_coff (Go32v2) using internal writer'#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*1R<x>_assembler reading style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
-  '3*2Rdirect_copy assembler text directly to assembler file'#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 (def','ault)'#010+
+  '3*2OG_generate faster code (default)'#010+
   '3*2Or_keep certain variables in registers'#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 repe','atedly, max 5 times)'#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 to 386/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
-  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
+  '3*3Op3_set',' target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
-  '3*2TGO32V1_','version 1 of DJ Delorie DOS extender'#010+
+  '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
   '3*2TLINUX_Linux'#010+
   '3*2Tnetware_Novell Netware Module (experimental)'#010+
-  '3*2TOS2_OS/2 2.x'#010+
+  '3*','2TOS2_OS/2 2.x'#010+
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWin32_Windows 32 Bit'#010+
-  '3*1W<x>_Win32 target opt','ions'#010+
+  '3*1W<x>_Win32 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*2WF_S','pecify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
-  '3','*2WN_Do not generate relocation code (necessary for debugging)'#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*2A','gas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
-  '6*2Amot_Standard Motorola assemb','ler'#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*2Ox_optimize maximum (still BUGGY','!!!)'#010+
   '6*2O2_set target processor to a MC68020+'#010+
   '6*1R<x>_assembler reading style:'#010+
-  '6*2RMOT_r','ead motorola style assembler'#010+
+  '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
   '6*2TATARI_Atari ST/STe/TT'#010+
   '6*2TMACOS_Macintosh m68k'#010+
-  '6*2TLINUX_Linux-68k'#010+
+  '6*2TLINUX_Lin','ux-68k'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
   '**1h_shows this help without waiting'#000

+ 32 - 16
compiler/options.pas

@@ -55,6 +55,7 @@ type
     procedure Interpret_file(const filename : string);
     procedure Read_Parameters;
     procedure parsecmd(cmd:string);
+    procedure TargetDefines(def:boolean);
   end;
 
   TOptionClass=class of toption;
@@ -729,7 +730,7 @@ begin
                       if not target_is_set then
                        begin
                          { remove old target define }
-                         undef_symbol(upper(target_info.shortname));
+                         TargetDefines(false);
                          { Save assembler if set }
                          if asm_is_set then
                           forceasm:=target_asm.id;
@@ -740,7 +741,7 @@ begin
                          if asm_is_set then
                           set_target_asm(forceasm);
                          { set new define }
-                         def_symbol(upper(target_info.shortname));
+                         TargetDefines(true);
                          target_is_set:=true;
                        end
                       else
@@ -1241,6 +1242,30 @@ begin
 end;
 
 
+procedure TOption.TargetDefines(def:boolean);
+var
+  s : string;
+  i : integer;
+begin
+  if def then
+   def_symbol(upper(target_info.shortname))
+  else
+   undef_symbol(upper(target_info.shortname));
+  s:=target_info.extradefines;
+  while (s<>'') do
+   begin
+     i:=pos(';',s);
+     if i=0 then
+      i:=length(s)+1;
+     if def then
+      def_symbol(Copy(s,1,i-1))
+     else
+      def_symbol(Copy(s,1,i-1));
+     delete(s,1,i);
+   end;
+end;
+
+
 constructor TOption.create;
 begin
   DoWriteLogo:=false;
@@ -1437,15 +1462,7 @@ begin
    StopOptions;
 
   { Non-core target defines }
-  s:=target_info.extradefines;
-  while (s<>'') do
-   begin
-     i:=pos(';',s);
-     if i=0 then
-      i:=length(s)+1;
-     def_symbol(Copy(s,1,i-1));
-     delete(s,1,i);
-   end;
+  Option.TargetDefines(true);
 
   { endian define }
   case target_info.endian of
@@ -1567,10 +1584,6 @@ begin
    end;
   UpdateAlignment(initalignment,option.paraalignment);
 
-{ Set defines depending on the target }
-  if (target_info.target in [target_i386_GO32V1,target_i386_GO32V2]) then
-   def_symbol('DPMI'); { MSDOS is not defined in BP when target is DPMI }
-
   option.free;
   Option:=nil;
 end;
@@ -1584,7 +1597,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.54  2001-08-12 17:57:06  peter
+  Revision 1.55  2001-08-19 11:22:23  peter
+    * palmos support from v10 merged
+
+  Revision 1.54  2001/08/12 17:57:06  peter
     * under development flag for targets
 
   Revision 1.53  2001/08/07 18:42:46  peter

+ 6 - 3
compiler/pdecsub.pas

@@ -1386,9 +1386,9 @@ const
       mutexclpo     : [po_external]
     ),(
       idtok:_SYSCALL;
-      pd_flags : pd_interface+pd_notobjintf;
+      pd_flags : pd_interface+pd_implemen+pd_notobjintf;
       handler  : {$ifdef FPCPROCVAR}@{$endif}pd_syscall;
-      pocall   : [pocall_palmossyscall];
+      pocall   : [pocall_palmossyscall,pocall_cdecl,pocall_clearstack];
       pooption : [];
       mutexclpocall : [pocall_cdecl,pocall_cppdecl,pocall_inline,
         pocall_internproc,pocall_leftright];
@@ -1910,7 +1910,10 @@ const
 end.
 {
   $Log$
-  Revision 1.31  2001-08-05 13:18:50  peter
+  Revision 1.32  2001-08-19 11:22:23  peter
+    * palmos support from v10 merged
+
+  Revision 1.31  2001/08/05 13:18:50  peter
     * turn pocall_inline off when inline is not supported
 
   Revision 1.30  2001/08/01 15:07:29  jonas

+ 4 - 5
compiler/pmodules.pas

@@ -1208,10 +1208,6 @@ implementation
             aktprocsym.definition.aliasnames.insert('program_init');
             aktprocsym.definition.aliasnames.insert('PASCALMAIN');
             aktprocsym.definition.aliasnames.insert(target_info.cprefix+'main');
-{$ifdef m68k}
-            if target_info.target=target_m68k_PalmOS then
-              aktprocsym.definition.aliasnames.insert('PilotMain');
-{$endif m68k}
           end;
          compile_proc_body(true,false);
 
@@ -1339,7 +1335,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.43  2001-08-12 19:59:49  peter
+  Revision 1.44  2001-08-19 11:22:23  peter
+    * palmos support from v10 merged
+
+  Revision 1.43  2001/08/12 19:59:49  peter
     * typo in extdebug msg
 
   Revision 1.42  2001/08/06 21:40:47  peter

+ 31 - 2
compiler/scandir.pas

@@ -156,6 +156,28 @@ implementation
           Message1(scan_w_unsupported_asmmode_specifier,s);
       end;
 
+{$ifdef m68k}
+    procedure dir_appid;
+      begin
+        if target_info.target<>target_m68k_palmos then
+          Message(scan_w_appid_not_support);
+        { change description global var in all cases }
+        { it not used but in win32 and os2 }
+        current_scanner^.skipspace;
+        palmos_applicationid:=current_scanner^.readcomment;
+      end;
+
+    procedure dir_appname;
+      begin
+        if target_info.target<>target_m68k_palmos then
+          Message(scan_w_appname_not_support);
+        { change description global var in all cases }
+        { it not used but in win32 and os2 }
+        current_scanner^.skipspace;
+        palmos_applicationname:=current_scanner^.readcomment;
+      end;
+{$endif m68k}
+
     procedure dir_apptype;
       var
          hs : string;
@@ -198,7 +220,7 @@ implementation
     procedure dir_description;
       begin
         if not (target_info.target in [target_i386_os2,target_i386_win32,target_i386_netware]) then
-          Message(scan_w_decription_not_support);
+          Message(scan_w_description_not_support);
         { change description global var in all cases }
         { it not used but in win32, os2 and netware }
         current_scanner.skipspace;
@@ -810,6 +832,10 @@ implementation
     procedure InitScannerDirectives;
       begin
         AddDirective('ALIGN',{$ifdef FPCPROCVAR}@{$endif}dir_align);
+{$ifdef m68k}
+        AddDirective('APPID',{$ifdef FPCPROCVAR}@{$endif}dir_appid);
+        AddDirective('APPNAME',{$ifdef FPCPROCVAR}@{$endif}dir_appname);
+{$endif m68k}
         AddDirective('APPTYPE',{$ifdef FPCPROCVAR}@{$endif}dir_apptype);
         AddDirective('ASMMODE',{$ifdef FPCPROCVAR}@{$endif}dir_asmmode);
         AddDirective('ASSERTIONS',{$ifdef FPCPROCVAR}@{$endif}dir_assertions);
@@ -887,7 +913,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  2001-08-07 18:47:13  peter
+  Revision 1.7  2001-08-19 11:22:24  peter
+    * palmos support from v10 merged
+
+  Revision 1.6  2001/08/07 18:47:13  peter
     * merged netbsd start
     * profile for win32
 

+ 9 - 2
compiler/systems.pas

@@ -69,7 +69,8 @@ interface
               as_i386_nasmelf,as_i386_nasmobj,
               as_i386_tasm,as_i386_masm,
               as_i386_dbg,as_i386_coff,as_i386_pecoff,as_i386_elf32
-            ,as_m68k_as,as_m68k_gas,as_m68k_mit,as_m68k_mot,as_m68k_mpw
+            ,as_m68k_as,as_m68k_gas,as_m68k_mit,as_m68k_mot,
+              as_m68k_mpw,as_m68k_palm
             ,as_alpha_as
             ,as_powerpc_as,as_powerpc_mpw
        );
@@ -152,6 +153,9 @@ interface
        ttargetflags = (tf_none,
             tf_under_development,tf_supports_stack_checking,
             tf_need_export,tf_needs_isconsole
+{$ifdef m68k}
+            ,tf_code_small,tf_static_a5_based
+{$endif m68k}
        );
 
        ptargetinfo = ^ttargetinfo;
@@ -637,7 +641,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.23  2001-08-12 17:57:07  peter
+  Revision 1.24  2001-08-19 11:22:24  peter
+    * palmos support from v10 merged
+
+  Revision 1.23  2001/08/12 17:57:07  peter
     * under development flag for targets
 
   Revision 1.22  2001/08/07 18:47:13  peter

+ 5 - 2
compiler/targets/t_go32v1.pas

@@ -200,7 +200,7 @@ end;
             flags        : [];
             cpu          : i386;
             unit_env     : 'GO32V1UNITS';
-            extradefines : '';
+            extradefines : 'DPMI';
             sharedlibext : '.dll';
             staticlibext : '.a';
             sourceext    : '.pp';
@@ -260,7 +260,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.8  2001-08-07 18:47:15  peter
+  Revision 1.9  2001-08-19 11:22:24  peter
+    * palmos support from v10 merged
+
+  Revision 1.8  2001/08/07 18:47:15  peter
     * merged netbsd start
     * profile for win32
 

+ 5 - 2
compiler/targets/t_go32v2.pas

@@ -422,7 +422,7 @@ end;
             flags        : [];
             cpu          : i386;
             unit_env     : 'GO32V2UNITS';
-            extradefines : '';
+            extradefines : 'DPMI';
             sharedlibext : '.dll';
             staticlibext : '.a';
             sourceext    : '.pp';
@@ -482,7 +482,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.10  2001-08-07 18:47:15  peter
+  Revision 1.11  2001-08-19 11:22:24  peter
+    * palmos support from v10 merged
+
+  Revision 1.10  2001/08/07 18:47:15  peter
     * merged netbsd start
     * profile for win32
 

+ 173 - 4
compiler/targets/t_palmos.pas

@@ -27,14 +27,180 @@ unit t_palmos;
 
 interface
 
+  uses
+    link;
+
+  type
+    tlinkerPalmOS=class(tlinker)
+    private
+       Function  WriteResponseFile : Boolean;
+    public
+       constructor Create;override;
+       procedure SetDefaultInfo;override;
+       function  MakeExecutable:boolean;override;
+    end;
+
 
 implementation
 
     uses
-       link,
        cutils,cclasses,
        globtype,globals,systems,verbose,script,fmodule;
 
+{****************************************************************************
+                               TLinkerPalmOS
+****************************************************************************}
+
+Constructor TLinkerPalmOS.Create;
+begin
+  Inherited Create;
+  { allow duplicated libs (PM) }
+  SharedLibFiles.doubles:=true;
+  StaticLibFiles.doubles:=true;
+end;
+
+
+procedure TLinkerPalmOS.SetDefaultInfo;
+begin
+  with Info do
+   begin
+     ExeCmd[1]:='ldpalm $OPT $STRIP -N -dy -T $SCRIPT -o $EXE @$RES';
+     ExeCmd[2]:='build-prc $EXE.prc "$APPNAME" $APPID $EXE *.bin';
+   end;
+end;
+
+
+Function TLinkerPalmOS.WriteResponseFile : Boolean;
+Var
+  linkres  : TLinkRes;
+  i        : longint;
+  HPath    : PStringQueueItem;
+  s        : string;
+  linklibc : boolean;
+begin
+  WriteResponseFile:=False;
+
+  { Open link.res file }
+  LinkRes:=TLinkRes.Create(outputexedir+Info.ResName);
+
+  { Write path to search libraries }
+  HPath:=TStringListItem(current_module.locallibrarysearchpath.First);
+  while assigned(HPath) do
+   begin
+     LinkRes.Add('-L'+HPath.Str);
+     HPath:=TStringListItem(HPath.Next);
+   end;
+  HPath:=TStringListItem(LibrarySearchPath.First);
+  while assigned(HPath) do
+   begin
+     LinkRes.Add('-L'+HPath.Str);
+     HPath:=TStringListItem(HPath.Next);
+   end;
+
+  { add objectfiles, start with crt0 always  }
+  { using crt0, we should stick C compatible }
+  LinkRes.AddFileName(FindObjectFile('crt0',''));
+
+  { main objectfiles }
+  while not ObjectFiles.Empty do
+   begin
+     s:=ObjectFiles.GetFirst;
+     if s<>'' then
+      LinkRes.AddFileName(s);
+   end;
+
+  { Write staticlibraries }
+  if not StaticLibFiles.Empty then
+   begin
+     LinkRes.Add('-(');
+     While not StaticLibFiles.Empty do
+      begin
+        S:=StaticLibFiles.GetFirst;
+        LinkRes.AddFileName(s)
+      end;
+     LinkRes.Add('-)');
+   end;
+
+  { currently the PalmOS target must be linked always against the C lib }
+  LinkRes.Add('-lcrt');
+
+  { Write sharedlibraries like -l<lib>, also add the needed dynamic linker
+    here to be sure that it gets linked this is needed for glibc2 systems (PFV) }
+  linklibc:=false;
+  While not SharedLibFiles.Empty do
+   begin
+     S:=SharedLibFiles.GetFirst;
+     if s<>'c' then
+      begin
+        i:=Pos(target_info.sharedlibext,S);
+        if i>0 then
+         Delete(S,i,255);
+        LinkRes.Add('-l'+s);
+      end
+     else
+      linklibc:=true;
+   end;
+  { be sure that libc is the last lib }
+  if linklibc then
+   begin
+     LinkRes.Add('-lc');
+     LinkRes.Add('-lgcc');
+   end;
+
+{ Write and Close response }
+  linkres.writetodisk;
+  linkres.Free;
+
+  WriteResponseFile:=True;
+end;
+
+
+function TLinkerPalmOS.MakeExecutable:boolean;
+var
+  binstr,
+  cmdstr  : string;
+  success : boolean;
+  StripStr : string[40];
+  i : longint;
+begin
+  if not(cs_link_extern in aktglobalswitches) then
+    Message1(exec_i_linking,current_module^.exefilename^);
+
+  { Create some replacements }
+  StripStr:='';
+  if (cs_link_strip in aktglobalswitches) then
+   StripStr:='-s';
+
+  { Write used files and libraries }
+  WriteResponseFile;
+
+{ Call linker }
+  success:=false;
+  for i:=1 to 2 do
+   begin
+     SplitBinCmd(Info.ExeCmd[i],binstr,cmdstr);
+     if binstr<>'' then
+      begin
+        Replace(cmdstr,'$EXE',MaybeQuote(current_module.exefilename^));
+        Replace(cmdstr,'$OPT',Info.ExtraOptions);
+        Replace(cmdstr,'$RES',outputexedir+Info.ResName);
+        Replace(cmdstr,'$STRIP',StripStr);
+        Replace(cmdstr,'$SCRIPT',FindUtil('palm.ld'));
+        Replace(cmdstr,'$APPNAME',palmos_applicationname);
+        Replace(cmdstr,'$APPID',palmos_applicationid);
+        success:=DoExec(FindUtil(binstr),cmdstr,(i=1),false);
+        if not success then
+         break;
+      end;
+   end;
+
+  { Remove ReponseFile }
+  if (success) and not(cs_link_extern in aktglobalswitches) then
+   RemoveFile(outputexedir+Info.ResName);
+
+  MakeExecutable:=success;   { otherwise a recursive call to link method }
+end;
+
 {*****************************************************************************
                                      Initialize
 *****************************************************************************}
@@ -46,7 +212,7 @@ implementation
             target       : target_m68k_PalmOS;
             name         : 'PalmOS';
             shortname    : 'palmos';
-            flags        : [];
+            flags        : [tf_code_small,tf_static_a5_based];
             cpu          : m68k;
             short_name   : 'PALMOS';
             unit_env     : 'PALMUNITS';
@@ -78,7 +244,7 @@ implementation
             script       : script_unix;
             endian       : endian_big;
             stackalignment : 2;
-            maxCrecordalignment : 32;
+            maxCrecordalignment : 4;
             size_of_pointer : 4;
             size_of_longint : 4;
             heapsize     : 128*1024;
@@ -97,7 +263,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.4  2001-08-07 18:47:15  peter
+  Revision 1.5  2001-08-19 11:22:24  peter
+    * palmos support from v10 merged
+
+  Revision 1.4  2001/08/07 18:47:15  peter
     * merged netbsd start
     * profile for win32