From f7efca92ec1236487f86775e7df9658818619fce Mon Sep 17 00:00:00 2001 From: yury Date: Wed, 12 Dec 2018 14:04:57 +0000 Subject: [PATCH] * android: Disabled usage of the "pselect6" and "ppoll" syscalls for arm-android. These syscalls are not available on old Android versions (2.3 or older). git-svn-id: trunk@40536 - --- rtl/linux/bunxsysc.inc | 4 ++-- rtl/linux/osdefs.inc | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rtl/linux/bunxsysc.inc b/rtl/linux/bunxsysc.inc index 3ee2ac066b..280705ab1a 100644 --- a/rtl/linux/bunxsysc.inc +++ b/rtl/linux/bunxsysc.inc @@ -460,7 +460,7 @@ Function fpSelect(N:cint;readfds,writefds,exceptfds:pfdSet;TimeOut:PTimeVal):cin Select checks whether the file descriptor sets in readfs/writefs/exceptfs have changed. } -{$if defined(generic_linux_syscalls)} +{$if defined(generic_linux_syscalls) and not defined(NO_SYSCALL_PSELECT6)} var ts : timespec; pts : PTimeSpec; @@ -495,7 +495,7 @@ end; {$endif} function fpPoll(fds: ppollfd; nfds: cuint; timeout: clong): cint; -{$if defined(generic_linux_syscalls)} +{$if defined(generic_linux_syscalls) and not defined(NO_SYSCALL_PPOLL)} var ts : timespec; begin if timeout<0 then diff --git a/rtl/linux/osdefs.inc b/rtl/linux/osdefs.inc index bee1fc3077..2d68e1189b 100644 --- a/rtl/linux/osdefs.inc +++ b/rtl/linux/osdefs.inc @@ -107,6 +107,10 @@ {$ifdef android} {$define generic_linux_syscalls} + {$ifdef cpuarm} + {$define NO_SYSCALL_PSELECT6} + {$define NO_SYSCALL_PPOLL} + {$endif cpuarm} {$define userenameat} {$undef usestime} {$undef OLDMMAP}