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

--- Merging r42115 into '.':

Browse Source 
U    compiler/i386/n386flw.pas
--- Recording mergeinfo for merge of r42115 into '.':
 U   .
--- Merging r43830 into '.':
U    compiler/i386/cpunode.pas
U    compiler/options.pas
--- Recording mergeinfo for merge of r43830 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43978 -
This commit is contained in:
joost 2020-01-19 12:48:36 +00:00
parent 897ae85a0e
commit e70c001dad
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/i386/cpunode.pas
View File

@ -55,9 +55,9 @@ unit cpunode;
n386mem,
n386set,
n386inl,
{$ifdef TEST_WIN32_SEH}
{$ifndef DISABLE_WIN32_SEH}
n386flw,
{$endif TEST_WIN32_SEH}
{$endif not DISABLE_WIN32_SEH}
n386mat,
{ symtable }
symcpu,

5
compiler/i386/n386flw.pas
View File

@ -144,16 +144,15 @@ function reset_regvars(var n: tnode; arg: pointer): foreachnoderesult;
make_not_regable(n,[]);
calln:
include(tprocinfo(arg).flags,pi_do_call);
else ;
end;
result:=fen_true;
end;
function copy_parasize(var n: tnode; arg: pointer): foreachnoderesult;
begin
case n.nodetype of
calln:
if n.nodetype=calln then
tcgprocinfo(arg).allocate_push_parasize(tcallnode(n).pushed_parasize);
end;
result:=fen_true;
end;

4
compiler/options.pas
View File

@ -4251,10 +4251,10 @@ begin
def_system_macro('FPC_USE_WIN64_SEH');
{$endif DISABLE_WIN64_SEH}
{$ifdef TEST_WIN32_SEH}
{$ifndef DISABLE_WIN32_SEH}
if target_info.system=system_i386_win32 then
def_system_macro('FPC_USE_WIN32_SEH');
{$endif TEST_WIN32_SEH}
{$endif not DISABLE_WIN32_SEH}
{$ifdef ARM}
{ define FPC_DOUBLE_HILO_SWAPPED if needed to properly handle doubles in RTL }