浏览代码

+ only include softfpu if FPUNONE is not set

git-svn-id: trunk@17012 -
florian 14 年之前
父节点
当前提交
c2f04796b9
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      rtl/embedded/system.pp

+ 4 - 0
rtl/embedded/system.pp

@@ -79,6 +79,7 @@ function get_cmdline:Pchar;
 property cmdline:Pchar read get_cmdline;
 property cmdline:Pchar read get_cmdline;
 {$endif FPC_HAS_FEATURE_COMMANDARGS}
 {$endif FPC_HAS_FEATURE_COMMANDARGS}
 
 
+{$ifndef FPUNONE}
 {$ifdef FPC_HAS_FEATURE_SOFTFPU}
 {$ifdef FPC_HAS_FEATURE_SOFTFPU}
 
 
 {$define fpc_softfpu_interface}
 {$define fpc_softfpu_interface}
@@ -86,6 +87,7 @@ property cmdline:Pchar read get_cmdline;
 {$undef fpc_softfpu_interface}
 {$undef fpc_softfpu_interface}
 
 
 {$endif FPC_HAS_FEATURE_SOFTFPU}
 {$endif FPC_HAS_FEATURE_SOFTFPU}
+{$endif FPUNONE}
 
 
 {*****************************************************************************}
 {*****************************************************************************}
                                  implementation
                                  implementation
@@ -95,11 +97,13 @@ property cmdline:Pchar read get_cmdline;
 
 
 const calculated_cmdline:Pchar=nil;
 const calculated_cmdline:Pchar=nil;
 
 
+{$ifndef FPUNONE}
 {$ifdef FPC_HAS_FEATURE_SOFTFPU}
 {$ifdef FPC_HAS_FEATURE_SOFTFPU}
 
 
 {$define fpc_softfpu_implementation}
 {$define fpc_softfpu_implementation}
 {$i softfpu.pp}
 {$i softfpu.pp}
 {$undef fpc_softfpu_implementation}
 {$undef fpc_softfpu_implementation}
+{$endif FPUNONE}
 
 
 { we get these functions and types from the softfpu code }
 { we get these functions and types from the softfpu code }
 {$define FPC_SYSTEM_HAS_float64}
 {$define FPC_SYSTEM_HAS_float64}