intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-17 06:40:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use accept instead of accept4 for Android.

Browse Source 
Summary:
The accept4 syscall is missing on older ARM Android kernels, and the accept()
call is implemented with the accept4 syscall, so we'll need to call the accept
syscall directly.

Reviewers: vharron, tberghammer, labath

Subscribers: ovyalov, chaoren, labath, tberghammer, aemerson, lldb-commits

Differential Revision: http://reviews.llvm.org/D10887

llvm-svn: 242319
This commit is contained in:
Chaoren Lin
2015-07-15 19:22:12 +00:00
parent f7ee0870ae
commit e271658ec1
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lldb/source/Host/common/Socket.cpp
View File

@@ -24,7 +24,11 @@
#include <asm-generic/errno-base.h>
#include <errno.h>
#include <arpa/inet.h>
#endif
#if defined(ANDROID_ARM_BUILD_STATIC)
#include <unistd.h>
#include <sys/syscall.h>
#endif // ANDROID_ARM_BUILD_STATIC
#endif // __ANDROID_NDK__
#ifndef LLDB_DISABLE_POSIX
#include <arpa/inet.h>
@@ -70,7 +74,20 @@ NativeSocket CreateSocket(const int domain, const int type, const int protocol,
NativeSocket Accept(NativeSocket sockfd, struct sockaddr *addr, socklen_t *addrlen, bool child_processes_inherit)
{
#ifdef SOCK_CLOEXEC
#if defined(ANDROID_ARM_BUILD_STATIC)
// Temporary workaround for statically linking Android lldb-server with the
// latest API.
int fd = syscall(__NR_accept, sockfd, addr, addrlen);
if (fd >= 0 && !child_processes_inherit)
{
int flags = ::fcntl(fd, F_GETFD);
if (flags == -1)
return -1;
if (::fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1)
return -1;
}
return fd;
#elif defined(SOCK_CLOEXEC)
int flags = 0;
if (!child_processes_inherit) {
flags |= SOCK_CLOEXEC;