diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-08-16 14:46:20 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-08-16 14:46:20 +0000 |
| commit | 25a1c69fe29434003f28493683f172599258dd84 (patch) | |
| tree | 8a1f9d54c8eb3f8da3fbb7c5609acaafc317cadf /compiler | |
| parent | 4d4f9cc7c40767ebc2d0c47a6160601ac26c8408 (diff) | |
| download | fpc-25a1c69fe29434003f28493683f172599258dd84.tar.gz | |
* safecall is only supposed to do anything for Windows targets. Removed
partial implementation for other targets and run test only for Windows
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11593 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ncgflw.pas | 3 | ||||
| -rw-r--r-- | compiler/psub.pas | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/ncgflw.pas b/compiler/ncgflw.pas index 59251b3a92..16ad629ce3 100644 --- a/compiler/ncgflw.pas +++ b/compiler/ncgflw.pas @@ -1521,7 +1521,8 @@ implementation if codegenerror then exit; {$if defined(x86) or defined(arm)} - if current_procinfo.procdef.proccalloption=pocall_safecall then + if (target_info.system in system_all_windows) and + (current_procinfo.procdef.proccalloption=pocall_safecall) then begin { Remove and destroy the last exception object } cg.a_call_name(current_asmdata.CurrAsmList,'FPC_POPOBJECTSTACK'); diff --git a/compiler/psub.pas b/compiler/psub.pas index 5798bf760c..03a1109779 100644 --- a/compiler/psub.pas +++ b/compiler/psub.pas @@ -744,7 +744,8 @@ implementation {$if defined(x86) or defined(arm)} { set implicit_finally flag for if procedure is safecall } - if procdef.proccalloption=pocall_safecall then + if (target_info.system in system_all_windows) and + (procdef.proccalloption=pocall_safecall) then include(flags, pi_needs_implicit_finally); {$endif} { firstpass everything } |