From c961c72c300775ad41509fcb4e81a7b3c68be090 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 12 Feb 2017 16:05:13 +0000
Subject: [PATCH] * tarmtypeconvnode.first_int_to_real should call the generic
 method in the parent class, if soft fpu code is generated, resolves #31350

git-svn-id: trunk@35430 -
---
 compiler/arm/narmcnv.pas | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compiler/arm/narmcnv.pas b/compiler/arm/narmcnv.pas
index 177c0edea3..8af7553b07 100644
--- a/compiler/arm/narmcnv.pas
+++ b/compiler/arm/narmcnv.pas
@@ -75,6 +75,9 @@ implementation
         fname: string[19];
       begin
         if (cs_fp_emulation in current_settings.moduleswitches) or
+{$ifdef cpufpemu}
+          (current_settings.fputype=fpu_soft) or
+{$endif cpufpemu}
           (current_settings.fputype=fpu_fpv4_s16) then
           result:=inherited first_int_to_real
         else