瀏覽代碼

* ensure that softfloat and libgcc float never use rfs/wfs

git-svn-id: trunk@7229 -
florian 18 年之前
父節點
當前提交
d78071f8b2
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      rtl/arm/arm.inc
  2. 3 3
      rtl/arm/mathu.inc

+ 1 - 1
rtl/arm/arm.inc

@@ -23,7 +23,7 @@ const
 
 
 procedure fpc_cpuinit;
 procedure fpc_cpuinit;
 begin
 begin
-{$if not(defined(wince)) and not(defined(gba)) and not(defined(nds))}
+{$if not(defined(wince)) and not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
   asm
   asm
     rfs r0
     rfs r0
     and r0,r0,#0xffe0ffff
     and r0,r0,#0xffe0ffff

+ 3 - 3
rtl/arm/mathu.inc

@@ -212,7 +212,7 @@ end;
 }
 }
 
 
 
 
-{$if not(defined(gba)) and not(defined(nds))}
+{$if not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
 const
 const
   _FPU_MASK_IM  =  $00010000;      { invalid operation      }
   _FPU_MASK_IM  =  $00010000;      { invalid operation      }
   _FPU_MASK_ZM  =  $00020000;      { divide by zero         }
   _FPU_MASK_ZM  =  $00020000;      { divide by zero         }
@@ -263,7 +263,7 @@ function GetExceptionMask: TFPUExceptionMask;
   var
   var
     cw : dword;
     cw : dword;
   begin
   begin
-{$if not(defined(gba)) and not(defined(nds))}
+{$if not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
     Result:=[];
     Result:=[];
     cw:=FPU_GetCW;
     cw:=FPU_GetCW;
 
 
@@ -294,7 +294,7 @@ function SetExceptionMask(const Mask: TFPUExceptionMask): TFPUExceptionMask;
   var
   var
     cw : dword;
     cw : dword;
   begin
   begin
-{$if not(defined(gba)) and not(defined(nds))}
+{$if not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
     cw:=FPU_GetCW or _FPU_MASK_ALL;
     cw:=FPU_GetCW or _FPU_MASK_ALL;
 
 
     if exInvalidOp in Mask then
     if exInvalidOp in Mask then