diff options
author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-10-15 22:06:16 +0000 |
---|---|---|
committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-10-15 22:06:16 +0000 |
commit | 462a434f097d68267e501e749818ac488f34ddfa (patch) | |
tree | ad927d5e9030ad1f9f5c8e360d9703e8d4346217 /compiler/ngtcon.pas | |
parent | 9a05fd20d413bebdef35b459f93c69df80db3e87 (diff) | |
download | fpc-462a434f097d68267e501e749818ac488f34ddfa.tar.gz |
* specify AT_DATA when refering to the 'RESSTR' symbols; among other things,
this fixes resourcestring constants in the i8086 memory model.
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@25796 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/ngtcon.pas')
-rw-r--r-- | compiler/ngtcon.pas | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/ngtcon.pas b/compiler/ngtcon.pas index afe86662fb..7649bf966d 100644 --- a/compiler/ngtcon.pas +++ b/compiler/ngtcon.pas @@ -491,7 +491,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis begin current_asmdata.ResStrInits.Concat( TTCInitItem.Create(tcsym,curoffset, - current_asmdata.RefAsmSymbol(make_mangledname('RESSTR',hsym.owner,hsym.name))) + current_asmdata.RefAsmSymbol(make_mangledname('RESSTR',hsym.owner,hsym.name),AT_DATA)) ); Include(tcsym.varoptions,vo_force_finalize); end; @@ -959,7 +959,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis list.concat(Tai_const.Createname(tlabelsym(srsym).mangledname,offset)); constsym : if tconstsym(srsym).consttyp=constresourcestring then - list.concat(Tai_const.Createname(make_mangledname('RESSTR',tconstsym(srsym).owner,tconstsym(srsym).name),sizeof(pint))) + list.concat(Tai_const.Createname(make_mangledname('RESSTR',tconstsym(srsym).owner,tconstsym(srsym).name),AT_DATA,sizeof(pint))) else Message(type_e_variable_id_expected); else |