From 7201fbe85e94ecd64540e7f4f9111b365791ec8d Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sat, 30 May 2020 16:02:35 +0000
Subject: [PATCH] # revisions: 43880,44093

git-svn-id: branches/fixes_3_2@45533 -
---
 rtl/linux/bunxsysc.inc | 2 +-
 rtl/linux/linux.pp     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rtl/linux/bunxsysc.inc b/rtl/linux/bunxsysc.inc
index 280705ab1a..be03c5c41a 100644
--- a/rtl/linux/bunxsysc.inc
+++ b/rtl/linux/bunxsysc.inc
@@ -521,7 +521,7 @@ Function fpLstat(path:pchar;Info:pstat):cint;
 
 begin
 {$if defined(generic_linux_syscalls)}
- fpLStat:=do_syscall(syscall_nr_fstatat,AT_FDCWD,TSysParam(path),TSysParam(info),0)
+ fpLStat:=do_syscall(syscall_nr_fstatat,AT_FDCWD,TSysParam(path),TSysParam(info),AT_SYMLINK_NOFOLLOW)
 {$else}
  fpLStat:=do_syscall(
 {$ifdef cpu64}
diff --git a/rtl/linux/linux.pp b/rtl/linux/linux.pp
index dd7e7030fd..9de5948632 100644
--- a/rtl/linux/linux.pp
+++ b/rtl/linux/linux.pp
@@ -270,7 +270,8 @@ type
   TEPoll_Data =  Epoll_Data;
   PEPoll_Data = ^Epoll_Data;
 
-  EPoll_Event = {$ifdef cpu64} packed {$endif} record
+  { x86_64 uses a packed record so it is compatible with i386 }
+  EPoll_Event = {$ifdef cpux86_64} packed {$endif} record
     Events: cuint32;
     Data  : TEpoll_Data;
   end;
@@ -555,7 +556,7 @@ function epoll_wait(epfd: cint; events: pepoll_event; maxevents, timeout: cint):
 begin
 {$if defined(generic_linux_syscalls)}
   epoll_wait := do_syscall(syscall_nr_epoll_pwait, tsysparam(epfd),
-    tsysparam(events), tsysparam(maxevents), tsysparam(timeout),0);
+    tsysparam(events), tsysparam(maxevents), tsysparam(timeout),0,sizeof(TSigSet));
 {$else}
   epoll_wait := do_syscall(syscall_nr_epoll_wait, tsysparam(epfd),
     tsysparam(events), tsysparam(maxevents), tsysparam(timeout));