[Lldb-commits] [PATCH] D10887: Use accept instead of accept4 for Android.

[Chaoren Lin]

chaoren updated this revision to Diff 29788.
chaoren added a comment.
Herald added subscribers: srhines, danalbert.

- Add explanatory comment.


http://reviews.llvm.org/D10887

Files:
  source/Host/common/Socket.cpp

Index: source/Host/common/Socket.cpp
===================================================================
--- source/Host/common/Socket.cpp
+++ source/Host/common/Socket.cpp
@@ -24,7 +24,11 @@
 #include <asm-generic/errno-base.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#endif
+#ifdef __arm__
+#include <unistd.h>
+#include <sys/syscall.h>
+#endif // __arm__
+#endif // __ANDROID_NDK__
 
 #ifndef LLDB_DISABLE_POSIX
 #include <arpa/inet.h>
@@ -70,7 +74,14 @@
 
 NativeSocket Accept(NativeSocket sockfd, struct sockaddr *addr, socklen_t *addrlen, bool child_processes_inherit)
 {
-#ifdef SOCK_CLOEXEC
+#if defined(__ANDROID_NDK__) && defined(__arm__)
+	// 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)
+		fcntl(fd, F_SETFD, FD_CLOEXEC);
+	return fd;
+#elif defined(SOCK_CLOEXEC)
     int flags = 0;
     if (!child_processes_inherit) {
         flags |= SOCK_CLOEXEC;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D10887.29788.patch
Type: text/x-patch
Size: 1014 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150715/4c875266/attachment.bin>