mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-15 13:49:15 +02:00
* fix alignment broken by previous commit
git-svn-id: trunk@3056 -
This commit is contained in:
parent
b2121dae20
commit
693d7e2463
@ -85,7 +85,6 @@ implementation
|
|||||||
old_block_type : tblock_type;
|
old_block_type : tblock_type;
|
||||||
storefilepos : tfileposinfo;
|
storefilepos : tfileposinfo;
|
||||||
cursectype : TAsmSectiontype;
|
cursectype : TAsmSectiontype;
|
||||||
cural : tasmlisttype;
|
|
||||||
datalist : tasmlist;
|
datalist : tasmlist;
|
||||||
|
|
||||||
procedure check_range(def:torddef);
|
procedure check_range(def:torddef);
|
||||||
@ -1008,17 +1007,6 @@ implementation
|
|||||||
myexit:
|
myexit:
|
||||||
block_type:=old_block_type;
|
block_type:=old_block_type;
|
||||||
|
|
||||||
if writable then
|
|
||||||
begin
|
|
||||||
cural:=al_typedconsts;
|
|
||||||
cursectype:=sec_data;
|
|
||||||
end
|
|
||||||
else
|
|
||||||
begin
|
|
||||||
cural:=al_rotypedconsts;
|
|
||||||
cursectype:=sec_rodata;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ Add symbol name if this is specified. For array
|
{ Add symbol name if this is specified. For array
|
||||||
elements sym=nil and we should skip this }
|
elements sym=nil and we should skip this }
|
||||||
if assigned(sym) then
|
if assigned(sym) then
|
||||||
@ -1026,8 +1014,12 @@ implementation
|
|||||||
storefilepos:=aktfilepos;
|
storefilepos:=aktfilepos;
|
||||||
aktfilepos:=sym.fileinfo;
|
aktfilepos:=sym.fileinfo;
|
||||||
{ insert cut for smartlinking or alignment }
|
{ insert cut for smartlinking or alignment }
|
||||||
|
if writable then
|
||||||
|
cursectype:=sec_data
|
||||||
|
else
|
||||||
|
cursectype:=sec_rodata;
|
||||||
maybe_new_object_file(list);
|
maybe_new_object_file(list);
|
||||||
new_section(list,cursectype,lower(sym.mangledname),const_align(size_2_align(l)));
|
new_section(list,cursectype,lower(sym.mangledname),const_align(t.def.alignment));
|
||||||
if (sym.owner.symtabletype=globalsymtable) or
|
if (sym.owner.symtabletype=globalsymtable) or
|
||||||
maybe_smartlink_symbol or
|
maybe_smartlink_symbol or
|
||||||
(assigned(current_procinfo) and
|
(assigned(current_procinfo) and
|
||||||
|
Loading…
Reference in New Issue
Block a user