diff --git a/compiler/aasmtai.pas b/compiler/aasmtai.pas
index 788b1ee268..b2296e227b 100644
--- a/compiler/aasmtai.pas
+++ b/compiler/aasmtai.pas
@@ -135,6 +135,17 @@ interface
aitconst_farptr,
{ i8086 segment of symbol; emits: 'DW SEG symbol' }
aitconst_seg,
+ { i8086 data segment group; emits: 'DW dgroup'
+ generated by the this inline asm:
+ DW SEG @DATA
+ in all memory models, except huge }
+ aitconst_dgroup,
+ { i8086 far data segment of the current pascal module (unit or program);
+ emits: 'DW CURRENTMODULENAME_DATA'
+ generated by the this inline asm:
+ DW SEG @DATA
+ in the huge memory model }
+ aitconst_fardataseg,
{ offset of symbol's GOT slot in GOT }
aitconst_got,
{ offset of symbol itself from GOT }
@@ -620,6 +631,8 @@ interface
constructor Create_int_dataptr(_value: int64);
{$ifdef i8086}
constructor Create_seg_name(const name:string);
+ constructor Create_dgroup;
+ constructor Create_fardataseg;
{$endif i8086}
constructor ppuload(t:taitype;ppufile:tcompilerppufile);override;
procedure ppuwrite(ppufile:tcompilerppufile);override;
@@ -1817,6 +1830,20 @@ implementation
self.Createname(name,0);
self.consttype:=aitconst_seg;
end;
+
+
+ constructor tai_const.Create_dgroup;
+ begin
+ self.Create_16bit(0);
+ self.consttype:=aitconst_dgroup;
+ end;
+
+
+ constructor tai_const.Create_fardataseg;
+ begin
+ self.Create_16bit(0);
+ self.consttype:=aitconst_fardataseg;
+ end;
{$endif i8086}
@@ -1884,6 +1911,8 @@ implementation
result:=2;
aitconst_farptr:
result:=4;
+ aitconst_dgroup,
+ aitconst_fardataseg,
aitconst_seg:
result:=2;
aitconst_got:
diff --git a/compiler/assemble.pas b/compiler/assemble.pas
index 8ca6c542ad..737482c9c5 100644
--- a/compiler/assemble.pas
+++ b/compiler/assemble.pas
@@ -1866,6 +1866,10 @@ Implementation
ObjData.writereloc(0,2,Objdata.SymbolRef(tai_const(hp).sym),RELOC_SEG)
else
internalerror(2015110502);
+ aitconst_dgroup:
+ ObjData.writereloc(0,2,nil,RELOC_DGROUP);
+ aitconst_fardataseg:
+ ObjData.writereloc(0,2,nil,RELOC_FARDATASEG);
{$endif i8086}
{$ifdef arm}
aitconst_got:
diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 549d2df3c2..4adfbc6b16 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -2457,7 +2457,7 @@ cg_f_max_units_reached=06057_F_Maximum number of units ($1) reached for the curr
#
# Assembler reader
#
-# 07126 is the last used one
+# 07127 is the last used one
#
asmr_d_start_reading=07000_DL_Starting $1 styled assembler parsing
% This informs you that an assembler block is being parsed
@@ -2761,6 +2761,8 @@ asmr_e_invalid_ref_register=07125_E_Invalid register used in memory reference ex
asmr_e_seg_without_identifier=07126_E_SEG used without identifier
% You can only use SEG with an identifier. Other syntaxes are not
% supported
+asmr_e_CODE_or_DATA_without_SEG=07127_E_@CODE and @DATA can only be used with the SEG operator
+% You can only use @CODE and @DATA symbols together with the SEG operator
#
# Assembler/binary writers
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index 95538436f5..f724febee2 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -799,6 +799,7 @@ const
asmr_w_check_mem_operand_automap_multiple_size=07124;
asmr_e_invalid_ref_register=07125;
asmr_e_seg_without_identifier=07126;
+ asmr_e_CODE_or_DATA_without_SEG=07127;
asmw_f_too_many_asm_files=08000;
asmw_f_assembler_output_not_supported=08001;
asmw_f_comp_not_supported=08002;
@@ -1021,9 +1022,9 @@ const
option_info=11024;
option_help_pages=11025;
- MsgTxtSize = 76316;
+ MsgTxtSize = 76379;
MsgIdxMax : array[1..20] of longint=(
- 27,99,344,124,96,58,127,32,208,64,
+ 27,99,344,124,96,58,128,32,208,64,
58,20,1,1,1,1,1,1,1,1
);
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index e9ced012f4..1cdeb14e72 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1,7 +1,7 @@
{$ifdef Delphi}
-const msgtxt : array[0..000317] of string[240]=(
+const msgtxt : array[0..000318] of string[240]=(
{$else Delphi}
-const msgtxt : array[0..000317,1..240] of char=(
+const msgtxt : array[0..000318,1..240] of char=(
{$endif Delphi}
'01000_T_Compiler: $1'#000+
'01001_D_Compiler OS: $1'#000+
@@ -981,278 +981,282 @@ const msgtxt : array[0..000317,1..240] of char=(
'"'#000+
'07125_E_Invalid register used in memory reference expression: "$1"'#000+
'07126_E_SEG used without identifier'#000+
+ '07127_E_@CODE and @DATA can only be used with the SEG o','perator'#000+
'08000_F_Too many assembler files'#000+
- '08001_F_Selected assem','bler 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 wr','iter selected'#000+
'08006_E_Asm: Opcode $1 not in table'#000+
- '08007_E_Asm: ','$1 invalid combination 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+
- '08011_E_Asm: $1 value exceeds bounds $2'#000+
- '08012_E_Asm: Short jump i','s out of range $1'#000+
+ '08','011_E_Asm: $1 value exceeds bounds $2'#000+
+ '08012_E_Asm: Short jump is out of range $1'#000+
'08013_E_Asm: Undefined label $1'#000+
'08014_E_Asm: Comp type not supported for this target'#000+
'08015_E_Asm: Extended type not supported for this target'#000+
- '08016_E_Asm: Duplicate label $1'#000+
+ '08016_E_Asm: Dupl','icate label $1'#000+
'08017_E_Asm: Redefined label $1'#000+
- '08018_E_Asm: Fir','st defined here'#000+
+ '08018_E_Asm: First defined here'#000+
'08019_E_Asm: Invalid register $1'#000+
'08020_E_Asm: 16 or 32 Bit references not supported'#000+
'08021_E_Asm: 64 Bit operands not supported'#000+
- '08022_E_Asm: AH,BH,CH or DH cannot be used in an instruction requiring'+
- ' REX prefix'#000+
- '08023_E_Missing',' .seh_endprologue directive'#000+
+ '08022_E_Asm: AH,BH,CH or DH cannot',' be used in an instruction requiri'+
+ 'ng REX prefix'#000+
+ '08023_E_Missing .seh_endprologue directive'#000+
'08024_E_Function prologue exceeds 255 bytes'#000+
'08025_E_.seh_handlerdata directive without preceding .seh_handler'#000+
- '08026_F_Relocation count for section $1 exceeds 65535'#000+
- '08027_N_Change of bind type of symbol $1 from $2',' to $3 after use'#000+
+ '08026_F_Relocation count for section $1',' exceeds 65535'#000+
+ '08027_N_Change of bind type of symbol $1 from $2 to $3 after use'#000+
'08028_H_Change of bind type of symbol $1 from $2 to $3 after use'#000+
'08029_E_Asm: 32 Bit references not supported'#000+
'08030_F_Code segment too large'#000+
- '08031_F_Data segment too large'#000+
+ '08031_F_Data segmen','t too large'#000+
'09000_W_Source operating system redefined'#000+
- '09001_I_A','ssembling (pipe) $1'#000+
+ '09001_I_Assembling (pipe) $1'#000+
'09002_E_Can'#039't create assembler file: $1'#000+
'09003_E_Can'#039't create object file: $1 (error code: $2)'#000+
'09004_E_Can'#039't create archive file: $1'#000+
- '09005_E_Assembler $1 not found, switching to external assembling'#000+
- '09006_T_Using assembler',': $1'#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+
'09009_I_Assembling $1'#000+
- '09010_I_Assembling with smartlinking $1'#000+
+ '09010_I_Assembling with smartli','nking $1'#000+
'09011_W_Object $1 not found, Linking may fail !'#000+
- '09012_','W_Library $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+
'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_Cr','eation of Executables not supported'#000+
+ '09018_E_Creation of Executables not supported'#000+
'09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
'09035_E_Creation of Static Libraries not supported'#000+
'09020_I_Closing script $1'#000+
- '09021_E_resource compiler "$1" not found, switching to external mode',#000+
+ '09021','_E_resource compiler "$1" not found, switching to external mode'+
+ #000+
'09022_I_Compiling resource $1'#000+
'09023_T_unit $1 cannot be statically linked, switching to smart linkin'+
'g'#000+
'09024_T_unit $1 cannot be smart linked, switching to static linking'#000+
- '09025_T_unit $1 cannot be shared linked, switching to static linking'#000,
+ '09025_','T_unit $1 cannot be shared linked, switching to static linking'+
+ #000+
'09026_E_unit $1 cannot be smart or static linked'#000+
'09027_E_unit $1 cannot be shared or static linked'#000+
'09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
- '09029_E_Error while compiling resources'#000+
- '09030_E_Can'#039't call the resource comp','iler "$1", switching to exte'+
- 'rnal mode'#000+
+ '09029_E_Error',' while compiling resources'#000+
+ '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+
+ 'al mode'#000+
'09031_E_Can'#039't open resource file "$1"'#000+
'09032_E_Can'#039't write resource file "$1"'#000+
'09033_N_File "$1" not found for backquoted cat command'#000+
- '09034_W_"$1" not found, this will probably cause a linking failure'#000+
- '091','28_F_Can'#039't post process executable $1'#000+
+ '09034_W','_"$1" not found, this will probably cause a linking failure'#000+
+ '09128_F_Can'#039't post process executable $1'#000+
'09129_F_Can'#039't open executable $1'#000+
'09130_X_Size of Code: $1 bytes'#000+
'09131_X_Size of initialized data: $1 bytes'#000+
- '09132_X_Size of uninitialized data: $1 bytes'#000+
+ '09132_X_Size of uninitialized da','ta: $1 bytes'#000+
'09133_X_Stack space reserved: $1 bytes'#000+
- '09134_X_Sta','ck space committed: $1 bytes'#000+
+ '09134_X_Stack space committed: $1 bytes'#000+
'09200_F_Executable image size is too big for $1 target.'#000+
'09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
' "$2".'#000+
- '09202_E_Program segment too large (exceeds 64k by $1 bytes)'#000+
- '09203_E_Code segme','nt too large (exceeds 64k by $1 bytes)'#000+
+ '09202_E_Program',' segment too large (exceeds 64k by $1 bytes)'#000+
+ '09203_E_Code segment too large (exceeds 64k by $1 bytes)'#000+
'09204_E_Data segment too large (exceeds 64k by $1 bytes)'#000+
'09205_E_Segment "$1" too large (exceeds 64k by $2 bytes)'#000+
- '09206_E_Group "$1" too large (exceeds 64k by $2 bytes)'#000+
- '09207_E_Cannot create a .COM fil','e, because the program contains segm'+
- 'ent relocations'#000+
+ '09206_E_Group "$1" too l','arge (exceeds 64k by $2 bytes)'#000+
+ '09207_E_Cannot create a .COM file, because the program contains segmen'+
+ 't relocations'#000+
'10000_T_Unitsearch: $1'#000+
'10001_T_PPU Loading $1'#000+
'10002_U_PPU Name: $1'#000+
'10003_U_PPU Flags: $1'#000+
'10004_U_PPU Crc: $1'#000+
- '10005_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+
+ '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
'10008_U_PPU Invalid Version $1'#000+
'10009_U_PPU is compiled for another processor'#000+
'10010_U_PPU is compiled for another target'#000+
'10011_U_PPU Source: $1'#000+
- '10012_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,
+ '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+
'10018_E_Illegal unit name: $1'#000+
'10019_F_Too much units'#000+
- '10020_F_Circular unit reference between $1 and $2'#000+
- '10021_F_Can'#039't compile unit $1, no sou','rces available'#000+
+ '10020_F_Circular unit re','ference 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 used by $2'#000+
'10023_W_Unit $1 was not found but $2 exists'#000+
'10024_F_Unit $1 searched but $2 found'#000+
- '10025_W_Compiling the system unit requires the -Us switch'#000+
- '10026_F_There were $1 errors compiling module, ','stopping'#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+
'10029_U_Recompiling $1, source found only'#000+
- '10030_U_Recompiling unit, static lib is older than ppufile'#000+
- '10031_U_Recompiling unit, shared lib is older th','an ppufile'#000+
+ '10030_U_Recompiling unit, static lib is olde','r 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+
'10034_U_Parsing interface of $1'#000+
- '10035_U_Parsing implementation of $1'#000+
+ '10035_U_Parsing implement','ation of $1'#000+
'10036_U_Second load for unit $1'#000+
- '10037_U_PPU Check f','ile $1 time $2'#000+
+ '10037_U_PPU Check file $1 time $2'#000+
'10040_W_Can'#039't recompile unit $1, but found modified include files'#000+
'10041_U_File $1 is newer than the one used for creating PPU file $2'#000+
- '10042_U_Trying to use a unit which was compiled with a different FPU m'+
- 'ode'#000+
- '10043_U_Loading i','nterface units from $1'#000+
+ '10042_U_Trying to use a unit',' which was compiled with a different FPU'+
+ ' mode'#000+
+ '10043_U_Loading interface units from $1'#000+
'10044_U_Loading implementation units from $1'#000+
'10045_U_Interface CRC changed for unit $1'#000+
'10046_U_Implementation CRC changed for unit $1'#000+
- '10047_U_Finished compiling unit $1'#000+
+ '10047_U_Finished com','piling unit $1'#000+
'10048_U_Adding dependency: $1 depends on $2'#000+
- '1004','9_U_No reload, is caller: $1'#000+
+ '10049_U_No reload, is caller: $1'#000+
'10050_U_No reload, already in second compile: $1'#000+
'10051_U_Flag for reload: $1'#000+
'10052_U_Forced reloading'#000+
'10053_U_Previous state of $1: $2'#000+
- '10054_U_Already compiling $1, setting second compile'#000+
- '10055_U_Loading unit $1',#000+
+ '10054_U_Alrea','dy compiling $1, setting second compile'#000+
+ '10055_U_Loading unit $1'#000+
'10056_U_Finished loading unit $1'#000+
'10057_U_Registering new unit $1'#000+
'10058_U_Re-resolving unit $1'#000+
'10059_U_Skipping re-resolving unit $1, still loading used units'#000+
- '10060_U_Unloading resource unit $1 (not needed)'#000+
- '10061_E_Unit $1 was compiled usin','g a different whole program optimiz'+
- 'ation feedback input ($2, $3); recompile it without wpo or use the sam'+
- 'e wpo feedback input file for this compilation invocation'#000+
- '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+
- '10063_U_','PPU is compiled for another i8086 memory model'#000+
+ '10060_U_Unloading ','resource unit $1 (not needed)'#000+
+ '10061_E_Unit $1 was compiled using a different whole program optimizat'+
+ 'ion feedback input ($2, $3); recompile it without wpo or use the same '+
+ 'wpo feedback input file for this compilation invocation'#000+
+ '10062_U_Indire','ct interface (objects/classes) CRC changed for unit $1'+
+ #000+
+ '10063_U_PPU is compiled for another i8086 memory model'#000+
'11000_O_$1 [options] <inputfile> [options]'#000+
'11001_W_Only one source file supported, changing source file to compil'+
- 'e from "$1" into "$2"'#000+
+ 'e from "$1" into ','"$2"'#000+
'11002_W_DEF file can be created only for OS/2'#000+
- '11003_E_nest','ed response 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 page','s'#000+
'11008_F_Too many config files nested'#000+
- '11009_F_Unable to open f','ile $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_In options file $1 at line $2 too many #IF(N)DEFs encountered'#000+
- '11014_F_In opti','ons file $1 at line $2 unexpected #ENDIFs encountered'+
- #000+
+ '11013_F_In options fil','e $1 at line $2 too many #IF(N)DEFs encountere'+
+ 'd'#000+
+ '11014_F_In options file $1 at line $2 unexpected #ENDIFs encountered'#000+
'11015_F_Open conditional at the end of the options file'#000+
- '11016_W_Debug information generation is not supported by this executab'+
- 'le'#000+
+ '11016_W_Debug information generation is not supported by this execu','t'+
+ 'able'#000+
'11017_H_Try recompiling with -dGDB'#000+
- '11018_W_You are using ','the obsolete switch $1'#000+
+ '11018_W_You are using the obsolete switch $1'#000+
'11019_W_You are using the obsolete switch $1, please use $2'#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+
+ '11021_W_Assembler output selec','ted "$1" is not compatible with "$2"'#000+
+ '11022_W_"$1" assembler use forced'#000+
'11026_T_Reading options from file $1'#000+
'11027_T_Reading options from environment $1'#000+
'11028_D_Handling option "$1"'#000+
'11029_O_*** press enter ***'#000+
- '11030_H_Start of reading config file $1'#000+
+ '11030_H_Start of reading config',' file $1'#000+
'11031_H_End of reading config file $1'#000+
- '11032_D_interpre','ting option "$1"'#000+
+ '11032_D_interpreting option "$1"'#000+
'11036_D_interpreting firstpass option "$1"'#000+
'11033_D_interpreting file option "$1"'#000+
'11034_D_Reading config file "$1"'#000+
'11035_D_found source file name "$1"'#000+
- '11039_E_Unknown codepage "$1"'#000+
+ '11039_E_Un','known codepage "$1"'#000+
'11040_F_Config file $1 is a directory'#000+
- '11041','_W_Assembler output selected "$1" cannot generate debug info, d'+
- 'ebugging disabled'#000+
+ '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
+ 'ugging disabled'#000+
'11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
- '11043_F_In options file $1 at line $2 #ELSE directive without #IF(N)DE'+
- 'F found'#000+
- '11044_F_Optio','n "$1" is not, or not yet, supported on the current tar'+
- 'get platform'#000+
+ '11043_F_In options file $1 a','t line $2 #ELSE directive without #IF(N)'+
+ 'DEF found'#000+
+ '11044_F_Option "$1" is not, or not yet, supported on the current targe'+
+ 't platform'#000+
'11045_F_The feature "$1" is not, or not yet, supported on the selected'+
' target platform'#000+
- '11046_N_DWARF debug information cannot be used with smart linking on t'+
- 'his target, swi','tching to static linking'#000+
+ '11046_N_DWARF debug in','formation cannot be used with smart linking on'+
+ ' this target, switching to static linking'#000+
'11047_W_Option "$1" is ignored for the current target platform.'#000+
'11048_W_Disabling external debug information because it is unsupported'+
- ' for the selected target/debug format combination.'#000+
- '11049_N_DWARF debug informatio','n cannot be used with smart linking wi'+
- 'th external assembler, disabling static library creation.'#000+
+ ' for the selected ','target/debug format combination.'#000+
+ '11049_N_DWARF debug information cannot be used with smart linking with'+
+ ' external assembler, disabling static library creation.'#000+
'11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+
'e: $1'#000+
- '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment var','i'+
- 'able: $1'#000+
+ '11051','_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment var'+
+ 'iable: $1'#000+
'11052_E_You must use a FPU type of VFPV2, VFPV3 or VFPV3_D16 when usin'+
'g the EABIHF ABI target'#000+
'11053_W_The selected debug format is not supported on the current targ'+
- 'et, not changing the current setting'#000+
- '11054_E_argument to "$1" is m','issing'#000+
+ 'et,',' not changing the current setting'#000+
+ '11054_E_argument to "$1" is missing'#000+
'11055_E_malformed parameter: $1'#000+
'11056_W_Smart linking requires external linker'#000+
'11057_E_Creating .COM files is not supported in the current memory mod'+
- 'el. Only the tiny memory model supports making .COM files.'#000+
- '12000_F_Cannot open whole',' program optimization feedback file "$1"'#000+
+ 'el. Only the tiny mem','ory model supports making .COM files.'#000+
+ '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
'12001_D_Processing whole program optimization information in wpo feedb'+
'ack file "$1"'#000+
- '12002_D_Finished processing the whole program optimization information'+
- ' in wpo feedback file "$1"'#000+
- '12003_E_Expected s','ection header, but got "$2" at line $1 of wpo feed'+
- 'back file'#000+
+ '12002_D_Finished processing the whole program optimi','zation informati'+
+ 'on in wpo feedback file "$1"'#000+
+ '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
+ 'ck file'#000+
'12004_W_No handler registered for whole program optimization section "'+
'$2" at line $1 of wpo feedback file, ignoring'#000+
- '12005_D_Found whole program optimization section "$1" with infor','mati'+
+ '1','2005_D_Found whole program optimization section "$1" with informati'+
'on about "$2"'#000+
'12006_F_The selected whole program optimizations require a previously '+
'generated feedback file (use -Fw to specify)'#000+
- '12007_E_No collected information necessary to perform "$1" whole progr'+
- 'am optimization found'#000+
- '12008_F_Specify',' a whole program optimization feedback file to store '+
- 'the generated info in (using -FW)'#000+
+ '12007_E_No collected information necessary t','o perform "$1" whole pro'+
+ 'gram optimization found'#000+
+ '12008_F_Specify a whole program optimization feedback file to store th'+
+ 'e generated info in (using -FW)'#000+
'12009_E_Not generating any whole program optimization information, yet'+
- ' a feedback file was specified (using -FW)'#000+
- '12010_E_Not performing any whole program',' optimizations, yet an input'+
- ' feedback file was specified (using -Fw)'#000+
+ ' a feedback file was',' specified (using -FW)'#000+
+ '12010_E_Not performing any whole program optimizations, yet an input f'+
+ 'eedback file was specified (using -Fw)'#000+
'12011_D_Skipping whole program optimization section "$1", because not '+
- 'needed by the requested optimizations'#000+
- '12012_W_Overriding previously read information for "$1" from fe','edbac'+
- 'k input file using information in section "$2"'#000+
+ 'needed by the requested optimizations'#000,
+ '12012_W_Overriding previously read information for "$1" from feedback '+
+ 'input file using information in section "$2"'#000+
'12013_E_Cannot extract symbol liveness information from program when s'+
'tripping symbols, use -Xs-'#000+
- '12014_E_Cannot extract symbol liveness information from program when w'+
- 'hen not linking'#000+
- '12015','_F_Cannot find "$1" or "$2" to extract symbol liveness informat'+
- 'ion from linked program'#000+
+ '12014_E_Cannot extract symbo','l liveness information from program when'+
+ ' when not linking'#000+
+ '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
+ 'n from linked program'#000+
'12016_E_Error during reading symbol liveness information produced by "'+
'$1"'#000+
- '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
- 'ion from ','linked program'#000+
+ '12017_F_Error ex','ecuting "$1" (exitcode: $2) to extract symbol inform'+
+ 'ation from linked program'#000+
'12018_E_Collection of symbol liveness information can only help when u'+
'sing smart linking, use -CX -XX'#000+
- '12019_E_Cannot create specified whole program optimisation feedback fi'+
- 'le "$1"'#000+
- '11023_Free Pascal Compiler version $FPCFULLVE','RSION [$FPCDATE] for $F'+
- 'PCCPU'#010+
+ '12019_E_Cannot create specified whole program optimisation f','eedback '+
+ 'file "$1"'#000+
+ '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
+ 'CPU'#010+
'Copyright (c) 1993-2015 by Florian Klaempfl and others'#000+
'11024_Free Pascal Compiler version $FPCVERSION'#010+
#010+
'Compiler date : $FPCDATE'#010+
- 'Compiler CPU target: $FPCCPU'#010+
+ 'Compiler CPU ta','rget: $FPCCPU'#010+
#010+
- 'Supported targets (targets marked with '#039'{*}'#039' are',' under devel'+
- 'opment):'#010+
+ 'Supported targets (targets marked with '#039'{*}'#039' are under develop'+
+ 'ment):'#010+
' $OSTARGETS'#010+
#010+
'Supported CPU instruction sets:'#010+
@@ -1262,10 +1266,10 @@ const msgtxt : array[0..000317,1..240] of char=(
' $FPUINSTRUCTIONSETS'#010+
#010+
'Supported inline assembler modes:'#010+
- ' $ASMMODES'#010+
+ ' ',' $ASMMODES'#010+
#010+
'Recognized compiler and RTL features:'#010+
- ' $FEATURELIS','T'#010+
+ ' $FEATURELIST'#010+
#010+
'Supported ABI targets:'#010+
' $ABITARGETS'#010+
@@ -1277,329 +1281,330 @@ const msgtxt : array[0..000317,1..240] of char=(
' All'#010+
' $WPOPTIMIZATIONS'#010+
#010+
- 'Supported Microcontroller types:$\n $CONTROLLERTYPES$\n'#010+
- 'This program comes under the GNU G','eneral Public Licence'#010+
+ 'Supported Microcontroller ty','pes:$\n $CONTROLLERTYPES$\n'#010+
+ 'This program comes under the GNU General Public Licence'#010+
'For more information read COPYING.v2'#010+
#010+
'Please report bugs in our bug tracker on:'#010+
' http://bugs.freepascal.org'#010+
#010+
- 'More information may be found on our WWW pages (including directions'#010+
- 'for mailing lists useful',' for asking questions or discussing potentia'+
- 'l'#010+
+ 'More information may be found ','on our WWW pages (including directions'+
+ #010+
+ 'for mailing lists useful for asking questions or discussing potential'#010+
'new features, etc.):'#010+
' http://www.freepascal.org'#000+
- '11025_F*0*_Only options valid for the default or selected platform are'+
- ' listed.'#010+
- '**0*_Put + after a boolean switch option to enable ','it, - to disable '+
- 'it.'#010+
+ '11025_F*0*_Only options valid for the default or selected platform ','a'+
+ 're listed.'#010+
+ '**0*_Put + after a boolean switch option to enable it, - to disable it'+
+ '.'#010+
'**1@<x>_Read compiler options from <x> in addition to the default fpc.'+
'cfg'#010+
'**1a_The compiler does not delete the generated assembler file'#010+
- '**2al_List sourcecode lines in assembler file'#010+
- '**2an_List node info in assembler fi','le (-dEXTDEBUG compiler)'#010+
+ '**2al_List sourceco','de lines in assembler file'#010+
+ '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+
'**2ao_Add an extra option to external assembler call (ignored for inte'+
'rnal)'#010+
'*L2ap_Use pipes instead of creating temporary assembler files'#010+
- '**2ar_List register allocation/release info in assembler file'#010+
- '**2at_List temp',' allocation/release info in assembler file'#010+
+ '**2ar_List reg','ister allocation/release info in assembler file'#010+
+ '**2at_List temp allocation/release info in assembler file'#010+
'**1A<x>_Output format:'#010+
'**2Adefault_Use default assembler'#010+
'3*2Aas_Assemble using GNU AS'#010+
- '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
+ '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using in','ternal writer'#010+
'8*2Anasm_Assemble using Nasm'#010+
- '8*2Anasmobj_Assemble',' using Nasm'#010+
+ '8*2Anasmobj_Assemble using Nasm'#010+
'3*2Anasm_Assemble using Nasm'#010+
'3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
'3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
'3*2Anasmwin32_Win32 object file using Nasm'#010+
- '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
- '3*2Anasmdarwin_macho32',' object file using Nasm (experimental)'#010+
+ '3*2Anasm','wdosx_Win32/WDOSX object file using Nasm'#010+
+ '3*2Anasmdarwin_macho32 object file using Nasm (experimental)'#010+
'3*2Awasm_Obj file using Wasm (Watcom)'#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*2Atasm_Obj file using Tas','m (Borland)'#010+
'3*2Aelf_ELF (Linux) using internal writer'#010+
- '3*2Acoff_','COFF (Go32v2) using internal writer'#010+
+ '3*2Acoff_COFF (Go32v2) using internal writer'#010+
'3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
'3*2Ayasm_Assemble using Yasm (experimental)'#010+
'4*2Aas_Assemble using GNU AS'#010+
- '4*2Agas_Assemble using GNU GAS'#010+
- '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU G','AS'#010+
+ '4*2Agas_Assemble us','ing GNU GAS'#010+
+ '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU GAS'#010+
'4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
'4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
'4*2Aelf_ELF (Linux-64bit) using internal writer'#010+
- '4*2Ayasm_Assemble using Yasm (experimental)'#010+
+ '4*2Ayasm_Assemble using Yas','m (experimental)'#010+
'4*2Anasm_Assemble using Nasm (experimental)'#010+
- '4','*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+
+ '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+
'4*2Anasmelf_Assemble Linux-64bit object file using Nasm (experimental)'+
#010+
- '4*2Anasmdarwin_Assemble darwin macho64 object file using Nasm (experim'+
- 'ental)'#010+
- '6*2Aas_Unix o-file using G','NU AS'#010+
+ '4*2Anasmdarwin_Assemble darwin macho64 o','bject file using Nasm (exper'+
+ 'imental)'#010+
+ '6*2Aas_Unix o-file using GNU AS'#010+
'6*2Agas_GNU Motorola assembler'#010+
'6*2Amit_MIT Syntax (old GAS)'#010+
'6*2Amot_Standard Motorola assembler'#010+
'A*2Aas_Assemble using GNU AS'#010+
'P*2Aas_Assemble using GNU AS'#010+
- 'S*2Aas_Assemble using GNU AS'#010+
+ 'S*2Aas_Assemble u','sing GNU AS'#010+
'**1b_Generate browser info'#010+
- '**2bl_Generate local sym','bol info'#010+
+ '**2bl_Generate local symbol info'#010+
'**1B_Build all modules'#010+
'**1C<x>_Code generation options:'#010+
'**2C3_Turn on ieee error checking for constants'#010+
'**2Ca<x>_Select ABI; see fpc -i or fpc -ia for possible values'#010+
- '**2Cb_Generate code for a big-endian variant of the target archi','tect'+
+ '*','*2Cb_Generate code for a big-endian variant of the target architect'+
'ure'#010+
'**2Cc<x>_Set default calling convention to <x>'#010+
'**2CD_Create also dynamic library (not supported)'#010+
'**2Ce_Compilation with emulated floating point opcodes'#010+
- '**2Cf<x>_Select fpu instruction set to use; see fpc -i or fpc -if for '+
- 'possible v','alues'#010+
+ '**2Cf<x>_Select f','pu instruction set to use; see fpc -i or fpc -if fo'+
+ 'r possible values'#010+
'**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
'**2Cg_Generate PIC code'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
'**2Ci_IO-checking'#010+
- 'A*2CI<x>_Select instruction set on ARM: ARM or THUMB'#010+
- '**2Cn_Omit linking',' stage'#010+
+ 'A*2CI<x>','_Select instruction set on ARM: ARM or THUMB'#010+
+ '**2Cn_Omit linking stage'#010+
'P*2CN_Generate nil-pointer checks (AIX-only)'#010+
'**2Co_Check overflow of integer operations'#010+
'**2CO_Check for possible overflow of integer operations'#010+
- '**2Cp<x>_Select instruction set; see fpc -i or fpc -ic for possible va'+
- 'lues'#010+
- '**2CP<x>=<y>_ ','packing settings'#010+
+ '**2Cp<x>_Select instructio','n set; see fpc -i or fpc -ic for possible '+
+ 'values'#010+
+ '**2CP<x>=<y>_ packing settings'#010+
'**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
'and 8'#010+
'**3CPPACKENUM=<y>_ <y> enum packing: 0, 1, 2 and 4 or DEFAULT or NORMA'+
'L'#010+
- '**3CPPACKRECORD=<y>_ <y> record packing: 0 or DEFAULT or NORMAL, 1, 2,'+
- ' 4, 8',', 16 and 32'#010+
+ '**3CPPACKREC','ORD=<y>_ <y> record packing: 0 or DEFAULT or NORMAL, 1, '+
+ '2, 4, 8, 16 and 32'#010+
'**2Cr_Range checking'#010+
'**2CR_Verify object method call validity'#010+
'**2Cs<n>_Set stack checking size to <n>'#010+
'**2Ct_Stack checking (for testing only, see manual)'#010+
- '8*2CT<x>_Target-specific code generation options'#010+
- '3*2CT<x>_Target-specific ','code generation options'#010+
+ '8*2CT<x>_Ta','rget-specific code generation options'#010+
+ '3*2CT<x>_Target-specific code generation options'#010+
'4*2CT<x>_Target-specific code generation options'#010+
'p*2CT<x>_Target-specific code generation options'#010+
'P*2CT<x>_Target-specific code generation options'#010+
- 'J*2CT<x>_Target-specific code generation options'#010+
- 'A*2CT<x>_Target-spec','ific code generation options'#010+
+ 'J*2CT<','x>_Target-specific code generation options'#010+
+ 'A*2CT<x>_Target-specific code generation options'#010+
'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
' (AIX)'#010+
'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
- ' (AIX)'#010+
- 'J*3CTautogetterprefix=X_ Automatically create getters fo','r propertie'+
- 's with prefix X (empty string disables)'#010+
+ ' ','(AIX)'#010+
+ 'J*3CTautogetterprefix=X_ Automatically create getters for properties '+
+ 'with prefix X (empty string disables)'#010+
'J*3CTautosetterprefix=X_ Automatically create setters for properties '+
'with prefix X (empty string disables)'#010+
- '8*3CTcld_ Emit a CLD instruction before using the x86 '+
- 'string inst','ructions'#010+
+ '8*3CTcld_ ',' Emit a CLD instruction before using the x8'+
+ '6 string instructions'#010+
'3*3CTcld_ Emit a CLD instruction before using the x86 '+
'string instructions'#010+
'4*3CTcld_ Emit a CLD instruction before using the x86 '+
- 'string instructions'#010+
- '8*3CTfarprocspushoddbp_ Increment BP before p','ushing it in the '+
- 'prologue of far functions'#010+
+ 'string i','nstructions'#010+
+ '8*3CTfarprocspushoddbp_ Increment BP before pushing it in the pr'+
+ 'ologue of far functions'#010+
'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+
'de for initializing integer array constants'#010+
- 'J*3CTenumfieldinit_ Initialize enumeration fields in constructor'+
- 's to enumtype','(0), after calling inherited constructors'#010+
+ 'J*3CTenumfieldinit_ ',' Initialize enumeration fields in construct'+
+ 'ors to enumtype(0), after calling inherited constructors'#010+
'J*3CTinitlocals_ Initialize local variables that trigger a JV'+
- 'M bytecode verification error if used uninitialized (slows down code)'#010+
- 'J*3CTlowercaseprocstart_ Lowercase the first character of',' procedure'+
- '/function/method names'#010+
+ 'M bytecode verification error if used uninitialized (slows down c','ode'+
+ ')'#010+
+ 'J*3CTlowercaseprocstart_ Lowercase the first character of procedure/f'+
+ 'unction/method names'#010+
'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possi'+
'ble'#010+
'J*2Cv_Var/out parameter copy-out checking'#010+
- '**2CX_Create also smartlinked library'#010+
+ '**2CX_Create also smartlinke','d library'#010+
'**1d<x>_Defines the symbol <x>'#010+
- '**1D_Generate a DEF fi','le'#010+
+ '**1D_Generate a DEF file'#010+
'**2Dd<x>_Set description to <x>'#010+
'**2Dv<x>_Set DLL version to <x>'#010+
'*O2Dw_PM application'#010+
'**1e<x>_Set path to executable'#010+
'**1E_Same as -Cn'#010+
'**1fPIC_Same as -Cg'#010+
- '**1F<x>_Set file names and paths:'#010+
- '**2Fa<x>[,y]_(for a program) load units <x> and [y','] before uses is p'+
- 'arsed'#010+
+ '**1F<x>_Set file name','s and paths:'#010+
+ '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
+ 'sed'#010+
'**2Fc<x>_Set input codepage to <x>'#010+
'**2FC<x>_Set RC compiler binary name to <x>'#010+
'**2Fd_Disable the compiler'#039's internal directory cache'#010+
- '**2FD<x>_Set the directory where to search for compiler utilities'#010+
- '**2Fe<x>_Redirect',' error output to <x>'#010+
+ '**2FD<x>_Set the dir','ectory where to search for compiler utilities'#010+
+ '**2Fe<x>_Redirect error output to <x>'#010+
'**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
'**2FE<x>_Set exe/unit output path to <x>'#010+
'**2Fi<x>_Add <x> to include path'#010+
- '**2Fl<x>_Add <x> to library path'#010+
+ '**2Fl<x>_Add <x> to library path'#010,
'**2FL<x>_Use <x> as dynamic linker'#010+
- '**2Fm<x>_Load unicode conver','sion table from <x>.txt in the compiler '+
- 'dir'#010+
+ '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
+ 'r'#010+
'**2FM<x>_Set the directory where to search for unicode binary files'#010+
'**2Fo<x>_Add <x> to object path'#010+
- '**2Fr<x>_Load error message file <x>'#010+
+ '**2Fr<x>_Load error message file ','<x>'#010+
'**2FR<x>_Set resource (.res) linker to <x>'#010+
- '**2Fu<x>_Add <x>',' to unit path'#010+
+ '**2Fu<x>_Add <x> to unit path'#010+
'**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
'**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
- '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
- 'om <x>'#010+
- '*g1g_Generate debug informati','on (default format for target)'#010+
+ '**2Fw<x>_Load previously stored whole-progr','am optimization feedback '+
+ 'from <x>'#010+
+ '*g1g_Generate debug information (default format for target)'#010+
'*g2gc_Generate checks for pointers'#010+
'*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
- '*g2gl_Use line info unit (show more info with backtraces)'#010+
+ '*g2gl_Use line info unit (show more info with b','acktraces)'#010+
'*g2go<x>_Set debug information options'#010+
- '*g3godwarfset','s_ Enable DWARF '#039'set'#039' type debug information (b'+
- 'reaks gdb < 6.5)'#010+
+ '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
+ 'aks gdb < 6.5)'#010+
'*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
#010+
- '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
- 'ame'#010+
- '*g2gp_Preserve case in stabs sy','mbol names'#010+
+ '*g3godwarfmethodclassprefix_ Prefix method',' names in DWARF with class'+
+ ' name'#010+
+ '*g2gp_Preserve case in stabs symbol names'#010+
'*g2gs_Generate Stabs debug information'#010+
'*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+
't'#039' changes the trashing value)'#010+
- '*g2gv_Generates programs traceable with Valgrind'#010+
- '*g2gw_Generate DWARFv2 debug information ','(same as -gw2)'#010+
+ '*g2gv_Generates programs tr','aceable with Valgrind'#010+
+ '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
'*g2gw2_Generate DWARFv2 debug information'#010+
'*g2gw3_Generate DWARFv3 debug information'#010+
'*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
'**1i_Information'#010+
- '**2iD_Return compiler date'#010+
+ '**2i','D_Return compiler date'#010+
'**2iSO_Return compiler OS'#010+
- '**2iSP_Return ','compiler host processor'#010+
+ '**2iSP_Return compiler host processor'#010+
'**2iTO_Return target OS'#010+
'**2iTP_Return target processor'#010+
'**2iV_Return short compiler version'#010+
'**2iW_Return full compiler version'#010+
- '**2ia_Return list of supported ABI targets'#010+
- '**2ic_Return list of supported CPU instruction ','sets'#010+
+ '**2ia_Return list of suppor','ted ABI targets'#010+
+ '**2ic_Return list of supported CPU instruction sets'#010+
'**2if_Return list of supported FPU instruction sets'#010+
'**2ii_Return list of supported inline assembler modes'#010+
'**2io_Return list of supported optimizations'#010+
- '**2ir_Return list of recognized compiler and RTL features'#010+
- '**2it_Return list of suppo','rted targets'#010+
+ '**2ir_Return list of ','recognized compiler and RTL features'#010+
+ '**2it_Return list of supported targets'#010+
'**2iu_Return list of supported microcontroller types'#010+
'**2iw_Return list of supported whole program optimizations'#010+
'**1I<x>_Add <x> to include path'#010+
- '**1k<x>_Pass <x> to the linker'#010+
+ '**1k<x>_Pass <x> to ','the linker'#010+
'**1l_Write logo'#010+
'**1M<x>_Set language mode to <x>'#010+
- '**2','Mfpc_Free Pascal dialect (default)'#010+
+ '**2Mfpc_Free Pascal dialect (default)'#010+
'**2Mobjfpc_FPC mode with Object Pascal support'#010+
'**2Mdelphi_Delphi 7 compatibility mode'#010+
'**2Mtp_TP/BP 7.0 compatibility mode'#010+
- '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
- '**1n_Do not read the defaul','t config files'#010+
+ '**2Mmacpas_Macintosh',' Pascal dialects compatibility mode'#010+
+ '**1n_Do not read the default config files'#010+
'**1o<x>_Change the name of the executable produced to <x>'#010+
'**1O<x>_Optimizations:'#010+
'**2O-_Disable optimizations'#010+
- '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
+ '**2O1_Level 1 optimizations (quick and debugger frien','dly)'#010+
'**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
- '**','2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
'**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+
'pected side effects)'#010+
'**2Oa<x>=<y>_Set alignment'#010+
- '**2Oo[NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io f',
- 'or possible values'#010+
+ '**2Oo[','NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io '+
+ 'for possible values'#010+
'**2Op<x>_Set target cpu for optimizing; see fpc -i or fpc -ic for poss'+
'ible values'#010+
'**2OW<x>_Generate whole-program optimization feedback for optimization'+
- ' <x>; see fpc -i or fpc -iw for possible values'#010+
- '**2Ow<x>_Perform whol','e-program optimization <x>; see fpc -i or fpc -'+
- 'iw for possible values'#010+
+ ' <x>; ','see fpc -i or fpc -iw for possible values'#010+
+ '**2Ow<x>_Perform whole-program optimization <x>; see fpc -i or fpc -iw'+
+ ' for possible values'#010+
'**2Os_Optimize for size rather than speed'#010+
'**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
- 'F*1P<x>_Target CPU / compiler related options:'#010+
- 'F*2PB_Show default co','mpiler binary'#010+
+ 'F*1P<','x>_Target CPU / compiler related options:'#010+
+ 'F*2PB_Show default compiler binary'#010+
'F*2PP_Show default target cpu'#010+
'F*2P<x>_Set target CPU (arm,avr,i386,jvm,m68k,mips,mipsel,powerpc,powe'+
'rpc64,sparc,x86_64)'#010+
'**1R<x>_Assembler reading style:'#010+
- '**2Rdefault_Use default assembler for target'#010+
- '3*2Ratt_Read AT&T style asse','mbler'#010+
+ '**2Rdefaul','t_Use default assembler for target'#010+
+ '3*2Ratt_Read AT&T style assembler'#010+
'3*2Rintel_Read Intel style assembler'#010+
'6*2RMOT_Read motorola style assembler'#010+
'**1S<x>_Syntax options:'#010+
'**2S2_Same as -Mobjfpc'#010+
- '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010,
'**2Sa_Turn on assertions'#010+
'**2Sd_Same as -Mdelphi'#010+
- '**2Se<x>_Error ','options. <x> is a combination of the following:'#010+
+ '**2Se<x>_Error options. <x> is a combination of the following:'#010+
'**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
'**3*_w : Compiler also halts after warnings'#010+
- '**3*_n : Compiler also halts after notes'#010+
+ '**3*_n : Compiler also ','halts after notes'#010+
'**3*_h : Compiler also halts after hints'#010+
- '**2S','f_Enable certain features in compiler and RTL; see fpc -i or fpc'+
- ' -ir for possible values)'#010+
+ '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc -'+
+ 'ir for possible values)'#010+
'**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
- '**2Sh_Use reference counted strings (ansistring by default) instead of'+
- ' shortstrings'#010+
- '**2Si_T','urn on inlining of procedures/functions declared as "inline"'#010+
+ '**2Sh_Use reference counted ','strings (ansistring by default) instead '+
+ 'of shortstrings'#010+
+ '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
'**2Sk_Load fpcylix unit'#010+
'**2SI<x>_Set interface style to <x>'#010+
'**3SIcom_COM compatible interface (default)'#010+
- '**3SIcorba_CORBA compatible interface'#010+
- '**2Sm_Support macros like C (global)'#010,
+ '**3SIcorba_C','ORBA compatible interface'#010+
+ '**2Sm_Support macros like C (global)'#010+
'**2So_Same as -Mtp'#010+
'**2Ss_Constructor name must be init (destructor must be done)'#010+
'**2Sv_Support vector processing (use CPU vector extensions if availabl'+
'e)'#010+
- '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
- '**2Sy_@<pointer> retu','rns a typed pointer, same as $T+'#010+
+ '**2Sx_Enable exception ','keywords (default in Delphi/ObjFPC modes)'#010+
+ '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
'**1s_Do not call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+
'**2st_Generate script to link on target'#010+
- '**2sr_Skip register allocation phase (use with -alr)'#010+
+ '**2sr_Skip register allocati','on phase (use with -alr)'#010+
'**1T<x>_Target operating system:'#010+
- '3*2Ta','ndroid_Android'#010+
+ '3*2Tandroid_Android'#010+
'3*2Taros_AROS'#010+
'3*2Tbeos_BeOS'#010+
'3*2Tdarwin_Darwin/Mac OS X'#010+
'3*2Tembedded_Embedded'#010+
'3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
'3*2Tfreebsd_FreeBSD'#010+
- '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
+ '3*2Tgo32v2_Vers','ion 2 of DJ Delorie DOS extender'#010+
'3*2Thaiku_Haiku'#010+
- '3*2Tiphonesim_',' iPhoneSimulator from iOS SDK 3.2+ (older versions: -T'+
- 'darwin)'#010+
+ '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+
+ 'rwin)'#010+
'3*2Tlinux_Linux'#010+
'3*2Tnativent_Native NT API (experimental)'#010+
'3*2Tnetbsd_NetBSD'#010+
- '3*2Tnetware_Novell Netware Module (clib)'#010+
+ '3*2Tnetware_Novell Netware Module (clib',')'#010+
'3*2Tnetwlibc_Novell Netware Module (libc)'#010+
- '3*2Topenbsd_OpenBSD',#010+
+ '3*2Topenbsd_OpenBSD'#010+
'3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsunos_SunOS/Solaris'#010+
'3*2Tsymbian_Symbian OS'#010+
'3*2Tsolaris_Solaris'#010+
'3*2Twatcom_Watcom compatible DOS extender'#010+
'3*2Twdosx_WDOSX DOS extender'#010+
- '3*2Twin32_Windows 32 Bit'#010+
+ '3*2Twin32_W','indows 32 Bit'#010+
'3*2Twince_Windows CE'#010+
'4*2Tdarwin_Darwin/Mac OS X'#010+
- '4','*2Tfreebsd_FreeBSD'#010+
+ '4*2Tfreebsd_FreeBSD'#010+
'4*2Tiphonesim_ iPhoneSimulator'#010+
'4*2Tlinux_Linux'#010+
'4*2Tnetbsd_NetBSD'#010+
'4*2Topenbsd_OpenBSD'#010+
'4*2Tsolaris_Solaris'#010+
'4*2Twin64_Win64 (64 bit Windows systems)'#010+
- '6*2Tamiga_Commodore Amiga'#010+
+ '6*2Tamiga_Co','mmodore Amiga'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux'#010+
- '6*2Tpal','mos_PalmOS'#010+
+ '6*2Tpalmos_PalmOS'#010+
'8*2Tmsdos_MS-DOS (and compatible)'#010+
'a*2Tdarwin_Darwin/iOS'#010+
'A*2Tandroid_Android'#010+
'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
'A*2Tembedded_Embedded'#010+
'A*2Tgba_Game Boy Advance'#010+
- 'A*2Tlinux_Linux'#010+
+ 'A*2Tlinux_Li','nux'#010+
'A*2Tnds_Nintendo DS'#010+
'A*2Tsymbian_Symbian'#010+
- 'A*2Twince_Windows C','E'#010+
+ 'A*2Twince_Windows CE'#010+
'J*2Tandroid_Android'#010+
'J*2Tjava_Java'#010+
'm*2Tembedded_Embedded'#010+
@@ -1609,10 +1614,10 @@ const msgtxt : array[0..000317,1..240] of char=(
'P*2Taix_AIX'#010+
'P*2Tamiga_AmigaOS'#010+
'P*2Tdarwin_Darwin/Mac OS X'#010+
- 'P*2Tlinux_Linux'#010+
+ 'P*2T','linux_Linux'#010+
'P*2Tmacos_Mac OS (classic)'#010+
'P*2Tmorphos_MorphOS'#010+
- 'P*2T','netbsd_NetBSD'#010+
+ 'P*2Tnetbsd_NetBSD'#010+
'P*2Twii_Wii'#010+
'p*2Taix_AIX'#010+
'p*2Tdarwin_Darwin/Mac OS X'#010+
@@ -1621,142 +1626,142 @@ const msgtxt : array[0..000317,1..240] of char=(
'S*2Tlinux_Linux'#010+
'V*2Tembedded_Embedded'#010+
'**1u<x>_Undefines the symbol <x>'#010+
- '**1U_Unit options:'#010+
- '**2Un_Do not check where the unit name matches th','e file name'#010+
+ '**1U_','Unit options:'#010+
+ '**2Un_Do not check where the unit name matches the file name'#010+
'**2Ur_Generate release unit files (never automatically recompiled)'#010+
'**2Us_Compile a system unit'#010+
'**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
- '**2*_e : Show errors (default) 0 : Show nothing (except erro','rs'+
+ '**2','*_e : Show errors (default) 0 : Show nothing (except errors'+
')'#010+
'**2*_w : Show warnings u : Show unit info'#010+
'**2*_n : Show notes t : Show tried/used files'#010+
- '**2*_h : Show hints c : Show conditionals'#010+
+ '**2*_h : Show hints c : Show conditio','nals'#010+
'**2*_i : Show general info d : Show debug info'#010+
- '*','*2*_l : Show linenumbers r : Rhide/GCC compatibility mod'+
- 'e'#010+
+ '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+
'**2*_s : Show time stamps q : Show message numbers'#010+
- '**2*_a : Show everything x : Show info about invoked tools'+
- #010+
- '**2*_b : Write file names messages p',' : Write tree.log with parse t'+
- 'ree'#010+
+ '**2*_a : Show everything x : Show ','info about invoked too'+
+ 'ls'#010+
+ '**2*_b : Write file names messages p : Write tree.log with parse tre'+
+ 'e'#010+
'**2*_ with full path v : Write fpcdebug.txt with'#010+
'**2*_z : Write output to stderr lots of debugging info'#010+
- '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
- 'F*1V<x>_Append '#039'-<x','>'#039' to the used compiler binary name (e.g.'+
- ' for version)'#010+
+ '**2*_m<x>,<y> ',': Do not show messages numbered <x> and <y>'#010+
+ 'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
+ 'or version)'#010+
'**1W<x>_Target-specific options (targets)'#010+
'3*2WA_Specify native type application (Windows)'#010+
- '4*2WA_Specify native type application (Windows)'#010+
- 'A*2WA_Specify native type application (Windows)',#010+
+ '4*2WA_Specify native type applic','ation (Windows)'#010+
+ 'A*2WA_Specify native type application (Windows)'#010+
'3*2Wb_Create a bundle instead of a library (Darwin)'#010+
'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
- 'a*2Wb_Create a bundle instead of a library (Darwin)'#010+
- 'A*2Wb_Create a bundle instead o','f a library (Darwin)'#010+
+ 'a*2Wb_Create a bundl','e instead of a library (Darwin)'#010+
+ 'A*2Wb_Create a bundle instead of a library (Darwin)'#010+
'4*2Wb_Create a bundle instead of a library (Darwin)'#010+
'3*2WB_Create a relocatable image (Windows, Symbian)'#010+
- '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
+ '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010,
'4*2WB_Create a relocatable image (Windows)'#010+
- '4*2WBxxxx_Set image ','base to xxxx (Windows)'#010+
+ '4*2WBxxxx_Set image base to xxxx (Windows)'#010+
'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
- '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
+ '3*2WC_Specify console type application (EMX, OS/2,',' Windows)'#010+
'4*2WC_Specify console type application (Windows)'#010+
- 'A*2W','C_Specify console type application (Windows)'#010+
+ 'A*2WC_Specify console type application (Windows)'#010+
'P*2WC_Specify console type application (Classic Mac OS)'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
- '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
- 'A*2WD_Use DEFFI','LE to export functions of DLL or EXE (Windows)'#010+
+ '4*2WD_Use DEFF','ILE to export functions of DLL or EXE (Windows)'#010+
+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'3*2We_Use external resources (Darwin)'#010+
'4*2We_Use external resources (Darwin)'#010+
'a*2We_Use external resources (Darwin)'#010+
- 'A*2We_Use external resources (Darwin)'#010+
+ 'A*2We_Use extern','al resources (Darwin)'#010+
'P*2We_Use external resources (Darwin)'#010+
- 'p*2','We_Use external resources (Darwin)'#010+
+ 'p*2We_Use external resources (Darwin)'#010+
'3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
'3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
- '4*2WG_Specify graphic type application (Windows)'#010+
- 'A*2WG_Specify graphic type application (W','indows)'#010+
+ '4*2WG_Specify graphic type ','application (Windows)'#010+
+ 'A*2WG_Specify graphic type application (Windows)'#010+
'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
'3*2Wi_Use internal resources (Darwin)'#010+
'4*2Wi_Use internal resources (Darwin)'#010+
- 'a*2Wi_Use internal resources (Darwin)'#010+
+ 'a*2Wi_Use internal resources (Darwin)',#010+
'A*2Wi_Use internal resources (Darwin)'#010+
- 'P*2Wi_Use internal resou','rces (Darwin)'#010+
+ 'P*2Wi_Use internal resources (Darwin)'#010+
'p*2Wi_Use internal resources (Darwin)'#010+
'3*2WI_Turn on/off the usage of import sections (Windows)'#010+
'4*2WI_Turn on/off the usage of import sections (Windows)'#010+
- 'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
- '8*2Wm<x>_Set memo','ry model'#010+
+ 'A*2WI_Turn ','on/off the usage of import sections (Windows)'#010+
+ '8*2Wm<x>_Set memory model'#010+
'8*3WmTiny_Tiny memory model'#010+
'8*3WmSmall_Small memory model (default)'#010+
'8*3WmMedium_Medium memory model'#010+
'8*3WmCompact_Compact memory model'#010+
'8*3WmLarge_Large memory model'#010+
- '8*3WmHuge_Huge memory model'#010+
- '3*2WM<x>_Minimum Mac OS X deployment ve','rsion: 10.4, 10.5.1, ... (Dar'+
- 'win)'#010+
+ '8*3W','mHuge_Huge memory model'#010+
+ '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+ 'n)'#010+
'4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
- 'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+ 'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi',
+ 'n)'#010+
+ 'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
- 'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ','... (Dar'+
- 'win)'#010+
'3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
- 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
- 'A*2Wpxxxx_Specify',' the controller type; see fpc -i or fpc -iu for pos'+
- 'sible values'#010+
+ 'A*2WN_Do not generate re','location code, needed for debugging (Windows'+
+ ')'#010+
+ 'A*2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for possi'+
+ 'ble values'#010+
'm*2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for possi'+
'ble values'#010+
- 'V*2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for possi'+
- 'ble values'#010+
- '3*2WP<x>_Minim','um iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'+
- #010+
+ 'V*2Wpxxxx_Specify the controller',' type; see fpc -i or fpc -iu for pos'+
+ 'sible values'#010+
+ '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
'4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+
- 'a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
- 'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.','1, ... (Darwin)'#010+
+ 'a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ','... (Darwin)'#010+
+ 'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
'3*2WR_Generate relocation code (Windows)'#010+
'4*2WR_Generate relocation code (Windows)'#010+
'A*2WR_Generate relocation code (Windows)'#010+
- '8*2Wt<x>_Set the target executable format'#010+
+ '8*2Wt<x>_Set the target executable for','mat'#010+
'8*3Wtexe_Create a DOS .EXE file (default)'#010+
- '8*3Wtcom_Create a',' DOS .COM file (requires tiny memory model)'#010+
+ '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
'**2WX_Enable executable stack (Linux)'#010+
'**1X_Executable options:'#010+
- '**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+
- '9.1 (L','inux)'#010+
+ '**2X9_Generat','e linkerscript for GNU Binutils ld older than version 2'+
+ '.19.1 (Linux)'#010+
'**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
'ux)'#010+
'**2Xd_Do not search default library path (sometimes required for cross'+
- '-compiling when not using -XR)'#010+
+ '-compiling when not using -','XR)'#010+
'**2Xe_Use external linker'#010+
- '**2Xf_Substitute pthread library ','name for linking (BSD)'#010+
+ '**2Xf_Substitute pthread library name for linking (BSD)'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink section '+
'to executable'#010+
'**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+
- '**2Xi_Use internal linker'#010+
- '**2XLA_Define library substitutions for',' linking'#010+
+ '**','2Xi_Use internal linker'#010+
+ '**2XLA_Define library substitutions for linking'#010+
'**2XLO_Define order of library linking'#010+
'**2XLD_Exclude default order of standard libraries'#010+
'**2Xm_Generate link map'#010+
- '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
- 's '#039'main'#039')'#010+
- '**2Xn_Use target system native linker instead',' of GNU ld (Solaris, AI'+
- 'X)'#010+
+ '**2XM<x>_Set the name of the '#039'main'#039' program routine (d','efault'+
+ ' is '#039'main'#039')'#010+
+ '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+
+ #010+
'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
'**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
- '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
- 'ile, see the ld manual fo','r more information) (BeOS, Linux)'#010+
+ '**2Xr<x>_Set the linker'#039's rl','ink-path to <x> (needed for cross co'+
+ 'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
'**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
', Linux, Mac OS, Solaris)'#010+
'**2Xs_Strip all symbols from executable'#010+
- '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010,
+ '**2XS_T','ry to link units statically (default, defines FPC_LINK_STATIC'+
+ ')'#010+
'**2Xt_Link with static libraries (-static is passed to linker)'#010+
'**2Xv_Generate table for Virtual Entry calls'#010+
'**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+
- '**1*_'#010+
+ '**1','*_'#010+
'**1?_Show this help'#010+
'**1h_Shows this help without waiting'
);
diff --git a/compiler/x86/agx86nsm.pas b/compiler/x86/agx86nsm.pas
index 48193433c5..486ae21d4a 100644
--- a/compiler/x86/agx86nsm.pas
+++ b/compiler/x86/agx86nsm.pas
@@ -777,6 +777,10 @@ interface
internalerror(2015110501);
writer.AsmLn;
end;
+ aitconst_dgroup:
+ writer.AsmWriteLn(#9'DW'#9'DGROUP');
+ aitconst_fardataseg:
+ writer.AsmWriteLn(#9'DW'#9+current_module.modulename^+'_DATA');
{$endif i8086}
aitconst_32bit,
aitconst_16bit,
diff --git a/compiler/x86/rax86.pas b/compiler/x86/rax86.pas
index c1fbdea716..07461500ec 100644
--- a/compiler/x86/rax86.pas
+++ b/compiler/x86/rax86.pas
@@ -296,7 +296,15 @@ end;
procedure Tx86Operand.SetupData;
begin
+{$ifdef i8086}
+ InitRef;
+ if current_settings.x86memorymodel=mm_huge then
+ opr.ref.refaddr:=addr_fardataseg
+ else
+ opr.ref.refaddr:=addr_dgroup;
+{$else i8086}
Message(asmr_w_CODE_and_DATA_not_supported);
+{$endif i8086}
end;
diff --git a/compiler/x86/rax86int.pas b/compiler/x86/rax86int.pas
index 3ef89d2e30..967f0572da 100644
--- a/compiler/x86/rax86int.pas
+++ b/compiler/x86/rax86int.pas
@@ -984,7 +984,17 @@ Unit Rax86int;
is_asmopcode(actasmpattern) then
break;
consume(AS_ID);
- if SearchIConstant(tempstr,l) then
+ if (tempstr='@CODE') or (tempstr='@DATA') then
+ begin
+ if asmsym='' then
+ begin
+ asmsym:=tempstr;
+ asmsymtyp:=AT_SECTION;
+ end
+ else
+ Message(asmr_e_cant_have_multiple_relocatable_symbols);
+ end
+ else if SearchIConstant(tempstr,l) then
begin
str(l, tempstr);
expr:=expr + tempstr;
@@ -1518,7 +1528,10 @@ Unit Rax86int;
oper.opr.ref.symbol:=current_asmdata.RefAsmSymbol(tempstr);
{$ifdef i8086}
if isseg then
- oper.opr.ref.refaddr:=addr_seg
+ begin
+ if not (oper.opr.ref.refaddr in [addr_fardataseg,addr_dgroup]) then
+ oper.opr.ref.refaddr:=addr_seg;
+ end
else if (tempsymtyp=AT_FUNCTION) and (oper.opr.ref.segment=NR_NO) then
oper.opr.ref.segment:=NR_CS;
{$endif i8086}
@@ -1596,6 +1609,15 @@ Unit Rax86int;
if not (oper.opr.typ in [OPR_NONE,OPR_CONSTANT]) then
Message(asmr_e_invalid_operand_type);
BuildConstSymbolExpression(true,false,false,l,tempstr,tempsymtyp,isseg,is_farproc_entry);
+{$ifdef i8086}
+ if tempstr='@DATA' then
+ begin
+ if not isseg then
+ Message(asmr_e_CODE_or_DATA_without_SEG);
+ oper.SetupData;
+ end
+ else
+{$endif i8086}
if tempstr<>'' then
begin
oper.opr.typ:=OPR_SYMBOL;
@@ -1803,15 +1825,13 @@ Unit Rax86int;
Consume(AS_ID);
end
else
- if actasmpattern = '@CODE' then
+ if (actasmpattern = '@CODE') or (actasmpattern = '@DATA') then
begin
- oper.SetupCode;
- Consume(AS_ID);
- end
- else
- if actasmpattern = '@DATA' then
- begin
- oper.SetupData;
+{$ifdef i8086}
+ Message(asmr_e_CODE_or_DATA_without_SEG);
+{$else i8086}
+ Message(asmr_w_CODE_and_DATA_not_supported);
+{$endif i8086}
Consume(AS_ID);
end
else
@@ -2328,7 +2348,22 @@ Unit Rax86int;
if constsize<>sizeof(pint) then
Message1(asmr_w_const32bit_for_address,asmsym);
{$ifdef i8086}
- if isseg then
+ if (asmsym='@CODE') or (asmsym='@DATA') then
+ begin
+ if not isseg then
+ Message(asmr_e_CODE_or_DATA_without_SEG);
+ if asmsym='@DATA' then
+ begin
+ if current_settings.x86memorymodel=mm_huge then
+ curlist.concat(Tai_const.Create_fardataseg)
+ else
+ curlist.concat(Tai_const.Create_dgroup);
+ end
+ else
+ { todo: implement @CODE }
+ internalerror(2015111001);
+ end
+ else if isseg then
curlist.concat(Tai_const.Create_seg_name(asmsym))
else
{$endif i8086}