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

- don't apply const_align() to alignments passed to high level typed

Browse Source 
constant builder, it will do so itself if necessary

git-svn-id: trunk@34632 -
This commit is contained in:
Jonas Maebe 2016-10-06 06:25:02 +00:00
parent 4987bc5c98
commit 4c9903455e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/aasmdef.pas
View File

@ -72,7 +72,7 @@ function TAsmDataDef.DefineAsmSymbolByClass(symclass: TAsmSymbolClass; const s:
symind,ptrdef, symind,ptrdef,
sec_rodata, sec_rodata,
lower(symind.name), lower(symind.name),
const_align(ptrdef.alignment))); ptrdef.alignment));
tcb.free; tcb.free;
if (_typ=AT_DATA_FORCEINDIRECT) and not (target_info.system in systems_indirect_var_imports) then if (_typ=AT_DATA_FORCEINDIRECT) and not (target_info.system in systems_indirect_var_imports) then
current_module.add_public_asmsym(symind.name,AB_INDIRECT,AT_DATA); current_module.add_public_asmsym(symind.name,AB_INDIRECT,AT_DATA);

2
compiler/cresstr.pas
View File

@ -170,7 +170,7 @@ uses
valuelab.lab:=nil; valuelab.lab:=nil;
valuelab.ofs:=0; valuelab.ofs:=0;
end; end;
current_asmdata.asmlists[al_const].concat(cai_align.Create(const_align(sizeof(pint)))); current_asmdata.asmlists[al_const].concat(cai_align.Create(sizeof(pint)));
namelab:=tcb.emit_ansistring_const(current_asmdata.asmlists[al_const],@R.Name[1],length(R.name),getansistringcodepage); namelab:=tcb.emit_ansistring_const(current_asmdata.asmlists[al_const],@R.Name[1],length(R.name),getansistringcodepage);
{ {
Resourcestring index: Resourcestring index:

6
compiler/ncgrtti.pas
View File

@ -1372,7 +1372,7 @@ implementation
rttilab:=current_asmdata.DefineAsmSymbol(Tstoreddef(def).rtti_mangledname(rt)+'_o2s',AB_GLOBAL,AT_DATA_FORCEINDIRECT,tabledef); rttilab:=current_asmdata.DefineAsmSymbol(Tstoreddef(def).rtti_mangledname(rt)+'_o2s',AB_GLOBAL,AT_DATA_FORCEINDIRECT,tabledef);
current_asmdata.asmlists[al_rtti].concatlist(tcb.get_final_asmlist( current_asmdata.asmlists[al_rtti].concatlist(tcb.get_final_asmlist(
rttilab,tabledef,sec_rodata, rttilab,tabledef,sec_rodata,
rttilab.name,const_align(sizeof(pint)))); rttilab.name,sizeof(pint)));
tcb.free; tcb.free;
current_module.add_public_asmsym(rttilab); current_module.add_public_asmsym(rttilab);
@ -1419,7 +1419,7 @@ implementation
rttilab:=current_asmdata.DefineAsmSymbol(Tstoreddef(def).rtti_mangledname(rt)+'_s2o',AB_GLOBAL,AT_DATA_FORCEINDIRECT,tabledef); rttilab:=current_asmdata.DefineAsmSymbol(Tstoreddef(def).rtti_mangledname(rt)+'_s2o',AB_GLOBAL,AT_DATA_FORCEINDIRECT,tabledef);
current_asmdata.asmlists[al_rtti].concatlist(tcb.get_final_asmlist( current_asmdata.asmlists[al_rtti].concatlist(tcb.get_final_asmlist(
rttilab,tabledef,sec_rodata, rttilab,tabledef,sec_rodata,
rttilab.name,const_align(sizeof(pint)))); rttilab.name,sizeof(pint)));
tcb.free; tcb.free;
current_module.add_public_asmsym(rttilab); current_module.add_public_asmsym(rttilab);
@ -1568,7 +1568,7 @@ implementation
rttidef:=tcb.end_anonymous_record; rttidef:=tcb.end_anonymous_record;
rttilab:=current_asmdata.DefineAsmSymbol(tstoreddef(def).rtti_mangledname(rt),AB_GLOBAL,AT_DATA_FORCEINDIRECT,rttidef); rttilab:=current_asmdata.DefineAsmSymbol(tstoreddef(def).rtti_mangledname(rt),AB_GLOBAL,AT_DATA_FORCEINDIRECT,rttidef);
current_asmdata.AsmLists[al_rtti].concatList( current_asmdata.AsmLists[al_rtti].concatList(
tcb.get_final_asmlist(rttilab,rttidef,sec_rodata,rttilab.name,const_align(sizeof(pint)))); tcb.get_final_asmlist(rttilab,rttidef,sec_rodata,rttilab.name,sizeof(pint)));
tcb.free; tcb.free;
current_module.add_public_asmsym(rttilab); current_module.add_public_asmsym(rttilab);

6
compiler/ncgvmt.pas
View File

@ -445,7 +445,7 @@ implementation
begin begin
current_asmdata.getglobaldatalabel(r); current_asmdata.getglobaldatalabel(r);
gendmt:=r; gendmt:=r;
al_globals.concat(cai_align.create(const_align(sizeof(pint)))); al_globals.concat(cai_align.create(sizeof(pint)));
al_globals.concat(Tai_label.Create(r)); al_globals.concat(Tai_label.Create(r));
{ entries for caching } { entries for caching }
al_globals.concat(Tai_const.Create_ptr(0)); al_globals.concat(Tai_const.Create_ptr(0));
@ -930,7 +930,7 @@ implementation
rec_tguid, rec_tguid,
sec_rodata, sec_rodata,
s, s,
const_align(sizeof(pint)))); sizeof(pint)));
tcb.free; tcb.free;
current_module.add_public_asmsym(sym); current_module.add_public_asmsym(sym);
end; end;
@ -1238,7 +1238,7 @@ implementation
current_asmdata.asmlists[al_globals].concatlist( current_asmdata.asmlists[al_globals].concatlist(
tcb.get_final_asmlist( tcb.get_final_asmlist(
sym, sym,
vmtdef,sec_rodata,_class.vmt_mangledname,const_align(sizeof(pint)) vmtdef,sec_rodata,_class.vmt_mangledname,sizeof(pint)
) )
); );
tcb.free; tcb.free;