Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -3287,7 +3287,7 @@
   }
   return error;
 }
-#if defined(__APPLE__)
+#ifndef _WIN32
 #define USE_SOCKETPAIR_FOR_LOCAL_CONNECTION 1
 #endif
 
Index: tools/lldb-server/lldb-gdbserver.cpp
===================================================================
--- tools/lldb-server/lldb-gdbserver.cpp
+++ tools/lldb-server/lldb-gdbserver.cpp
@@ -97,6 +97,7 @@
     {"attach", required_argument, NULL, 'a'},
     {"named-pipe", required_argument, NULL, 'N'},
     {"pipe", required_argument, NULL, 'U'},
+    {"fd", required_argument, NULL, 'F'},
     {"native-regs", no_argument, NULL,
      'r'}, // Specify to use the native registers instead of the gdb defaults
            // for the architecture.  NOTE: this is a do-nothing arg as it's
@@ -401,6 +402,7 @@
       break;
 
     case 'U': // unnamed pipe
+    case 'F':
       if (optarg && optarg[0])
         unnamed_pipe_fd = StringConvert::ToUInt32(optarg, -1);
       break;