From 2a610e74b791bde7d191292f1c43692e93028abf Mon Sep 17 00:00:00 2001 From: pierre Date: Tue, 18 Dec 2012 15:06:24 +0000 Subject: [PATCH] Also handle fpu_soft git-svn-id: trunk@23178 - --- compiler/m68k/n68kcnv.pas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/m68k/n68kcnv.pas b/compiler/m68k/n68kcnv.pas index af5b48e8f7..a2cd3cce1a 100644 --- a/compiler/m68k/n68kcnv.pas +++ b/compiler/m68k/n68kcnv.pas @@ -46,7 +46,7 @@ implementation cgbase,pass_1,pass_2,procinfo, ncon,ncal, ncgutil, - cpubase,aasmcpu, + cpubase,cpuinfo,aasmcpu, rgobj,tgobj,cgobj,hlcgobj,cgutils,globtype,cgcpu; @@ -61,7 +61,8 @@ implementation { In case we are in emulation mode, we must always call the helpers } - if (cs_fp_emulation in current_settings.moduleswitches) then + if (cs_fp_emulation in current_settings.moduleswitches) + or (current_settings.fputype=fpu_soft) then begin result := inherited first_int_to_real; exit;