浏览代码

+ $R support for OS/2 (EMX) added

Tomas Hajny 25 年之前
父节点
当前提交
c790e4afbe
共有 6 个文件被更改,包括 277 次插入243 次删除
  1. 17 12
      compiler/comprsrc.pas
  2. 3 2
      compiler/msgidx.inc
  3. 213 212
      compiler/msgtxt.inc
  4. 10 3
      compiler/scandir.inc
  5. 13 4
      compiler/systems.pas
  6. 21 10
      compiler/t_os2.pas

+ 17 - 12
compiler/comprsrc.pas

@@ -117,24 +117,29 @@ procedure CompileResourceFiles;
 var
   hr : presourcefile;
 begin
-  While not Current_module^.ResourceFiles.Empty do
-   begin
-     case target_info.target of
-       target_i386_win32 :
-         hr:=new(presourcefile,init(Current_module^.ResourceFiles.get));
-       else
-         Message(scan_e_resourcefiles_not_supported);
-     end;
-     hr^.compile;
-     dispose(hr,done);
-   end;
+(* OS/2 (EMX) must be processed elsewhere (in the linking/binding stage). *)
+  if target_info.target <> target_i386_os2 then
+   While not Current_module^.ResourceFiles.Empty do
+    begin
+      case target_info.target of
+        target_i386_win32:
+          hr:=new(presourcefile,init(Current_module^.ResourceFiles.get));
+        else
+          Message(scan_e_resourcefiles_not_supported);
+      end;
+      hr^.compile;
+      dispose(hr,done);
+    end;
 end;
 
 
 end.
 {
   $Log$
-  Revision 1.11  2000-06-23 20:11:05  peter
+  Revision 1.12  2000-06-25 19:08:28  hajny
+    + $R support for OS/2 (EMX) added
+
+  Revision 1.11  2000/06/23 20:11:05  peter
     * made resourcecompiling object so it can be inherited and replaced
       for other targets if needed
 

+ 3 - 2
compiler/msgidx.inc

@@ -31,7 +31,7 @@ type tmsgconst=(
   scan_e_endif_expected,
   scan_e_preproc_syntax_error,
   scan_e_error_in_preproc_expr,
-  scan_w_marco_cut_after_255_chars,
+  scan_w_macro_cut_after_255_chars,
   scan_e_endif_without_if,
   scan_f_user_defined,
   scan_e_user_defined,
@@ -67,6 +67,7 @@ type tmsgconst=(
   scan_e_resourcefiles_not_supported,
   scan_w_include_env_not_found,
   scan_e_invalid_maxfpureg_value,
+  scan_w_only_one_resourcefile_supported,
   parser_e_syntax_error,
   parser_w_proc_far_ignored,
   parser_w_proc_near_ignored,
@@ -699,4 +700,4 @@ type tmsgconst=(
 endmsgconst
 );
 const
-  MsgCRCValue : longint = -90958003;
+  MsgCRCValue : longint = 1376339778;

+ 213 - 212
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000111] of string[240]=(
+const msgtxt : array[0..000112] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000111,1..240] of char=(
+const msgtxt : array[0..000112,1..240] of char=(
 {$endif Delphi}
   'T_Compiler: $1'#000+
   'D_Compiler OS: $1'#000+
@@ -72,647 +72,648 @@ const msgtxt : array[0..000111,1..240] of char=(
   'E_Resource files are not supported for this target'#000+
   'W_Include e','nvironment $1 not found in environment'#000+
   'E_Illegal value for FPU register limit'#000+
+  'W_Only one resource file is supported for this target'#000+
   'E_Parser - Syntax Error'#000+
   'W_Procedure type FAR ignored'#000+
   'W_Procedure type NEAR ignored'#000+
-  'W_Procedure type INTERRUPT ignored for not i386'#000+
-  'E_INTERRUPT procedure can'#039't be ','nested'#000+
+  'W_Procedure type INTERRUP','T ignored for not i386'#000+
+  'E_INTERRUPT procedure can'#039't be nested'#000+
   'W_Procedure type $1 ignored'#000+
   'E_Not all declarations of $1 are declared with OVERLOAD'#000+
   'E_No DLL File specified'#000+
   'E_Duplicate exported function name $1'#000+
-  'E_Duplicate exported function index $1'#000+
+  'E_Duplicate exported function ind','ex $1'#000+
   'E_Invalid index for exported function'#000+
-  'W_Relocata','ble DLL or executable $1 debug info does not work, disable'+
-  'd.'#000+
+  'W_Relocatable DLL or executable $1 debug info does not work, disabled.'+
+  #000+
   'W_To allow debugging for win32 code you need to disable relocation wit'+
   'h -WN option'#000+
   'E_Constructor name must be INIT'#000+
-  'E_Destructor name must be DONE'#000+
+  'E_Destruct','or name must be DONE'#000+
   'E_Illegal open parameter'#000+
-  'E_Proced','ure type INLINE not supported'#000+
+  'E_Procedure type INLINE not supported'#000+
   'W_Private methods shouldn'#039't be VIRTUAL'#000+
   'W_Constructor should be public'#000+
   'W_Destructor should be public'#000+
   'N_Class should have one destructor only'#000+
-  'E_Local class definitions are not allowed'#000+
-  'F_Anonym class definitions a','re not allowed'#000+
+  'E_Local class de','finitions are not allowed'#000+
+  'F_Anonym class definitions are not allowed'#000+
   'E_The object $1 has no VMT'#000+
   'E_Illegal parameter list'#000+
   'E_Wrong parameter type specified for arg no. $1'#000+
   'E_Wrong amount of parameters specified'#000+
-  'E_overloaded identifier $1 isn'#039't a function'#000+
-  'E_overloaded functions have the same param','eter list'#000+
+  'E_overloaded identifier $1 isn'#039't',' a function'#000+
+  'E_overloaded functions have the same parameter list'#000+
   'E_function header doesn'#039't match the forward declaration $1'#000+
   'E_function header $1 doesn'#039't match forward : var name changes $2 ='+
   '> $3'#000+
-  'N_Values in enumeration types have to be ascending'#000+
-  'N_Interface and implementation names are differen','t $1 => $2'#000+
+  'N_Values in enumeration types have to be ascen','ding'#000+
+  'N_Interface and implementation names are different $1 => $2'#000+
   'E_With can not be used for variables in a different segment'#000+
   'E_function nesting > 31'#000+
   'E_range check error while evaluating constants'#000+
-  'W_range check error while evaluating constants'#000+
+  'W_range check error while evaluating constan','ts'#000+
   'E_duplicate case label'#000+
-  'E_Upper bound of case range ','is less than lower bound'#000+
+  'E_Upper bound of case range is less than lower bound'#000+
   'E_typed constants of classes are not allowed'#000+
   'E_functions variables of overloaded functions are not allowed'#000+
   'E_string length must be a value from 1 to 255'#000+
-  'W_use extended syntax of NEW and DISPOSE for instances of obje','cts'#000+
+  'W_use ex','tended syntax of NEW and DISPOSE for instances of objects'#000+
   'W_use of NEW or DISPOSE for untyped pointers is meaningless'#000+
   'E_use of NEW or DISPOSE is not possible for untyped pointers'#000+
   'E_class identifier expected'#000+
-  'E_type identifier not allowed here'#000+
+  'E_type identifier not allowed her','e'#000+
   'E_method identifier expected'#000+
-  'E_function header doesn',#039't match any method of this class'#000+
+  'E_function header doesn'#039't match any method of this class'#000+
   'P_procedure/function $1'#000+
   'E_Illegal floating point constant'#000+
   'E_FAIL can be used in constructors only'#000+
   'E_Destructors can'#039't have parameters'#000+
-  'E_Only class methods can be referred with class references'#000+
-  'E_Only class ','methods can be accessed in class methods'#000+
+  'E_Only class metho','ds can be referred with class references'#000+
+  'E_Only class methods can be accessed in class methods'#000+
   'E_Constant and CASE types do not match'#000+
   'E_The symbol can'#039't be exported from a library'#000+
   'W_An inherited method is hidden by $1'#000+
-  'E_There is no method in an ancestor class to be overridden: $1'#000+
-  'E_No member i','s provided to access property'#000+
+  'E_There is no method i','n an ancestor class to be overridden: $1'#000+
+  'E_No member is provided to access property'#000+
   'W_Stored prorperty directive is not yet implemented'#000+
   'E_Illegal symbol for property access'#000+
   'E_Cannot access a protected field of an object here'#000+
-  'E_Cannot access a private field of an object here'#000+
-  'W_overloaded method',' of virtual method should be virtual: $1'#000+
+  'E_Cannot access',' a private field of an object here'#000+
+  'W_overloaded method of virtual method should be virtual: $1'#000+
   'W_overloaded method of non-virtual method should be non-virtual: $1'#000+
   'E_overloaded methods which are virtual must have the same return type:'+
   ' $1'#000+
-  'E_EXPORT declared functions can'#039't be nested'#000+
-  'E_methods can',#039't be EXPORTed'#000+
+  'E_E','XPORT declared functions can'#039't be nested'#000+
+  'E_methods can'#039't be EXPORTed'#000+
   'E_call by var parameters have to match exactly: Got $1 expected $2'#000+
   'E_Class isn'#039't a parent class of the current class'#000+
   'E_SELF is only allowed in methods'#000+
-  'E_methods can be only in other methods called direct with type identif'+
-  'ier ','of the class'#000+
+  'E_methods can be onl','y in other methods called direct with type ident'+
+  'ifier of the class'#000+
   'E_Illegal use of '#039':'#039#000+
   'E_range check error in set constructor or duplicate set element'#000+
   'E_Pointer to object expected'#000+
   'E_Expression must be constructor call'#000+
-  'E_Expression must be destructor call'#000+
+  'E_Expression must be ','destructor call'#000+
   'E_Illegal order of record elements'#000+
-  'E_E','xpression type must be class or record type'#000+
+  'E_Expression type must be class or record type'#000+
   'E_Procedures can'#039't return a value'#000+
   'E_constructors and destructors must be methods'#000+
   'E_Operator is not overloaded'#000+
-  'E_Impossible to overload assignment for equal types'#000+
+  'E_Impossible to overload assignm','ent for equal types'#000+
   'E_Impossible operator overload'#000+
-  'E_R','e-raise isn'#039't possible there'#000+
+  'E_Re-raise isn'#039't possible there'#000+
   'E_The extended syntax of new or dispose isn'#039't allowed for a class'#000+
   'E_Assembler incompatible with function return type'#000+
-  'E_Procedure overloading is switched off'#000+
-  'E_It is not possible to overload this operator (overlo','ad = instead)'#000+
+  'E_Procedure overloading is switched off'#000,
+  'E_It is not possible to overload this operator (overload = instead)'#000+
   'E_Comparative operator must return a boolean value'#000+
   'E_Only virtual methods can be abstract'#000+
   'F_Use of unsupported feature!'#000+
   'E_The mix of CLASSES and OBJECTS isn'#039't allowed'#000+
-  'W_Unknown procedure directive had to be ignored: $1'#000+
-  'E_absol','ute can only be associated to ONE variable'#000+
+  'W_Unk','nown procedure directive had to be ignored: $1'#000+
+  'E_absolute can only be associated to ONE variable'#000+
   'E_absolute can only be associated a var or const'#000+
   'E_Only ONE variable can be initialized'#000+
-  'E_Abstract methods shouldn'#039't have any definition (with function bo'+
-  'dy)'#000+
-  'E_This overloaded function can'#039't be loc','al (must be exported)'#000+
+  'E_Abstract methods shouldn'#039't have any definition (with ','function '+
+  'body)'#000+
+  'E_This overloaded function can'#039't be local (must be exported)'#000+
   'W_Virtual methods are used without a constructor in $1'#000+
   'M_Macro defined: $1'#000+
   'M_Macro undefined: $1'#000+
   'M_Macro $1 set to $2'#000+
   'I_Compiling $1'#000+
-  'U_Parsing interface of unit $1'#000+
+  'U_Parsing interface of unit $1'#000,
   'U_Parsing implementation of $1'#000+
-  'D_Compiling $1 for the ','second time'#000+
+  'D_Compiling $1 for the second time'#000+
   'E_Array properties aren'#039't allowed here'#000+
   'E_No property found to override'#000+
   'E_Only one default property is allowed, found inherited default proper'+
   'ty in class $1'#000+
-  'E_The default property must be an array property'#000+
-  'E_Virtual constructors ','are only supported in class object model'#000+
+  'E_The default prop','erty must be an array property'#000+
+  'E_Virtual constructors are only supported in class object model'#000+
   'E_No default property available'#000+
   'E_The class can'#039't have a published section, use the {$M+} switch'#000+
-  'E_Forward declaration of class $1 must be resolved here to use the cla'+
-  'ss as ancestor'#000+
-  'E_Local operators',' not supported'#000+
+  'E_Forward declaration of class $1 must be resolv','ed here to use the c'+
+  'lass as ancestor'#000+
+  'E_Local operators not supported'#000+
   'E_Procedure directive $1 not allowed in interface section'#000+
   'E_Procedure directive $1 not allowed in implementation section'#000+
-  'E_Procedure directive $1 not allowed in procvar declaration'#000+
-  'E_Function is already declared Public/Forwar','d $1'#000+
+  'E_Procedure directive $1 not allowed in procvar de','claration'#000+
+  'E_Function is already declared Public/Forward $1'#000+
   'E_Can'#039't use both EXPORT and EXTERNAL'#000+
   'E_NAME keyword expected'#000+
   'W_$1 not yet supported inside inline procedure/function'#000+
   'W_Inlining disabled'#000+
   'I_Writing Browser log $1'#000+
-  'H_may be pointer dereference is missing'#000+
-  'F_Selected assembler reader not s','upported'#000+
+  'H_may be pointer de','reference is missing'#000+
+  'F_Selected assembler reader not supported'#000+
   'E_Procedure directive $1 has conflicts with other directives'#000+
   'E_Calling convention doesn'#039't match forward'#000+
   'E_Register calling (fastcall) not supported'#000+
-  'E_Property can'#039't have a default value'#000+
-  'E_The default value of a property must be con','stant'#000+
+  'E_Property can'#039't have a defau','lt value'#000+
+  'E_The default value of a property must be constant'#000+
   'E_Symbol can'#039't be published, can be only a class'#000+
   'E_That kind of property can'#039't be published'#000+
   'W_Empty import name specified'#000+
   'W_An import name is required'#000+
-  'E_Function internal name changed after use of function'#000+
+  'E_Function internal name chan','ged after use of function'#000+
   'E_Division by zero'#000+
-  'E_Invalid',' floating point operation'#000+
+  'E_Invalid floating point operation'#000+
   'E_Upper bound of range is less than lower bound'#000+
   'W_string "$1" is longer than $2'#000+
   'E_string length is larger than array of char length'#000+
-  'E_Illegal expression after message directive'#000+
-  'E_Message handlers can take only one ','call by ref. parameter'#000+
+  'E_Illegal expression after m','essage directive'#000+
+  'E_Message handlers can take only one call by ref. parameter'#000+
   'E_Duplicate message label: $1'#000+
   'E_Self can be only an explicit parameter in message handlers'#000+
   'E_Threadvars can be only static or global'#000+
-  'F_Direct assembler not supported for binary output format'#000+
-  'W_Don'#039't load OBJPAS unit m','anual, use {$mode objfpc} or {$mode de'+
-  'lphi} instead'#000+
+  'F_Direct assembler not support','ed for binary output format'#000+
+  'W_Don'#039't load OBJPAS unit manual, use {$mode objfpc} or {$mode delp'+
+  'hi} instead'#000+
   'E_OVERRIDE can'#039't be used in objects'#000+
   'E_Data types which requires initialization/finalization can'#039't be u'+
   'sed in variant records'#000+
-  'E_Resourcestrings can be only static or global'#000+
-  'E_Exit with argu','ment can'#039't be used here'#000+
+  'E_Resourc','estrings can be only static or global'#000+
+  'E_Exit with argument can'#039't be used here'#000+
   'E_The type of the storage symbol must be boolean'#000+
   'E_This symbol isn'#039't allowed as storage symbol'#000+
   'E_Only class which are compiled in $M+ mode can be published'#000+
-  'E_Procedure directive expected'#000+
-  'E_The value for a property in','dex must be of an ordinal type'#000+
+  'E_Proc','edure directive expected'#000+
+  'E_The value for a property index must be of an ordinal type'#000+
   'E_Procedure name to short to be exported'#000+
   'E_No DEFFILE entry can be generated for unit global vars'#000+
   'E_Compile without -WD option'#000+
   'E_Type mismatch'#000+
-  'E_Incompatible types: got "$1" expected "$2"'#000+
-  'E_Type mismatch betwe','en $1 and $2'#000+
+  'E_Incompatib','le types: got "$1" expected "$2"'#000+
+  'E_Type mismatch between $1 and $2'#000+
   'E_Type identifier expected'#000+
   'E_Variable identifier expected'#000+
   'E_Integer expression expected, but got "$1"'#000+
   'E_Boolean expression expected, but got "$1"'#000+
-  'E_Ordinal expression expected'#000+
+  'E_Ordinal expression expect','ed'#000+
   'E_pointer type expected, but got "$1"'#000+
-  'E_class type ','expected, but got "$1"'#000+
+  'E_class type expected, but got "$1"'#000+
   'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
-  'W_Automatic type conversion from floating type to COMP which is an in',
-  'teger type'#000+
+  'W_Automatic typ','e conversion from floating type to COMP which is an i'+
+  'nteger type'#000+
   'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
-  'E_Can'#039't read or write variables of this type'#000+
-  'E_Can'#039't use readln or writeln on type','d file'#000+
+  'E_Can'#039't read or write variab','les of this type'#000+
+  'E_Can'#039't use readln or writeln on typed file'#000+
   'E_Can'#039't use read or write on untyped file.'#000+
   'E_Type conflict between set elements'#000+
   'W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
   'E_Integer or real expression expected'#000+
-  'E_Wrong type $1 in array constructor'#000+
-  'E_Incompatible type fo','r arg no. $1: Got $2, expected $3'#000+
+  'E_Wro','ng type $1 in array constructor'#000+
+  'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
   'E_Method (variable) and Procedure (variable) are not compatible'#000+
   'E_Illegal constant passed to internal math function'#000+
-  'E_Can'#039't get the address of constants'#000+
+  'E_Can'#039't get the address of constants',#000+
   'E_Argument can'#039't be assigned to'#000+
-  'E_Can'#039't assign local ','procedure/function to procedure variable'#000+
+  'E_Can'#039't assign local procedure/function to procedure variable'#000+
   'E_Can'#039't assign values to an address'#000+
   'E_Can'#039't assign values to const variable'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
-  'E_Duplicate identifier $1'#000+
-  'H_Identifier already defined in $1 ','at line $2'#000+
+  'E_Dupli','cate identifier $1'#000+
+  'H_Identifier already defined in $1 at line $2'#000+
   'E_Unknown identifier $1'#000+
   'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
   'E_Type identifier not defined'#000+
-  'E_Forward type not resolved $1'#000+
-  'E_Only static variables can be used in ','static methods or outside met'+
-  'hods'#000+
+  'E_Forward type n','ot resolved $1'#000+
+  'E_Only static variables can be used in static methods or outside metho'+
+  'ds'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
   'E_Instances of classes or objects with an abstract method are not allo'+
   'wed'#000+
-  'W_Label not defined $1'#000+
+  'W_Labe','l not defined $1'#000+
   'E_Label used but not defined $1'#000+
-  'E_Ill','egal label declaration'#000+
+  'E_Illegal label declaration'#000+
   'E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration of set elements'#000+
+  'E_illegal type declaration of set elements',#000+
   'E_Forward class definition not resolved $1'#000+
-  'H_Unit $1 ','not used in $2'#000+
+  'H_Unit $1 not used in $2'#000+
   'H_Parameter $1 not used'#000+
   'N_Local variable $1 not used'#000+
   'H_Value parameter $1 is assigned but never used'#000+
   'N_Local variable $1 is assigned but never used'#000+
-  'H_Local $1 $2 is not used'#000+
+  'H_Local $1 $2 is not us','ed'#000+
   'N_Private field $1.$2 is never used'#000+
-  'N_Private field',' $1.$2 is assigned but never used'#000+
+  'N_Private field $1.$2 is assigned but never used'#000+
   'N_Private method $1.$2 never used'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
-  'W_Type $1 is not aligned correctly in current record for C'#000+
+  'W_Type $1 is not aligned correctly in current record for',' C'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local variab','le $1 does not seem to be initialized'#000+
+  'W_Local variable $1 does not seem to be initialized'#000+
   'W_Variable $1 does not seem to be initialized'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_Data segment too large (max. 2GB)'#000+
-  'E_BREAK not allowed'#000+
+  'E_BREAK n','ot allowed'#000+
   'E_CONTINUE not allowed'#000+
-  'E_Expression too com','plicated - FPU stack overflow'#000+
+  'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
   'E_Invalid integer expression'#000+
   'E_Illegal qualifier'#000+
   'E_High range limit < low range limit'#000+
   'E_Illegal counter variable'#000+
-  'E_Can'#039't determine which overloaded function to call'#000+
-  'E_Parameter list size ex','ceeds 65535 bytes'#000+
+  'E_Can'#039't determine whic','h overloaded function to call'#000+
+  'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'D_Conversion between ordinals and pointers is not portable across plat'+
   'forms'#000+
   'E_File types must be var parameters'#000+
-  'E_The use of a far pointer isn'#039't allowed there'#000+
-  'E_illegal call by reference parameter','s'#000+
+  'E_The use of a far pointer isn',#039't allowed there'#000+
+  'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP/SP'#000+
-  'E_Abstract methods can'#039't be cal','led directly'#000+
+  'E_procedure call ','with stackframe ESP/SP'#000+
+  'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
-  'F_32-bit unsigned not supported in MC68000 mode'#000+
+  'F_32-bit unsigned not supported i','n MC68000 mode'#000+
   'F_Internal Error in secondinline()'#000+
-  'D_Re','gister $1 weight $2 $3'#000+
+  'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omitted'#000+
   'W_Range check for 64 bit integers is not supported on this target'#000+
-  'E_Object or class methods can'#039't be inline.'#000+
+  'E_Object or class methods can'#039't ','be inline.'#000+
   'E_Procvar calls can'#039't be inline.'#000+
-  'E_No code ','for inline procedure stored'#000+
+  'E_No code for inline procedure stored'#000+
   'E_Direct call of interrupt procedure $1 is not possible'#000+
   'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
   'se (set)length instead'#000+
-  'E_Include and exclude not implemented in this case'#000+
-  'E_Constructors o','r destructors can not be called inside a '#039'with'#039+
+  'E_Include and',' exclude not implemented in this case'#000+
+  'E_Constructors or destructors can not be called inside a '#039'with'#039+
   ' clause'#000+
   'E_Cannot call message handler method directly'#000+
   'E_Jump in or outside of an exception block'#000+
-  'E_Control flow statements aren'#039't allowed in a finally block'#000+
-  'D_Starting $1 styled assembler parsi','ng'#000+
+  'E_Control flow statements aren'#039't allowed i','n a finally block'#000+
+  'D_Starting $1 styled assembler parsing'#000+
   'D_Finished $1 styled assembler parsing'#000+
   'E_Non-label pattern contains @'#000+
   'W_Override operator not supported'#000+
   'E_Error building record offset'#000+
   'E_OFFSET used without identifier'#000+
-  'E_TYPE used without identifier'#000+
-  'E_Cannot use local variable or paramet','ers here'#000+
+  'E_TYPE used wit','hout identifier'#000+
+  'E_Cannot use local variable or parameters here'#000+
   'E_need to use OFFSET here'#000+
   'E_need to use $ here'#000+
   'E_Cannot use multiple relocatable symbols'#000+
   'E_Relocatable symbol can only be added'#000+
   'E_Invalid constant expression'#000+
-  'E_Relocatable symbol is not allowed'#000+
+  'E_Relocatable symbo','l is not allowed'#000+
   'E_Invalid reference syntax'#000+
-  'E_You can ','not reach $1 from that code'#000+
+  'E_You can not reach $1 from that code'#000+
   'E_Local symbols/labels aren'#039't allowed as references'#000+
   'E_Invalid base and index register usage'#000+
   'W_Possible error in object field handling'#000+
-  'E_Wrong scale factor specified'#000+
+  'E_Wrong scale factor spe','cified'#000+
   'E_Multiple index register usage'#000+
-  'E_Invalid opera','nd type'#000+
+  'E_Invalid operand type'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
   'E_Divide by zero in asm evaluator'#000+
   'E_Illegal expression'#000+
-  'E_escape sequence ignored: $1'#000+
+  'E_escape seq','uence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
-  'W_Fwait c','an cause emulation problems with emu387'#000+
+  'W_Fwait can cause emulation problems with emu387'#000+
   'W_FADD without operand translated into FADDP'#000+
   'W_ENTER instruction is not supported by Linux kernel'#000+
   'W_Calling an overload function in assembler'#000+
-  'E_Unsupported symbol type for operand'#000+
-  'E_Constant value out',' of bounds'#000+
+  'E_Un','supported symbol type for operand'#000+
+  'E_Constant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
   'E_Error converting binary $1'#000+
   'E_Error converting hexadecimal $1'#000+
   'H_$1 translated to $2'#000+
-  'W_$1 is associated to an overloaded function'#000+
+  'W_$1 is associated to an overloa','ded function'#000+
   'E_Cannot use SELF outside a method'#000+
-  'E_Cann','ot use OLDEBP outside a nested procedure'#000+
+  'E_Cannot use OLDEBP outside a nested procedure'#000+
   'W_Procedures can'#039't return any value in asm code'#000+
   'E_SEG not supported'#000+
   'E_Size suffix and destination or source size do not match'#000+
-  'W_Size suffix and destination or source size do not match'#000+
-  'E_Assembler syn','tax error'#000+
+  'W_Size suffix and d','estination or source size do not match'#000+
+  'E_Assembler syntax error'#000+
   'E_Invalid combination of opcode and operands'#000+
   'E_Assemler syntax error in operand'#000+
   'E_Assemler syntax error in constant'#000+
   'E_Invalid String expression'#000+
-  '32bit constant created for address'#000+
+  '32bit constant created for addre','ss'#000+
   'E_Unrecognized opcode $1'#000+
-  'E_Invalid or missing opcod','e'#000+
+  'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'E_Duplicate local symbol $1'#000+
-  'E_Undefined local symbol $1'#000+
-  'E_Unknown label identifier $1',#000+
+  'E_U','ndefined local symbol $1'#000+
+  'E_Unknown label identifier $1'#000+
   'E_Invalid register name'#000+
   'E_Invalid floating point register name'#000+
   'E_NOR not supported'#000+
   'W_Modulo not supported'#000+
   'E_Invalid floating point constant $1'#000+
   'E_Invalid floating point expression'#000+
-  'E_Wrong symbol type'#000+
-  'E_Cannot index a local var or parameter ','with a register'#000+
+  'E_Wron','g symbol type'#000+
+  'E_Cannot index a local var or parameter with a register'#000+
   'E_Invalid segment override expression'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Strings not allowed as constants'#000+
   'No type of variable specified'#000+
-  'E_assembler code not returned to text section'#000+
+  'E_assembler code not returned to ','text section'#000+
   'E_Not a directive or local symbol $1'#000+
-  'E_Us','ing a defined name as a local label'#000+
+  'E_Using a defined name as a local label'#000+
   'E_Dollar token is used without an identifier'#000+
   'W_32bit constant created for address'#000+
   'N_.align is target specific, use .balign or .p2align'#000+
-  'E_Can'#039't access fields directly for parameters'#000+
-  'E_Can'#039't access fields o','f objects/classes directly'#000+
+  'E_Can'#039't access ','fields directly for parameters'#000+
+  'E_Can'#039't access fields of objects/classes directly'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'F_Comp not supported'#000+
   'F_Direct not support for binary writers'#000+
-  'E_Allocating of data is only allowed in bss section'#000+
+  'E_Allocating of data is only ','allowed in bss section'#000+
   'F_No binary writer selected'#000+
-  'E_A','sm: Opcode $1 not in table'#000+
+  'E_Asm: Opcode $1 not in table'#000+
   'E_Asm: $1 invalid combination of opcode and operands'#000+
   'E_Asm: 16 Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
-  'E_Asm: Immediate or reference expected'#000+
+  'E_Asm: Immediate or reference expe','cted'#000+
   'E_Asm: $1 value exceeds bounds $2'#000+
-  'E_Asm: Short ju','mp is out of range $1'#000+
+  'E_Asm: Short jump is out of range $1'#000+
   'E_Asm: Undefined label $1'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file: $1'#000+
   'E_Can'#039't create object file: $1'#000+
-  'E_Can'#039't create archive file: $1'#000+
-  'W_Assembler $1 not found, switching t','o external assembling'#000+
+  'E_Can'#039't create ','archive file: $1'#000+
+  'W_Assembler $1 not found, switching to external assembling'#000+
   'T_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
-  'I_Assembling smartlink $1'#000+
+  'I_Assembling smartl','ink $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
-  'W_Lib','rary $1 not found, Linking may fail !'#000+
+  'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_Util $1 not found, switching to external linking'#000+
-  'T_Using util $1'#000+
+  'T_Using',' util $1'#000+
   'E_Creation of Executables not supported'#000+
-  'E_Cre','ation of Dynamic/Shared Libraries not supported'#000+
+  'E_Creation of Dynamic/Shared Libraries not supported'#000+
   'I_Closing script $1'#000+
   'W_resource compiler not found, switching to external mode'#000+
   'I_Compiling resource $1'#000+
   'F_Can'#039't post process executable $1'#000+
-  'F_Can'#039't open executable $1'#000+
+  'F','_Can'#039't open executable $1'#000+
   'X_Size of Code: $1 bytes'#000+
-  'X_S','ize of initialized data: $1 bytes'#000+
+  'X_Size of initialized data: $1 bytes'#000+
   'X_Size of uninitialized data: $1 bytes'#000+
   'X_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
-  'U_PPU Name: $1'#000+
+  'U_PPU Name: $','1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
-  'U_PPU F','ile too short'#000+
+  'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
-  'U_Writing $1'#000+
+  'U_Writin','g $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_Error reading PPU-File'#000+
-  'F','_unexpected end of PPU-File'#000+
+  'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
-  'F_Can'#039't compile unit $1, no sources available'#000+
+  'F_Can'#039't compile unit',' $1, no sources available'#000+
   'F_Can'#039't find unit $1'#000+
-  'W_Unit ','$1 was not found but $2 exists'#000+
+  'W_Unit $1 was not found but $2 exists'#000+
   'F_Unit $1 searched but $2 found'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
-  'U_Load from $1 ($2) unit $3'#000+
+  'U_Load from $1 ($2) u','nit $3'#000+
   'U_Recompiling $1, checksum changed for $2'#000+
-  'U_Rec','ompiling $1, source found only'#000+
+  'U_Recompiling $1, source found only'#000+
   'U_Recompiling unit, static lib is older than ppufile'#000+
   'U_Recompiling unit, shared lib is older than ppufile'#000+
-  'U_Recompiling unit, obj and asm are older than ppufile'#000+
+  'U_Recompiling unit, obj and asm are older than pp','ufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
-  'U_Pars','ing interface of $1'#000+
+  'U_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
-  'W_DEF file can be created only for OS/2'#000+
-  'E_nested response files are',' not supported'#000+
+  'W_DEF file ca','n be created only for OS/2'#000+
+  'E_nested response files are not supported'#000+
   'F_No source file name in command line'#000+
   'N_No option inside $1 config file'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
-  'F_Unable to open file $1'#000+
+  'F_Unable to open file',' $1'#000+
   'N_Reading further options from $1'#000+
-  'W_Target is alre','ady set to: $1'#000+
+  'W_Target is already set to: $1'#000+
   'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
-  'W_Debug information generation is not supported by this executable'#000+
-  'H_Try recomp','iling with -dGDB'#000+
+  'W_Debug information gener','ation is not supported by this executable'#000+
+  'H_Try recompiling with -dGDB'#000+
   'E_You are using the obsolete switch $1'#000+
   'E_You are using the obsolete switch $1, please use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
-  'W_Assembler output selected "$1" is not compatible with "$2"'#000+
-  'W_"$1" asse','mbler use forced'#000+
+  'W_Assembler output',' selected "$1" is not compatible with "$2"'#000+
+  'W_"$1" assembler use forced'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
-  'Compiler Date  : $FPCDATE'#000+
+  'Compiler Date  : $FPCDAT','E'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
-  'This program comes unde','r the GNU General Public Licence'#000+
+  'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                 [email protected]'#000+
-  '**0*_put + after a boolean switch option to enable it, - to disable it'+
-  #000+
-  '**1a_the compiler doesn'#039't ','delete the generated assembler file'#000+
+  '**0*_put + after a boolean switch option to',' enable it, - to disable '+
+  'it'#000+
+  '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '**2ar_list register allocation/release info in assembler file'#000+
-  '**2at_list temp allocation/release info in assembler file'#000+
+  '**2at_list temp allocation/release info in',' assembler file'#000+
   '**1b_generate browser info'#000+
-  '**2bl_gener','ate local symbol info'#000+
+  '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
   '**2CD_create also dynamic library (not supported)'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
-  '**2Ci_IO-checking'#000+
+  '**2Ci_','IO-checking'#000+
   '**2Cn_omit linking stage'#000+
-  '**2Co_check overf','low of integer operations'#000+
+  '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
   '**2CX_create also smartlinked library'#000+
   '**1d<x>_defines the symbol <x>'#000+
-  '*O1D_generate a DEF file'#000+
+  '*O1D_generate a DE','F file'#000+
   '*O2Dd<x>_set description to <x>'#000+
-  '*O2Dw_PM applic','ation'#000+
+  '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F<x>_set file names and paths:'#000+
   '**2FD<x>_sets the directory where to search for compiler utilities'#000+
-  '**2Fe<x>_redirect error output to <x>'#000+
+  '**2Fe<x>_redirect error output ','to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
-  '**2Fi<','x>_adds <x> to include path'#000+
+  '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to unit path'#000+
-  '**2FU<x>_set unit output path to <x>, ove','rrides -FE'#000+
+  '**2Fu<x>_adds <x> ','to unit path'#000+
+  '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '*g2gh_use heap trace unit (for memory leak debugging)'#000+
-  '*g2gl_use line info unit to show more info for backtraces'#000+
+  '*g2gl_use line info unit to show more info for backtrace','s'#000+
   '*g2gc_generate checks for pointers'#000+
-  '**1i_information'#000,
+  '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
-  '**1I<x>_adds <x> to include path'#000+
+  '**1I<x>_adds <x','> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
-  '**1l_','write logo'#000+
+  '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
   '**1o<x>_change the name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#000+
-  '*L1P_use pipes instead of creating temporary assembler files'#000+
-  '**1S<x>_sy','ntax options:'#000+
+  '*L1P_use pipes in','stead of creating temporary assembler files'#000+
+  '**1S<x>_syntax options:'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2sa_include assertion code.'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#000+
-  '**2Sg_all','ow LABEL and GOTO'#000+
+  '**2Se<x>_compil','er stops after the <x> errors (default is 1)'#000+
+  '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ styled INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init (destructor must be don','e)'#000+
+  '**2Ss','_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
-  '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a combin','ation of the following letters:'#000+
+  '**2Us_com','pile a system unit'#000+
+  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
   '**2*_w : Show warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Show tried/used files'#000+
-  '**2*_h : Show hints             ','     m : Show defined macros'#000+
+  '**2*_n : Show notes                  t : ','Show tried/used files'#000+
+  '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : Show al','l procedure          r : Rhide/GCC compatibility mod'+
-  'e'#000+
+  '**2*_a : Show everything        ','     0 : Show nothing (except errors'+
+  ')'#000+
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
   '**2*_    occurs'#000+
   '**1X_executable options:'#000+
-  '*L2Xc_link with the c library'#000+
+  '*L2Xc_link with the c',' library'#000+
   '**2Xs_strip all symbols from executable'#000+
-  '**2XD','_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
+  '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#000+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#000+
-  '**0*_Processor specific options:'#000+
+  '**0*_Pro','cessor specific options:'#000+
   '3*1A<x>_output format:'#000+
-  '3*2Aas','_assemble using GNU AS'#000+
+  '3*2Aas_assemble using GNU AS'#000+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Nasm'#000+
+  '3*2Anasmobj_obj file using ','Nasm'#000+
   '3*2Amasm_obj file using Masm (Microsoft)'#000+
-  '3*2Atasm','_obj file using Tasm (Borland)'#000+
+  '3*2Atasm_obj file using Tasm (Borland)'#000+
   '3*2Acoff_coff (Go32v2) using internal writer'#000+
   '3*2Apecoff_pecoff (Win32) using internal writer'#000+
   '3*1R<x>_assembler reading style:'#000+
-  '3*2Ratt_read AT&T style assembler'#000+
+  '3*2Ratt_read AT&T style assem','bler'#000+
   '3*2Rintel_read Intel style assembler'#000+
-  '3*2Rdirect_c','opy assembler text directly to assembler file'#000+
+  '3*2Rdirect_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers'#000+
-  '3*2Ou_enable uncertain optimizations (see docs)'#000+
-  '3*2O1_level 1 op','timizations (quick optimizations)'#000+
+  '3*2Ou_enab','le uncertain optimizations (see docs)'#000+
+  '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_target processor:'#000+
-  '3*3Op1_set target processor to 386/486'#000+
-  '3*3Op2_set target processor to Pentium/P','entiumMMX (tm)'#000+
+  '3*3Op1_set target process','or to 386/486'#000+
+  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
-  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V2_version 2 of DJ Delorie D','OS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
-  '3*2TWin32','_Windows 32 Bit'#000+
+  '3*2TWin32_Windows 32 Bit'#000+
   '3*1W<x>_Win32 target options'#000+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#000+
   '3*2WC_Specify console type application'#000+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#000+
-  '3*2WG_Specify graphic type application'#000+
-  '3*2WN_Do not gen','erate relocation code (necessary for debugging)'#000+
+  '3','*2WG_Specify graphic type application'#000+
+  '3*2WN_Do not generate relocation code (necessary for debugging)'#000+
   '3*2WR_Generate relocation code'#000+
   '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_MIT Syntax (old GAS)'#000+
+  '6*2Amit_MIT Syntax (ol','d GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
-  '6*1O_optimi','zations:'#000+
+  '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
-  '6*1R<x>_assembler reading style:'#000+
-  '6*2RMOT_read motorola st','yle assembler'#000+
+  '6*1','R<x>_assembler reading style:'#000+
+  '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
@@ -720,5 +721,5 @@ const msgtxt : array[0..000111,1..240] of char=(
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h_shows this help without waiting'#000
+  '**1h_shows this',' help without waiting'#000
 );

+ 10 - 3
compiler/scandir.inc

@@ -201,7 +201,7 @@ const
                              if mac^.buflen>255 then
                                begin
                                   len:=255;
-                                  Message(scan_w_marco_cut_after_255_chars);
+                                  Message(scan_w_macro_cut_after_255_chars);
                                end
                              else
                                len:=mac^.buflen;
@@ -779,7 +779,11 @@ const
             end;
         s:=AddExtension(FixFileName(s),target_info.resext);
         if target_info.res<>res_none then
-          current_module^.resourcefiles.insert(FixFileName(s))
+          if (target_info.res = res_i386_emx) and
+                                 not (Current_Module^.ResourceFiles.Empty) then
+            Message(scan_w_only_one_resourcefile_supported)
+          else
+            current_module^.resourcefiles.insert(FixFileName(s))
         else
           Message(scan_e_resourcefiles_not_supported);
       end;
@@ -1415,7 +1419,10 @@ const
 
 {
   $Log$
-  Revision 1.81  2000-05-23 20:18:25  pierre
+  Revision 1.82  2000-06-25 19:08:27  hajny
+    + $R support for OS/2 (EMX) added
+
+  Revision 1.81  2000/05/23 20:18:25  pierre
     + pavel's code integrated, but onyl inside
       ifdef pavel_linklib !
 

+ 13 - 4
compiler/systems.pas

@@ -114,10 +114,10 @@ unit systems;
 
      type
        tres = (res_none
-            ,res_i386_windres,res_m68k_mpw,res_powerpc_mpw
+            ,res_i386_windres,res_m68k_mpw,res_powerpc_mpw, res_i386_emx
        );
      const
-       {$ifdef i386} i386rescnt=1; {$else} i386rescnt=0; {$endif}
+       {$ifdef i386} i386rescnt=2; {$else} i386rescnt=0; {$endif}
        {$ifdef m68k} m68krescnt=1; {$else} m68krescnt=0; {$endif}
        {$ifdef alpha} alpharescnt=0; {$else} alpharescnt=0; {$endif}
        {$ifdef powerpc} powerpcrescnt=1; {$else} powerpcrescnt=0; {$endif}
@@ -934,6 +934,12 @@ implementation
             resbin : 'windres';
             rescmd : '--include $INC -O coff -o $OBJ $RES'
           )
+          ,(
+            id     : res_i386_emx;
+            resbin : 'emxbind';
+            rescmd : '-b -r $RES $OBJ'
+(* Not really used - see TLinkeros2.SetDefaultInfo in t_os2.pas. *)
+          )
 {$endif i386}
 {$ifdef m68k}
           ,(
@@ -1054,7 +1060,7 @@ implementation
             assem       : as_i386_as_aout;
             assemsrc    : as_i386_as_aout;
             ar          : ar_i386_ar;
-            res         : res_none;
+            res         : res_i386_emx;
             heapsize    : 256*1024;
             maxheapsize : 32768*1024;
             stacksize   : 32768
@@ -1638,7 +1644,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.105  2000-06-23 21:31:18  pierre
+  Revision 1.106  2000-06-25 19:08:28  hajny
+    + $R support for OS/2 (EMX) added
+
+  Revision 1.105  2000/06/23 21:31:18  pierre
    + new target_os field: maxCstructalignment
 
   Revision 1.104  2000/05/23 21:26:52  pierre

+ 21 - 10
compiler/t_os2.pas

@@ -32,7 +32,7 @@ unit t_os2;
 
 interface
 uses
-  import,link;
+  import,link,comprsrc;
 
 type
   pimportlibos2=^timportlibos2;
@@ -365,8 +365,8 @@ procedure TLinkeros2.SetDefaultInfo;
 begin
   with Info do
    begin
-     ExeCmd[1]:='ld -o $EXE @$RES';
-     ExeCmd[2]:='emxbind -b $STRIP $PM -k$STACKKB -h$HEAPMB -o $EXE.exe $EXE -aim -s$DOSHEAPKB';
+     ExeCmd[1]:='ld $OPT -o $EXE @$RES';
+     ExeCmd[2]:='emxbind -b $STRIP $PM $RSRC -k$STACKKB -h$HEAPMB -o $EXE.exe $EXE -aim -s$DOSHEAPKB';
    end;
 end;
 
@@ -445,6 +445,7 @@ var
   i       : longint;
   PMStr,
   StripStr : string[40];
+  RsrcStr: string;
 begin
   if not(cs_link_extern in aktglobalswitches) then
    Message1(exec_i_linking,current_module^.exefilename^);
@@ -456,31 +457,38 @@ begin
    StripStr:='-s';
   if usewindowapi then
    PMStr:='-p';
-
+  if not (Current_Module^.ResourceFiles.Empty) then
+   RsrcStr := '-r ' + Current_Module^.ResourceFiles.Get;
+(* Only one resource file supported, discard everything else
+   (should be already empty anyway, however. *)
+  Current_Module^.ResourceFiles.Clear;
 { Write used files and libraries }
   WriteResponseFile(false);
 
 { Call linker }
   success:=false;
-  for i:=1to 2 do
+  for i:=1 to 2 do
    begin
      SplitBinCmd(Info.ExeCmd[i],binstr,cmdstr);
      if binstr<>'' then
       begin
-        Replace(cmdstr,'$EXE',current_module^.exefilename^);
-        Replace(cmdstr,'$OPT',Info.ExtraOptions);
-        Replace(cmdstr,'$RES',outputexedir+Info.ResName);
-        Replace(cmdstr,'$STRIP',StripStr);
         Replace(cmdstr,'$HEAPMB',tostr((maxheapsize+1048575) shr 20));
         {Size of the stack when an EMX program runs in OS/2.}
         Replace(cmdstr,'$STACKKB',tostr((stacksize+1023) shr 10));
         {When an EMX program runs in DOS, the heap and stack share the
          same memory pool. The heap grows upwards, the stack grows downwards.}
         Replace(cmdstr,'$DOSHEAPKB',tostr((stacksize+maxheapsize+1023) shr 10));
+        Replace(cmdstr,'$STRIP',StripStr);
         Replace(cmdstr,'$PM',PMStr);
+        Replace(cmdstr,'$RES',outputexedir+Info.ResName);
+        Replace(cmdstr,'$OPT',Info.ExtraOptions);
+        Replace(cmdstr,'$RSRC',RsrcStr);
+        Replace(cmdstr,'$EXE',current_module^.exefilename^);
         success:=DoExec(FindUtil(binstr),cmdstr,(i=1),false);
+(* We still want to have the PPAS script complete, right?
         if not success then
          break;
+*)
       end;
    end;
 
@@ -495,7 +503,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.11  2000-04-01 10:45:14  hajny
+  Revision 1.12  2000-06-25 19:08:28  hajny
+    + $R support for OS/2 (EMX) added
+
+  Revision 1.11  2000/04/01 10:45:14  hajny
     * .ao2 bug fixed
 
   Revision 1.10  2000/02/28 17:23:57  daniel