Selaa lähdekoodia

# revisions: 45533

git-svn-id: tags/release_3_2_0@45534 -
marco 5 vuotta sitten
vanhempi
commit
f1f3e219fe
3 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 1 1
      rtl/linux/bunxsysc.inc
  2. 3 2
      rtl/linux/linux.pp
  3. 1 1
      utils/fpcm/revision.inc

+ 1 - 1
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}

+ 3 - 2
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));

+ 1 - 1
utils/fpcm/revision.inc

@@ -1 +1 @@
-'2020-03-20 rev 44315'
+'2020-05-04 rev 45256'