Index: cmake/modules/LLDBConfig.cmake
===================================================================
--- cmake/modules/LLDBConfig.cmake
+++ cmake/modules/LLDBConfig.cmake
@@ -248,3 +248,22 @@
 endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLDB_COMPILE_FLAGS}")
+
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    # Check for syscalls used by lldb-server on linux.
+    # If these are not found, it will fall back to ptrace (slow) for memory reads.
+    check_cxx_source_compiles("
+#include <sys/uio.h>
+
+int main() { return process_vm_readv(0, 0, 0, 0, 0, 0); }
+"
+        HAVE_PROCESS_VM_READV)
+    check_cxx_source_compiles("
+#include <sys/syscall.h>
+
+int main() { return __NR_process_vm_readv; }
+"
+        HAVE_NR_PROCESS_VM_READV)
+    add_definitions( -DHAVE_PROCESS_VM_READV=${HAVE_PROCESS_VM_READV}
+        -DHAVE_NR_PROCESS_VM_READV=${HAVE_NR_PROCESS_VM_READV})
+endif()
Index: include/lldb/Host/linux/Uio.h
===================================================================
--- include/lldb/Host/linux/Uio.h
+++ include/lldb/Host/linux/Uio.h
@@ -12,8 +12,8 @@
 
 #include <sys/uio.h>
 
-// Android does not define the process_vm_readv wrapper
-#ifdef __ANDROID_NDK__
+// We shall provide our own implementation of process_vm_readv if it is not present
+#if !HAVE_PROCESS_VM_READV
 ssize_t process_vm_readv(::pid_t pid,
 			 const struct iovec *local_iov, unsigned long liovcnt,
 			 const struct iovec *remote_iov, unsigned long riovcnt,
Index: source/Host/CMakeLists.txt
===================================================================
--- source/Host/CMakeLists.txt
+++ source/Host/CMakeLists.txt
@@ -110,6 +110,7 @@
         linux/Host.cpp
         linux/HostInfoLinux.cpp
         linux/HostThreadLinux.cpp
+        linux/LibcGlue.cpp
         linux/ThisThread.cpp
         )
     else()
@@ -117,6 +118,7 @@
         linux/Host.cpp
         linux/HostInfoLinux.cpp
         linux/HostThreadLinux.cpp
+        linux/LibcGlue.cpp
         linux/ThisThread.cpp
         )
     endif()
Index: source/Host/android/LibcGlue.cpp
===================================================================
--- source/Host/android/LibcGlue.cpp
+++ source/Host/android/LibcGlue.cpp
@@ -12,7 +12,6 @@
 #include <android/api-level.h>
 
 #include <sys/syscall.h>
-#include <lldb/Host/linux/Uio.h>
 
 #if __ANDROID_API__ < 21
 
@@ -39,11 +38,3 @@
 }
 
 #endif
-
-ssize_t process_vm_readv(::pid_t pid,
-			 const struct iovec *local_iov, unsigned long liovcnt,
-			 const struct iovec *remote_iov, unsigned long riovcnt,
-			 unsigned long flags)
-{
-    return syscall(__NR_process_vm_readv, pid, local_iov, liovcnt, remote_iov, riovcnt, flags);
-}
Index: source/Host/linux/LibcGlue.cpp
===================================================================
--- source/Host/linux/LibcGlue.cpp
+++ source/Host/linux/LibcGlue.cpp
@@ -7,43 +7,22 @@
 //
 //===----------------------------------------------------------------------===//
 
-// This files adds functions missing from libc on earlier versions of Android
-
-#include <android/api-level.h>
+// This files adds functions missing from libc on older versions of linux
 
 #include <sys/syscall.h>
 #include <lldb/Host/linux/Uio.h>
 
-#if __ANDROID_API__ < 21
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#include "lldb/Host/Time.h"
-
-time_t timegm(struct tm* t)
-{
-    return (time_t) timegm64(t);
-}
-
-int signalfd (int fd, const sigset_t *mask, int flags)
-{
-    return syscall(__NR_signalfd4, fd, mask, _NSIG / 8, flags);
-}
-
-int posix_openpt(int flags)
-{
-    return open("/dev/ptmx", flags);
-}
-
-#endif
-
+#if !HAVE_PROCESS_VM_READV // If the syscall wrapper is not available, provide one.
 ssize_t process_vm_readv(::pid_t pid,
 			 const struct iovec *local_iov, unsigned long liovcnt,
 			 const struct iovec *remote_iov, unsigned long riovcnt,
 			 unsigned long flags)
 {
+#if HAVE_NR_PROCESS_VM_READV // If we have the syscall number, we can issue the syscall ourselves.
     return syscall(__NR_process_vm_readv, pid, local_iov, liovcnt, remote_iov, riovcnt, flags);
+#else // If not, let's pretend the syscall is not present.
+    errno = ENOSYS;
+    return -1;
+#endif
 }
+#endif