- Don't include softfpu code on SPARC, unless bootstrapping with 2.6.

- Atari is never compiled on SPARC or MIPS (and even it does one day, softfpu is not needed).

git-svn-id: trunk@27203 -

rtl/atari/system.pp

@@ -53,18 +53,18 @@ const
   StdOutputHandle = 1;
   StdErrorHandle  = $ffff;
 
-    {$if defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC) or defined(CPUMIPS)}
+    {$if defined(CPUARM) or defined(CPUM68K)}
 
     {$define fpc_softfpu_interface}
     {$i softfpu.pp}
     {$undef fpc_softfpu_interface}
 
-    {$endif defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC) or defined(CPUMIPS)}
+    {$endif defined(CPUARM) or defined(CPUM68K)}
 
 
   implementation
 
-    {$if defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC) or defined(CPUMIPS)}
+    {$if defined(CPUARM) or defined(CPUM68K)}
 
     {$define fpc_softfpu_implementation}
     {$i softfpu.pp}
@@ -82,7 +82,7 @@ const
     {$define FPC_SYSTEM_HAS_extractFloat32Exp}
     {$define FPC_SYSTEM_HAS_extractFloat32Sign}
 
-    {$endif defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC) or defined(CPUMIPS)}
+    {$endif defined(CPUARM) or defined(CPUM68K)}
 
     {$I system.inc}
     {$I lowmath.inc}

rtl/linux/system.pp

@@ -36,13 +36,13 @@ Unit System;
 function get_cmdline:Pchar; 
 property cmdline:Pchar read get_cmdline;
 
-{$if defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC)}
+{$if defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$define fpc_softfpu_interface}
 {$i softfpu.pp}
 {$undef fpc_softfpu_interface}
 
-{$endif defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC)}
+{$endif defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {*****************************************************************************}
                                  implementation
@@ -55,7 +55,7 @@ var
 
 const calculated_cmdline:Pchar=nil;
 
-{$if defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC) }
+{$if defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$define fpc_softfpu_implementation}
 {$i softfpu.pp}
@@ -73,7 +73,7 @@ const calculated_cmdline:Pchar=nil;
 {$define FPC_SYSTEM_HAS_extractFloat32Exp}
 {$define FPC_SYSTEM_HAS_extractFloat32Sign}
 
-{$endif defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC) }
+{$endif defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$I system.inc}
 

rtl/solaris/system.pp

@@ -28,18 +28,18 @@ var argc:longint;
     argv:PPchar;
     envp:PPchar;
 
-{$if defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC)}
+{$if defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$define fpc_softfpu_interface}
 {$i softfpu.pp}
 {$undef fpc_softfpu_interface}
 
-{$endif defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC)}
+{$endif defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 implementation
 
 
-{$if defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC)}
+{$if defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$define fpc_softfpu_implementation}
 {$i softfpu.pp}
@@ -57,7 +57,7 @@ implementation
 {$define FPC_SYSTEM_HAS_extractFloat32Exp}
 {$define FPC_SYSTEM_HAS_extractFloat32Sign}
 
-{$endif defined(CPUARM) or defined(CPUM68K) or defined(CPUSPARC)}
+{$endif defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 { OS independant parts}