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

* fixed compilation with -dllvm after r30343

Browse Source 
git-svn-id: branches/hlcgllvm@30347 -
This commit is contained in:
Jonas Maebe 2015-03-28 11:34:02 +00:00
parent 5a2609933f
commit e12bd99b59
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/llvm/llvmdef.pas
View File

@ -63,7 +63,7 @@ interface
record consisting of 4 longints must be returned as a record consisting of record consisting of 4 longints must be returned as a record consisting of
two int64's on x86-64. This function is used to create (and reuse) two int64's on x86-64. This function is used to create (and reuse)
temporary recorddefs for such purposes.} temporary recorddefs for such purposes.}
function llvmgettemprecorddef(fieldtypes: tfplist; packrecords: shortint): trecorddef; function llvmgettemprecorddef(fieldtypes: tfplist; packrecords, recordalignmin, maxcrecordalign: shortint): trecorddef;
{ get the llvm type corresponding to a parameter, e.g. a record containing { get the llvm type corresponding to a parameter, e.g. a record containing
two integer int64 for an arbitrary record split over two individual int64 two integer int64 for an arbitrary record split over two individual int64
@ -621,7 +621,7 @@ implementation
end; end;
function llvmgettemprecorddef(fieldtypes: tfplist; packrecords: shortint): trecorddef; function llvmgettemprecorddef(fieldtypes: tfplist; packrecords, recordalignmin, maxcrecordalign: shortint): trecorddef;
var var
i: longint; i: longint;
res: PHashSetItem; res: PHashSetItem;
@ -675,7 +675,8 @@ implementation
res:=current_module.llvmdefs.FindOrAdd(@typename[1],length(typename)); res:=current_module.llvmdefs.FindOrAdd(@typename[1],length(typename));
if not assigned(res^.Data) then if not assigned(res^.Data) then
begin begin
res^.Data:=crecorddef.create_global_internal(typename,packrecords); res^.Data:=crecorddef.create_global_internal(typename,packrecords,
recordalignmin,maxcrecordalign);
trecorddef(res^.Data).add_fields_from_deflist(fieldtypes); trecorddef(res^.Data).add_fields_from_deflist(fieldtypes);
end; end;
result:=trecorddef(res^.Data); result:=trecorddef(res^.Data);
@ -706,7 +707,9 @@ implementation
retdeflist.add(retloc^.def); retdeflist.add(retloc^.def);
retloc:=retloc^.next; retloc:=retloc^.next;
until not assigned(retloc); until not assigned(retloc);
result:=llvmgettemprecorddef(retdeflist,C_alignment); result:=llvmgettemprecorddef(retdeflist,C_alignment,
targetinfos[target_info.system]^.alignment.recordalignmin,
targetinfos[target_info.system]^.alignment.maxCrecordalign);
end; end;