From 51644f497b5a301f39600bb4b799fb3bc606ec73 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Wed, 26 Sep 2018 20:22:13 +0000
Subject: [PATCH] * fixes broken compilation after merging

git-svn-id: trunk@39815 -
---
 rtl/linux/system.pp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/rtl/linux/system.pp b/rtl/linux/system.pp
index 9c68cec6f7..330dfb45c4 100644
--- a/rtl/linux/system.pp
+++ b/rtl/linux/system.pp
@@ -47,7 +47,7 @@ property cmdline:Pchar read get_cmdline;
 
 {$if defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 {$define FPC_LOAD_SOFTFPU}
-{$endif}
+{$endif defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$ifdef FPC_SOFT_FPUX80}
 {$define FPC_SOFTFLOAT_FLOATX80}
@@ -65,7 +65,6 @@ property cmdline:Pchar read get_cmdline;
 {$undef fpc_softfpu_interface}
 {$endif FPC_LOAD_SOFTFPU}
 
-{$endif defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$ifdef android}
   {$I sysandroidh.inc}
@@ -80,14 +79,13 @@ var
   sysenter_supported: LongInt = 0;
 {$endif}
 
-const 
+const
   calculated_cmdline:Pchar=nil;
 {$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
 {$define FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}
 procedure OsSetupEntryInformation(constref info: TEntryInformation); forward;
 {$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
 
-{$if defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 {$ifdef FPC_LOAD_SOFTFPU}
 
 {$define fpc_softfpu_implementation}
@@ -111,7 +109,6 @@ procedure OsSetupEntryInformation(constref info: TEntryInformation); forward;
 {$define FPC_SYSTEM_HAS_extractFloat32Sign}
 
 {$endif FPC_LOAD_SOFTFPU}
-{$endif defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
 
 {$I system.inc}