From 7c9cf75418b9fc60c968820df62a77f162e4d213 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Sat, 6 Jan 2024 14:33:42 +0100 Subject: [PATCH] Fix syscall unit compilation for i386-linux using -dFPC_USE_LIBC --- rtl/linux/i386/syscall.inc | 1 + rtl/linux/system.pp | 5 ----- rtl/unix/syscall.pp | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rtl/linux/i386/syscall.inc b/rtl/linux/i386/syscall.inc index 129c4f47f9..d8a9a1c9e5 100644 --- a/rtl/linux/i386/syscall.inc +++ b/rtl/linux/i386/syscall.inc @@ -45,6 +45,7 @@ type var psysinfo: LongWord = 0; + sysenter_supported : longint = 0; procedure InitSyscallIntf; var diff --git a/rtl/linux/system.pp b/rtl/linux/system.pp index 438e535ca9..f1070f4398 100644 --- a/rtl/linux/system.pp +++ b/rtl/linux/system.pp @@ -77,11 +77,6 @@ property cmdline:PAnsiChar read get_cmdline; implementation {*****************************************************************************} -{$if defined(CPUI386) and not defined(FPC_USE_LIBC)} -var - sysenter_supported: LongInt = 0; -{$endif} - const calculated_cmdline:PAnsiChar=nil; {$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION} diff --git a/rtl/unix/syscall.pp b/rtl/unix/syscall.pp index 02d4bdfccd..c37278387f 100644 --- a/rtl/unix/syscall.pp +++ b/rtl/unix/syscall.pp @@ -34,5 +34,10 @@ procedure seterrno(err:cint); external name 'FPC_SYS_SETERRNO'; {$ifdef FPC_HAS_SETSYSNR_INC} begin SetSyscallNumbers; +{$else} +{$if defined(linux) and defined(i386) and defined(FPC_USE_LIBC)} +begin + InitSyscallIntf; +{$endif} {$endif FPC_HAS_SETSYSNR_INC} end.