paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-07 16:10:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

* use the indirect symbol for resource strings if necessary

Browse Source 
* have the unit import the resource string symbol if necessary

git-svn-id: trunk@34188 -
This commit is contained in:
svenbarth 2016-07-22 16:04:51 +00:00
parent cbbbe8927e
commit 02ebae7658
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/ncgld.pas
View File

@ -379,6 +379,8 @@ implementation
href : treference;
newsize : tcgsize;
vd : tdef;
indirect : boolean;
name : TSymStr;
begin
{ we don't know the size of all arrays }
newsize:=def_cgsize(resultdef);
@ -402,7 +404,14 @@ implementation
if tconstsym(symtableentry).consttyp=constresourcestring then
begin
location_reset_ref(location,LOC_CREFERENCE,def_cgsize(cansistringtype),cansistringtype.size);
location.reference.symbol:=current_asmdata.RefAsmSymbol(make_mangledname('RESSTR',symtableentry.owner,symtableentry.name),AT_DATA);
indirect:=(tf_supports_packages in target_info.flags) and
(target_info.system in systems_indirect_var_imports) and
(cs_imported_data in current_settings.localswitches) and
(symtableentry.owner.moduleid<>current_module.moduleid);
name:=make_mangledname('RESSTR',symtableentry.owner,symtableentry.name);
location.reference.symbol:=current_asmdata.RefAsmSymbol(name,AT_DATA,indirect);
if symtableentry.owner.moduleid<>current_module.moduleid then
current_module.addimportedsym(symtableentry);
vd:=search_system_type('TRESOURCESTRINGRECORD').typedef;
hlcg.g_set_addr_nonbitpacked_field_ref(
current_asmdata.CurrAsmList,