paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 23:01:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixes broken compilation after merging

Browse Source 
git-svn-id: trunk@39815 -
This commit is contained in:
florian 2018-09-26 20:22:13 +00:00
parent a34d4e715c
commit 51644f497b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/linux/system.pp
View File

@ -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))} {$if defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
{$define FPC_LOAD_SOFTFPU} {$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} {$ifdef FPC_SOFT_FPUX80}
{$define FPC_SOFTFLOAT_FLOATX80} {$define FPC_SOFTFLOAT_FLOATX80}
@ -65,7 +65,6 @@ property cmdline:Pchar read get_cmdline;
{$undef fpc_softfpu_interface} {$undef fpc_softfpu_interface}
{$endif FPC_LOAD_SOFTFPU} {$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} {$ifdef android}
{$I sysandroidh.inc} {$I sysandroidh.inc}
@ -80,14 +79,13 @@ var
sysenter_supported: LongInt = 0; sysenter_supported: LongInt = 0;
{$endif} {$endif}
const const
calculated_cmdline:Pchar=nil; calculated_cmdline:Pchar=nil;
{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION} {$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
{$define FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION} {$define FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}
procedure OsSetupEntryInformation(constref info: TEntryInformation); forward; procedure OsSetupEntryInformation(constref info: TEntryInformation); forward;
{$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION} {$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} {$ifdef FPC_LOAD_SOFTFPU}
{$define fpc_softfpu_implementation} {$define fpc_softfpu_implementation}
@ -111,7 +109,6 @@ procedure OsSetupEntryInformation(constref info: TEntryInformation); forward;
{$define FPC_SYSTEM_HAS_extractFloat32Sign} {$define FPC_SYSTEM_HAS_extractFloat32Sign}
{$endif FPC_LOAD_SOFTFPU} {$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} {$I system.inc}